查询选项加入缓存

dsk-common/src/main/java/com/dsk/common/constant/CacheConstants.java

@@ -41,4 +41,9 @@ public class CacheConstants
      * 登录账户密码错误次数 redis key
      */
     public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
+
+    /**
+     * 查甲方 菜单选线
+     */
+    public static final String DATA_UIPGROUPDATA = "data:uipGroupData";
 }

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java

@@ -5,9 +5,11 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.dsk.acc.openapi.client.util.CommonUtils;
+import com.dsk.common.constant.CacheConstants;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.domain.model.*;
 import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.common.core.redis.RedisCache;
 import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.common.utils.EncodeIdUtil;
 import com.dsk.system.domain.customer.vo.CustomerStatusListVo;
@@ -23,6 +25,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @ClassName enterpriseService
@@ -42,6 +45,9 @@ public class EnterpriseService {
     @Autowired
     ICustomerService iCustomerService;
 
+    @Autowired
+    private RedisCache redisCache;
+
     public R infoHeader(EnterpriseInfoHeaderBody body) throws Exception {
         Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(body, false, false));
         Integer companyCode = MapUtils.getInteger(companyMap, "code", 300);
@@ -80,13 +86,6 @@ public class EnterpriseService {
         return BeanUtil.toBean(map, R.class);
     }
 
-    public R supplierPage(EnterpriseSupplierPageBody body) throws Exception {
-        Map<String, String> headerMap = new HashMap<>();
-        headerMap.put("Api-Version", "1.0");
-        Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/selectPageSupplierInfo", BeanUtil.beanToMap(body, false, false), headerMap);
-        return BeanUtil.toBean(map, R.class);
-    }
-
     public R projectTenderDataGroup(EnterpriseProjectTenderDataGroupBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/projectTenderDataGroup", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
@@ -108,34 +107,6 @@ public class EnterpriseService {
         return dskOpenApiUtil.responsePage(map);
     }
 
-    public R bidNoticePage(EnterpriseBidNoticePageBody body) throws Exception {
-        Map<String, String> headerMap = new HashMap<>();
-        headerMap.put("Api-Version", "1.0");
-        Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/selectPageBidNoticeInfo", BeanUtil.beanToMap(body, false, false), headerMap);
-        return BeanUtil.toBean(map, R.class);
-    }
-
-    public R bidNoticeProvince(EnterpriseBidNoticePageBody body) throws Exception {
-        Map<String, String> headerMap = new HashMap<>();
-        headerMap.put("Api-Version", "1.0");
-        Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/selectBidProvinceByCompanyId", BeanUtil.beanToMap(body, false, false), headerMap);
-        return BeanUtil.toBean(map, R.class);
-    }
-
-    public R bidNoticeTenderStage(EnterpriseBidNoticePageBody body) throws Exception {
-        Map<String, String> headerMap = new HashMap<>();
-        headerMap.put("Api-Version", "1.0");
-        Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/selectTenderStageByCompanyId", BeanUtil.beanToMap(body, false, false), headerMap);
-        return BeanUtil.toBean(map, R.class);
-    }
-
-    public R bidNoticeDeatil(EnterpriseBidNoticeDetailBody body) throws Exception {
-        Map<String, String> headerMap = new HashMap<>();
-        headerMap.put("Api-Version", "1.0");
-        Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/bid/detail", BeanUtil.beanToMap(body, false, false), headerMap);
-        return BeanUtil.toBean(map, R.class);
-    }
-
     public TableDataInfo dynamicPage(EnterpriseDynamicPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterprise/dynamic", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
@@ -210,7 +181,21 @@ public class EnterpriseService {
     }
 
     public R uipGroupData() throws Exception {
+        String redisKey = CacheConstants.DATA_UIPGROUPDATA;
+
+        Map<String, Object> cacheMap = redisCache.getCacheMap(redisKey);
+        if (MapUtils.isNotEmpty(cacheMap)) {
+            return R.ok(cacheMap);
+        }
+
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/uipGroupData", new HashMap<>());
+        Integer code = MapUtils.getInteger(map, "code", 300);
+        if (200 != code) throw new RuntimeException();
+
+        Map data = MapUtils.getMap(map, "data", null);
+        redisCache.setCacheMap(redisKey, data);
+        redisCache.expire(redisKey, 24, TimeUnit.HOURS);
+
         return BeanUtil.toBean(map, R.class);
     }