TRX 1 vuosi sitten
vanhempi
commit
69b028d9e6
19 muutettua tiedostoa jossa 134 lisäystä ja 24 poistoa
  1. 30 0
      src/main/java/com/github/microservice/models/devicePermiss/DevicePermiss.java
  2. 31 0
      src/main/java/com/github/microservice/models/devicePermiss/GateWayPermissModel.java
  3. 19 0
      src/main/java/com/github/microservice/models/devicePermiss/GateWayQuery.java
  4. 32 0
      src/main/java/com/github/microservice/models/devicePermiss/UserPermiss.java
  5. 2 2
      src/main/java/com/github/microservice/models/gateDoor/OnLineModel.java
  6. 2 2
      src/main/java/com/github/microservice/models/gateDoor/OnLineParam.java
  7. 1 1
      src/main/java/com/github/microservice/models/hxz/ConsumTransactionsModel.java
  8. 2 2
      src/main/java/com/github/microservice/models/hxz/ConsumTransactionsResult.java
  9. 1 2
      src/main/java/com/github/microservice/models/hxz/DevicePingInfoParam.java
  10. 1 2
      src/main/java/com/github/microservice/models/hxz/GateWayPingInfoParam.java
  11. 1 1
      src/main/java/com/github/microservice/models/hxz/IotSuperModel.java
  12. 1 1
      src/main/java/com/github/microservice/models/hxz/OrderQueryModel.java
  13. 2 2
      src/main/java/com/github/microservice/models/hxz/PingResult.java
  14. 1 1
      src/main/java/com/github/microservice/models/hxz/QRCodeTransactionModel.java
  15. 2 2
      src/main/java/com/github/microservice/models/hxz/QRCodeTransactionResult.java
  16. 2 2
      src/main/java/com/github/microservice/models/hxz/ServerTimeResult.java
  17. 1 1
      src/main/java/com/github/microservice/models/hxz/TransactionInquiryModel.java
  18. 2 2
      src/main/java/com/github/microservice/models/hxz/TransactionInquiryResult.java
  19. 1 1
      src/main/java/com/github/microservice/models/hxz/base/IotBaseResult.java

+ 30 - 0
src/main/java/com/github/microservice/models/devicePermiss/DevicePermiss.java

@@ -0,0 +1,30 @@
+package com.github.microservice.models.devicePermiss;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 设备权限 包括的可使用的用户列表
+ *
+ * @author TRX
+ * @date 2024/10/12
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DevicePermiss {
+
+    @Schema(description = "设备ID")
+    private String deviceId;
+
+    @Schema(description = "是否开放使用")
+    private Boolean isOpenUse = Boolean.FALSE;
+
+    @Schema(description = "包含用户权限")
+    private List<UserPermiss> userPermisses;
+
+}

+ 31 - 0
src/main/java/com/github/microservice/models/devicePermiss/GateWayPermissModel.java

@@ -0,0 +1,31 @@
+package com.github.microservice.models.devicePermiss;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.microservice.models.hxz.base.IotBaseResult;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 网关权限
+ *
+ * @author TRX
+ * @date 2024/10/12
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GateWayPermissModel extends IotBaseResult {
+
+    @JsonProperty("GateWayId")
+    @Schema(description = "网关ID")
+    private String GateWayId;
+
+    @Schema(description = "设备权限信息")
+    private List<DevicePermiss> devices = new ArrayList<DevicePermiss>();
+
+}

+ 19 - 0
src/main/java/com/github/microservice/models/devicePermiss/GateWayQuery.java

@@ -0,0 +1,19 @@
+package com.github.microservice.models.devicePermiss;
+
+import com.github.microservice.models.hxz.IotSuperModel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 网关查询 关联设备的权限
+ *
+ * @author TRX
+ * @date 2024/10/12
+ */
+@Data
+public class GateWayQuery extends IotSuperModel {
+
+    @Schema(description = "请求时间")
+    private Long time;
+
+}

+ 32 - 0
src/main/java/com/github/microservice/models/devicePermiss/UserPermiss.java

@@ -0,0 +1,32 @@
+package com.github.microservice.models.devicePermiss;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author TRX
+ * @date 2024/10/12
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserPermiss {
+
+    @Schema(description = "用户userId")
+    private String userId = "";
+
+    @Schema(description = "用户名称")
+    private String userName = "";
+
+    @Schema(description = "人脸图片")
+    private List<String> faceImages = new ArrayList<>();
+
+    @Schema(description = "卡号")
+    private List<String> cardNos = new ArrayList<>();
+
+}

+ 2 - 2
src/main/java/com/github/microservice/models/gateDoor/OnLineModel.java

@@ -1,6 +1,6 @@
 package com.github.microservice.models.gateDoor;
 
-import com.github.microservice.models.hxz.base.HxzBaseResult;
+import com.github.microservice.models.hxz.base.IotBaseResult;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -13,7 +13,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class OnLineModel extends HxzBaseResult {
+public class OnLineModel extends IotBaseResult {
 
     @Schema(description = "消息ID")
     private Long messageId = 0L;

+ 2 - 2
src/main/java/com/github/microservice/models/gateDoor/OnLineParam.java

@@ -1,6 +1,6 @@
 package com.github.microservice.models.gateDoor;
 
-import com.github.microservice.models.hxz.HxzSuperModel;
+import com.github.microservice.models.hxz.IotSuperModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -13,7 +13,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class OnLineParam extends HxzSuperModel {
+public class OnLineParam extends IotSuperModel {
 
     @Schema(description = "")
     private OnLineInfoParam info;

+ 1 - 1
src/main/java/com/github/microservice/models/hxz/ConsumTransactionsModel.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class ConsumTransactionsModel extends HxzSuperModel implements Serializable {
+public class ConsumTransactionsModel extends IotSuperModel implements Serializable {
 
     @JsonProperty("Order")
     @Schema(description = "消费序号(年月日时分秒+2个字节序号(0~65535)),用于识别上传数据不重复")

+ 2 - 2
src/main/java/com/github/microservice/models/hxz/ConsumTransactionsResult.java

@@ -1,7 +1,7 @@
 package com.github.microservice.models.hxz;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.microservice.models.hxz.base.HxzBaseResult;
+import com.github.microservice.models.hxz.base.IotBaseResult;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
 @NoArgsConstructor
 @AllArgsConstructor
 @Accessors(chain = true)
-public class ConsumTransactionsResult extends HxzBaseResult {
+public class ConsumTransactionsResult extends IotBaseResult {
 
     @Schema(description = "人员姓名")
     @JsonProperty("Name")

+ 1 - 2
src/main/java/com/github/microservice/models/hxz/DevicePingInfoParam.java

@@ -1,6 +1,5 @@
 package com.github.microservice.models.hxz;
 
-import com.github.microservice.models.type.OnLineState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -9,7 +8,7 @@ import lombok.Data;
  * @date 2024/7/3
  */
 @Data
-public class DevicePingInfoParam extends HxzSuperModel {
+public class DevicePingInfoParam extends IotSuperModel {
 
     @Schema(description = "激活时间")
     private Long activityTime;

+ 1 - 2
src/main/java/com/github/microservice/models/hxz/GateWayPingInfoParam.java

@@ -1,6 +1,5 @@
 package com.github.microservice.models.hxz;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -8,6 +7,6 @@ import lombok.Data;
  * @date 2024/7/5
  */
 @Data
-public class GateWayPingInfoParam extends HxzSuperModel {
+public class GateWayPingInfoParam extends IotSuperModel {
 
 }

+ 1 - 1
src/main/java/com/github/microservice/models/hxz/HxzSuperModel.java → src/main/java/com/github/microservice/models/hxz/IotSuperModel.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class HxzSuperModel implements Serializable {
+public class IotSuperModel implements Serializable {
 
     @JsonProperty("DeviceId")
     @Schema(description = "设备ID")

+ 1 - 1
src/main/java/com/github/microservice/models/hxz/OrderQueryModel.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class OrderQueryModel extends HxzSuperModel implements Serializable {
+public class OrderQueryModel extends IotSuperModel implements Serializable {
 
     @JsonProperty("Order")
     @Schema(description = "消费序号(年月日时分秒+2个字节序号(0~65535)),用于识别上传数据不重复")

+ 2 - 2
src/main/java/com/github/microservice/models/hxz/PingResult.java

@@ -1,6 +1,6 @@
 package com.github.microservice.models.hxz;
 
-import com.github.microservice.models.hxz.base.HxzBaseResult;
+import com.github.microservice.models.hxz.base.IotBaseResult;
 import lombok.Data;
 
 /**
@@ -8,6 +8,6 @@ import lombok.Data;
  * @date 2024/7/5
  */
 @Data
-public class PingResult extends HxzBaseResult {
+public class PingResult extends IotBaseResult {
     private Long time;
 }

+ 1 - 1
src/main/java/com/github/microservice/models/hxz/QRCodeTransactionModel.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class QRCodeTransactionModel extends HxzSuperModel implements Serializable {
+public class QRCodeTransactionModel extends IotSuperModel implements Serializable {
 
     @JsonProperty("Mode")
     @Schema(description = "Mode:交易模式(0:扣费 1:充值3:信息查询)")

+ 2 - 2
src/main/java/com/github/microservice/models/hxz/QRCodeTransactionResult.java

@@ -1,6 +1,6 @@
 package com.github.microservice.models.hxz;
 
-import com.github.microservice.models.hxz.base.HxzBaseResult;
+import com.github.microservice.models.hxz.base.IotBaseResult;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -13,7 +13,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class QRCodeTransactionResult extends HxzBaseResult {
+public class QRCodeTransactionResult extends IotBaseResult {
     @Schema(description = "订单号")
     private String Qrorder;
 }

+ 2 - 2
src/main/java/com/github/microservice/models/hxz/ServerTimeResult.java

@@ -1,7 +1,7 @@
 package com.github.microservice.models.hxz;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.microservice.models.hxz.base.HxzBaseResult;
+import com.github.microservice.models.hxz.base.IotBaseResult;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class ServerTimeResult extends HxzBaseResult {
+public class ServerTimeResult extends IotBaseResult {
     @JsonProperty("Time")
     @Schema(description = "服务器时间")
     private String Time = "";

+ 1 - 1
src/main/java/com/github/microservice/models/hxz/TransactionInquiryModel.java

@@ -13,7 +13,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class TransactionInquiryModel extends HxzSuperModel {
+public class TransactionInquiryModel extends IotSuperModel {
 
     @JsonProperty("QROrder")
     @Schema(description = "二维码交易订单号(该值来自于第六及第七接口返回的QROrder)")

+ 2 - 2
src/main/java/com/github/microservice/models/hxz/TransactionInquiryResult.java

@@ -1,6 +1,6 @@
 package com.github.microservice.models.hxz;
 
-import com.github.microservice.models.hxz.base.HxzBaseResult;
+import com.github.microservice.models.hxz.base.IotBaseResult;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -13,7 +13,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class TransactionInquiryResult extends HxzBaseResult {
+public class TransactionInquiryResult extends IotBaseResult {
     @Schema(description = "订单号")
     private String Qrorder;
 }

+ 1 - 1
src/main/java/com/github/microservice/models/hxz/base/HxzBaseResult.java → src/main/java/com/github/microservice/models/hxz/base/IotBaseResult.java

@@ -17,7 +17,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class HxzBaseResult implements Serializable {
+public class IotBaseResult implements Serializable {
 
     @JsonProperty("Status")
     // 1:成功; 0:失败