设备分页查询

device-api/src/main/java/com/xy/dto/DeviceInfoDto.java

@@ -1,6 +1,7 @@
 package com.xy.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xy.utils.DataTime;
 import com.xy.utils.PageBean;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -29,6 +30,15 @@ public class DeviceInfoDto {
         @NotNull(message = "deviceId不能为空")
         @ApiModelProperty("设备id")
         private Long deviceId;
+
+        @ApiModelProperty(value = "系统信息", hidden = true)
+        private DeviceSysinfoDto.Vo deviceSysinfo;
+
+        @ApiModelProperty(value = "状态信息", hidden = true)
+        private DeviceStatusDto.Vo deviceStatus;
+
+        @ApiModelProperty(value = "注册信息", hidden = true)
+        private DeviceRegisterDto.Vo deviceRegister;
     }
 
     @Data
@@ -61,12 +71,12 @@ public class DeviceInfoDto {
         @ApiModelProperty(value = "激活时间-始")
         private LocalDate endActiveTime;
 
-        public LocalDateTime getBeginActiveTime() {
-            return beginActiveTime == null ? null : beginActiveTime.atTime(0, 0, 0);
+        public String getBeginActiveTime() {
+            return beginActiveTime == null ? null : DataTime.toString(beginActiveTime.atTime(0, 0, 0));
         }
 
-        public LocalDateTime getEndActiveTime() {
-            return endActiveTime == null ? null : endActiveTime.atTime(23, 59, 59);
+        public String getEndActiveTime() {
+            return endActiveTime == null ? null : DataTime.toString(endActiveTime.atTime(23, 59, 59));
         }
 
         @ApiModelProperty(value = "系统信息", hidden = true)