提交任务详情、问题记录查询

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/McbWarningController.java

@@ -20,24 +20,24 @@ import java.util.Map;
 
 @RestController
 @Api(tags = "McbWarning Controller")
-@RequestMapping(value = "/mcb-warning")
+@RequestMapping(value = "/warning")
 public class McbWarningController {
 
     @Autowired
-    private IMcbWarningService IMcbWarningService;
+    private IMcbWarningService iMcbWarningService;
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "[监测总览]今日预警-预警总数", notes = "[监测总览]今日预警-预警总数")
     @GetMapping(value = "/count/today")
     public ResponseModel<Map<String, Object>> queryTodayCount(@RequestParam("processingStatus") Integer processingStatus) {
-        return ResponseHelper.buildResponse(IMcbWarningService.queryTodayCount(processingStatus));
+        return ResponseHelper.buildResponse(iMcbWarningService.queryTodayCount(processingStatus));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "[监测总览]近七日预警统计", notes = "[监测总览]近七日预警统计")
     @GetMapping(value = "/count/week")
     public ResponseModel<List<Map<String, Object>>> queryWeekCount() {
-        return ResponseHelper.buildResponse(IMcbWarningService.queryWeekCount());
+        return ResponseHelper.buildResponse(iMcbWarningService.queryWeekCount());
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@@ -47,7 +47,7 @@ public class McbWarningController {
                                                               @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize,
                                                               @RequestParam("processingStatus") Integer processingStatus) {
         Page<BaseEntity> page = new Page<>(pageNumber, pageSize);
-        return ResponseHelper.buildResponse(IMcbWarningService.queryWarningPage(page, processingStatus));
+        return ResponseHelper.buildResponse(iMcbWarningService.queryWarningPage(page, processingStatus));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@@ -57,7 +57,42 @@ public class McbWarningController {
                                                                       @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize,
                                                                       @RequestParam("completionStatus") Integer completionStatus) {
         Page<BaseEntity> page = new Page<>(pageNumber, pageSize);
-        return ResponseHelper.buildResponse(IMcbWarningService.queryQuestionPage(page, completionStatus));
+        return ResponseHelper.buildResponse(iMcbWarningService.queryQuestionPage(page, completionStatus));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "任务详情、问题记录左侧树", notes = "任务详情、问题记录左侧树")
+    @GetMapping(value = "/warning-warning-info/tree")
+    public ResponseModel getWarnTree(@RequestParam Map<String, Object> map) {
+        return ResponseHelper.buildResponse(iMcbWarningService.getWarnTree(map));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "任务详情分页列表", notes = "任务详情分页列表")
+    @GetMapping(value = "/warning-warning-info/page")
+    public ResponseModel<Page<Map<String, Object>>> getTaskDetailPage(@RequestParam Map<String, Object> map) {
+        return ResponseHelper.buildResponse(iMcbWarningService.getTaskDetailPage(map));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "任务详情统计", notes = "任务详情统计")
+    @GetMapping(value = "/warning-warning-info/statistics")
+    public ResponseModel getTaskDetailStatistic(@RequestParam Map<String, Object> map) {
+        return ResponseHelper.buildResponse(iMcbWarningService.getTaskDetailStatistic(map));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "问题记录分页列表", notes = "问题记录分页列表")
+    @GetMapping(value = "/warning-question-info/questionPage")
+    public ResponseModel<Page<Map<String, Object>>> getQuestionRecordPage(@RequestParam Map<String, Object> map) {
+        return ResponseHelper.buildResponse(iMcbWarningService.getQuestionRecordPage(map));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "问题记录统计", notes = "问题记录统计")
+    @GetMapping(value = "/warning-question-info/questionPageTopStatistics")
+    public ResponseModel getQuestionRecordStatistic(@RequestParam Map<String, Object> map) {
+        return ResponseHelper.buildResponse(iMcbWarningService.getQuestionRecordStatistic(map));
     }
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/IMcbWarningService.java

@@ -38,4 +38,35 @@ public interface IMcbWarningService {
      */
     Page<Map<String, Object>> queryQuestionPage(Page<BaseEntity> page, Integer processingStatus);
 
+    /**
+     * 任务详情分页列表
+     *
+     * @return 任务详情分页列表
+     */
+    Page<Map<String, Object>> getTaskDetailPage(Map<String, Object> map);
+
+    /**
+     * 问题记录分页列表
+     *
+     * @return 任务详情分页列表
+     */
+    Page<Map<String, Object>> getQuestionRecordPage(Map<String, Object> map);
+
+    /**
+     * 任务详情、问题记录左侧树
+     */
+    Object getWarnTree(Map<String, Object> map);
+
+    /**
+     * 任务详情列表统计
+     */
+    Object getTaskDetailStatistic(Map<String, Object> map);
+
+    /**
+     * 问题记录列表统计
+     */
+    Object getQuestionRecordStatistic(Map<String, Object> map);
+
+
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/McbWarningServiceImpl.java

@@ -2,16 +2,16 @@ package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.jxiop.api.feign.McbWarningFeign;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.McbWarningMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.IMcbWarningService;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.IPermissionService;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 @Service
 public class McbWarningServiceImpl implements IMcbWarningService {
@@ -22,6 +22,9 @@ public class McbWarningServiceImpl implements IMcbWarningService {
     @Autowired
     private IPermissionService permissionService;
 
+    @Autowired
+    private McbWarningFeign warningFeign;
+
     /**
      * 今日预警-预警总数
      *
@@ -48,7 +51,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
     /**
      * 预警信息列表
      *
-     * @param page 分页
+     * @param page             分页
      * @param processingStatus 处理状态
      * @return 预警信息列表
      */
@@ -61,7 +64,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
     /**
      * 问题信息列表
      *
-     * @param page 分页
+     * @param page             分页
      * @param completionStatus 处理状态
      * @return 问题信息列表
      */
@@ -72,7 +75,57 @@ public class McbWarningServiceImpl implements IMcbWarningService {
     }
 
     /**
-     * 获取用户权限(此处使用gatewayId)
+     * 任务详情分页列表
+     */
+    @Override
+    public Page<Map<String, Object>> getTaskDetailPage(Map<String, Object> map) {
+        map.put("GATEWAY_ID", String.format("[%s]", buildGateWayIdsParam()));
+        FeignClientResult<Page<Map<String, Object>>> page = warningFeign.getTaskDetailPage(map);
+        return page.getResult();
+    }
+
+    @Override
+    public Page<Map<String, Object>> getQuestionRecordPage(Map<String, Object> map) {
+        map.put("GATEWAY_ID", String.format("[%s]", buildGateWayIdsParam()));
+        FeignClientResult<Page<Map<String, Object>>> page = warningFeign.getQuestionRecordPage(map);
+        return page.getResult();
+    }
+
+    /**
+     * 任务详情、问题记录左侧树
+     *
+     */
+    @Override
+    public Object getWarnTree(Map<String, Object> map) {
+        map.put("GATEWAY_ID", String.format("[%s]", buildGateWayIdsParam()));
+        FeignClientResult result = warningFeign.getWarnTree(map);
+        return result.getResult();
+    }
+
+    /**
+     * 任务详情列表统计
+     *
+     */
+    @Override
+    public Object getTaskDetailStatistic(Map<String, Object> map) {
+        map.put("GATEWAY_ID", String.format("[%s]", buildGateWayIdsParam()));
+        FeignClientResult result = warningFeign.getTaskDetailStatistic(map);
+        return result.getResult();
+    }
+
+    /**
+     * 问题记录统计
+     *
+     */
+    @Override
+    public Object getQuestionRecordStatistic(Map<String, Object> map) {
+        map.put("GATEWAY_ID", String.format("[%s]", buildGateWayIdsParam()));
+        FeignClientResult result = warningFeign.getQuestionRecordStatistic(map);
+        return result.getResult();
+    }
+
+    /**
+     * 获取用户权限(此处使用projectOrgCode)
      *
      * @return gatewayIds
      */
@@ -83,4 +136,17 @@ public class McbWarningServiceImpl implements IMcbWarningService {
         }
         return projectOrgCodes;
     }
+
+    private String buildGateWayIdsParam() {
+        List<String> currentUserPermissions = permissionService.getCurrentUserPermissions();
+        if (Objects.isNull(currentUserPermissions)) {
+            currentUserPermissions = new ArrayList<>();
+        }
+        String gatewayIds = String.join(",", currentUserPermissions);
+        if (!gatewayIds.isEmpty()) {
+            gatewayIds = String.format("[%s]", gatewayIds);
+        }
+        return Optional.ofNullable(gatewayIds).orElse("[]");
+    }
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/feign/McbWarningFeign.java

 package com.yeejoin.amos.boot.module.jxiop.api.feign;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -39,4 +40,35 @@ public interface McbWarningFeign {
     @PostMapping("/task/updateRawDataByTraceId")
     FeignClientResult<Boolean> updateRawDataByTraceId(@RequestParam(value = "traceId") String traceId, @RequestParam(value = "rawData") String rawData);
 
+
+    /**
+     * 任务详情分页列表
+     */
+    @GetMapping("/warning-warning-info/page")
+    FeignClientResult<Page<Map<String, Object>>> getTaskDetailPage(@RequestParam Map<String, Object> map);
+
+    /**
+     * 问题记录分页列表
+     */
+    @GetMapping("/warning-question-info/questionPage")
+    FeignClientResult<Page<Map<String, Object>>> getQuestionRecordPage(@RequestParam Map<String, Object> map);
+
+    /**
+     * 任务详情、问题记录左侧树
+     */
+    @GetMapping("/warning-warning-info/tree")
+    FeignClientResult getWarnTree(@RequestParam Map<String, Object> map);
+
+    /**
+     * 任务详情列表统计
+     */
+    @GetMapping("/warning-warning-info/statistics")
+    FeignClientResult getTaskDetailStatistic(@RequestParam Map<String, Object> map);
+
+    /**
+     * 问题记录列表统计
+     */
+    @GetMapping("/warning-question-info/questionPageTopStatistics")
+    FeignClientResult getQuestionRecordStatistic(@RequestParam Map<String, Object> map);
+
 }