设备相关

device-api-service/src/main/java/com/xy/entity/DeviceInfo.java

@@ -1,6 +1,7 @@
 package com.xy.entity;
 
-import com.xy.base.BaseEntity2;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.xy.base.BaseEntity3;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -18,10 +19,13 @@ import java.time.LocalDateTime;
 @Data
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
-public class DeviceInfo extends BaseEntity2 {
+public class DeviceInfo extends BaseEntity3<DeviceInfo> {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId
+    private Long deviceId;
+
     /**
      * 设备类型
      */

device-api-service/src/main/java/com/xy/entity/DeviceStatus.java

@@ -1,6 +1,7 @@
 package com.xy.entity;
 
-import com.xy.base.BaseEntity2;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.xy.base.BaseEntity3;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -16,10 +17,13 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
-public class DeviceStatus extends BaseEntity2 {
+public class DeviceStatus extends BaseEntity3<DeviceStatus> {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId
+    private Long deviceId;
+
     /**
      * 系统启动时间
      */

device-api-service/src/main/java/com/xy/entity/DeviceSysinfo.java

@@ -1,6 +1,7 @@
 package com.xy.entity;
 
-import com.xy.base.BaseEntity2;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.xy.base.BaseEntity3;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -16,10 +17,13 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
-public class DeviceSysinfo extends BaseEntity2 {
+public class DeviceSysinfo extends BaseEntity3<DeviceSysinfo> {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId
+    private Long deviceId;
+
     /**
      * 设备SN号
      */

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

@@ -17,16 +17,16 @@ public class DeviceStatusDto {
     @Accessors(chain = true)
     public static class Up extends Vo {
 
-        @NotNull(message = "id不能为空")
+        @NotNull(message = "deviceId不能为空")
         @ApiModelProperty(value = "设备ID", required = true)
-        private Long id;
+        private Long deviceId;
     }
 
     @Data
     @Accessors(chain = true)
     public static class Vo {
         @ApiModelProperty("设备ID")
-        private Long id;
+        private Long deviceId;
 
         @ApiModelProperty("系统启动时间")
         private String sysStartTime;

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

@@ -39,16 +39,16 @@ public class DeviceSysinfoDto {
     @Accessors(chain = true)
     public static class Up extends Vo {
 
-        @NotNull(message = "id不能为空")
+        @NotNull(message = "deviceId不能为空")
         @ApiModelProperty(value = "设备ID", required = true)
-        private Long id;
+        private Long deviceId;
     }
 
     @Data
     @Accessors(chain = true)
     public static class Vo {
         @ApiModelProperty("设备ID")
-        private Long id;
+        private Long deviceId;
 
         @ApiModelProperty("设备SN号")
         private String deviceSn;