修改告警图标

fiveep-controller/src/main/java/com/bizmatics/controller/web/AlarmPowerController.java

@@ -46,16 +46,16 @@ public class AlarmPowerController {
 
     /**
      * 告警趋势图
-     * @param days 天数
+     * @param startTime 天数
      * @param endTime 结束时间
      * @param siteId 站点id
      * @return
      */
     @GetMapping("/trendIco")
-    public ApiResult<List<CommonIcoVO>> selectByDate(@RequestParam Integer days,
+    public ApiResult<List<CommonIcoVO>> selectByDate(@RequestParam Date startTime,
                                                      @RequestParam Date endTime,
                                                      @RequestParam(required = false) Integer siteId){
-        return ApiResult.success(alarmPowerService.selectByDate(days,endTime,siteId));
+        return ApiResult.success(alarmPowerService.selectByDate(startTime,endTime,siteId));
     }
 
 

fiveep-service/src/main/java/com/bizmatics/service/AlarmPowerService.java

@@ -30,7 +30,7 @@ public interface AlarmPowerService extends CrudService<AlarmPower> {
      * 告警趋势图
      * @return
      */
-    List<CommonIcoVO> selectByDate(Integer days,Date endTime,Integer siteId);
+    List<CommonIcoVO> selectByDate(Date startTime,Date endTime,Integer siteId);
 
     /**
      * list

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

@@ -53,14 +53,14 @@ public class AlarmPowerServiceImpl extends AbstractCrudService<AlarmPowerMapper,
     }
 
     @Override
-    public List<CommonIcoVO> selectByDate(Integer days,Date endTime,Integer siteId) {
+    public List<CommonIcoVO> selectByDate(Date startTime,Date endTime,Integer siteId) {
         List<Object> faultList = new ArrayList<>();
         List<Object> rushList = new ArrayList<>();
         List<Object> noDisposeList = new ArrayList<>();
         List<Object> dateList = new ArrayList<>();
         Integer userId = SessionLocal.getUserId();
-        List<AlarmPower> alarmPowers = baseMapper.list(userId, siteId, null, DateUtils.addDays(endTime, -days), endTime, null, null);
-        for (int i = 0; i < days; i++) {
+        List<AlarmPower> alarmPowers = baseMapper.list(userId, siteId, null, startTime, endTime, null, null);
+        for (int i = 0; i < DateUtils.getDistanceDayOfTwoDate(startTime,endTime); i++) {
             Date setDays = DateUtils.addDays(endTime, -i);
             Date dayStartTime = DateUtils.getDayStartTime(setDays);
             Date dayEndTime = DateUtils.getDayEndTime(setDays);