Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/service/impl/MonitorServiceImpl.java

@@ -343,26 +343,27 @@ public class MonitorServiceImpl implements MonitorService {
     public R addDefaultCompany() {
         //获取所有供应商企业名称
         List<Integer> idList = new ArrayList<>();
-
-        //如果没有上一次的企业id数据则直接返回
-        if (RedisUtils.hasKey("monitorCompanyList")){
-            log.info("添加默认企业监控：企业id从缓存中取");
-            idList = RedisUtils.getCacheList("monitorCompanyList");
-        }else {
-            List<String> list = customerMapper.allSearchCompanyNameList();
-            for (String companyName : list) {
-                //循环匹配 得到能关联上的企业id
-                Map<String, Object> map = opportunityRadarService.enterpriseByName(companyName);
-                if (!ObjectUtils.isEmpty(map.get("data"))) {
-                    Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
-                    Integer companyId = MapUtil.getInt(data, "jskEid");
-                    idList.add(companyId);
-                }
-            }
-            RedisUtils.setCacheList("monitorCompanyList",idList);
-            //设置过期时间两天
-            RedisUtils.expire("monitorCompanyList",172800);
-        }
+        idList.add(3068);
+
+//        //如果没有上一次的企业id数据则直接返回
+//        if (RedisUtils.hasKey("monitorCompanyList")){
+//            log.info("添加默认企业监控：企业id从缓存中取");
+//            idList = RedisUtils.getCacheList("monitorCompanyList");
+//        }else {
+//            List<String> list = customerMapper.allSearchCompanyNameList();
+//            for (String companyName : list) {
+//                //循环匹配 得到能关联上的企业id
+//                Map<String, Object> map = opportunityRadarService.enterpriseByName(companyName);
+//                if (!ObjectUtils.isEmpty(map.get("data"))) {
+//                    Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
+//                    Integer companyId = MapUtil.getInt(data, "jskEid");
+//                    idList.add(companyId);
+//                }
+//            }
+//            RedisUtils.setCacheList("monitorCompanyList",idList);
+//            //设置过期时间两天
+//            RedisUtils.expire("monitorCompanyList",172800);
+//        }
 
         PushMonitorCompanyAddVo addVo = new PushMonitorCompanyAddVo();
         addVo.setSystemCode("ZJYJ");
@@ -373,6 +374,7 @@ public class MonitorServiceImpl implements MonitorService {
         }
         log.info("中建一局用户添加默认监控企业！");
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/addDefaultCompany", BeanUtil.beanToMap(addVo, false, false));
+        log.info("----------------------------------"+map.toString());
         return BeanUtil.toBean(map, R.class);
     }
 }