综合云图报警隐患折线图优化

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/impl/BaseAlarmStatisticServiceImpl.java

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.*;
+import java.time.temporal.ChronoUnit;
 import java.time.temporal.TemporalAdjusters;
 import java.util.List;
 import java.util.Map;
@@ -67,10 +68,21 @@ public class BaseAlarmStatisticServiceImpl extends AbstractCrudService<BaseAlarm
     public List<Map<String, Object>> alarmStatistic(Integer deptId,Integer dateType) {
         LocalDateTime currentDate = LocalDateTime.now();
         LocalDateTime firstDayOfMonth = LocalDateTime.now().with(TemporalAdjusters.firstDayOfMonth());
+        LocalDateTime halfYearAgo = currentDate.minus(6, ChronoUnit.MONTHS);
+        LocalDateTime firstDayOfHalfYearAgo = halfYearAgo.withDayOfMonth(1);
         QueryWrapper<BaseAlarmStatistic> queryWrapper = Wrappers.query();
-        queryWrapper.select("alarm_num as alarmNum","pitfall_num as pitfallNum","DATE_FORMAT(statistic_time, '%m-%d') AS " +
-                "statisticTime")
-                .between("statistic_time",firstDayOfMonth,currentDate);
+        if (dateType.equals(1)){
+            queryWrapper.select("alarm_num as alarmNum","pitfall_num as pitfallNum","DATE_FORMAT(statistic_time, '%m-%d') AS " +
+                    "statisticTime")
+                    .between("statistic_time",firstDayOfMonth,currentDate)
+                    .eq("statistic_dimen",1);
+        }else {
+            queryWrapper.select("alarm_num as alarmNum","pitfall_num as pitfallNum","DATE_FORMAT(statistic_time, " +
+                    "'%Y-%m') AS " +
+                    "statisticTime")
+                    .between("statistic_time",firstDayOfHalfYearAgo,currentDate)
+                    .eq("statistic_dimen",2);
+        }
         List<Map<String, Object>> list = this.listMaps(queryWrapper);
         return list;
     }