告警模块bug修改

fiveep-persistence/src/main/resources/mapper/mysql/AlarmPowerMapper.xml

@@ -94,7 +94,7 @@
         order by rsd.sending_time desc
     </select>
     <select id="list" resultType="com.bizmatics.model.AlarmPower">
-        select ap.id,ap.digital_value,ap.sending_time
+        select ap.id,ap.digital_value,ap.sending_time,ap.handling_status
         from user_site as us
         inner join device as d
         on us.site_id = d.site_id

fiveep-service/src/main/java/com/bizmatics/service/impl/HadDataLogServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bizmatics.common.core.util.DateUtils;
 import com.bizmatics.model.HadDataLog;
 import com.bizmatics.persistence.mapper.HadDataLogMapper;
 import com.bizmatics.service.HadDataLogService;
@@ -44,13 +45,13 @@ public class HadDataLogServiceImpl extends AbstractCrudService<HadDataLogMapper,
                 .select(HadDataLog::getDataTime)
                 .between(HadDataLog::getDataTime,startTime,endTime);
         minPage = baseMapper.selectPage(minPage, minQuery);
-        Page<HadDataLog> maxPage = new Page<>(0, 1);
+        Page<HadDataLog> maxPage = new Page<>(1, 1);
         LambdaQueryWrapper<HadDataLog> maxQuery = Wrappers.lambdaQuery();
         maxQuery
                 .select(HadDataLog::getDataTime)
                 .between(HadDataLog::getDataTime,startTime,endTime)
                 .orderByDesc(HadDataLog::getId);
-        maxPage = baseMapper.selectPage(maxPage, minQuery);
+        maxPage = baseMapper.selectPage(maxPage, maxQuery);
         List<HadDataLog> hadDataLogs = addList(minPage);
         hadDataLogs.addAll(addList(maxPage));
         return hadDataLogs;

fiveep-service/src/main/java/com/bizmatics/service/impl/HtAnalogDataServiceImpl.java

@@ -17,6 +17,7 @@ import com.bizmatics.service.vo.*;
 import com.fasterxml.jackson.core.type.TypeReference;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.lucene.index.IndexFormatTooNewException;
+import org.apache.poi.ss.usermodel.DateUtil;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -93,8 +94,9 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         Date date = new Date();
         List<CommonIcoVO> list = new ArrayList<>();
         List<Integer> idList = getSiteIdList(siteId);
-        list.add(getTrendOne("today", idList, DateUtils.getDayStartTime(date), date));
-        list.add(getTrendOne("yesterday", idList, DateUtils.addDays(date, -1), date));
+        list.add(getTrendOne("today", idList, DateUtils.getDayStartTime(date), DateUtils.getDayEndTime(date)));
+        Date yeDate = DateUtils.addDays(date, -1);
+        list.add(getTrendOne("yesterday", idList,DateUtils.getDayStartTime(yeDate) , DateUtils.getDayEndTime(yeDate)));
         return list;
     }
 
@@ -124,7 +126,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         dates.add("00:00:00");
         for (int i = 2; i < 24 ; i+=2) {
             //结束时间
-            Date hours = DateUtils.addHours(startTime, i);
+            Date hours = DateUtils.setHours(startTime, i);
             objects.add(getEpp(list,idList,startTime,hours));
             startTime = hours;
             dates.add(DateUtils.getTime(hours));
@@ -282,7 +284,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         List<HadDataLog> hadDataLogList = getByToday(date, DateUtils.getDayStartTime(date));
         for (int i = 2; i < 24 ; i+=2) {
             //结束时间
-            Date endTime = DateUtils.addHours(date, i);
+            Date endTime = DateUtils.setHours(date, i);
             Date finalDate = date;
             List<HadDataLogVO> maxHadList = new ArrayList<>();
             Comparator<HadDataLogVO> comparator = Comparator.comparing(HadDataLogVO::getDataTime);