修改场地redis

liquidnet-bus-service/liquidnet-service-sweet/pom.xml

@@ -111,6 +111,12 @@
             <artifactId>liquidnet-api-feign-candy</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-api-feign-slime</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -3,9 +3,12 @@ package com.liquidnet.service.sweet.utils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.*;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.kylin.constant.KylinRedisConst;
+import com.liquidnet.service.feign.slime.api.FeignSlimeApiClient;
+import com.liquidnet.service.slime.constant.SlimeRedisConst;
+import com.liquidnet.service.slime.dto.vo.SlimeFieldsDetailsVo;
 import com.liquidnet.service.sweet.constant.SweetConstant;
 import com.liquidnet.service.sweet.dto.SweetManualAppletDto;
 import com.liquidnet.service.sweet.dto.SweetManualArtistList2Dto;
@@ -19,7 +22,6 @@ import com.liquidnet.service.sweet.entity.*;
 import com.liquidnet.service.sweet.mapper.*;
 import com.liquidnet.service.sweet.param.SweetCityVoteParam;
 import com.liquidnet.service.sweet.vo.*;
-import jodd.util.ArraysUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -51,8 +53,8 @@ public class RedisDataUtils {
     private SweetManualShopMapper sweetManualShopMapper;
     @Autowired
     private SweetArtistsMapper sweetArtistsMapper;
-
-
+    @Autowired
+    private FeignSlimeApiClient feignSlimeApiClient;
     public List<SweetManualAppletDto> setPushList() {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_MANUAL_PUSH_LIST;
         List<SweetManualAppletDto> data = sweetManualMapper.getManualAppletDto();
@@ -60,10 +62,19 @@ public class RedisDataUtils {
             if (!item.getIsMember().equals(1)) {
                 item.setTimeSell(DateUtil.format(DateUtil.addMin(DateUtil.parse(item.getTimeSell(), "yyyy-MM-dd HH:mm:ss"), item.getPayCountdownMinute()), DateUtil.Formatter.yyyyMMddHHmmss));
             }
-            item.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "name"));
+           /* item.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "name"));
             item.setCityName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "city_name"));
             item.setLatitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "latitude"));
-            item.setLongitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "longitude"));
+            item.setLongitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "longitude"));*/
+            SlimeFieldsDetailsVo slimeFieldsDetailsVo = feignSlimeApiClient.fieldDetails(item.getFieldId()).getData();
+            String fieldName = slimeFieldsDetailsVo.getName();
+            String cityName = slimeFieldsDetailsVo.getCityName();
+            String latitude = slimeFieldsDetailsVo.getLatitude();
+            String longitude = slimeFieldsDetailsVo.getLongitude();
+            item.setFieldName(fieldName);
+            item.setCityName(cityName);
+            item.setLatitude(latitude);
+            item.setLongitude(longitude);
         }
         redisUtil.set(redisKey, data);
         return data;

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisMDSKDataUtils.java

@@ -6,7 +6,8 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.kylin.constant.KylinRedisConst;
+import com.liquidnet.service.feign.slime.api.FeignSlimeApiClient;
+import com.liquidnet.service.slime.dto.vo.SlimeFieldsDetailsVo;
 import com.liquidnet.service.sweet.constant.SweetConstant;
 import com.liquidnet.service.sweet.dto.*;
 import com.liquidnet.service.sweet.entity.*;
@@ -40,7 +41,8 @@ public class RedisMDSKDataUtils {
     private SweetManualShopMdskMapper sweetManualShopMdskMapper;
     @Autowired
     private SweetArtistsMapper sweetArtistsMapper;
-
+    @Autowired
+    private FeignSlimeApiClient feignSlimeApiClient;
 
     public List<SweetManualAppletMDSKDto> setPushList() {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_MDSK_MANUAL_PUSH_LIST;
@@ -49,10 +51,19 @@ public class RedisMDSKDataUtils {
             if(!item.getIsMember().equals(1)){
                 item.setTimeSell(DateUtil.format(DateUtil.addMin(DateUtil.parse(item.getTimeSell(),"yyyy-MM-dd HH:mm:ss"),-item.getPayCountdownMinute()),DateUtil.Formatter.yyyyMMddHHmmss));
             }
-            item.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "name"));
+           /* item.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "name"));
             item.setCityName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "city_name"));
             item.setLatitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "latitude"));
-            item.setLongitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "longitude"));
+            item.setLongitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "longitude"));*/
+            SlimeFieldsDetailsVo slimeFieldsDetailsVo = feignSlimeApiClient.fieldDetails(item.getFieldId()).getData();
+            String fieldName = slimeFieldsDetailsVo.getName();
+            String cityName = slimeFieldsDetailsVo.getCityName();
+            String latitude = slimeFieldsDetailsVo.getLatitude();
+            String longitude = slimeFieldsDetailsVo.getLongitude();
+            item.setFieldName(fieldName);
+            item.setCityName(cityName);
+            item.setLatitude(latitude);
+            item.setLongitude(longitude);
         }
         redisUtil.set(redisKey, data);
         return data;

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisTFCDataUtils.java

@@ -6,12 +6,10 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.kylin.constant.KylinRedisConst;
+import com.liquidnet.service.feign.slime.api.FeignSlimeApiClient;
+import com.liquidnet.service.slime.dto.vo.SlimeFieldsDetailsVo;
 import com.liquidnet.service.sweet.constant.SweetConstant;
-import com.liquidnet.service.sweet.dto.SweetManualAppletTFCDto;
-import com.liquidnet.service.sweet.dto.SweetManualArtistList2TFCDto;
-import com.liquidnet.service.sweet.dto.SweetManualArtistListTFCDto;
-import com.liquidnet.service.sweet.dto.SweetManualArtistStageListTFCDto;
+import com.liquidnet.service.sweet.dto.*;
 import com.liquidnet.service.sweet.entity.SweetManualNotifyTfc;
 import com.liquidnet.service.sweet.entity.SweetManualShopTfc;
 import com.liquidnet.service.sweet.entity.SweetManualSortTfc;
@@ -44,7 +42,8 @@ public class RedisTFCDataUtils {
     private SweetManualNotifyTfcMapper sweetManualNotifyTFCMapper;
     @Autowired
     private SweetManualShopTfcMapper sweetManualShopTFCMapper;
-
+    @Autowired
+    private FeignSlimeApiClient feignSlimeApiClient;
 
     public List<SweetManualAppletTFCDto> setPushList() {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_TFC_MANUAL_PUSH_LIST;
@@ -53,10 +52,19 @@ public class RedisTFCDataUtils {
             if(!item.getIsMember().equals(1)){
                 item.setTimeSell(DateUtil.format(DateUtil.addMin(DateUtil.parse(item.getTimeSell(),"yyyy-MM-dd HH:mm:ss"),-item.getPayCountdownMinute()),DateUtil.Formatter.yyyyMMddHHmmss));
             }
-            item.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "name"));
+           /* item.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "name"));
             item.setCityName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "city_name"));
             item.setLatitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "latitude"));
-            item.setLongitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "longitude"));
+            item.setLongitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "longitude"));*/
+            SlimeFieldsDetailsVo slimeFieldsDetailsVo = feignSlimeApiClient.fieldDetails(item.getFieldId()).getData();
+            String fieldName = slimeFieldsDetailsVo.getName();
+            String cityName = slimeFieldsDetailsVo.getCityName();
+            String latitude = slimeFieldsDetailsVo.getLatitude();
+            String longitude = slimeFieldsDetailsVo.getLongitude();
+            item.setFieldName(fieldName);
+            item.setCityName(cityName);
+            item.setLatitude(latitude);
+            item.setLongitude(longitude);
         }
         redisUtil.set(redisKey, data);
         return data;