exit smile

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileSchoolController.java

@@ -43,14 +43,18 @@ public class SmileSchoolController {
         return AjaxResult.success(iSmileSchoolService.getSchoolById(id));
     }
 
-    @PostMapping("create")
+    @PostMapping("/create")
     @ApiOperation("新建学校")
     @ResponseBody
     public AjaxResult create(@RequestBody SmileSchool smileSchool){
-        return AjaxResult.success(iSmileSchoolService.create(smileSchool));
+        if (iSmileSchoolService.create(smileSchool)){
+            return AjaxResult.success();
+        }else {
+            return AjaxResult.warn("学校已存在");
+        }
     }
 
-    @PostMapping("updateById")
+    @PostMapping("/updateById")
     @ApiOperation("更具id修改学校")
     @ResponseBody
     public AjaxResult updateById(@RequestBody SmileSchool smileSchool){
@@ -58,7 +62,6 @@ public class SmileSchoolController {
             return AjaxResult.success();
         }else {
             return AjaxResult.error();
-
         }
     }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileUserController.java

@@ -31,7 +31,7 @@ public class SmileUserController extends BaseController {
     ISmileUserService iSmileUserService;
 
     @GetMapping("/userList")
-    @ApiOperation(value = "获取注册用户列表")
+    @ApiOperation(value = "获取用户列表")
     @ResponseBody
     public AjaxResult userList(){
         List<SmileUserVo> smileUserVos = iSmileUserService.userList();

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/pom.xml

@@ -157,7 +157,12 @@
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-smile-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileSchoolService.java

@@ -20,5 +20,5 @@ public interface ISmileSchoolService extends IService<SmileSchool> {
 
     SmileSchool getSchoolById(Long id);
 
-    Integer create(SmileSchool smileSchool);
+    Boolean create(SmileSchool smileSchool);
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileOrganizationServiceImpl.java

@@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -38,7 +39,7 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
     @Override
     public List<SmileOrganizationVo> organizationList() {
         LambdaQueryWrapper<SmileOrganization> queryWrapper = Wrappers.lambdaQuery(SmileOrganization.class);
-        queryWrapper.eq(SmileOrganization::getDelTag,1);
+        queryWrapper.eq(SmileOrganization::getDelTag,0);
         List<SmileOrganization> smileOrganizations = smileOrganizationMapper.selectList(queryWrapper);
         return smileOrganizations.stream().map(smileOrganization -> {
             SmileOrganizationVo smileOrganizationVo = new SmileOrganizationVo();
@@ -53,11 +54,15 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
     @Override
     public Integer create(SmileOrganization smileOrganization) {
         log.info("smileOrganization:{}",smileOrganization);
+        smileOrganization.setCreatedDate(LocalDateTime.now());
+        smileOrganization.setUpdatedDate(LocalDateTime.now());
+        smileOrganization.setDelTag(0);
         return smileOrganizationMapper.insert(smileOrganization);
     }
 
     @Override
     public Boolean update(SmileOrganization smileOrganization) {
+        smileOrganization.setUpdatedDate(LocalDateTime.now());
         smileOrganizationMapper.updateById(smileOrganization);
         return true;
     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileSchoolServiceImpl.java

 package com.liquidnet.client.admin.zhengzai.smile.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileSchoolService;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
+import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.service.goblin.constant.SmileRedisConst;
 import com.liquidnet.service.smile.entity.SmileSchool;
 import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -26,6 +31,9 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
     @Autowired
     SmileSchoolMapper smileSchoolMapper;
 
+    @Autowired
+    RedisDataSourceUtil redisUtil;
+
     @Override
     public List<SmileSchool> schoolList() {
         return smileSchoolMapper.selectList(null);
@@ -37,9 +45,20 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
     }
 
     @Override
-    public Integer create(SmileSchool smileSchool) {
-        log.info("smileSchool:{}",smileSchool);
-        return smileSchoolMapper.insert(smileSchool);
+    public Boolean create(SmileSchool smileSchool) {
+        log.info("smileSchool:{}", smileSchool);
+        LambdaQueryWrapper<SmileSchool> queryWrapper = Wrappers.lambdaQuery(SmileSchool.class);
+        queryWrapper.eq(SmileSchool::getName, smileSchool.getName());
+        if (smileSchoolMapper.selectOne(queryWrapper) == null) {
+            int id = smileSchoolMapper.insert(smileSchool);
+            if (id > 0){
+                //存入redis中
+                log.info("school, id:{},smileSchool:{}",smileSchool.getId(),smileSchool);
+
+                return true;
+            }
+        }
+        return false;
     }
 
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileUserServiceImpl.java

@@ -29,7 +29,7 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
     public List<SmileUserVo> userList() {
         //查询未删除，未通过审核的用户
         LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class);
-        queryWrapper.eq(SmileUser::getDelTag,1);
+        queryWrapper.eq(SmileUser::getDelTag,0);
         queryWrapper.eq(false,SmileUser::getType,0);
         List<SmileUser> smileUsers = smileUserMapper.selectList(queryWrapper);
         return smileUsers.stream().map(smileUser -> {
@@ -44,7 +44,7 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
         log.info("查询用户id:{}",uid);
         //查询未删除，未通过审核的用户,id=uid
         LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class);
-        queryWrapper.eq(SmileUser::getDelTag,1);
+        queryWrapper.eq(SmileUser::getDelTag,0);
         queryWrapper.eq(false,SmileUser::getType,0);
         queryWrapper.eq(SmileUser::getId,uid);
         SmileUser smileUser = smileUserMapper.selectById(queryWrapper);
@@ -55,7 +55,7 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
     @Override
     public int create(SmileUser smileUser) {
         smileUser.setCreatedDate(LocalDateTime.now());
-        smileUser.setDelTag(1);
+        smileUser.setDelTag(0);
         log.info("smileUser:{}",smileUser);
         int id = smileUserMapper.insert(smileUser);
         log.info("return id:{}.",id);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/vo/SmileOrganizationVo.java

 package com.liquidnet.client.admin.zhengzai.smile.vo;
 
-import lombok.Data;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
@@ -13,6 +13,10 @@ import java.time.LocalDateTime;
  * @since 2022-03-14
  */
 @Data
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class SmileOrganizationVo{
 
     private static final long serialVersionUID = 1L;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/vo/SmileUserVo.java

 package com.liquidnet.client.admin.zhengzai.smile.vo;
 
+import lombok.*;
+
 import java.time.LocalDate;
 
+@Data
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class SmileUserVo {
 
     private Long id;
@@ -32,25 +39,30 @@ public class SmileUserVo {
     private String phone;
 
     /**
-     * 身份（1:在校学生（默认），2已毕业）
+     * 省key
      */
-    private Integer identity;
+    private String provinceKey;
 
     /**
-     * 学校名称
+     * 省
      */
-    private String schoolName;
+    private String province;
 
     /**
-     * 省
+     * 市key
      */
-    private String province;
+    private String cityKey;
 
     /**
      * 市
      */
     private String city;
 
+    /**
+     * 区key
+     */
+    private String areaKey;
+
     /**
      * 区
      */
@@ -61,18 +73,78 @@ public class SmileUserVo {
      */
     private String address;
 
+    /**
+     * 微信号
+     */
+    private String wechat;
+
     /**
      * 代理类型（1：总代，2：普代）
      */
     private Integer type;
 
+    /**
+     * 组织关联
+     */
+    private Long orgId;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 学校名称
+     */
+    private String schoolName;
+
+    /**
+     * 专业
+     */
+    private String schoolMajor;
+
+    /**
+     * 身份（1:在校学生（默认），2已毕业）
+     */
+    private Integer identity;
+
+    /**
+     * 标识步骤
+     */
+    private Integer tag;
+
+    /**
+     * 认证标识（0:未审核，1：通过，2：未通过）
+     */
+    private Integer authTag;
+
+    /**
+     * 认证失败原因
+     */
+    private String errorReason;
+
     /**
      * 1：代理开启，2：代理关闭
      */
     private Integer agent;
 
     /**
-     * 正常/黑名单
+     * 自我介绍
+     */
+    private String introduce;
+
+    /**
+     * 擅长1
+     */
+    private String specialty1;
+
+    /**
+     * 擅长2
+     */
+    private String specialty2;
+
+    /**
+     * 擅长3
      */
-    private Integer state;
+    private String specialty3;
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/vo/SmileUserVoOrg.java

 package com.liquidnet.client.admin.zhengzai.smile.vo;
 
+import lombok.*;
+
+@Data
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class SmileUserVoOrg {
 
     private Long id;

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/SmileOrganization.java

@@ -78,7 +78,7 @@ public class SmileOrganization implements Serializable {
     private Long agentName;
 
     /**
-     * 0：删除，1正常
+     * 0：未删除，1：已删除
      */
     private Integer delTag;
 

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/SmileUser.java

@@ -171,7 +171,7 @@ public class SmileUser implements Serializable {
     private Integer state;
 
     /**
-     * 0：删除，1正常
+     * 0：未删除，1：已删除
      */
     private Integer delTag;