合并代码。redis 和 积分商城 和 抽奖

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/stone/service/utils/StoneMongoUtils.java

 package com.liquidnet.client.admin.zhengzai.stone.service.utils;
 
-import com.liquidnet.client.admin.zhengzai.kylin.utils.MongoVoUtils;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
-import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
-import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
-import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
-import com.liquidnet.service.stone.constant.StoneConstant;
 import com.liquidnet.service.stone.entity.StoneScoreItems;
 import com.liquidnet.service.stone.vo.StoneUserVo;
 import com.mongodb.client.result.UpdateResult;
 import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
 
 @Component
 public class StoneMongoUtils {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/stone/service/utils/StoneRedisUtils.java

 package com.liquidnet.client.admin.zhengzai.stone.service.utils;
 
-import com.liquidnet.client.admin.zhengzai.kylin.utils.MongoVoUtils;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.service.stone.constant.StoneConstant;
 import com.liquidnet.service.stone.entity.StoneScoreItems;
 import com.liquidnet.service.stone.vo.StoneUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.List;
 
 @Component
 public class StoneRedisUtils {
 
     @Autowired
-    private RedisUtil redisUtil;
+    private RedisDataSourceUtil redisDataSourceUtil;
     @Autowired
     private StoneMongoUtils mongoUtils;
 
@@ -28,7 +24,7 @@ public class StoneRedisUtils {
      */
     public Integer getStoneGeneralSurplus(String itemId) {
         String redisKey = StoneConstant.ITEM.concat(itemId).concat(StoneConstant.SURPLUS_GENERAL);
-        Object obj = redisUtil.get(redisKey);
+        Object obj = redisDataSourceUtil.getRedisStoneUtil().get(redisKey);
         if (obj == null) {
             return 0;
         } else {
@@ -47,9 +43,9 @@ public class StoneRedisUtils {
         String redisKey = StoneConstant.ITEM.concat(itemId).concat(StoneConstant.SURPLUS_GENERAL);
         long result;
         if (general > 0) {
-            result = redisUtil.incr(redisKey, general);
+            result = redisDataSourceUtil.getRedisStoneUtil().incr(redisKey, general);
         } else {
-            result = redisUtil.decr(redisKey, Math.abs(general));
+            result = redisDataSourceUtil.getRedisStoneUtil().decr(redisKey, Math.abs(general));
         }
         return (int) result;
     }
@@ -62,7 +58,7 @@ public class StoneRedisUtils {
      */
     public void setItemData(String itemId, StoneScoreItems data) {
         String redisKey = StoneConstant.ITEM.concat(itemId);
-        redisUtil.set(redisKey, data);
+        redisDataSourceUtil.getRedisStoneUtil().set(redisKey, data);
     }
 
     /**
@@ -72,7 +68,7 @@ public class StoneRedisUtils {
      */
     public StoneScoreItems getItemData(String itemId) {
         String redisKey = StoneConstant.ITEM.concat(itemId);
-        Object obj = redisUtil.get(redisKey);
+        Object obj = redisDataSourceUtil.getRedisStoneUtil().get(redisKey);
         if (obj == null) {
             return mongoUtils.itemGet(itemId);
         } else {
@@ -80,68 +76,6 @@ public class StoneRedisUtils {
         }
     }
 
-
-//    /**
-//     * 修改 积分物品 缓存list
-//     *
-//     * @param data
-//     */
-//    public void updateItemDataList(StoneScoreItems data) {
-//        String redisKey = StoneConstant.ITEM_LIST;
-//        Object obj = redisUtil.get(redisKey);
-//        List<StoneScoreItems> dataList;
-//        if (obj == null) {
-//            dataList = mongoUtils.itemList();
-//        } else {
-//            dataList = (List<StoneScoreItems>) obj;
-//        }
-//        for (int i = 0; i < dataList.size(); i++) {
-//            StoneScoreItems items = dataList.get(i);
-//            if (items.getItemId().equals(data.getItemId())) {
-//                dataList.set(i, items);
-//                break;
-//            }
-//        }
-//        redisUtil.set(redisKey, dataList);
-//    }
-
-//    /**
-//     * 添加 积分物品 缓存list
-//     *
-//     * @param data
-//     */
-//    public void addItemDataList(StoneScoreItems data) {
-//        String redisKey = StoneConstant.ITEM_LIST;
-//        Object obj = redisUtil.get(redisKey);
-//        List<StoneScoreItems> dataList;
-//        if (obj == null) {
-//            dataList = mongoUtils.itemList();
-//        } else {
-//            dataList = (List<StoneScoreItems>) obj;
-//        }
-//        dataList.add(0, data);
-//        if (dataList.size() > 40) {
-//            int size = dataList.size() - 40;
-//            for (int i = 0; i < size; i++) {
-//                dataList.remove(40);
-//            }
-//        }
-//        redisUtil.set(redisKey, dataList);
-//    }
-
-//    /**
-//     * 设置 积分物品 缓存list
-//     */
-//    public List<StoneScoreItems> getItemDataList() {
-//        String redisKey = StoneConstant.ITEM_LIST;
-//        Object obj = redisUtil.get(redisKey);
-//        if (obj == null) {
-//            return mongoUtils.itemList();
-//        } else {
-//            return (List<StoneScoreItems>) obj;
-//        }
-//    }
-
     /**
      * 设置 用户积分 缓存
      *
@@ -150,7 +84,7 @@ public class StoneRedisUtils {
      */
     public void setUserData(String uid, StoneUserVo data) {
         String redisKey = StoneConstant.USER.concat(uid);
-        redisUtil.set(redisKey, data);
+        redisDataSourceUtil.getRedisStoneUtil().set(redisKey, data);
     }
 
     /**
@@ -160,7 +94,7 @@ public class StoneRedisUtils {
      */
     public StoneUserVo getUserData(String uid) {
         String redisKey = StoneConstant.USER.concat(uid);
-        Object obj = redisUtil.get(redisKey);
+        Object obj = redisDataSourceUtil.getRedisStoneUtil().get(redisKey);
         if (obj == null) {
             return null;
         } else {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/utils/SweetRedisAdminUtils.java

 package com.liquidnet.client.admin.zhengzai.sweet.utils;
 
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.service.sweet.constant.SweetConstant;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityDrawVo;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityVo;
@@ -17,16 +17,16 @@ public class SweetRedisAdminUtils {
     @Autowired
     private MongoTemplate mongoTemplate;
     @Autowired
-    private RedisUtil redisUtil;
+    private RedisDataSourceUtil redisDataSourceUtil;
 
     public void setIntegralActivityList(List<IntegralActivityVo> voList) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_LIST;
-        boolean set = redisUtil.set(redisKey, voList);
+        boolean set = redisDataSourceUtil.getRedisSweetUtil().set(redisKey, voList);
     }
 
     public void setIntegralActivityInfo(IntegralActivityVo integralActivityVo) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_INFO.concat(integralActivityVo.getIntegralActivityId());
-        boolean set = redisUtil.set(redisKey, integralActivityVo);
+        boolean set = redisDataSourceUtil.getRedisSweetUtil().set(redisKey, integralActivityVo);
     }
 
     public void incrIntegralActivityPrizeNum(String integralActivityId, String prizeId, Integer num) {
@@ -34,7 +34,7 @@ public class SweetRedisAdminUtils {
                 .concat(integralActivityId)
                 .concat(":prizeId:")
                 .concat(prizeId);
-        redisUtil.incr(redisKey, num);
+        redisDataSourceUtil.getRedisSweetUtil().incr(redisKey, num);
     }
 
     public void incrIntegralActivityPrizeWinnersNum(String integralActivityId, String prizeId, Integer num) {
@@ -42,7 +42,7 @@ public class SweetRedisAdminUtils {
                 .concat(integralActivityId)
                 .concat(":prizeId:")
                 .concat(prizeId);
-        redisUtil.incr(redisKey, num);
+        redisDataSourceUtil.getRedisSweetUtil().incr(redisKey, num);
     }
 
     public void decrIntegralActivityPrizeNum(String integralActivityId, String prizeId, Integer num) {
@@ -50,7 +50,7 @@ public class SweetRedisAdminUtils {
                 .concat(integralActivityId)
                 .concat(":prizeId:")
                 .concat(prizeId);
-        redisUtil.decr(redisKey, num);
+        redisDataSourceUtil.getRedisSweetUtil().decr(redisKey, num);
     }
 
     public void decrIntegralActivityPrizeWinnersNum(String integralActivityId, String prizeId, Integer num) {
@@ -58,7 +58,7 @@ public class SweetRedisAdminUtils {
                 .concat(integralActivityId)
                 .concat(":prizeId:")
                 .concat(prizeId);
-        redisUtil.decr(redisKey, num);
+        redisDataSourceUtil.getRedisSweetUtil().decr(redisKey, num);
     }
 
     public void setIntegralActivityDraw(LinkedList<IntegralActivityDrawVo> sweetIntegralActivityDraws, String integralActivityId, String userId) {
@@ -66,14 +66,14 @@ public class SweetRedisAdminUtils {
                 .concat(integralActivityId)
                 .concat(":userId:")
                 .concat(userId);
-        redisUtil.set(redisKey, sweetIntegralActivityDraws);
+        redisDataSourceUtil.getRedisSweetUtil().set(redisKey, sweetIntegralActivityDraws);
     }
 
     public void setIntegralActivityDrawInfo(String drawId) {
         String redisKeyDraw = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_INFO
                 .concat(drawId);
-        IntegralActivityDrawVo info = (IntegralActivityDrawVo) redisUtil.get(redisKeyDraw);
+        IntegralActivityDrawVo info = (IntegralActivityDrawVo) redisDataSourceUtil.getRedisSweetUtil().get(redisKeyDraw);
         info.setReceivingStatus(2);
-        redisUtil.set(redisKeyDraw, info);
+        redisDataSourceUtil.getRedisSweetUtil().set(redisKeyDraw, info);
     }
 }

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

@@ -45,6 +45,10 @@ public class RedisDataSourceUtil {
         return this.redisAdamUtil;
     }
 
+    public AbstractRedisUtil getRedisStoneUtil(){
+        return this.redisSweetUtil;
+    }
+
     public AbstractRedisUtil getRedisCandyUtil(){
         return this.redisCandyUtil;
     }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DataImpl.java

@@ -3,32 +3,13 @@ package com.liquidnet.service.platform.service.impl.kylin;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.google.gson.JsonObject;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.entity.AdamUser;
 import com.liquidnet.service.adam.mapper.AdamUserMapper;
-import com.liquidnet.service.kylin.constant.KylinRedisConst;
-import com.liquidnet.service.kylin.dto.param.CheckPerformanceRelationParam;
-import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
-import com.liquidnet.service.kylin.dto.vo.mongo.KylinCheckUserPerformanceVo;
-import com.liquidnet.service.kylin.dto.vo.mongo.KylinCheckUserVo;
-import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
-import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
-import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
-import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
-import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
-import com.liquidnet.service.platform.utils.DataUtils;
-import com.liquidnet.service.platform.utils.PerformanceVoTask;
-import com.liquidnet.service.stone.constant.StoneConstant;
 import com.liquidnet.service.stone.entity.StoneScoreLogs;
 import com.liquidnet.service.stone.entity.StoneScoreUser;
 import com.liquidnet.service.stone.mapper.StoneScoreLogsMapper;
@@ -39,23 +20,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Service;
-import org.springframework.util.DigestUtils;
 import org.springframework.util.MultiValueMap;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
 
-import java.math.BigDecimal;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Service
 public class DataImpl {
@@ -66,7 +35,7 @@ public class DataImpl {
     @Autowired
     private MongoTemplate mongoTemplate;
     @Autowired
-    private RedisUtil redisUtil;
+    private RedisDataSourceUtil redisDataSourceUtil;
     private static final List<String> defaultBackgroundList = Arrays.asList("https://img.zhengzai.tv/other/2021/07/27/150eeb0e20af4fc88e8a1ec57c46c362.png", "https://img.zhengzai.tv/files/2021/01/13/5ffeab3584b7d.png", "http://pic.zhengzai.tv/default/background.png", "http://img.zhengzai.tv/album/20171027/1509106243302.png");
 
     @Autowired
@@ -88,7 +57,7 @@ public class DataImpl {
                 //获取用户相关信息
                 String uid = item.getUid();
                 String mobile = item.getMobile();
-                AdamUserInfoVo userInfoVo = (AdamUserInfoVo) redisUtil.get(AdamRedisConst.INFO_USER.concat(uid));
+                AdamUserInfoVo userInfoVo = (AdamUserInfoVo) redisDataSourceUtil.getRedisAdamUtil().get(AdamRedisConst.INFO_USER.concat(uid));
                 if (userInfoVo == null) {
                     continue;
                 }
@@ -164,7 +133,7 @@ public class DataImpl {
     public boolean initScore(String uid) {
         try {
             //获取用户相关信息
-            AdamUserInfoVo userInfoVo = (AdamUserInfoVo) redisUtil.get(AdamRedisConst.INFO_USER.concat(uid));
+            AdamUserInfoVo userInfoVo = (AdamUserInfoVo) redisDataSourceUtil.getRedisAdamUtil().get(AdamRedisConst.INFO_USER.concat(uid));
             int score = 0;
             String mobile = userInfoVo.getMobile();
             //创建 用户积分数据
@@ -248,7 +217,7 @@ public class DataImpl {
 
     public String getUnionIdByPhone(String phone) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_UNIONID_PHONE.concat(phone);
-        Object obj = redisUtil.get(redisKey);
+        Object obj = redisDataSourceUtil.getRedisSweetUtil().get(redisKey);
         if (obj == null) {
             return null;
         } else {