添加默认监控企业

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/controlelr/MonitorController.java

@@ -174,8 +174,7 @@ public class MonitorController {
      */
     @PostMapping(value = "/add/default")
     public R addDefaultCompany() {
-        monitorService.addDefaultCompany();
-        return R.ok("监控企业添加中，请稍候");
+        return monitorService.addDefaultCompany();
     }
 
 }

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

@@ -145,5 +145,5 @@ public interface MonitorService {
      */
     Map<String, Object> settingHoliday(PushSettingHolidayVo holidayVo) throws Exception;
 
-    void addDefaultCompany();
+    R addDefaultCompany();
 }

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

@@ -22,7 +22,6 @@ import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
@@ -341,20 +340,29 @@ public class MonitorServiceImpl implements MonitorService {
     }
 
     @Override
-    @Async
-    public void addDefaultCompany() {
+    public R addDefaultCompany() {
         //获取所有供应商企业名称
-        List<String> list = customerMapper.allSearchCompanyNameList();
         List<Integer> idList = new ArrayList<>();
-        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数据则直接返回
+        if (RedisUtils.hasKey("monitorCompanyList")){
+            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");
         addVo.setCid(idList);
@@ -363,6 +371,7 @@ public class MonitorServiceImpl implements MonitorService {
             addVo.setUserId(userId);
         }
         log.info("中建一局用户添加默认监控企业！");
-        dskOpenApiUtil.requestBody("/operate/monitor/company/addDefaultCompany", BeanUtil.beanToMap(addVo, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/addDefaultCompany", BeanUtil.beanToMap(addVo, false, false));
+        return BeanUtil.toBean(map, R.class);
     }
 }