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

@@ -31,8 +31,8 @@ public class SmileSchoolController {
     @GetMapping("/schoolList")
     @ApiOperation("获取学校列表")
     @ResponseBody
-    public AjaxResult schoolList() {
-        List<SmileSchool> smileSchools = iSmileSchoolService.schoolList();
+    public AjaxResult schoolList(@RequestParam(name = "name", required = false) String name) {
+        List<SmileSchool> smileSchools = iSmileSchoolService.schoolList(name);
         return AjaxResult.success(smileSchools);
     }
 
@@ -57,10 +57,10 @@ public class SmileSchoolController {
     @PostMapping("/updateById")
     @ApiOperation("更具id修改学校")
     @ResponseBody
-    public AjaxResult updateById(@RequestBody SmileSchool smileSchool){
-        if (iSmileSchoolService.updateById(smileSchool)){
+    public AjaxResult updateSchoolById(@RequestBody SmileSchool smileSchool){
+        if (iSmileSchoolService.updateSchoolById(smileSchool)) {
             return AjaxResult.success();
-        }else {
+        } 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

@@ -33,8 +33,8 @@ public class SmileUserController extends BaseController {
     @GetMapping("/userList")
     @ApiOperation(value = "获取用户列表")
     @ResponseBody
-    public AjaxResult userList(){
-        List<SmileUserVo> smileUserVos = iSmileUserService.userList();
+    public AjaxResult userList(@RequestParam(value = "phone", required = false)String phone){
+        List<SmileUserVo> smileUserVos = iSmileUserService.userList(phone);
         return AjaxResult.success(smileUserVos);
     }
 
@@ -62,12 +62,4 @@ public class SmileUserController extends BaseController {
         List<SmileUserVoOrg> userListByOrgId = iSmileUserService.getUserListByOrgId(orgId, agentId);
         return AjaxResult.success(userListByOrgId);
     }
-
-    @GetMapping("/getUserByPhone")
-    @ApiOperation(value = "根据手机号返回用户")
-    @ResponseBody
-    public AjaxResult getUserByPhone(@RequestParam(name = "phone" ,required = true)String phone){
-        SmileUserVo smileUserVo = iSmileUserService.getUserByPhone(phone);
-        return AjaxResult.success(smileUserVo);
-    }
 }

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

@@ -16,9 +16,11 @@ import java.util.List;
  */
 public interface ISmileSchoolService extends IService<SmileSchool> {
 
-    List<SmileSchool> schoolList();
+    List<SmileSchool> schoolList(String name);
 
     SmileSchool getSchoolById(Long id);
 
     Boolean create(SmileSchool smileSchool);
+
+    boolean updateSchoolById(SmileSchool smileSchool);
 }

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

@@ -10,7 +10,7 @@ import java.util.List;
 
 public interface ISmileUserService  extends IService<SmileUser> {
 
-    List<SmileUserVo> userList();
+    List<SmileUserVo> userList(String phone);
 
     SmileUser getUserById(Long uid);
 
@@ -18,5 +18,4 @@ public interface ISmileUserService  extends IService<SmileUser> {
 
     List<SmileUserVoOrg> getUserListByOrgId(Long orgId, Long agentId);
 
-    SmileUserVo getUserByPhone(String phone);
 }

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

@@ -6,11 +6,10 @@ 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;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -32,11 +31,16 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
     SmileSchoolMapper smileSchoolMapper;
 
     @Autowired
-    RedisDataSourceUtil redisUtil;
+    private RedisDataSourceUtil redisDataSourceUtil;
 
     @Override
-    public List<SmileSchool> schoolList() {
-        return smileSchoolMapper.selectList(null);
+    public List<SmileSchool> schoolList(String name) {
+        LambdaQueryWrapper<SmileSchool> queryWrapper = Wrappers.lambdaQuery(SmileSchool.class);
+        if (StringUtils.isNotBlank(name)) {
+            log.info("smileSchool:name{}", name);
+            queryWrapper.like(SmileSchool::getName, name);
+        }
+        return smileSchoolMapper.selectList(queryWrapper);
     }
 
     @Override
@@ -51,15 +55,27 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
         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);
-
+            if (id > 0) {
+                //更新redis
+                log.info("school, id:{},smileSchool:{}", smileSchool.getId(), smileSchool);
+//                redisDataSourceUtil.getRedisSmileUtil().set(SmileRedisConst.SMILE_SCHOOL + id, smileSchool);
                 return true;
             }
         }
         return false;
     }
 
+    @Override
+    public boolean updateSchoolById(SmileSchool smileSchool) {
+        LambdaQueryWrapper<SmileSchool> queryWrapper = Wrappers.lambdaQuery(SmileSchool.class);
+        queryWrapper.eq(SmileSchool::getId, smileSchool.getId());
+        if (smileSchoolMapper.update(smileSchool, queryWrapper) > 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

@@ -9,6 +9,7 @@ import com.liquidnet.client.admin.zhengzai.smile.vo.SmileUserVoOrg;
 import com.liquidnet.service.smile.entity.SmileUser;
 import com.liquidnet.service.smile.mapper.SmileUserMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,12 +26,17 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
     @Autowired
     SmileUserMapper smileUserMapper;
 
+
+
     @Override
-    public List<SmileUserVo> userList() {
+    public List<SmileUserVo> userList(String phone) {
         //查询未删除，未通过审核的用户
         LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class);
         queryWrapper.eq(SmileUser::getDelTag,0);
         queryWrapper.eq(false,SmileUser::getType,0);
+        if (StringUtils.isNotBlank(phone)){
+            queryWrapper.like(SmileUser::getPhone,phone);
+        }
         List<SmileUser> smileUsers = smileUserMapper.selectList(queryWrapper);
         return smileUsers.stream().map(smileUser -> {
             SmileUserVo smileUserVo = new SmileUserVo();
@@ -55,6 +61,7 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
     @Override
     public int create(SmileUser smileUser) {
         smileUser.setCreatedDate(LocalDateTime.now());
+        smileUser.setUpdatedDate(LocalDateTime.now());
         smileUser.setDelTag(0);
         log.info("smileUser:{}",smileUser);
         int id = smileUserMapper.insert(smileUser);
@@ -76,15 +83,4 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
         return smileUserVos;
     }
 
-    @Override
-    public SmileUserVo getUserByPhone(String phone) {
-        log.info("getUserByPhone phone:{}",phone);
-        LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class);
-        queryWrapper.eq(SmileUser::getPhone,phone);
-        SmileUser smileUser = smileUserMapper.selectOne(queryWrapper);
-        SmileUserVo userVo = new SmileUserVo();
-        BeanUtils.copyProperties(smileUser, userVo);
-        return userVo;
-    }
-
 }
\ 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/utils/SmileRedisUtils.java

+package com.liquidnet.client.admin.zhengzai.smile.utils;
+
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SmileRedisUtils {
+
+    @Autowired
+    RedisDataSourceUtil redisDataSourceUtil;
+
+}

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

@@ -13,6 +13,8 @@ public class SmileUserVo {
 
     private Long id;
 
+    private Long uid;
+
     /**
      * 照片
      */

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/config/RedisSmileConfig.java

+package com.liquidnet.common.cache.redis.config;//package com.liquidnet.common.cache.redis.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: RedisConfig
+ * @Package com.liquidnet.common.cache.redis.config
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/8/10 16:28
+ */
+@Slf4j
+@Configuration
+public class RedisSmileConfig extends AbstractRedisConfig {
+
+    @Value("${spring.redis.smile.host:null}")
+    private String host;
+    @Value("${spring.redis.smile.port:-1}")
+    private int port;
+    @Value("${spring.redis.smile.password:null}")
+    private String password;
+    @Value("${spring.redis.smile.lettuce.pool.max-active:-1}")
+    private int maxActive;
+    @Value("${spring.redis.smile.lettuce.pool.max-idle:-1}")
+    private int maxIdle;
+    @Value("${spring.redis.smile.lettuce.pool.min-idle:-1}")
+    private int minIdle;
+    @Value("${spring.redis.smile.lettuce.pool.max-wait:-1}")
+    private int maxWait;
+
+    @Value("${spring.redis.smile.dbs:${spring.redis.smile.database:-1}}")
+    private List<Integer> dbs;
+
+    String getHost(){
+        return this.host;
+    }
+
+    int getPort(){
+        return this.port;
+    }
+    String getPassword(){
+        return this.password;
+    }
+    int getMaxActive(){
+        return this.maxActive;
+    }
+    int getMaxIdle(){
+        return this.maxIdle;
+    }
+    int getMinIdle(){
+        return this.minIdle;
+    }
+    int getMaxWait(){
+        return this.maxWait;
+    }
+    List<Integer> getDbs(){
+        return this.dbs;
+    }
+}
\ No newline at end of file

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisDataSourceUtil.java

@@ -32,31 +32,38 @@ public class RedisDataSourceUtil {
     @Autowired
     private RedisCandyUtil redisCandyUtil;
 
-    public AbstractRedisUtil getRedisKylinUtil(){
+    @Autowired
+    private RedisSmileUtil redisSmileUtil;
+
+    public AbstractRedisUtil getRedisKylinUtil() {
         return this.redisKylinUtil;
     }
 
-    public AbstractRedisUtil getRedisDragonUtil(){
+    public AbstractRedisUtil getRedisDragonUtil() {
         return this.redisDragonUtil;
     }
 
-    public AbstractRedisUtil getRedisSweetUtil(){
+    public AbstractRedisUtil getRedisSweetUtil() {
         return this.redisSweetUtil;
     }
 
-    public AbstractRedisUtil getRedisAdamUtil(){
+    public AbstractRedisUtil getRedisAdamUtil() {
         return this.redisAdamUtil;
     }
 
-    public AbstractRedisUtil getRedisStoneUtil(){
+    public AbstractRedisUtil getRedisStoneUtil() {
         return this.redisSweetUtil;
     }
 
-    public AbstractRedisUtil getRedisCandyUtil(){
+    public AbstractRedisUtil getRedisCandyUtil() {
         return this.redisCandyUtil;
     }
 
-    public AbstractRedisUtil getRedisGoblinUtil(){
+    public AbstractRedisUtil getRedisGoblinUtil() {
         return this.redisGoblinUtil;
     }
+
+    public AbstractRedisUtil getRedisSmileUtil() {
+        return this.redisSmileUtil;
+    }
 }

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisSmileUtil.java

+package com.liquidnet.common.cache.redis.util;
+
+import com.liquidnet.common.cache.redis.config.AbstractRedisConfig;
+import com.liquidnet.common.cache.redis.config.RedisSmileConfig;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author AnJiabin <jiabin.an@lightnet.io>
+ * @version V1.0
+ * @Description: Redis工具类
+ * @class: RedisUtil
+ * @Package com.liquidnet.stellar.utils
+ * @Copyright: LightNet @ Copyright (c) 2020
+ * @date 2020/8/26 13:11
+ */
+@Slf4j
+@Component("redisSmileUtil")
+public final class RedisSmileUtil extends AbstractRedisUtil {
+    @Autowired
+    private RedisSmileConfig redisConfig;
+
+    @Override
+    public int getDbs() {
+        log.info("redisSmileUtil.totalDbs===", redisConfig.totalDbs);
+        return redisConfig.totalDbs;
+    }
+
+    @Override
+    AbstractRedisConfig getRedisConfig() {
+        return this.redisConfig;
+    }
+}

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

@@ -2,7 +2,6 @@ package com.liquidnet.service.smile.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -21,7 +20,6 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@Builder
 @ToString
 public class SmileUser implements Serializable {
 
@@ -30,6 +28,8 @@ public class SmileUser implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    private Long uid;
+
     /**
      * 照片
      */