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

@@ -29,6 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.time.Duration;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @ClassName MonitorServiceImpl
@@ -343,38 +344,55 @@ public class MonitorServiceImpl implements MonitorService {
     public R addDefaultCompany() {
         //获取所有供应商企业名称
         List<Integer> idList = new ArrayList<>();
-        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);
-//        }
+
+        //如果没有上一次的企业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);
+                }
+            }
+            //去除重复企业id
+            idList = idList.stream().distinct().collect(Collectors.toList());
+            log.info("获取供应商企业id数量："+idList.size());
+            RedisUtils.setCacheList("monitorCompanyList",idList);
+            //设置过期时间两天
+            RedisUtils.expire("monitorCompanyList",172800);
+        }
 
         PushMonitorCompanyAddVo addVo = new PushMonitorCompanyAddVo();
         addVo.setSystemCode("ZJYJ");
+        int size = idList.size();
+        if (size<=200){
             addVo.setCid(idList);
-        Long userId = LoginHelper.getUserId();
-        if (ObjectUtil.isNotEmpty(userId)) {
-            addVo.setUserId(userId);
-        }
             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);
+            log.info("addDefaultCompany  返回值map====================》"+map.toString());
+        }else {
+            //循环次数
+            int num =  (size+(200-1))/200;
+            for (int i = 0; i < num; i++) {
+                List<Integer> newList = new ArrayList<>();
+                if (((i+1)*200)>=size){
+                    //如果下标索引大于 list容量
+                    newList = idList.subList(i*200, size);
+                }else {
+                    newList = idList.subList(i*200, (i+1)*200);
+                }
+                addVo.setCid(newList);
+                log.info("中建一局用户添加默认监控企业------->循环添加："+i*200+"----"+(i+1)*200);
+                Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/addDefaultCompany", BeanUtil.beanToMap(addVo, false, false));
+                log.info("addDefaultCompany  循环添加返回值map====================》"+map.toString());
+            }
+        }
+        return R.ok("默认企业添加中，请稍候");
     }
 }