-

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

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/PartnershipProjectSource.java

+package com.dsk.jsk.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @ClassName PartnershipProjectSource
+ * @Description
+ * @Author Dgm
+ * @Date 2023/12/11 20:35
+ * @Version
+ */
+@Slf4j
+@RestController
+@RequestMapping(value = "/enterpriseCredit")
+public class PartnershipProjectSource {
+
+
+}

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

+package com.dsk.jsk.domain.bo;
+
+import java.util.Date;
+
+/**
+ * @ClassName PartnershipProjectSource
+ * @Description
+ * @Author Dgm
+ * @Date 2023/12/11 20:37
+ * @Version
+ */
+public class JskCompanyRelationTableV1 {
+
+    /**
+     *
+     */
+    private String uuid;
+    /**
+     * 项目唯一标识
+     */
+    private String partnerRelationshipUuid;
+    /**
+     * 企业Id
+     */
+    private Long companyId;
+    /**
+     * 企业名称
+     */
+    private String companyName;
+    /**
+     * 企业角色
+     */
+    private String companyRole;
+    /**
+     * 乙方企业名称
+     */
+    private String counterpartCompanyName;
+    /**
+     * 乙方企业id
+     */
+    private String counterpartCompanyId;
+    /**
+     * 乙方企业角色
+     */
+    private String counterpartCompanyRole;
+    /**
+     * 工程名称
+     */
+    private String project;
+    /**
+     *
+     */
+    private String projectMd5;
+    /**
+     * 项目类型
+     */
+    private String buildingProjectType;
+    /**
+     * 咨询机构业务类型
+     */
+    private String enquiryAgencyBusinessType;
+    /**
+     * 公布日期
+     */
+    private Date contractStartDate;
+    /**
+     * 本次合作合同金额(万元)
+     */
+    private String contractAmount;
+    /**
+     * 币种
+     */
+    private String currency;
+    /**
+     * 省份
+     */
+    private String province;
+    /**
+     * 省Id
+     */
+    private String provinceId;
+    /**
+     * 市
+     */
+    private String city;
+    /**
+     * 市Id
+     */
+    private String cityId;
+    /**
+     * 区
+     */
+    private String area;
+    /**
+     * 区Id
+     */
+    private String areaId;
+    /**
+     * 数据来源id
+     */
+    private String isDeal;
+}

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

+package com.dsk.jsk.domain.bo;
+
+/**
+ * @ClassName PartnershipProjectSource
+ * @Description
+ * @Author Dgm
+ * @Date 2023/12/11 20:37
+ * @Version
+ */
+public class JskPartnershipProjectSourceV1 {
+
+    /**
+     *
+     */
+    private String uuid;
+    /**
+     * 项目唯一标识
+     */
+    private String partnerRelationshipUuid;
+    /**
+     * 工程名称
+     */
+    private String projectName;
+    /**
+     * 处理后项目名称
+     */
+    private String dealProjectName;
+    /**
+     * 数据来源
+     */
+    private String dataSource;
+    /**
+     * 数据来源id
+     */
+    private String dataSourceId;
+    /**
+     *
+     */
+    private String isDeal;
+}

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

@@ -144,15 +144,15 @@ public class MonitorController {
     }
 
     /***
-     *@Description: 导入
+     *@Description: 批量导入
      *@Param:
      *@return: java.lang.String
      *@Author: Dgm
      *@date: 2022/6/14 10:45
      */
     @RequestMapping("/system/import")
-    public R importGuarantee(@RequestParam MultipartFile file) throws Exception{
-        return monitorService.importGuarantee(file);
+    public R systemImport(@RequestParam MultipartFile file, PushMonitorCompanyImportAddVo importAddVo) throws Exception{
+        return monitorService.systemImport(file, importAddVo);
     }
 
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/dto/PushMonitorRules.java

@@ -25,7 +25,7 @@ public class PushMonitorRules implements Serializable {
     /**
      * 创建人Id
      */
-    private String userId = "98";
+    private Long userId = 98L;
 
     /**
      * 风险类型,多个逗号隔开

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/vo/ConditionVo.java

@@ -14,7 +14,7 @@ public class ConditionVo {
     /**
      * 用户id
      */
-    private Integer userId = 98;
+    private Long userId = 98L;
     /**
      * 条件查询企业id
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/vo/PushMonitorCompanyAddVo.java

@@ -18,7 +18,7 @@ public class PushMonitorCompanyAddVo {
     /**
      * 用户id
      */
-    private Integer userId = 98;
+    private Long userId = 98L;
     /**
      * 多个企业id数组
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/vo/PushMonitorCompanyCancelVo.java

@@ -17,7 +17,7 @@ public class PushMonitorCompanyCancelVo {
     /**
      * 用户id
      */
-    private Integer userId = 98;
+    private Long userId = 98L;
     /**
      * 多个企业id数组
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/vo/PushMonitorCompanyImportAddVo.java

+package com.dsk.monitor.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName PushMonitorRulesVo
+ * @Description 监控报告 分页
+ * @Author Dgm
+ * @Date 2023/12/9 11:05
+ * @Version
+ */
+@Data
+public class PushMonitorCompanyImportAddVo {
+
+    /**
+     * 用户id
+     */
+    private Long userId = 98L;
+    /**
+     * 多个企业id数组
+     */
+    private List<String> names;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/vo/PushMonitorRulesDetailVo.java

@@ -14,5 +14,5 @@ public class PushMonitorRulesDetailVo {
     /**
      * 创建人Id
      */
-    private String userId = "98";
+    private Long userId = 98L;
 }

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

@@ -107,11 +107,11 @@ public interface MonitorService {
     R systemCancel(PushMonitorCompanyCancelVo cancelVo);
 
     /***
-     *@Description: 取消监控
+     *@Description: 批量导入
      *@Param: cancelVo 信息
      *@return: R
      *@Author: Dgm
      *@date: 2023/12/9 10:03
      */
-    R importGuarantee(MultipartFile file) throws Exception;
+    R systemImport(MultipartFile file, PushMonitorCompanyImportAddVo importAddVo) throws Exception;
 }

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

@@ -5,6 +5,7 @@ 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.monitor.domain.dto.PushMonitorInfo;
 import com.dsk.monitor.domain.dto.PushMonitorRules;
@@ -23,7 +24,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.time.Duration;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 
 /**
  * @ClassName MonitorServiceImpl
@@ -76,6 +76,10 @@ public class MonitorServiceImpl implements MonitorService {
     @Override
     public R insertRules(PushMonitorRulesVo monitorRulesDto) {
         // todo 20231211 规则是否与使用登录人强关联
+        Long userId = LoginHelper.getUserId();
+        if (ObjectUtil.isNotEmpty(userId)) {
+            monitorRulesDto.setUserId(userId);
+        }
         if (ObjectUtil.isEmpty(monitorRulesDto.getId())) {
             rulesMapper.insert(monitorRulesDto);
         } else {
@@ -86,6 +90,10 @@ public class MonitorServiceImpl implements MonitorService {
 
     @Override
     public R rulesDetail(PushMonitorRulesDetailVo detailVo) {
+        Long userId = LoginHelper.getUserId();
+        if (ObjectUtil.isNotEmpty(userId)) {
+            detailVo.setUserId(userId);
+        }
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("user_id", detailVo.getUserId());
         PushMonitorRules detail  = rulesMapper.selectOne(queryWrapper);
@@ -94,6 +102,10 @@ public class MonitorServiceImpl implements MonitorService {
 
     @Override
     public TableDataInfo companyDynamicPage(PushMonitorDynamicPageVo pageVo) throws Exception {
+        Long userId = LoginHelper.getUserId();
+        if (ObjectUtil.isNotEmpty(userId)) {
+            pageVo.getCondition().setUserId(userId);
+        }
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/info/companyDynamicList", BeanUtil.beanToMap(pageVo, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
@@ -108,18 +120,30 @@ public class MonitorServiceImpl implements MonitorService {
 
     @Override
     public TableDataInfo reportPage(PushMonitorReportPageVo pageVo) throws Exception {
+        Long userId = LoginHelper.getUserId();
+        if (ObjectUtil.isNotEmpty(userId)) {
+            pageVo.getCondition().setUserId(userId);
+        }
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/info/monitor/report", BeanUtil.beanToMap(pageVo, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
     @Override
     public TableDataInfo companyPage(PushMonitorCompanyPageVo pageVo) throws Exception {
+        Long userId = LoginHelper.getUserId();
+        if (ObjectUtil.isNotEmpty(userId)) {
+            pageVo.getCondition().setUserId(userId);
+        }
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/supplier/system/paging", BeanUtil.beanToMap(pageVo, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
     @Override
     public R systemAdd(PushMonitorCompanyAddVo addVo) {
+        Long userId = LoginHelper.getUserId();
+        if (ObjectUtil.isNotEmpty(userId)) {
+            addVo.setUserId(userId);
+        }
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/supplier/system/add", BeanUtil.beanToMap(addVo, false, false));
         return BeanUtil.toBean(map, R.class);
     }
@@ -127,16 +151,22 @@ public class MonitorServiceImpl implements MonitorService {
 
     @Override
     public R systemCancel(PushMonitorCompanyCancelVo cancelVo) {
+        Long userId = LoginHelper.getUserId();
+        if (ObjectUtil.isNotEmpty(userId)) {
+            cancelVo.setUserId(userId);
+        }
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/supplier/system/cancel", BeanUtil.beanToMap(cancelVo, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
     @Override
-    public R importGuarantee(MultipartFile file) {
-
+    public R systemImport(MultipartFile file, PushMonitorCompanyImportAddVo importAddVo) {
+        Long userId = LoginHelper.getUserId();
+        if (ObjectUtil.isNotEmpty(userId)) {
+            importAddVo.setUserId(userId);
+        }
         //存放保单信息
-        List<PushMonitorImportCompanyVo> companyVoListList = new ArrayList<PushMonitorImportCompanyVo>();
-        String userId = "98";
+        List<String> companyList = new ArrayList<String>();
         // 设置redisKey
         String lockKey = "stockKey" + userId;
         // 设置redisValue
@@ -175,26 +205,25 @@ public class MonitorServiceImpl implements MonitorService {
             }
             //行列皆从0开始
             for (int i = 1; i <= lastRowNum; i++) {
-                PushMonitorImportCompanyVo vo = new PushMonitorImportCompanyVo();
+                String companyNameStr = "";
                 // 统一社会信用代码
                 Cell companyName = sheet.getRow(i).getCell(0);
                 if (ObjectUtil.isNotEmpty(companyName)) {
                     String cn = companyName.toString();
-                    vo.setCompanyName(cn.trim());
+                    companyNameStr = cn.trim();
                 }
-                companyVoListList.add(vo);
+                companyList.add(companyNameStr);
             }
         } catch (Exception e) {
             log.error("",e.getMessage());
         } finally {
             RedisUtils.hasValueDelete(lockKey, value);
         }
-        if (ObjectUtil.isEmpty(companyVoListList)) {
+        if (ObjectUtil.isEmpty(companyList)) {
             return R.fail("操作失败");
         }
-        Map<String, Object> param = new HashMap<>(1);
-        param.put("names", companyVoListList);
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/supplier/system/addPatch", param);
+        importAddVo.setNames(companyList);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/supplier/system/addPatch", BeanUtil.beanToMap(importAddVo, false, false));
         return BeanUtil.toBean(map, R.class);
 
     }