首页报警统计查询前十四天的数据

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

@@ -23,6 +23,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -515,7 +517,7 @@ public class AlarmSnapService extends ServiceImpl<AlarmSnapMapper, AlarmSnap> {
         return alarmSnapMapper.getRecentAlarm(category1, lastUpdateTime);
     }
 
-    public Map<String,List<AlarmHome>> selectAlarmSnapCount(String stationId){
+    public Map<String,List<AlarmHome>> selectAlarmSnapCount(String stationId) throws ParseException {
 
         Map<String,List<AlarmHome>> stringListMap = new HashMap<>();
         QueryWrapper<AlarmSnap> wrapper = new QueryWrapper<>();
@@ -526,6 +528,13 @@ public class AlarmSnapService extends ServiceImpl<AlarmSnapMapper, AlarmSnap> {
             wrapper.eq("STATIONID", stationId);
         wrapper.eq("ISOPENED",1);
         wrapper.in("CATEGORY1",strings);
+        //设置时间范围
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
+        String strDate = sdf.format(DateUtil.addDays(new Date(),-14));
+        Date dtStart = sdf.parse(strDate);
+        Date dtEnd = new Date();
+        wrapper.ge("lastUpdateTime",dtStart);
+        wrapper.le("lastUpdateTime",dtEnd);
         List<AlarmSnap> alarmSnaps = baseMapper.selectList(wrapper);
         if (alarmSnaps.size() > 0){
             Map<String,List<AlarmSnap>> map = alarmSnaps.stream().collect(Collectors.groupingBy(AlarmSnap::getCategory1));
@@ -548,13 +557,6 @@ public class AlarmSnapService extends ServiceImpl<AlarmSnapMapper, AlarmSnap> {
         return stringListMap;
     }
 
-    public List<AlarmSnap> getAlarmSnap(String key) {
-        QueryWrapper<AlarmSnap> wrapper = new QueryWrapper<>();
-        if (StringUtil.isNotBlank(key))
-            wrapper.eq("WINDTURBINEID", key);
-        List<AlarmSnap> alarmSnaps = baseMapper.selectList(wrapper);
-        return alarmSnaps;
-    }
 
     public List<AlarmSnap> selectByAlertValue(List<Integer> list) {
         QueryWrapper<AlarmSnap> wrapper = new QueryWrapper<>();

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

@@ -6,12 +6,12 @@ import com.gyee.wisdom.alarm.sharding.entity.RiskSnap;
 import com.gyee.wisdom.alarm.sharding.mapper.RiskSnapMapper;
 import com.gyee.wisdom.alarm.sharding.model.AlarmHome;
 import com.gyee.wisdom.alarm.sharding.util.StringUtil;
+import com.gyee.wisdom.common.utils.DateUtil;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
 @Service
 public class RiskSnapService extends ServiceImpl<RiskSnapMapper, RiskSnap> {
 
-    public Map<String, List<AlarmHome>> selectRiskSnapCount(String stationId){
+    public Map<String, List<AlarmHome>> selectRiskSnapCount(String stationId) throws ParseException {
 
         Map<String,List<AlarmHome>> stringListMap = new HashMap<>();
 
@@ -30,6 +30,13 @@ public class RiskSnapService extends ServiceImpl<RiskSnapMapper, RiskSnap> {
         if (StringUtil.isNotBlank(stationId))
             wrapper.eq("windpowerstationId", stationId);
         wrapper.eq("OPENED",1);
+        //设置时间范围
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
+        String strDate = sdf.format(DateUtil.addDays(new Date(),-14));
+        Date dtStart = sdf.parse(strDate);
+        Date dtEnd = new Date();
+        wrapper.ge("lastUpdateTime",dtStart);
+        wrapper.le("lastUpdateTime",dtEnd);
         List<RiskSnap> riskSnaps = baseMapper.selectList(wrapper);
         if(riskSnaps.size() > 0) {
             Map<Integer, List<RiskSnap>> map = riskSnaps.stream().collect(Collectors.groupingBy(RiskSnap::getRank));