-jiankong

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

dsk-common/src/main/java/com/dsk/common/core/page/TableDataInfo.java

@@ -39,6 +39,11 @@ public class TableDataInfo<T> implements Serializable {
      */
     private String msg;
 
+    /**
+     * object
+     */
+    private Object object;
+
     /**
      * 分页
      *
@@ -52,6 +57,20 @@ public class TableDataInfo<T> implements Serializable {
         this.msg = "查询成功";
     }
 
+    /**
+     * 分页
+     *
+     * @param list  列表数据
+     * @param total 总记录数
+     */
+    public TableDataInfo(List<T> list, long total, Object object) {
+        this.rows = list;
+        this.object = object;
+        this.total = total;
+        this.code = HttpStatus.HTTP_OK;
+        this.msg = "查询成功";
+    }
+
     public static <T> TableDataInfo<T> build(IPage<T> page) {
         TableDataInfo<T> rspData = new TableDataInfo<>();
         rspData.setCode(HttpStatus.HTTP_OK);

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

@@ -107,6 +107,18 @@ public class MonitorController {
         return monitorService.companyPage(pageVo);
     }
 
+    /***
+     *@Description: 添加企业监控列表 分页
+     *@Param:
+     *@return: com.dsk.common.core.domain.R
+     *@Author: Dgm
+     *@date: 2023/12/9 9:29
+     */
+    @PostMapping(value = "system/queryMonitorCompany")
+    public TableDataInfo queryMonitorCompany(@RequestBody MonitorQueryMonitorCompanyPageVo pageVo) throws Exception{
+        return monitorService.queryMonitorCompany(pageVo);
+    }
+
     /***
      *@Description: 添加监控
      *@Param:

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

@@ -42,12 +42,12 @@ public class PushMonitorRules implements Serializable {
     /**
      * 推送时段-起
      */
-    private Integer timePeriodStart;
+    private String timePeriodStart;
 
     /**
      * 推送时段-止
      */
-    private Integer timePeriodEnd;
+    private String timePeriodEnd;
 
     /**
      * 接收方式 手机：0 PC:1

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

@@ -2,6 +2,8 @@ package com.dsk.monitor.domain.vo;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @ClassName ConditionVo
  * @Description 共用条件
@@ -18,7 +20,7 @@ public class ConditionVo {
     /**
      * 条件查询企业id
      */
-    private Integer companyOrstaffId;
+    private Integer companyId;
     /**
      * 条件查询企业名称(模糊查询)
      */
@@ -26,15 +28,15 @@ public class ConditionVo {
     /**
      * 条件查询风险等级：正向，负向，中立，警示
      */
-    private String riskLevel;
+    private List<String> riskLevel;
     /**
-     * 条件查询监控维度子级名称
+     * 条件查询监控维度父级名称数组
      */
-    private String dimensionId;
+    private List<String> parentDimension;
     /**
-     * 条件查询监控维度父级名称
+     * 条件查询监控维度子级名称数组
      */
-    private String parentId;
+    private List<String> dimension;
     /**
      * 条件查询开始时间
      */
@@ -49,4 +51,9 @@ public class ConditionVo {
      */
     private Integer reportType;
 
+    /**
+     * 系统来源(ZJYJ)
+     */
+    private String sysType = "ZJYJ";
+
 }

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

+package com.dsk.monitor.domain.vo;
+
+import com.dsk.jsk.domain.BasePage;
+import lombok.Data;
+
+/**
+ * @ClassName PushMonitorRulesVo
+ * @Description 添加企业监控列表 分页
+ * @Author Dgm
+ * @Date 2023/12/9 11:05
+ * @Version
+ */
+@Data
+public class MonitorQueryMonitorCompanyPageVo extends BasePage {
+    /**
+     * 查询条件
+     */
+    private String companyName;
+
+    /**
+     * 用户id
+     */
+    private Long userId = 7324L;
+}

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

@@ -79,6 +79,17 @@ public interface MonitorService {
     TableDataInfo companyPage(PushMonitorCompanyPageVo pageVo) throws Exception;
 
 
+    /***
+     *@Description: 企业监控列表 分页
+     *@Param: pageVo 信息
+     *@return: R
+     *@Author: Dgm
+     *@date: 2023/12/9 10:03
+     */
+    TableDataInfo queryMonitorCompany(MonitorQueryMonitorCompanyPageVo pageVo) throws Exception;
+
+
+
     /***
      *@Description: 添加监控
      *@Param: addVo 信息

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

@@ -92,13 +92,15 @@ public class MonitorServiceImpl implements MonitorService {
 
     @Override
     public TableDataInfo companyDynamicPage(PushMonitorDynamicPageVo pageVo) throws Exception {
-        Long userId = LoginHelper.getUserId();
+        pageVo.setPageSize(3);
+        Long userId = 1733058034734989314L;
         if (ObjectUtil.isNotEmpty(userId)) {
             pageVo.setUserId(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);
+        log.info("companyDynamicPage=============================>"+map);
+        return dskOpenApiUtil.responsePageT(map);
     }
 
     @Override
@@ -123,6 +125,16 @@ public class MonitorServiceImpl implements MonitorService {
         return dskOpenApiUtil.responsePage(map);
     }
 
+    @Override
+    public TableDataInfo queryMonitorCompany(MonitorQueryMonitorCompanyPageVo pageVo) throws Exception {
+        Long userId = LoginHelper.getUserId();
+        if (ObjectUtil.isNotEmpty(userId)) {
+            pageVo.setUserId(userId);
+        }
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/supplier/system/queryCancelMonitorCompany", BeanUtil.beanToMap(pageVo, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
     @Override
     public R systemAdd(PushMonitorCompanyAddVo addVo) {
         Long userId = LoginHelper.getUserId();
@@ -248,6 +260,13 @@ public class MonitorServiceImpl implements MonitorService {
         return BeanUtil.toBean(map, R.class);
     }
 
+    /***
+     *@Description: 参数处理
+     *@Param:
+     *@return: com.dsk.monitor.domain.vo.PushMonitorSystemDetailVo
+     *@Author: Dgm
+     *@date: 2023/12/15 15:43
+     */
     public PushMonitorSystemDetailVo getDetailVo(PushMonitorSystemDetailVo detailVo) {
         String value1 = null;
         String value2 = null;