From e9af9f5cfeddbe5c0b33a3060b8ea6364c51e744 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 15 十一月 2024 11:37:10 +0800
Subject: [PATCH] 白名单故障类型

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java |  145 +++++++++++++++++++++++++-----------------------
 1 files changed, 75 insertions(+), 70 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
index e05e86c..496430d 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
@@ -3,6 +3,7 @@
 import annotation.DataScope;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ycl.platform.base.CheckIndex;
 import com.ycl.platform.domain.dto.CheckResultExportDTO;
@@ -12,10 +13,7 @@
 import com.ycl.platform.domain.entity.*;
 import com.ycl.platform.domain.query.DashboardQuery;
 import com.ycl.platform.domain.vo.*;
-import com.ycl.platform.mapper.CheckRuleMapper;
-import com.ycl.platform.mapper.CheckScoreMapper;
-import com.ycl.platform.mapper.CheckTemplateMapper;
-import com.ycl.platform.mapper.CheckTemplateRuleMapper;
+import com.ycl.platform.mapper.*;
 import com.ycl.platform.service.ICheckIndexCarService;
 import com.ycl.platform.service.ICheckIndexFaceService;
 import com.ycl.platform.service.ICheckIndexVideoService;
@@ -28,6 +26,7 @@
 import com.ycl.utils.SecurityUtils;
 import com.ycl.utils.StringUtils;
 import constant.CheckConstants;
+import enumeration.general.AreaDeptEnum;
 import enumeration.general.PublishType;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -41,6 +40,7 @@
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.net.InetAddress;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -72,7 +72,8 @@
     private ICheckIndexVideoService indexVideoService;
     @Autowired
     private ISysDeptService deptService;
-
+    @Autowired
+    private PlatformMapper platformMapper;
 
     /**
      * 鏌ヨ鑰冩牳绉垎鎸囨爣
@@ -180,17 +181,22 @@
     }
 
     private void getCheckScore(CheckScore checkScore, Calendar calendar) {
-        // 0 鐪佸巺鏈堝害 1 甯傚眬鏈堝害 2 鐪佸巺瀛e害 3 甯傚眬瀛e害
+        // 0.鐪佸巺鏈堝害 1.鐪佸巺瀛e害 2.甯傚眬鏈堝害 3.甯傚眬瀛e害 4.鍏畨閮ㄦ湀搴� 5.鍏畨閮ㄥ搴�
         switch (checkScore.getExamineTag()) {
-            case 0, 1:
+            case 0, 2 ,4:
                 checkScore.setEndDate(calendar.getTime());
                 calendar.set(Calendar.DAY_OF_MONTH, 1);
                 checkScore.setStartDate(calendar.getTime());
+                if(checkScore.getExamineTag() == 0) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Province+""));
+                if(checkScore.getExamineTag() == 2) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_County+""));
+                if(checkScore.getExamineTag() == 4) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Dept+""));
                 break;
-            case 2, 3:
+            case 1, 3, 5:
                 checkScore.setStartDate(DateUtils.getQuarterStart(calendar).getTime());
                 checkScore.setEndDate(DateUtils.getQuarterEnd(calendar).getTime());
-                checkScore.setExamineTag(checkScore.getExamineTag() == 2 ? 0 : 1);
+                if(checkScore.getExamineTag() == 1) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Province+""));
+                if(checkScore.getExamineTag() == 3) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_County+""));
+                if(checkScore.getExamineTag() == 5) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Dept+""));
                 break;
         }
     }
@@ -298,35 +304,25 @@
      */
     @Override
     public void exportIndex(HttpServletResponse response, CheckResultExportDTO exportDTO) throws IOException {
-//        String date = exportDTO.getDate();
-        //濡傛灉璇锋眰鍙傛暟鏃堕棿涓虹┖锛屾煡杩欐潯璁板綍鐨勬椂闂�
-//        if (StringUtils.isEmpty(exportDTO.getDate()) && CollectionUtils.isEmpty(exportDTO.getQuarter())) {
-//            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
-//            if (exportDTO.getId() != null) {
-//                CheckScore checkScore = getById(exportDTO.getId());
-//                Date createTime = checkScore.getCreateTime();
-//                date = formatter.format(createTime);
-//            } else {
-//                //闃叉鍗$墖椤甸潰瀵煎嚭涓嶄紶scoreId锛屽鑷存姤閿�
-//                date = formatter.format(new Date());
-//            }
-//        }
-
+        //娌℃湁鏍囩榛樿鍏ㄥ
+        if(CollectionUtils.isEmpty(exportDTO.getExamineTags())){
+            exportDTO.setExamineTags(Arrays.asList(0,1,2));
+        }
         /** 瀵间笁寮爏heet */
         //杞﹁締
-        CheckIndexCar checkIndexCar = new CheckIndexCar();
-//        checkIndexCar.setDate(date);
-        checkIndexCar.setQuarter(exportDTO.getQuarter());
-        checkIndexCar.setDeptId(exportDTO.getDeptId());
-        checkIndexCar.setDeptIds(exportDTO.getDeptIds());
-        //鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
-        roleControl(checkIndexCar);
         List<CheckIndexCar> checkIndexCars = new ArrayList<>();
+        //杞﹁締鍜屼汉鑴告病鏈夊叕瀹夐儴
         for (Integer examineTag : exportDTO.getExamineTags()) {
-            checkIndexCar.setExamineTag(Short.valueOf(examineTag+""));
-            if(examineTag ==0){
-                checkIndexCar.setExamineTagQuery(1);
-            }
+            if(examineTag ==2) continue;
+            CheckIndexCar checkIndexCar = new CheckIndexCar();
+//        checkIndexCar.setDate(date);
+            checkIndexCar.setQuarter(exportDTO.getQuarter());
+            checkIndexCar.setDeptId(exportDTO.getDeptId());
+            checkIndexCar.setDeptIds(exportDTO.getDeptIds());
+            //鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
+            roleControl(checkIndexCar);
+            checkIndexCar.setExamineTag(Short.valueOf(examineTag + ""));
+
             checkIndexCars.addAll(indexCarService.selectCheckIndexCarList(checkIndexCar));
         }
         //璁$畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
@@ -361,20 +357,19 @@
             checkIndexCarVOS.add(excelVo);
         }
         ExcelExp e1 = new ExcelExp("杞﹁締鑰冩牳鎸囨爣鏁版嵁", checkIndexCarVOS, CheckIndexCarVO.class);
+
         //浜鸿劯
-        CheckIndexFace checkIndexFace = new CheckIndexFace();
-//        checkIndexFace.setDate(date);
-        checkIndexFace.setQuarter(exportDTO.getQuarter());
-        checkIndexFace.setDeptId(exportDTO.getDeptId());
-        checkIndexFace.setDeptIds(exportDTO.getDeptIds());
-        //鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
-        roleControl(checkIndexFace);
         List<CheckIndexFace> checkIndexFaces = new ArrayList<>();
         for (Integer examineTag : exportDTO.getExamineTags()) {
-            checkIndexFace.setExamineTag(Short.valueOf(examineTag+""));
-            if(examineTag ==0){
-                checkIndexFace.setExamineTagQuery(1);
-            }
+            if(examineTag ==2) continue;
+            CheckIndexFace checkIndexFace = new CheckIndexFace();
+//        checkIndexFace.setDate(date);
+            checkIndexFace.setQuarter(exportDTO.getQuarter());
+            checkIndexFace.setDeptId(exportDTO.getDeptId());
+            checkIndexFace.setDeptIds(exportDTO.getDeptIds());
+            //鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
+            roleControl(checkIndexFace);
+            checkIndexFace.setExamineTag(Short.valueOf(examineTag + ""));
             checkIndexFaces.addAll(indexFaceService.selectCheckIndexFaceList(checkIndexFace));
         }
         //璁$畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
@@ -409,20 +404,18 @@
             checkIndexFaceVOS.add(excelVo);
         }
         ExcelExp e2 = new ExcelExp("浜鸿劯鑰冩牳鎸囨爣鏁版嵁", checkIndexFaceVOS, CheckIndexFaceVO.class);
+
         //瑙嗛
-        CheckIndexVideo checkIndexVideo = new CheckIndexVideo();
-//        checkIndexVideo.setDate(date);
-        checkIndexVideo.setQuarter(exportDTO.getQuarter());
-        checkIndexVideo.setDeptId(exportDTO.getDeptId());
-        checkIndexVideo.setDeptIds(exportDTO.getDeptIds());
-        //鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
-        roleControl(checkIndexVideo);
         List<CheckIndexVideo> checkIndexVideos = new ArrayList<>();
         for (Integer examineTag : exportDTO.getExamineTags()) {
-            checkIndexVideo.setExamineTag(Short.valueOf(examineTag+""));
-            if(examineTag ==0){
-                checkIndexVideo.setExamineTagQuery(1);
-            }
+            CheckIndexVideo checkIndexVideo = new CheckIndexVideo();
+//        checkIndexVideo.setDate(date);
+            checkIndexVideo.setQuarter(exportDTO.getQuarter());
+            checkIndexVideo.setDeptId(exportDTO.getDeptId());
+            checkIndexVideo.setDeptIds(exportDTO.getDeptIds());
+            //鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
+            roleControl(checkIndexVideo);
+            checkIndexVideo.setExamineTag(Short.valueOf(examineTag + ""));
             checkIndexVideos.addAll(indexVideoService.selectCheckIndexVideoList(checkIndexVideo));
         }
         //璁$畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
@@ -442,6 +435,17 @@
             List<CheckIndexVideo> provinceList = checkIndexVideos.stream().filter(video -> CheckConstants.Examine_Tag_Province.equals(video.getExamineTag())).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(provinceList)) {
                 Map<Long, List<CheckIndexVideo>> videoMap = provinceList.stream().collect(Collectors.groupingBy(CheckIndexVideo::getDeptId));
+                List<CheckIndexVideo> videos = new ArrayList<>();
+                videoMap.forEach((deptId, list) -> {
+                    CheckIndexVideo video = CheckIndexVideo.calculateAverage(list);
+                    videos.add(video);
+                });
+                //鏍规嵁绉垎闄嶅簭
+                checkIndexVideos.addAll(videos.stream().sorted(Comparator.comparing(CheckIndexVideo::getScore).reversed()).collect(Collectors.toList()));
+            }
+            List<CheckIndexVideo> deptList = checkIndexVideos.stream().filter(video -> CheckConstants.Examine_Tag_Dept.equals(video.getExamineTag())).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(deptList)) {
+                Map<Long, List<CheckIndexVideo>> videoMap = deptList.stream().collect(Collectors.groupingBy(CheckIndexVideo::getDeptId));
                 List<CheckIndexVideo> videos = new ArrayList<>();
                 videoMap.forEach((deptId, list) -> {
                     CheckIndexVideo video = CheckIndexVideo.calculateAverage(list);
@@ -527,22 +531,23 @@
 
     //澶у睆灞曠ず鑰冩牳寰楀垎
     @Override
-    //TODO:鑰冭檻limit bug
-    public Map<String, List<Map<String, Object>>> dashboard(DashboardQuery dashboardQuery) {
+    public Map<String, Map<String, Object>> dashboard(DashboardQuery dashboardQuery) {
+        Date now = new Date();
+        dashboardQuery.setStartTime(DateUtils.getMouthStart(now));
+        dashboardQuery.setEndTime(DateUtils.getMouthEnd(now));
         List<CheckScore> dashboard = scoreMapper.dashboard(dashboardQuery);
-        Map<String, List<Map<String, Object>>> resultMap = new HashMap<>();
-
-        for (CheckScore checkScore : dashboard) {
-            List<Map<String, Object>> list = new ArrayList<>();
+        //鍒濆鍖栧悇涓尯鍘挎暟鎹�
+        Map<String, Map<String, Object>> resultMap = new HashMap<>();
+        for (AreaDeptEnum value : AreaDeptEnum.values()) {
             Map<String, Object> map = new HashMap<>();
-            map.put("value", checkScore.getScore());
-            if (dashboardQuery.getDataScope() == 1) {
-                map.put("name", "鐪佸巺寰楀垎");
-            } else {
-                map.put("name", "鍖哄幙寰楀垎");
-            }
-            list.add(map);
-            resultMap.put(checkScore.getDeptName(), list);
+            map.put("score", 0);
+            resultMap.put(value.getName(), map);
+        }
+        //濉厖鍚勪釜鍖哄幙鏁版嵁
+        for (CheckScore checkScore : dashboard) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("score", checkScore.getScore().setScale(1,RoundingMode.HALF_UP));
+            resultMap.put(checkScore.getDeptName(), map);
         }
         return resultMap;
     }

--
Gitblit v1.8.0