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

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

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

+package com.dsk.monitor.controlelr;
+
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.monitor.domain.vo.*;
+import com.dsk.monitor.service.MonitorService;
+import com.dsk.monitor.service.MonitorUserService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+
+/**
+ * @ClassName MonitorUserController
+ * @Description 监控业主单位   固定userID：123456789L
+ * @Author Dgm
+ * @Date 2023/12/8 10:19
+ * @Version 1.0.0
+ */
+@RestController
+@RequestMapping("/monitor/user")
+public class MonitorUserController {
+
+    @Resource
+    private MonitorUserService monitorService;
+
+    /***
+     *@Description: 同步推送数据入库
+     *@Param:
+     *@return: com.dsk.common.core.domain.R
+     *@Author: Dgm
+     *@date: 2023/12/9 9:29
+     */
+    @PostMapping(value = "push/insert")
+    public R insert(@RequestBody PushMonitorInfoVo pushMonitorInfoVo) {
+        return monitorService.insert(pushMonitorInfoVo);
+    }
+
+    /***
+     *@Description: 监控维度下拉选择
+     *@Param:
+     *@return: com.dsk.common.core.domain.R
+     *@Author: Dgm
+     *@date: 2023/12/9 9:29
+     */
+    @GetMapping(value = "push/rulesSelect")
+    public R rulesSelect(PushMonitorRulesSelectVo selectVo) {
+        return monitorService.rulesSelect(selectVo);
+    }
+
+    /***
+     *@Description: 新增修改我的规则
+     *@Param:
+     *@return: com.dsk.common.core.domain.R
+     *@Author: Dgm
+     *@date: 2023/12/9 9:29
+     */
+    @PostMapping(value = "push/rules/insertOrUpdate")
+    public R insertRules(@RequestBody PushMonitorRulesVo rulesVo) {
+        return monitorService.insertRules(rulesVo);
+    }
+
+    /***
+     *@Description: 我的推送规则
+     *@Param:
+     *@return: com.dsk.common.core.domain.R
+     *@Author: Dgm
+     *@date: 2023/12/9 9:29
+     */
+    @PostMapping(value = "push/rulesDetail")
+    public R rulesDetail(@RequestBody PushMonitorRulesDetailVo detailVo) {
+        return monitorService.rulesDetail(detailVo);
+    }
+
+    /***
+     *@Description: 监控动态/监控报告详情 分页
+     *@Param:
+     *@return: com.dsk.common.core.domain.R
+     *@Author: Dgm
+     *@date: 2023/12/9 9:29
+     */
+    @PostMapping(value = "company/dynamicPage")
+    public TableDataInfo companyDynamicPage(@RequestBody PushMonitorDynamicPageVo pageVo) throws Exception{
+        return monitorService.companyDynamicPage(pageVo);
+    }
+
+    /***
+     *@Description: 监控报告 分页
+     *@Param:
+     *@return: com.dsk.common.core.domain.R
+     *@Author: Dgm
+     *@date: 2023/12/9 9:29
+     */
+    @PostMapping(value = "reportPage")
+    public TableDataInfo reportPage(@RequestBody PushMonitorReportPageVo pageVo) throws Exception{
+        return monitorService.reportPage(pageVo);
+    }
+
+    /***
+     *@Description: 企业监控列表 分页
+     *@Param:
+     *@return: com.dsk.common.core.domain.R
+     *@Author: Dgm
+     *@date: 2023/12/9 9:29
+     */
+    @PostMapping(value = "system/companyPage")
+    public TableDataInfo companyPage(@RequestBody PushMonitorCompanyPageVo pageVo) throws Exception{
+        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:
+     *@return: com.dsk.common.core.domain.R
+     *@Author: Dgm
+     *@date: 2023/12/9 9:29
+     */
+    @PostMapping(value = "system/add")
+    public R systemAdd(@RequestBody PushMonitorCompanyAddVo addVo) {
+        return monitorService.systemAdd(addVo);
+    }
+
+    /***
+     *@Description: 取消监控
+     *@Param:
+     *@return: com.dsk.common.core.domain.R
+     *@Author: Dgm
+     *@date: 2023/12/9 9:29
+     */
+    @PostMapping(value = "system/cancel")
+    public R systemCancel(@RequestBody PushMonitorCompanyCancelVo cancelVo) throws Exception{
+        return monitorService.systemCancel(cancelVo);
+    }
+
+    /***
+     *@Description: 批量导入
+     *@Param:
+     *@return: java.lang.String
+     *@Author: Dgm
+     *@date: 2022/6/14 10:45
+     */
+    @RequestMapping("/system/import")
+    public R systemImport(@RequestParam MultipartFile file, PushMonitorCompanyImportAddVo importAddVo) throws Exception{
+        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);
+    }
+//
+//    /**
+//     * 监控列表添加默认业主单位
+//     * @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/MonitorUserService.java

+package com.dsk.monitor.service;
+
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.monitor.domain.vo.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * @ClassName MonitorService
+ * @Description 监控service
+ * @Author Dgm
+ * @Date 2023/12/9 10:01
+ * @Version
+ */
+public interface MonitorUserService {
+    /***
+     *@Description: 保存监控信息
+     *@Param: pushMonitorInfoDto 信息
+     *@return: R
+     *@Author: Dgm
+     *@date: 2023/12/9 10:03
+     */
+    R insert(PushMonitorInfoVo pushMonitorInfoDto);
+
+
+    /***
+     *@Description: 监控维度下拉选择
+     *@Param:
+     *@return: R
+     *@Author: Dgm
+     *@date: 2023/12/9 10:03
+     */
+    R rulesSelect(PushMonitorRulesSelectVo addVo);
+
+    /***
+     *@Description: 保存监控规则信息
+     *@Param: monitorRulesDto 信息
+     *@return: R
+     *@Author: Dgm
+     *@date: 2023/12/9 10:03
+     */
+    R insertRules(PushMonitorRulesVo monitorRulesDto);
+
+    /***
+     *@Description: 我的推送规则
+     *@Param: detailVo 信息
+     *@return: R
+     *@Author: Dgm
+     *@date: 2023/12/9 10:03
+     */
+    R rulesDetail(PushMonitorRulesDetailVo detailVo);
+
+
+    /***
+     *@Description: 监控动态 分页
+     *@Param: pageVo 信息
+     *@return: R
+     *@Author: Dgm
+     *@date: 2023/12/9 10:03
+     */
+    TableDataInfo companyDynamicPage(PushMonitorDynamicPageVo pageVo) throws Exception;
+
+    /***
+     *@Description: 监控动态分页(定时任务使用)
+     *@Param: pageVo 信息
+     *@return: R
+     *@Author: Dgm
+     *@date: 2023/12/9 10:03
+     */
+    Map<String, Object> companyDynamicPageScheduled(PushMonitorDynamicPageVo pageVo) throws Exception;
+
+    /***
+     *@Description: 监控报告
+     *@Param: pageVo 信息
+     *@return: R
+     *@Author: Dgm
+     *@date: 2023/12/9 10:03
+     */
+    TableDataInfo reportPage(PushMonitorReportPageVo pageVo) throws Exception;
+
+    /***
+     *@Description: 企业监控列表 分页
+     *@Param: pageVo 信息
+     *@return: R
+     *@Author: Dgm
+     *@date: 2023/12/9 10:03
+     */
+    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 信息
+     *@return: R
+     *@Author: Dgm
+     *@date: 2023/12/9 10:03
+     */
+    R systemAdd(PushMonitorCompanyAddVo addVo);
+
+    /***
+     *@Description: 取消监控
+     *@Param: cancelVo 信息
+     *@return: R
+     *@Author: Dgm
+     *@date: 2023/12/9 10:03
+     */
+    R systemCancel(PushMonitorCompanyCancelVo cancelVo);
+
+    /***
+     *@Description: 批量导入
+     *@Param: cancelVo 信息
+     *@return: R
+     *@Author: Dgm
+     *@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);
+    /***
+     *@Description: 是否工作日
+     *@Param: holidayVo 信息
+     *@return: R
+     *@Author: Dgm
+     *@date: 2023/12/9 10:03
+     */
+    Map<String, Object> settingHoliday(PushSettingHolidayVo holidayVo) throws Exception;
+
+    R addDefaultCompany();
+}