添加默认业主单位监控

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/DProjectMapper.java

@@ -32,4 +32,9 @@ public interface DProjectMapper extends BaseMapper<DProject> {
      * 获取合作项目明细
      */
     Page<CooperateProjectDetailSearchVo> selectPageCooperateProjectDetailList(@Param("page") Page<CooperateProjectDetailSearchVo> page, @Param(Constants.WRAPPER) Wrapper<DProject> Wrapper);
+
+    /**
+     * 获取业主单位列表
+     */
+    List<String> getOwnerNameList(@Param("contractOrgId") String contractOrgId);
 }
\ No newline at end of file

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

@@ -167,15 +167,15 @@ public class MonitorUserController {
     public R systemDetail(@RequestBody PushMonitorSystemDetailVo detailVo){
         return monitorService.systemDetail(detailVo);
     }
-//
-//    /**
-//     * 监控列表添加默认业主单位
-//     * @Author: lc
-//     * @return
-//     */
-//    @PostMapping(value = "/add/default")
-//    public R addDefaultCompany() {
-//        return monitorService.addDefaultCompany();
-//    }
+
+    /**
+     * 监控列表添加默认业主单位
+     * @Author: lc
+     * @return
+     */
+    @PostMapping(value = "/add/default")
+    public R addDefaultCompany() {
+        return monitorService.addDefaultCompany();
+    }
 
 }

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

@@ -8,7 +8,9 @@ import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.helper.LoginHelper;
 import com.dsk.common.utils.redis.RedisUtils;
+import com.dsk.cscec.constant.AdvisoryBodyManageQueryConstants;
 import com.dsk.cscec.mapper.DCustomerMapper;
+import com.dsk.cscec.mapper.DProjectMapper;
 import com.dsk.monitor.domain.dto.PushMonitorRules;
 import com.dsk.monitor.domain.vo.*;
 import com.dsk.monitor.mapper.PushMonitorInfoMapper;
@@ -51,6 +53,9 @@ public class MonitorUserServiceImpl implements MonitorUserService {
     @Resource
     private DCustomerMapper customerMapper;
 
+    @Resource
+    private DProjectMapper projectMapper;
+
     @Autowired
     private BusinessOpportunityRadarService opportunityRadarService;
 
@@ -317,11 +322,12 @@ public class MonitorUserServiceImpl implements MonitorUserService {
         List<Integer> idList = new ArrayList<>();
 
         //如果没有上一次的企业id数据则直接返回
-        if (RedisUtils.hasKey("monitorCompanyList")) {
-            log.info("添加默认企业监控：企业id从缓存中取");
-            idList = RedisUtils.getCacheList("monitorCompanyList");
+        if (RedisUtils.hasKey("monitorUserCompanyList")) {
+            log.info("添加默认业主单位企业监控：企业id从缓存中取");
+            idList = RedisUtils.getCacheList("monitorUserCompanyList");
         } else {
-            List<String> list = customerMapper.allSearchCompanyNameList();
+            //获取业主公司名称
+            List<String> list = projectMapper.getOwnerNameList(AdvisoryBodyManageQueryConstants.LEVEL1_COMPANY_ID);
             for (String companyName : list) {
                 //循环匹配 得到能关联上的企业id
                 Map<String, Object> map = opportunityRadarService.enterpriseByName(companyName);
@@ -331,24 +337,22 @@ public class MonitorUserServiceImpl implements MonitorUserService {
                     idList.add(companyId);
                 }
             }
-            RedisUtils.setCacheList("monitorCompanyList", idList);
+            RedisUtils.setCacheList("monitorUserCompanyList", idList);
             //设置过期时间两天
-            RedisUtils.expire("monitorCompanyList", 172800);
+            RedisUtils.expire("monitorUserCompanyList", 172800);
         }
         //去除重复企业id
         idList = idList.stream().distinct().collect(Collectors.toList());
         log.info("获取供应商企业id数量：" + idList.size());
 
         PushMonitorCompanyAddVo addVo = new PushMonitorCompanyAddVo();
-        Long userId = LoginHelper.getUserId();
-        if (ObjectUtil.isNotEmpty(userId)) {
+        Long userId = 123456789L;
         addVo.setUserId(userId);
-        }
         addVo.setSystemCode("ZJYJ");
         int size = idList.size();
         if (size <= 200) {
             addVo.setCid(idList);
-            log.info("中建一局用户添加默认监控企业！");
+            log.info("中建一局用户添加默认业主单位监控企业！");
             Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/addDefaultCompany", BeanUtil.beanToMap(addVo, false, false));
         } else {
             //循环次数
@@ -362,10 +366,10 @@ public class MonitorUserServiceImpl implements MonitorUserService {
                     newList = idList.subList(i * 200, (i + 1) * 200);
                 }
                 addVo.setCid(newList);
-                log.info("中建一局用户添加默认监控企业------->循环添加：" + i * 200 + "----" + (i + 1) * 200);
+                log.info("中建一局用户添加默认业主监控企业------->循环添加：" + i * 200 + "----" + (i + 1) * 200);
                 Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/addDefaultCompany", BeanUtil.beanToMap(addVo, false, false));
             }
         }
-        return R.ok("默认企业添加中，请稍候");
+        return R.ok("默认业主监控企业添加中，请稍候");
     }
 }

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DProjectMapper.xml

@@ -45,4 +45,12 @@
         from d_project p
             ${ew.getCustomSqlSegment}
     </select>
+
+    <select id="getOwnerNameList" resultType="java.lang.String">
+        SELECT owner_name
+        FROM d_project dp
+        WHERE contract_org_id =#{contractOrgId}
+        group BY owner_name
+    </select>
+
 </mapper>
\ No newline at end of file