Merge remote-tracking branch 'origin/dev_abandon_grid' into dev_abandon_grid

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java

@@ -1,6 +1,7 @@
 package com.epmet.commons.tools.redis.common;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.feign.CommonAggFeignClient;
 import com.epmet.commons.tools.redis.RedisKeys;
@@ -52,6 +53,7 @@ public class CustomerOrgRedis {
     public static GridInfoCache getGridInfo(String gridId){
         String key = RedisKeys.getGridInfoKey(gridId);
         Map<String, Object> grid = customerOrgRedis.redisUtils.hGetAll(key);
+        log.info("grid is {}", JSON.toJSONString(grid));
         if (!CollectionUtils.isEmpty(grid)) {
             return ConvertUtils.mapToEntity(grid, GridInfoCache.class);
         }
@@ -63,6 +65,7 @@ public class CustomerOrgRedis {
             //throw new RenException("没有此网格信息...");
             return null;
         }
+        log.info("select grid info is {}", JSON.toJSONString(gridInfoResult.getData()));
         Map<String, Object> map = BeanUtil.beanToMap(gridInfoResult.getData(), false, true);
         customerOrgRedis.redisUtils.hMSet(key, map);
         return gridInfoResult.getData();