修改获取站点信息通过redis获取

bill-manager/src/main/java/com/mortals/xhx/module/ph/web/PhQueueController.java

 package com.mortals.xhx.module.ph.web;
 
+import com.alibaba.fastjson.JSON;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
+import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.pdu.site.SitePdu;
 import com.mortals.xhx.feign.site.ISiteFeign;
+import com.mortals.xhx.module.pj.model.PjEvaluateEntity;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -53,6 +57,8 @@ public class PhQueueController extends BaseCRUDJsonBodyMappingController<PhQueue
     @Autowired
     private ParamService paramService;
     @Autowired
+    private ICacheService cacheService;
+    @Autowired
     private ISiteFeign siteFeign;
 
     public PhQueueController() {
@@ -93,12 +99,27 @@ public class PhQueueController extends BaseCRUDJsonBodyMappingController<PhQueue
     }
 
 
-    private void getSite(PhQueueEntity entity) {
+    private void getSite(PjEvaluateEntity entity) {
         if (!ObjectUtils.isEmpty(entity.getSiteId())) {
+
+            RedisTemplate<String, String> baseRedisTemplate = cacheService.selectDbRedisTemplate(1);
+
+            //com:mortals:xhx:module:site:model:SiteEntity  redis调用
+            String siteStr = (String) baseRedisTemplate.opsForHash().get("com:mortals:xhx:module:site:model:SiteEntity", entity.getSiteId());
+            if (!ObjectUtils.isEmpty(siteStr)) {
+                SitePdu sitePdu = JSON.parseObject(siteStr, SitePdu.class);
+                if (!ObjectUtils.isEmpty(sitePdu)) {
+                    entity.setSiteCode(sitePdu.getSiteCode());
+                    entity.setSiteName(sitePdu.getSiteName());
+                } else {
+                    log.info("站点信息不存在,siteId={}", entity.getSiteId());
+                }
+            }
+
+            //feign调用
             Rest<SitePdu> sitePduRest = siteFeign.info(entity.getSiteId());
             if (YesNoEnum.YES.getValue() == sitePduRest.getCode()) {
                 SitePdu sitePdu = sitePduRest.getData();
-
                 if (!ObjectUtils.isEmpty(sitePdu)) {
                     entity.setSiteCode(sitePdu.getSiteCode());
                     entity.setSiteName(sitePdu.getSiteName());
@@ -109,4 +130,5 @@ public class PhQueueController extends BaseCRUDJsonBodyMappingController<PhQueue
         }
     }
 
+
 }
\ No newline at end of file

bill-manager/src/main/java/com/mortals/xhx/module/pj/web/PjEvaluateController.java

 package com.mortals.xhx.module.pj.web;
 
+import com.alibaba.fastjson.JSON;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
+import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.pdu.site.SitePdu;
@@ -10,6 +12,7 @@ import com.mortals.xhx.module.ph.model.PhQueueEntity;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -54,6 +57,9 @@ public class PjEvaluateController extends BaseCRUDJsonBodyMappingController<PjEv
     @Autowired
     private ISiteFeign siteFeign;
 
+    @Autowired
+    private ICacheService cacheService;
+
     public PjEvaluateController() {
         super.setModuleDesc("评价汇总");
     }
@@ -97,10 +103,25 @@ public class PjEvaluateController extends BaseCRUDJsonBodyMappingController<PjEv
 
     private void getSite(PjEvaluateEntity entity) {
         if (!ObjectUtils.isEmpty(entity.getSiteId())) {
+
+            RedisTemplate<String, String> baseRedisTemplate = cacheService.selectDbRedisTemplate(1);
+
+            //com:mortals:xhx:module:site:model:SiteEntity  redis调用
+            String siteStr = (String) baseRedisTemplate.opsForHash().get("com:mortals:xhx:module:site:model:SiteEntity", entity.getSiteId());
+            if (!ObjectUtils.isEmpty(siteStr)) {
+                SitePdu sitePdu = JSON.parseObject(siteStr, SitePdu.class);
+                if (!ObjectUtils.isEmpty(sitePdu)) {
+                    entity.setSiteCode(sitePdu.getSiteCode());
+                    entity.setSiteName(sitePdu.getSiteName());
+                } else {
+                    log.info("站点信息不存在,siteId={}", entity.getSiteId());
+                }
+            }
+
+            //feign调用
             Rest<SitePdu> sitePduRest = siteFeign.info(entity.getSiteId());
             if (YesNoEnum.YES.getValue() == sitePduRest.getCode()) {
                 SitePdu sitePdu = sitePduRest.getData();
-
                 if (!ObjectUtils.isEmpty(sitePdu)) {
                     entity.setSiteCode(sitePdu.getSiteCode());
                     entity.setSiteName(sitePdu.getSiteName());