隐患分布接口查询优化

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/controller/HomeController.java

@@ -8,6 +8,7 @@ import com.gyee.wisdom.alarm.sharding.biz.InspectOrderBiz;
 import com.gyee.wisdom.alarm.sharding.entity.Alertrule2;
 import com.gyee.wisdom.alarm.sharding.model.AlarmCountStat;
 import com.gyee.wisdom.alarm.sharding.model.AlarmHome;
+import com.gyee.wisdom.alarm.sharding.model.HiddeDanger;
 import com.gyee.wisdom.alarm.sharding.service.AlarmCountService;
 import com.gyee.wisdom.alarm.sharding.service.AlarmSnapService;
 import com.gyee.wisdom.alarm.sharding.service.Alertrule2Service;
@@ -115,8 +116,8 @@ public class HomeController {
 
         ResponseWrapper wrapper = null;
         try {
-            Map<String, Double> map = alarmCountService.hiddeDanger();
-            wrapper = ResponseWrapper.success("请求成功", map);
+            List<HiddeDanger> list= alarmCountService.hiddeDanger();
+            wrapper = ResponseWrapper.success("请求成功", list);
         } catch (Exception ex) {
             wrapper = ResponseWrapper.error("请求失败", JSON.toJSONString(ex.getStackTrace()));
         }

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/model/HiddeDanger.java

@@ -0,0 +1,12 @@
+package com.gyee.wisdom.alarm.sharding.model;
+
+import lombok.Data;
+
+//隐患分布查询返回包装类
+@Data
+public class HiddeDanger {
+    private String code;
+    private String codeName;
+    private int count;
+    private double time;
+}

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/service/AlarmCountService.java

@@ -3,6 +3,7 @@ package com.gyee.wisdom.alarm.sharding.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.wisdom.alarm.sharding.cache.DataDictionaryCache;
 import com.gyee.wisdom.alarm.sharding.cache.WindturbineCache;
 import com.gyee.wisdom.alarm.sharding.entity.*;
 import com.gyee.wisdom.alarm.sharding.mapper.AlarmCountMapper;
@@ -10,6 +11,7 @@ import com.gyee.wisdom.alarm.sharding.mapper.AlarmHisotryMapper;
 import com.gyee.wisdom.alarm.sharding.model.AlarmCountStat;
 import com.gyee.wisdom.alarm.sharding.model.AlarmHistoryInfo;
 import com.gyee.wisdom.alarm.sharding.model.CodeValue;
+import com.gyee.wisdom.alarm.sharding.model.HiddeDanger;
 import com.gyee.wisdom.alarm.sharding.util.ResponseWrapper;
 import com.gyee.wisdom.alarm.sharding.util.SnowflakeGenerator;
 import com.gyee.wisdom.common.utils.DateUtil;
@@ -79,10 +81,10 @@ public class AlarmCountService extends ServiceImpl<AlarmCountMapper, AlarmCount>
         return list;
     }
 
-    public Map<String,Double> hiddeDanger(){
+    public List<HiddeDanger> hiddeDanger(){
         try {
             List<Integer> list = getEdnValue();
-            Map<String,Double> doubleMap =new HashMap<>();
+            List<HiddeDanger> hiddeDangerList =new ArrayList<>();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             String strDate = sdf.format(DateUtil.addDays(new Date(),-1));
             Date dtStart = sdf.parse(strDate);
@@ -100,14 +102,21 @@ public class AlarmCountService extends ServiceImpl<AlarmCountMapper, AlarmCount>
             Map<String,List<AlarmStat>> map = alarmStatList.stream().collect(Collectors.groupingBy(AlarmStat::getParts));
             for (Map.Entry<String,List<AlarmStat>> stringListMap : map.entrySet()){
                 double time = 0;
+                int count = 0;
                 for (AlarmStat alarmStat : stringListMap.getValue()){
                     if (alarmStat != null){
                         time = time + alarmStat.getTimes();
+                        count = count + alarmStat.getSum();
                     }
                 }
-                doubleMap.put(stringListMap.getKey(),time);
+                HiddeDanger hiddeDanger = new HiddeDanger();
+                hiddeDanger.setCode(stringListMap.getKey());
+                hiddeDanger.setCodeName(DataDictionaryCache.getPartName(stringListMap.getKey()));
+                hiddeDanger.setCount(count);
+                hiddeDanger.setTime(time);
+                hiddeDangerList.add(hiddeDanger);
             }
-            return doubleMap;
+            return hiddeDangerList;
         }catch (Exception ex) {
             log.error(ex.getMessage());
             log.error(ex.getStackTrace().toString());

warning-web/src/main/resources/application.yaml

@@ -46,7 +46,7 @@ spring:
 
 mybatis-plus:
   typeAliasesPackage: com.gyee.wisdom.alarm.sharding.entity
-  mapper-locations: classpath:mappers-oracle/*.xml
+  mapper-locations: classpath:mappers/*.xml
   global-config:
     #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
     id-type: 3
@@ -102,5 +102,5 @@ rule_encryption: false
 syz_kg_relieve_show: false
 
 homestat:
-  alertIds: HD10,HD11,HD12,HD13,HD06,HD07,HD33,HD08,HD09,HD10
+  alertIds: ZX00303NSSUP82,ZX010MHSUP77,ZX008MHSUP77,ZX059SBQUP105,ZX066MHSUP77,ZX065MHSUP77,ZX05301NSSUP82,ZX05203SBQUP105