Merge branch 'V20231129-中建一局二公司' of...

Merge branch 'V20231129-中建一局二公司' of http://47.105.106.177:66/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/JskCompanyRelationTableV1Service.java

+package com.dsk.jsk.service;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * @ClassName JskCompanyRelationTableV1Service
+ * @Description 1
+ * @Author Dgm
+ * @Date 2023/12/13 10:48
+ * @Version
+ */
+@Service
+public class JskCompanyRelationTableV1Service {
+
+}

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

@@ -43,8 +43,8 @@ public class MonitorController {
      *@date: 2023/12/9 9:29
      */
     @GetMapping(value = "push/rulesSelect")
-    public R rulesSelect(PushMonitorCompanyAddVo addVo) {
-        return monitorService.rulesSelect(addVo);
+    public R rulesSelect(PushMonitorRulesSelectVo selectVo) {
+        return monitorService.rulesSelect(selectVo);
     }
 
     /***
@@ -83,18 +83,6 @@ public class MonitorController {
         return monitorService.companyDynamicPage(pageVo);
     }
 
-    /***
-     *@Description: 监控动态详情
-     *@Param:
-     *@return: com.dsk.common.core.domain.R
-     *@Author: Dgm
-     *@date: 2023/12/9 9:29
-     */
-    @PostMapping(value = "company/dynamicDetail")
-    public R companyDynamicDetail(@RequestBody PushMonitorDynamicDetailVo detailVo) {
-        return monitorService.companyDynamicDetail(detailVo);
-    }
-
     /***
      *@Description: 监控报告 分页
      *@Param:
@@ -155,4 +143,16 @@ public class MonitorController {
         return monitorService.systemImport(file, importAddVo);
     }
 
+    /***
+     *@Description: 详情
+     *@Param:
+     *@return: java.lang.String
+     *@Author: Dgm
+     *@date: 2022/6/14 10:45
+     */
+    @RequestMapping("/system/detail")
+    public R systemDetail(@RequestBody PushMonitorSystemDetailVo detailVo){
+        return monitorService.systemDetail(detailVo);
+    }
+
 }

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 Long userId = 98L;
+    private Long userId = 7324L;
 
     /**
      * 风险类型,多个逗号隔开

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

@@ -14,7 +14,7 @@ public class ConditionVo {
     /**
      * 用户id
      */
-    private Long userId = 98L;
+    private Long userId = 7324L;
     /**
      * 条件查询企业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 Long userId = 98L;
+    private Long userId = 7324L;
     /**
      * 多个企业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 Long userId = 98L;
+    private Long userId = 7324L;
     /**
      * 多个企业id数组
      */

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

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

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

@@ -20,5 +20,5 @@ public class PushMonitorCompanyPageVo extends BasePage {
     /**
      * 用户id
      */
-    private Long userId = 98L;
+    private Long userId  = 7324L;
 }

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

@@ -16,7 +16,7 @@ public class PushMonitorDynamicPageVo extends BasePage {
     /**
      * 用户id
      */
-    private Long userId = 98L;
+    private Long userId = 7324L;
 
     private ConditionVo condition;
 }

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

@@ -20,5 +20,5 @@ public class PushMonitorReportPageVo extends BasePage {
     /**
      * 用户id
      */
-    private Long userId = 98L;
+    private Long userId = 7324L;
 }

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

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

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

+package com.dsk.monitor.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName PushMonitorRulesSelectVo
+ * @Description 监控 下拉
+ * @Author Dgm
+ * @Date 2023/12/9 11:05
+ * @Version
+ */
+@Data
+public class PushMonitorRulesSelectVo {
+
+    /**
+     * 用户id
+     */
+    private Long userId = 7324L;
+    /**
+     * 系统来源
+     */
+    private String sysType = "ZJYJ";
+}

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

+package com.dsk.monitor.domain.vo;
+
+import lombok.Data;
+
+/**
+ * @ClassName PushMonitorSystemDetail
+ * @Description 详情
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+public class PushMonitorSystemDetailVo {
+
+    /**
+     * 监控维度名称
+     */
+    private String dimensionName;
+
+    /**
+     * 来源Id
+     */
+    private String sourceId;
+
+    /**
+     * eid
+     */
+    private String eid;
+
+    /**
+     * uid
+     */
+    private String uId;
+
+    /**
+     * md5Id
+     */
+    private String md5Id;
+
+    /**
+     * objId
+     */
+    private String objId;
+
+    public String getDimensionName() {
+        return dimensionName;
+    }
+
+    public void setDimensionName(String dimensionName) {
+        this.dimensionName = dimensionName;
+    }
+
+    public String getSourceId() {
+        return sourceId;
+    }
+
+    public void setSourceId(String sourceId) {
+        this.sourceId = sourceId;
+    }
+
+    public String getEid() {
+        return eid;
+    }
+
+    public void setEid(String eid) {
+        this.eid = eid;
+    }
+
+    public String getuId() {
+        return uId;
+    }
+
+    public void setuId(String uId) {
+        this.uId = uId;
+    }
+
+    public String getMd5Id() {
+        return md5Id;
+    }
+
+    public void setMd5Id(String md5Id) {
+        this.md5Id = md5Id;
+    }
+
+    public String getObjId() {
+        return objId;
+    }
+
+    public void setObjId(String objId) {
+        this.objId = objId;
+    }
+
+    public PushMonitorSystemDetailVo() {
+    }
+
+    public PushMonitorSystemDetailVo(String eid, String uId, String md5Id, String objId) {
+        this.eid = eid;
+        this.uId = uId;
+        this.md5Id = md5Id;
+        this.objId = objId;
+    }
+
+    @Override
+    public String toString() {
+        return "PushMonitorSystemDetailVo{" +
+                "dimensionName='" + dimensionName + '\'' +
+                ", sourceId='" + sourceId + '\'' +
+                ", eid='" + eid + '\'' +
+                ", uId='" + uId + '\'' +
+                ", md5Id='" + md5Id + '\'' +
+                ", objId='" + objId + '\'' +
+                '}';
+    }
+}

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

@@ -30,7 +30,7 @@ public interface MonitorService {
      *@Author: Dgm
      *@date: 2023/12/9 10:03
      */
-    R rulesSelect(PushMonitorCompanyAddVo addVo);
+    R rulesSelect(PushMonitorRulesSelectVo addVo);
 
     /***
      *@Description: 保存监控规则信息
@@ -60,15 +60,6 @@ public interface MonitorService {
      */
     TableDataInfo companyDynamicPage(PushMonitorDynamicPageVo pageVo) throws Exception;
 
-    /***
-     *@Description: 监控动态详情
-     *@Param: detailVo 信息
-     *@return: R
-     *@Author: Dgm
-     *@date: 2023/12/9 10:03
-     */
-    R companyDynamicDetail(PushMonitorDynamicDetailVo detailVo);
-
     /***
      *@Description: 监控报告
      *@Param: pageVo 信息
@@ -114,4 +105,13 @@ public interface MonitorService {
      *@date: 2023/12/9 10:03
      */
     R systemImport(MultipartFile file, PushMonitorCompanyImportAddVo importAddVo) throws Exception;
+
+    /***
+     *@Description: 动态详情
+     *@Param: cancelVo 信息
+     *@return: R
+     *@Author: Dgm
+     *@date: 2023/12/9 10:03
+     */
+    R systemDetail(PushMonitorSystemDetailVo importAddVo);
 }

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

@@ -7,7 +7,6 @@ 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;
 import com.dsk.monitor.domain.vo.*;
 import com.dsk.monitor.mapper.PushMonitorInfoMapper;
@@ -52,14 +51,17 @@ public class MonitorServiceImpl implements MonitorService {
     }
 
     @Override
-    public R rulesSelect(PushMonitorCompanyAddVo addVo) {
+    public R rulesSelect(PushMonitorRulesSelectVo addVo) {
+        Long userId = LoginHelper.getUserId();
+        if (ObjectUtil.isNotEmpty(userId)) {
+            addVo.setUserId(userId);
+        }
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/supplier/system/queryDimensionEnum", BeanUtil.beanToMap(addVo, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
     @Override
     public R insertRules(PushMonitorRulesVo monitorRulesDto) {
-        // todo 20231211 规则是否与使用登录人强关联
         Long userId = LoginHelper.getUserId();
         if (ObjectUtil.isNotEmpty(userId)) {
             monitorRulesDto.setUserId(userId);
@@ -99,14 +101,6 @@ public class MonitorServiceImpl implements MonitorService {
         return dskOpenApiUtil.responsePage(map);
     }
 
-    @Override
-    public R companyDynamicDetail(PushMonitorDynamicDetailVo detailVo) {
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("source_id", detailVo.getSourceId());
-        PushMonitorInfo detail  = monitorInfoMapper.selectOne(queryWrapper);
-        return R.ok(detail);
-    }
-
     @Override
     public TableDataInfo reportPage(PushMonitorReportPageVo pageVo) throws Exception {
         Long userId = LoginHelper.getUserId();
@@ -219,4 +213,79 @@ public class MonitorServiceImpl implements MonitorService {
         return BeanUtil.toBean(map, R.class);
 
     }
+
+
+    @Override
+    public R systemDetail(PushMonitorSystemDetailVo cancelVo) {
+        String dimensionName = cancelVo.getDimensionName();
+        cancelVo = getDetailVo(cancelVo);
+        Map<String, Object> map = new HashMap<>();
+        switch (dimensionName) {
+            case "新增经营异常":
+                map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/abnormalDetail", BeanUtil.beanToMap(cancelVo, false, false));
+                break;
+            case "新增股权冻结":
+                map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/judicialFreezesDetail", BeanUtil.beanToMap(cancelVo, false, false));
+                break;
+            case "新增被执行人":
+                map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/executedPersonsDetail", BeanUtil.beanToMap(cancelVo, false, false));
+                break;
+            case "新增失信被执行人":
+                map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/executedDetail", BeanUtil.beanToMap(cancelVo, false, false));
+                break;
+            case "新增法院公告":
+                map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/noticesDetail", BeanUtil.beanToMap(cancelVo, false, false));
+                break;
+            case "新增裁判文书":
+                map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/lawsuitsDetail", BeanUtil.beanToMap(cancelVo, false, false));
+                break;
+            case "新增开庭公告":
+                map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/kaiTingDetail", BeanUtil.beanToMap(cancelVo, false, false));
+                break;
+            default:
+                break;
+        }
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public PushMonitorSystemDetailVo getDetailVo(PushMonitorSystemDetailVo detailVo) {
+        String value1 = null;
+        String value2 = null;
+        String sourceId = detailVo.getSourceId();
+        String[] arr = sourceId.split("_");
+        if (arr.length > 1) {
+            value1 = (arr[0]);
+            value2 = (arr[1]);
+        }
+        if (arr.length > 0) {
+            value1 = (arr[0]);
+        }
+        String dimensionName = detailVo.getDimensionName();
+        switch (dimensionName) {
+            case "新增经营异常":
+                detailVo = new PushMonitorSystemDetailVo(value1, null, null,value2);
+                break;
+            case "新增股权冻结":
+                detailVo = new PushMonitorSystemDetailVo(value1, value2, null,null);
+                break;
+            case "新增被执行人":
+                detailVo = new PushMonitorSystemDetailVo(value1, null, null,null);
+                break;
+            case "新增失信被执行人":
+                detailVo = new PushMonitorSystemDetailVo(value1, null, null,null);
+                break;
+            case "新增法院公告":
+                detailVo = new PushMonitorSystemDetailVo(value1, null, null,value2);
+                break;
+            case "新增裁判文书":
+                detailVo = new PushMonitorSystemDetailVo(value1, null, null,value2);
+                break;
+            case "新增开庭公告":
+                detailVo = new PushMonitorSystemDetailVo(value1, null, value2,null);
+                break;
+            default:
+                break;
+        }
+        return detailVo;
+    }
 }