可视化看板数据接口

@@ -2,21 +2,23 @@ package com.ash.controller;
 
 
 import com.ash.base.*;
 import com.ash.base.*;
 import com.ash.entity.Case;
 import com.ash.entity.Case;
-import com.ash.entity.WarningInstance;
+import com.ash.entity.CaseAnalysis;
+import com.ash.service.CaseAnalysisService;
 import com.ash.service.CaseService;
 import com.ash.service.CaseService;
 import com.ash.service.WarningInstanceAnalysisService;
 import com.ash.service.WarningInstanceAnalysisService;
 import com.ash.service.WarningInstanceService;
 import com.ash.service.WarningInstanceService;
 import com.ash.util.DateUtils;
 import com.ash.util.DateUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.Stream;
 
 
@@ -29,7 +31,7 @@ public class StatisticsController extends BaseController {
     private WarningInstanceService warningInstanceService;
     private WarningInstanceService warningInstanceService;
 
 
     @Resource
     @Resource
-    private WarningInstanceAnalysisService warningInstanceAnalysisService;
+    private CaseAnalysisService caseAnalysisService;
 
 
     @Resource
     @Resource
     private CaseService caseService;
     private CaseService caseService;
@@ -334,5 +336,21 @@ public class StatisticsController extends BaseController {
         }
         }
     }
     }
 
 
+    @PostMapping("/majorCasePage")
+    public JsonResult majorCasePage(@RequestBody StatisticsParams statisticsParams) {
+        statisticsParams.setStartTime(DateUtils.weeHours(statisticsParams.getStartTime(), 0));
+        statisticsParams.setEndTime(DateUtils.weeHours(statisticsParams.getEndTime(), 1));
+
+        List<Case> dataList = caseService.majorCasePage(statisticsParams);
+        if (CollectionUtils.isNotEmpty(dataList)) {
+            List<String> caseIds = dataList
+                    .stream().map(Case::getId).collect(Collectors.toList());
+            Map<String, CaseAnalysis> caseAnalysisMap = caseAnalysisService.listByCaseId(caseIds);
+            dataList.forEach(e -> e.setAnalysis(caseAnalysisMap.get(e.getId())));
+        }
+        return JsonResult.ok(OptionStatus.OPT_SUCCESS.getName(), dataList);
+
+    }
+
 
 
 }
 }

@@ -308,6 +308,29 @@ public class CaseService {
         return resultList;
         return resultList;
     }
     }
 
 
+    public List<Case> majorCasePage(StatisticsParams params) {
+        MPJQueryWrapper<Case> mpjQueryWrapper = new MPJQueryWrapper<Case>();
+        mpjQueryWrapper.select("t.*")
+                .leftJoin("t_ash_case_analysis ca on t.id=ca.case_id");
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if (params.getStartTime() != null) {
+            mpjQueryWrapper.ge("t.alarm_date", sdf.format(DateUtils.weeHours(params.getStartTime(), 0)));
+
+        }
+
+        if (params.getEndTime() != null) {
+            mpjQueryWrapper.le("t.alarm_date", sdf.format(DateUtils.weeHours(params.getEndTime(), 1)));
+        }
+
+        mpjQueryWrapper.ge("ca.total_amount", 500000);
+        mpjQueryWrapper.orderByDesc("total_amount");
+
+        return caseMapper.selectJoinList(Case.class, mpjQueryWrapper);
+
+
+    }
+
     private QueryWrapper<Case> getCondition(Case params) {
     private QueryWrapper<Case> getCondition(Case params) {
         QueryWrapper<Case> queryWrapper = new QueryWrapper<>();
         QueryWrapper<Case> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<Case> lambda = queryWrapper.lambda();
         LambdaQueryWrapper<Case> lambda = queryWrapper.lambda();