Merge remote-tracking branch 'origin/V20231129-中建一局二公司' into V20231129-中建一局二公司

Signed-off-by: Administrator <admin@example.com>

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

@@ -50,5 +50,7 @@ public interface DCustomerMapper extends BaseMapper<DCustomer> {
 
     List<CertificateVo> selectOtherCertificate(String customerId);
 
+    //获取所有供应商的企业名称列表
+    List<String> allSearchCompanyNameList();
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseCreditChinaPageBody.java

@@ -16,9 +16,9 @@ public class EnterpriseCreditChinaPageBody extends BasePage {
      * 企业id
      */
     @NotNull(message = "企业id不能为空")
-    private Integer companyId;
+    private Integer cid;
 
     public boolean isVaildCid() {
-        return 0 == companyId;
+        return 0 == cid;
     }
 }

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

@@ -167,4 +167,14 @@ public class MonitorController {
         return monitorService.systemDetail(detailVo);
     }
 
+    /**
+     * 监控列表添加默认供应商企业
+     * @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/MonitorService.java

@@ -136,7 +136,6 @@ public interface MonitorService {
      *@date: 2023/12/9 10:03
      */
     R systemDetail(PushMonitorSystemDetailVo importAddVo);
-
     /***
      *@Description: 是否工作日
      *@Param: holidayVo 信息
@@ -145,4 +144,6 @@ public interface MonitorService {
      *@date: 2023/12/9 10:03
      */
     Map<String, Object> settingHoliday(PushSettingHolidayVo holidayVo) throws Exception;
+
+    R addDefaultCompany();
 }

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

 package com.dsk.monitor.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.mapper.DCustomerMapper;
 import com.dsk.monitor.domain.dto.PushMonitorRules;
 import com.dsk.monitor.domain.vo.*;
 import com.dsk.monitor.mapper.PushMonitorInfoMapper;
 import com.dsk.monitor.mapper.PushMonitorRulesMapper;
 import com.dsk.monitor.service.MonitorService;
+import com.dsk.search.service.BusinessOpportunityRadarService;
 import com.dsk.system.utils.DskOpenApiUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
 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.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
@@ -42,6 +47,12 @@ public class MonitorServiceImpl implements MonitorService {
     @Resource
     private PushMonitorRulesMapper rulesMapper;
 
+    @Resource
+    private DCustomerMapper customerMapper;
+
+    @Autowired
+    private BusinessOpportunityRadarService opportunityRadarService;
+
     @Resource
     private DskOpenApiUtil dskOpenApiUtil;
 
@@ -327,4 +338,30 @@ public class MonitorServiceImpl implements MonitorService {
         log.info("companyDynamicPage=============================>" + map);
         return map;
     }
+
+    @Override
+    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);
+            }
+        }
+        PushMonitorCompanyAddVo addVo = new PushMonitorCompanyAddVo();
+        addVo.setCid(idList);
+        Long userId = LoginHelper.getUserId();
+        if (ObjectUtil.isNotEmpty(userId)) {
+            addVo.setUserId(userId);
+        }
+        log.info("中建一局用户添加默认监控企业！");
+        dskOpenApiUtil.requestBody("/operate/monitor/company/zjyj/addDefaultCompany", BeanUtil.beanToMap(addVo, false, false));
+        return R.ok("正在导入中 请稍后");
+
+    }
 }

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

@@ -209,4 +209,18 @@
     <select id="selectOtherCertificate" resultType="com.dsk.cscec.domain.vo.CertificateVo">
         select * from d_customer_other_certificate where customer_id =#{customerId}
     </select>
+
+    <select id="allSearchCompanyNameList" resultType="string">
+        select
+            dc.customer_name
+        from
+            d_customer dc
+        left join f_supplier_limited fsl on
+            (fsl.flaowufbid = dc.customer_id
+                or fsl.fzhuanyefbid = dc.customer_id
+                or fsl.ffgid = dc.customer_id
+                or fsl.fzlid = dc.customer_id)
+        where
+            dc.recommend_org_id = 'F17305B4EA4444CBAB12892C7B99E475'
+    </select>
 </mapper>
\ No newline at end of file