iaun 3 лет назад
Родитель
Сommit
7fb6e4f807

+ 2 - 1
src/main/java/cn/iaun/it/controller/ItMonitorController.java

@@ -321,7 +321,8 @@ public class ItMonitorController {
         }
         MyPage<ItMonitorData> myPage = new MyPage<>(itMonitorService.getDataByIds(
                 itMonitorDataGetReqVo.getPageNo(), itMonitorDataGetReqVo.getPageSize(),
-                itMonitorDataGetReqVo.getResourceId(), itMonitorDataGetReqVo.getItemId(), itMonitorDataGetReqVo.getDays()
+                itMonitorDataGetReqVo.getResourceId(), itMonitorDataGetReqVo.getItemId(), itMonitorDataGetReqVo.getDays(),
+                itMonitorDataGetReqVo.getDesc()
         ));
 
         return new Result<>(ResultCode.SUCCESS, myPage);

+ 10 - 0
src/main/java/cn/iaun/it/model/vo/monitor/controller/ItMonitorDataGetReqVo.java

@@ -11,6 +11,8 @@ public class ItMonitorDataGetReqVo {
     private Long itemId;
     @NotNull
     private Integer days;
+    @NotNull
+    private Boolean desc;
 
     @Override
     public String toString() {
@@ -23,6 +25,14 @@ public class ItMonitorDataGetReqVo {
                 '}';
     }
 
+    public Boolean getDesc() {
+        return desc;
+    }
+
+    public void setDesc(Boolean desc) {
+        this.desc = desc;
+    }
+
     public Integer getPageNo() {
         return pageNo;
     }

+ 1 - 1
src/main/java/cn/iaun/it/service/ItMonitorService.java

@@ -114,7 +114,7 @@ public interface ItMonitorService {
     boolean confirmAlarm(Long alarmId, Long itemId, Long resourceId, Long userId);
 
     // 监控数据
-    IPage<ItMonitorData> getDataByIds(Integer pageNo, Integer pageSize, Long resourceId, Long itemId, Integer days); //
+    IPage<ItMonitorData> getDataByIds(Integer pageNo, Integer pageSize, Long resourceId, Long itemId, Integer days, Boolean desc); //
 
     List<ItMonitorData> getLatestDataByResourceId(Long resourceId); // 获取该资源最新的所有数据?
 

+ 4 - 1
src/main/java/cn/iaun/it/service/impl/ItMonitorServiceImpl.java

@@ -313,7 +313,7 @@ public class ItMonitorServiceImpl implements ItMonitorService {
     }
 
     @Override
-    public IPage<ItMonitorData> getDataByIds(Integer pageNo, Integer pageSize, Long resourceId, Long itemId, Integer days) {
+    public IPage<ItMonitorData> getDataByIds(Integer pageNo, Integer pageSize, Long resourceId, Long itemId, Integer days, Boolean desc) {
         Page<ItMonitorData> page = new Page<>(pageNo, pageSize);
         QueryWrapper<ItMonitorData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("resource_id", resourceId);
@@ -322,6 +322,9 @@ public class ItMonitorServiceImpl implements ItMonitorService {
         calendar.setTime(new Date());
         calendar.add(Calendar.DATE, days * -1);
         queryWrapper.ge("record_time", calendar.getTime());
+        if (desc) {
+            queryWrapper.orderByDesc("record_time");
+        }
         return itMonitorDataMapper.selectPage(page, queryWrapper);
     }