TRX vor 1 Jahr
Ursprung
Commit
f6de2119a1

+ 29 - 0
src/main/java/com/github/microservice/models/gateDoor/gateDoor/GateDoorIotParam.java

@@ -0,0 +1,29 @@
+package com.github.microservice.models.gateDoor.gateDoor;
+
+import com.github.microservice.models.gateDoor.use.GateDoorInfoParam;
+import com.github.microservice.models.hxz.IotSuperModel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 门闸参数
+ *
+ * @author TRX
+ * @date 2024/10/30
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GateDoorIotParam extends IotSuperModel implements Serializable {
+
+    @Schema(description = "参数内容")
+    private GateDoorInfoParam info;
+
+    @Schema(description = "方式,如:RecPush、CardNum")
+    private String operator;
+
+}

+ 3 - 3
src/main/java/com/github/microservice/models/gateDoor/use/GateDoorInfoParam.java

@@ -32,7 +32,7 @@ public class GateDoorInfoParam {
     @Schema(description = "")
     private String otype;
 
-    @Schema(description = "")
+    @Schema(description = "设备ID")
     private String facesluiceId;
 
     @Schema(description = "")
@@ -41,7 +41,7 @@ public class GateDoorInfoParam {
     @Schema(description = "")
     private String cardNum2;
 
-    @Schema(description = "")
+    @Schema(description = "时间")
     private String time;
 
     @Schema(description = "人脸base64数据")
@@ -52,7 +52,7 @@ public class GateDoorInfoParam {
     private String VerifyStatus;
 
     @JsonProperty("OpendoorWay")
-    @Schema(description = "")
+    @Schema(description = "开门方式 0:人脸开门方式,1:远程开门方式, 2:远程开门或人脸方式 3:人脸核验+远程开门方式")
     private String OpendoorWay;
 
     @JsonProperty("PersonType")

+ 23 - 14
src/main/java/com/github/microservice/models/gateDoor/use/GateDoorUseParam.java

@@ -1,7 +1,7 @@
 package com.github.microservice.models.gateDoor.use;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.microservice.models.hxz.IotSuperModel;
+import com.github.microservice.types.deviceUse.OperateState;
+import com.github.microservice.types.deviceUse.OperateType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -18,29 +18,38 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class GateDoorUseParam extends IotSuperModel implements Serializable {
+public class GateDoorUseParam implements Serializable {
 
-    @Schema(description = "")
-    private GateDoorInfoParam info;
+    @Schema(description = "操作模式,卡片、人脸、密码、指纹...")
+    private OperateType operateType;
 
+    @Schema(description = "操作记录结果")
+    private OperateState operateState;
 
+    @Schema(description = "网关ID")
+    private String gateWayId;
 
-    @Schema(description = "10进制卡序列号(实体卡号或虚拟卡号)")
-    @JsonProperty("CardNo")
-    private String CardNo;
+    @Schema(description = "设备ID")
+    private String deviceId;
+
+    @Schema(description = "消息数据ID")
+    private String mqttDataId;
 
-    @Schema(description = "开门模式(0:刷卡 1:人脸认证 2:指纹 3:密码)")
-    @JsonProperty("Mode")
-    private Integer Mode;
+    @Schema(description = "10进制卡序列号(实体卡号或虚拟卡号)")
+    private String cardNo;
 
     @Schema(description = "用户userId")
-    @JsonProperty("UserId")
-    private String UserId;
+    private String userId;
 
     @Schema(description = "使用时间 2024-09-12 20:40:00")
-    @JsonProperty("Time")
     private String time;
 
     @Schema(description = "使用是否验证通过")
     private Boolean isPassed = Boolean.TRUE;
+
+    @Schema(description = "是否离线使用")
+    private Boolean isOffLine = Boolean.FALSE;
+
+    @Schema(description = "关联的数据")
+    private Object data;
 }

+ 20 - 0
src/main/java/com/github/microservice/types/deviceUse/OperateState.java

@@ -0,0 +1,20 @@
+package com.github.microservice.types.deviceUse;
+
+import lombok.Getter;
+
+/**
+ * 设备操作结果
+ */
+public enum OperateState {
+    Success("成功"),
+    Failed("失败"),
+    Unknown("未知"),
+    ;
+
+    @Getter
+    private String remark;
+
+    OperateState(String remark) {
+        this.remark = remark;
+    }
+}

+ 22 - 0
src/main/java/com/github/microservice/types/deviceUse/OperateType.java

@@ -0,0 +1,22 @@
+package com.github.microservice.types.deviceUse;
+
+import lombok.Getter;
+
+/**
+ * 操作类型
+ */
+public enum OperateType {
+    Card("卡片"),
+    Face("人脸"),
+    Fingerprint("指纹"),
+    PassWord("密码"),
+    Unknown("未知"),
+    ;
+
+    @Getter
+    private String remark;
+
+    OperateType(String remark) {
+        this.remark = remark;
+    }
+}