-

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

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

@@ -16,4 +16,9 @@ public class PushMonitorCompanyPageVo extends BasePage {
      * 查询条件
      */
     private ConditionVo condition;
+
+    /**
+     * 用户id
+     */
+    private Long userId = 98L;
 }

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

@@ -13,5 +13,10 @@ import lombok.Data;
 @Data
 public class PushMonitorDynamicPageVo extends BasePage {
 
+    /**
+     * 用户id
+     */
+    private Long userId = 98L;
+
     private ConditionVo condition;
 }

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

@@ -16,4 +16,9 @@ public class PushMonitorReportPageVo extends BasePage {
      * 查询条件
      */
     private ConditionVo condition;
+
+    /**
+     * 用户id
+     */
+    private Long userId = 98L;
 }

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

@@ -64,9 +64,13 @@ public class MonitorServiceImpl implements MonitorService {
         if (ObjectUtil.isNotEmpty(userId)) {
             monitorRulesDto.setUserId(userId);
         }
-        if (ObjectUtil.isEmpty(monitorRulesDto.getId())) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("user_id", monitorRulesDto.getUserId());
+        PushMonitorRules detail  = rulesMapper.selectOne(queryWrapper);
+        if (ObjectUtil.isEmpty(detail)) {
             rulesMapper.insert(monitorRulesDto);
         } else {
+            monitorRulesDto.setId(detail.getId());
             rulesMapper.updateById(monitorRulesDto);
         }
         return R.ok();
@@ -88,6 +92,7 @@ public class MonitorServiceImpl implements MonitorService {
     public TableDataInfo companyDynamicPage(PushMonitorDynamicPageVo pageVo) throws Exception {
         Long userId = LoginHelper.getUserId();
         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));
@@ -106,6 +111,7 @@ public class MonitorServiceImpl implements MonitorService {
     public TableDataInfo reportPage(PushMonitorReportPageVo pageVo) throws Exception {
         Long userId = LoginHelper.getUserId();
         if (ObjectUtil.isNotEmpty(userId)) {
+            pageVo.setUserId(userId);
             pageVo.getCondition().setUserId(userId);
         }
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/info/monitor/report", BeanUtil.beanToMap(pageVo, false, false));
@@ -116,6 +122,7 @@ public class MonitorServiceImpl implements MonitorService {
     public TableDataInfo companyPage(PushMonitorCompanyPageVo pageVo) throws Exception {
         Long userId = LoginHelper.getUserId();
         if (ObjectUtil.isNotEmpty(userId)) {
+            pageVo.setUserId(userId);
             pageVo.getCondition().setUserId(userId);
         }
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/supplier/system/paging", BeanUtil.beanToMap(pageVo, false, false));
@@ -208,6 +215,7 @@ public class MonitorServiceImpl implements MonitorService {
         }
         importAddVo.setNames(companyList);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/supplier/system/addPatch", BeanUtil.beanToMap(importAddVo, false, false));
+        log.info("systemImport==================================>" + map);
         return BeanUtil.toBean(map, R.class);
 
     }