浏览代码

修改时间告警

yq 4 年之前
父节点
当前提交
664460f21e

+ 4 - 0
fiveep-model/pom.xml

@@ -17,6 +17,10 @@
             <groupId>com.baomidou</groupId>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+        </dependency>
 
 
     </dependencies>
     </dependencies>
 
 

+ 1 - 0
fiveep-service/pom.xml

@@ -68,6 +68,7 @@
 
 
 
 
 
 
+
     </dependencies>
     </dependencies>
 
 
 
 

+ 1 - 1
fiveep-service/src/main/java/com/bizmatics/service/impl/AlarmPowerServiceImpl.java

@@ -61,7 +61,7 @@ public class AlarmPowerServiceImpl extends AbstractCrudService<AlarmPowerMapper,
         Integer userId = SessionLocal.getUserId();
         Integer userId = SessionLocal.getUserId();
         List<AlarmPower> alarmPowers = baseMapper.list(userId, siteId, null, startTime, endTime, null, null);
         List<AlarmPower> alarmPowers = baseMapper.list(userId, siteId, null, startTime, endTime, null, null);
         for (int i = 0; i < DateUtils.getDistanceDayOfTwoDate(startTime,endTime); i++) {
         for (int i = 0; i < DateUtils.getDistanceDayOfTwoDate(startTime,endTime); i++) {
-            Date setDays = DateUtils.addDays(endTime, -i);
+            Date setDays = DateUtils.addDays(startTime, i);
             Date dayStartTime = DateUtils.getDayStartTime(setDays);
             Date dayStartTime = DateUtils.getDayStartTime(setDays);
             Date dayEndTime = DateUtils.getDayEndTime(setDays);
             Date dayEndTime = DateUtils.getDayEndTime(setDays);
             faultList.add(getCount(alarmPowers,null,dayStartTime,dayEndTime,null,null));
             faultList.add(getCount(alarmPowers,null,dayStartTime,dayEndTime,null,null));