修改redis

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

@@ -34,7 +34,7 @@ public final class RedisUtil extends AbstractRedisUtil{
 
     public static void main(String[] args) {
         String[] keys = {
-                "smile:sellData:10022646571540480032259531001879371141365764109917",
+                "smile:user:validate刘冉110223198711010051",
         };
         for (String key : keys) {
             long value = key.hashCode();

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/controller/SmileNoLoginController.java

@@ -6,6 +6,7 @@ import com.liquidnet.service.goblin.constant.SmileRedisConst;
 import com.liquidnet.service.goblin.dto.vo.SmileAgentVo;
 import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.goblin.service.manage.SmileFrontService;
+import com.liquidnet.service.util.SmileRedisUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -28,6 +29,8 @@ public class SmileNoLoginController {
     @Autowired
     private RedisUtil redisUtil;
     @Autowired
+    private SmileRedisUtils smileRedisUtils;
+    @Autowired
     private SmileFrontService smileFrontService;
 
     @PostMapping("getUser")
@@ -44,7 +47,7 @@ public class SmileNoLoginController {
     @PostMapping("getUserById")
     @ApiOperation("获取用户状态,返回用户")
     public ResponseDto<SmileUserVO> getUserById(@RequestParam("userId") String userId) {
-        SmileUserVO smileUserVO = (SmileUserVO) redisUtil.get(SmileRedisConst.SMILE_USER.concat(userId));
+        SmileUserVO smileUserVO =smileRedisUtils.getSmileUserVo(userId);
         return ResponseDto.success(smileUserVO);
     }
 

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/controller/SmileUserController.java

 package com.liquidnet.service.controller;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.IdentityUtils;
 import com.liquidnet.commons.lang.util.JsonUtils;
@@ -12,6 +11,7 @@ import com.liquidnet.service.goblin.constant.SmileRedisConst;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.service.manage.SmileFrontService;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.liquidnet.service.util.SmileRedisUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -36,7 +36,7 @@ import java.util.List;
 @Slf4j
 public class SmileUserController {
     @Autowired
-    private RedisUtil redisUtil;
+    private SmileRedisUtils smileRedisUtils;
     @Autowired
     private SmileFrontService smileFrontService;
     @Autowired
@@ -46,18 +46,18 @@ public class SmileUserController {
     @ApiOperation("获取用户状态，如果没查到，则返回null")
     public ResponseDto<SmileUserVO> getUser() {
         String userId = CurrentUtil.getCurrentUid();
-        SmileUserVO smileUserVO= (SmileUserVO) redisUtil.get(SmileRedisConst.SMILE_USER.concat(userId));
+        SmileUserVO smileUserVO=smileRedisUtils.getSmileUserVo(userId);
         return ResponseDto.success(smileUserVO);
     }
     @GetMapping("getSchool")
     @ApiOperation("获得学校")
     public ResponseDto<List<SmileSchoolVo>> getSchool() {
-        String userId = CurrentUtil.getCurrentUid();
+       /* String userId = CurrentUtil.getCurrentUid();
         List<SmileSchoolVo> list=null;
         if(redisUtil.hasKey(SmileRedisConst.SMILE_SCHOOL)){
             list= (List<SmileSchoolVo>) redisUtil.get(SmileRedisConst.SMILE_SCHOOL);
-        }
-        return ResponseDto.success(list);
+        }*/
+        return ResponseDto.success(smileRedisUtils.getSchool());
     }
     @GetMapping("getPerformance")
     @ApiOperation("获得演出列表")
@@ -69,11 +69,11 @@ public class SmileUserController {
     public ResponseDto repeatAuth() {
         String userId = CurrentUtil.getCurrentUid();
         //判断是否认证了。
-        SmileUserVO smileUserVORedis= (SmileUserVO) redisUtil.get(SmileRedisConst.SMILE_USER.concat(userId));
-     /*   if(null!=smileUserVORedis&&null!= smileUserVORedis.getType()&&(smileUserVORedis.getType()==2||smileUserVORedis.getType()==1)){
+        SmileUserVO smileUserVORedis= smileRedisUtils.getSmileUserVo(userId);
+        if(null!=smileUserVORedis&&null!= smileUserVORedis.getType()&&(smileUserVORedis.getType()==2||smileUserVORedis.getType()==1)){
             return ResponseDto.failure("该用户已认证!");
-        }*/
-        redisUtil.del(SmileRedisConst.SMILE_USER.concat(userId));
+        }
+        smileRedisUtils.del(SmileRedisConst.SMILE_USER.concat(userId));
         smileFrontService.deleteUser(userId);
         return ResponseDto.success();
     }
@@ -81,13 +81,14 @@ public class SmileUserController {
     @ApiOperation("认证")
     public ResponseDto auth() {
         String userId = CurrentUtil.getCurrentUid();
-        SmileUserVO smileUserVORedis= (SmileUserVO) redisUtil.get(SmileRedisConst.SMILE_USER.concat(userId));
+        SmileUserVO smileUserVORedis=  smileRedisUtils.getSmileUserVo(userId);
         if(null!=smileUserVORedis){
             if(smileUserVORedis.getAuthStatus()==1){
                 return ResponseDto.success(true);
             }else{
                 smileUserVORedis.setAuthStatus(1);
-                redisUtil.set(SmileRedisConst.SMILE_USER.concat(userId),smileUserVORedis);
+                smileRedisUtils.setSmileUserVo(userId,smileUserVORedis);
+                //redisUtil.set(SmileRedisConst.SMILE_USER.concat(userId),smileUserVORedis);
                 return ResponseDto.success(smileFrontService.auth(userId,smileUserVORedis));
             }
         }
@@ -107,7 +108,8 @@ public class SmileUserController {
             }
         }
         String userId = CurrentUtil.getCurrentUid();
-        SmileUserVO smileUserVORedis= (SmileUserVO) redisUtil.get(SmileRedisConst.SMILE_USER.concat(userId));
+
+        SmileUserVO smileUserVORedis= smileRedisUtils.getSmileUserVo(userId);
         smileUserVO.setUid(userId);
         if(null==smileUserVORedis){
             smileUserVO.setTag("1");
@@ -132,7 +134,7 @@ public class SmileUserController {
             String userId = CurrentUtil.getCurrentUid();
             if(validate(smileUserVO.getName(),smileUserVO.getIdCard(),userId)){
                 smileUserVO.setUid(userId);
-                SmileUserVO smileUserVORedis= (SmileUserVO) redisUtil.get(SmileRedisConst.SMILE_USER.concat(userId));
+                SmileUserVO smileUserVORedis=smileRedisUtils.getSmileUserVo(userId);
                 if(null==smileUserVORedis){
                     smileUserVORedis.setTag("2");
                 }else{
@@ -151,9 +153,9 @@ public class SmileUserController {
         return  ResponseDto.success();
     }
     public boolean validate(String realName,String cardNo,String userid){
-        Object o=redisUtil.get(SmileRedisConst.SMILE_USER_VALIDATE.concat(userid));
         //查看是否之前这个 身份证和 名字(1：验证失败 2：验证成功)
-        String status= (String) redisUtil.get(SmileRedisConst.SMILE_USER_VALIDATE.concat(realName+cardNo));
+
+        String status=   smileRedisUtils.getValidate(realName,cardNo);
         if(null!=status&&"1".equals(status)){
             return false;
         }
@@ -162,10 +164,10 @@ public class SmileUserController {
         if (null == respJNode || !"0".equals(respErrorCode = String.valueOf(respJNode.get("error_code")))) {
             log.info("###实名认证失败[{}]", respJNode);
             ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
-            redisUtil.set(SmileRedisConst.SMILE_USER_VALIDATE.concat(realName+cardNo),"1");
+            smileRedisUtils.setValidate(realName,cardNo,"1");
             return false;
         }
-        redisUtil.set(SmileRedisConst.SMILE_USER_VALIDATE.concat(realName+cardNo),"2");
+        smileRedisUtils.setValidate(realName,cardNo,"2");
         return true;
     }
     @PostMapping("saveOrUpdateUserThreeStep")
@@ -180,7 +182,7 @@ public class SmileUserController {
         }
         String userId = CurrentUtil.getCurrentUid();
         smileUserVO.setUid(userId);
-        SmileUserVO smileUserVORedis= (SmileUserVO) redisUtil.get(SmileRedisConst.SMILE_USER.concat(userId));
+        SmileUserVO smileUserVORedis=  smileRedisUtils.getSmileUserVo(userId);
         if(null==smileUserVORedis){
             smileUserVORedis.setTag("3");
         }else{
@@ -197,7 +199,7 @@ public class SmileUserController {
     @ApiOperation("获取销售数据")
     public ResponseDto<SellDataVO> getSellDataOne(@RequestParam String performanceId) {
         String userId = CurrentUtil.getCurrentUid();
-        SellDataVO sellDataVO = (SellDataVO) redisUtil.get(SmileRedisConst.SELL_DATA.concat(userId).concat(performanceId));
+        SellDataVO sellDataVO = smileRedisUtils.getSellDataVo(userId,performanceId);
         return  ResponseDto.success(sellDataVO);
     }
     @GetMapping("getSellDataTwo")
@@ -213,7 +215,7 @@ public class SmileUserController {
     public ResponseDto<CommissionVO> getCommission() {
         String userId = CurrentUtil.getCurrentUid();
         log.debug("用户id{}",userId);
-        CommissionVO commissionVO= (CommissionVO) redisUtil.get(SmileRedisConst.SELL_DATA_COMMISSION.concat(userId));
+        CommissionVO commissionVO= smileRedisUtils.getCommissionVO(userId);
         return  ResponseDto.success(commissionVO);
     }
 

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/service/impl/SmileFrontServiceImpl.java

 package com.liquidnet.service.service.impl;
 
-import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.goblin.constant.SmileRedisConst;
 import com.liquidnet.service.goblin.dto.vo.SellDataDetailVO;
 import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.goblin.service.manage.SmileFrontService;
@@ -12,6 +10,7 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.util.ObjectUtil;
 import com.liquidnet.service.util.QueueUtils;
 import com.liquidnet.service.util.SmileMongoUtils;
+import com.liquidnet.service.util.SmileRedisUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,11 +29,11 @@ import java.util.Map;
 @Service
 @Slf4j
 public class SmileFrontServiceImpl implements SmileFrontService {
-    @Autowired
-    private RedisUtil redisUtil;
     @Autowired
     private SmileMongoUtils smileMongoUtils;
     @Autowired
+    private SmileRedisUtils smileRedisUtils;
+    @Autowired
     QueueUtils queueUtils;
     @Autowired
     private MongoTemplate mongoTemplate;
@@ -43,13 +42,13 @@ public class SmileFrontServiceImpl implements SmileFrontService {
         if(null==redisVo){
             smileUserVO.setCreatedDate(LocalDateTime.now());
             smileUserVO.setDelTag(0);
-            redisUtil.set(SmileRedisConst.SMILE_USER.concat(smileUserVO.getUid()),smileUserVO);
+            smileRedisUtils.setSmileUserVo(smileUserVO.getUid(),smileUserVO);
            /// insertUser(smileUserVO);
             //插入
         }else{
             //update
             setUser(smileUserVO,redisVo,type);
-            redisUtil.set(SmileRedisConst.SMILE_USER.concat(redisVo.getUid()),redisVo);
+            smileRedisUtils.setSmileUserVo(redisVo.getUid(),smileUserVO);
             //updateUser(smileUserVO);
         }
         return true;
@@ -97,7 +96,7 @@ public class SmileFrontServiceImpl implements SmileFrontService {
                 list.add(kylinPerformanceVo);
             }
         }*/
-        String perforManceIds= (String) redisUtil.get(SmileRedisConst.SMILE_SHOW);
+        String perforManceIds= smileRedisUtils.getSmileShow();
         if(StringUtils.isNotBlank(perforManceIds)){
             for(String id:perforManceIds.split(",")){
                 KylinPerformanceVo kylinPerformanceVo=smileMongoUtils.getPerFormance(id);

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/util/SmileRedisUtils.java

+package com.liquidnet.service.util;
+
+import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.service.goblin.constant.SmileRedisConst;
+import com.liquidnet.service.goblin.dto.vo.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Slf4j
+@Component
+public class SmileRedisUtils {
+    @Autowired
+    RedisUtil redisUtil;
+
+    private int randomMax = 10;
+
+    public void del(String... keys) {
+        redisUtil.del(keys);
+    }
+    /* ---------------------------------------- smileUser ---------------------------------------- */
+    public SmileUserVO getSmileUserVo(String userId){
+       return (SmileUserVO) redisUtil.get(SmileRedisConst.SMILE_USER.concat(userId));
+    }
+    public void setSmileUserVo(String userId,SmileUserVO smileUserVORedis){
+        redisUtil.set(SmileRedisConst.SMILE_USER.concat(userId),smileUserVORedis);
+    }
+    /* ---------------------------------------- school ---------------------------------------- */
+    public List<SmileSchoolVo> getSchool(){
+        return (List<SmileSchoolVo>) redisUtil.get(SmileRedisConst.SMILE_SCHOOL);
+    }
+    /* ---------------------------------------- 认证 ---------------------------------------- */
+    public String getValidate(String realName,String cardNo){
+        return (String) redisUtil.get(SmileRedisConst.SMILE_USER_VALIDATE.concat(realName+cardNo));
+    }
+    public void setValidate(String realName,String cardNo,String type){
+        redisUtil.set(SmileRedisConst.SMILE_USER_VALIDATE.concat(realName+cardNo),type);
+    }
+    /* ---------------------------------------- 销售数据 ---------------------------------------- */
+    public SellDataVO getSellDataVo(String userId,String performanceId){
+       return  (SellDataVO) redisUtil.get(SmileRedisConst.SELL_DATA.concat(userId).concat(performanceId));
+    }
+
+    /* ---------------------------------------- 佣金明细数据 ---------------------------------------- */
+    public CommissionVO getCommissionVO(String userId){
+        return (CommissionVO) redisUtil.get(SmileRedisConst.SELL_DATA_COMMISSION.concat(userId));
+    }
+    /* ---------------------------------------- 演出列表数据 ---------------------------------------- */
+    public String getSmileShow(){
+        return (String) redisUtil.get(SmileRedisConst.SMILE_SHOW);
+    }
+    /* ---------------------------------------- 代理数据 ---------------------------------------- */
+    public SmileAgentVo getSmileAgentVo(String performanceId,String ticketId){
+        return (SmileAgentVo) redisUtil.get(SmileRedisConst.SMILE_AGENT.concat(performanceId).concat(":").concat(ticketId));
+    }
+
+}