diff --git a/device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceStatVo.java b/device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceStatVo.java index 7c45d3a6e0ab699a13513d6523c2d074928bd0ad..d25522471ca0f37373ee42b0a4780f4007dbb021 100644 --- a/device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceStatVo.java +++ b/device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceStatVo.java @@ -1,10 +1,8 @@ package com.mortals.xhx.module.device.model.vo; import com.mortals.framework.model.BaseEntityLong; -import com.mortals.xhx.module.device.model.DeviceStatEntity; import lombok.Data; -import java.util.ArrayList; import java.util.List; /** @@ -16,6 +14,35 @@ import java.util.List; @Data public class DeviceStatVo extends BaseEntityLong { + /** 寮€濮� 骞� */ + private Integer yearStart; + /** 缁撴潫 骞� */ + private Integer yearEnd; + + /** 骞村垪琛� */ + private List <Integer> yearList; + + /** 寮€濮� 鏈� */ + private Integer monthStart; + + /** 缁撴潫 鏈� */ + private Integer monthEnd; + + + /** 鏈堝垪琛� */ + private List <Integer> monthList; + + /** 寮€濮� 鏃� */ + private Integer dayStart; + + /** 缁撴潫 鏃� */ + private Integer dayEnd; + + /** 寮€濮� 鍒涘缓鏃堕棿 */ + private String createTimeStart; + + /** 缁撴潫 鍒涘缓鏃堕棿 */ + private String createTimeEnd; } \ No newline at end of file diff --git a/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceAlarmInfoServiceImpl.java b/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceAlarmInfoServiceImpl.java index abba14a5c744e559bc09c1e6624e952a41d1773c..8b0da73d6f69424e7a6bc4929d7fbce30be11f98 100644 --- a/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceAlarmInfoServiceImpl.java +++ b/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceAlarmInfoServiceImpl.java @@ -128,6 +128,7 @@ public class DeviceAlarmInfoServiceImpl extends AbstractCRUDServiceImpl<DeviceAl //鏈€杩戠殑鍛婅淇℃伅 閫夋嫨鍓�20鏉� List<HashMap<String, Object>> deviceAlarmMapInfoList = deviceAlarmInfoList.stream().limit(20).map(item -> { HashMap<String, Object> map = new HashMap<>(); + map.put("id", item.getId()); map.put("deviceName", item.getDeviceName()); map.put("count", deviceAlarmCountMap.getOrDefault(item.getAlarmDevice(), 1L)); map.put("alarmTime", DateUtil.format(item.getAlarmTime(), DatePattern.NORM_TIME_PATTERN));