TRX il y a 1 an
Parent
commit
d7ca1c5c7e

+ 3 - 8
src/main/java/com/github/microservice/models/devicePermiss/DeviceAboutPermiss.java

@@ -19,19 +19,14 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class DeviceAboutPermiss extends IotBaseResult {
-
-    @JsonProperty("GateWayId")
-    @Schema(description = "网关ID")
-    private String GateWayId;
+public class DeviceAboutPermiss {
 
     @Schema(description = "设备ID")
     private String deviceId;
 
     @Schema(description = "是否开放使用")
     private Boolean isOpenUse = Boolean.FALSE;
-    
-    @Schema(description = "包含用户权限")
-    private List<UserPermiss> userPermisses = new ArrayList<>();
 
+    @Schema(description = "关联的用户列表")
+    private List<String> userIds = new ArrayList<>();
 }

+ 6 - 2
src/main/java/com/github/microservice/models/devicePermiss/DeviceUsersInfo.java

@@ -1,5 +1,6 @@
 package com.github.microservice.models.devicePermiss;
 
+import com.github.microservice.models.hxz.base.IotBaseResult;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -15,9 +16,12 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class DeviceUsersInfo {
+public class DeviceUsersInfo extends IotBaseResult {
+
+    @Schema(description = "网关ID")
+    private String gateWayId = "";
 
     @Schema(description = "用户信息列表")
-    private List<UserPermiss> users = new ArrayList<>();
+    private List<ProjectUserPermiss> users = new ArrayList<>();
 
 }

+ 1 - 2
src/main/java/com/github/microservice/models/devicePermiss/GateWayPermissModel.java

@@ -21,9 +21,8 @@ import java.util.List;
 @NoArgsConstructor
 public class GateWayPermissModel extends IotBaseResult {
 
-    @JsonProperty("GateWayId")
     @Schema(description = "网关ID")
-    private String GateWayId;
+    private String gateWayId = "";
 
     @Schema(description = "设备权限信息")
     private List<DeviceAboutPermiss> devices = new ArrayList<DeviceAboutPermiss>();

+ 4 - 1
src/main/java/com/github/microservice/models/devicePermiss/UserPermiss.java → src/main/java/com/github/microservice/models/devicePermiss/ProjectUserPermiss.java

@@ -15,7 +15,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class UserPermiss {
+public class ProjectUserPermiss {
 
     @Schema(description = "用户userId")
     private String userId = "";
@@ -23,6 +23,9 @@ public class UserPermiss {
     @Schema(description = "用户名称")
     private String userName = "";
 
+    @Schema(description = "限制最大金额,单位:分")
+    private Long limitAmount = 0L;
+
     @Schema(description = "人脸图片")
     private String faceImage = "";