TRX 1 år sedan
förälder
incheckning
2efa8f656f

+ 41 - 0
src/main/java/com/github/microservice/models/gateDoor/use/GateDoorUseParam.java

@@ -0,0 +1,41 @@
+package com.github.microservice.models.gateDoor.use;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+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/21
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GateDoorUseParam extends IotSuperModel implements Serializable {
+
+    @Schema(description = "10进制卡序列号(实体卡号或虚拟卡号)")
+    @JsonProperty("CardNo")
+    private String CardNo;
+
+    @Schema(description = "开门模式(0:刷卡 1:人脸认证 2:指纹 3:密码)")
+    @JsonProperty("Mode")
+    private Integer Mode;
+
+    @Schema(description = "用户userId")
+    @JsonProperty("UserId")
+    private String UserId;
+
+    @Schema(description = "使用时间 2024-09-12 20:40:00")
+    @JsonProperty("Time")
+    private String time;
+
+    @Schema(description = "使用是否验证通过")
+    private Boolean isPassed = Boolean.TRUE;
+}

+ 28 - 0
src/main/java/com/github/microservice/models/gateDoor/use/GateDoorUseResult.java

@@ -0,0 +1,28 @@
+package com.github.microservice.models.gateDoor.use;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.microservice.models.hxz.IotSuperModel;
+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.io.Serializable;
+
+/**
+ * 门闸使用的记录
+ *
+ * @author TRX
+ * @date 2024/10/21
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GateDoorUseResult extends IotBaseResult implements Serializable {
+
+    @Schema(description = "操作数据ID")
+    @JsonProperty("MqttDataId")
+    private String mqttDataId;
+
+}

+ 4 - 0
src/main/java/com/github/microservice/models/hxz/IotSuperModel.java

@@ -27,4 +27,8 @@ public class IotSuperModel implements Serializable {
 
     @Schema(description = "mqtt推送生成的业务数据ID")
     private String mqttDataId;
+
+    @JsonProperty("IsOffLine")
+    @Schema(description = "是否是离线使用")
+    private Boolean isOffLine = Boolean.FALSE;
 }

+ 1 - 2
src/main/java/com/github/microservice/types/payment/PaymentType.java

@@ -6,8 +6,7 @@ import lombok.Getter;
  * 支付方式
  */
 public enum PaymentType {
-    WeChat("微信支付", false, "WxPaymentMainService",
-            PaymentChannelType.BalancePayment),
+    WeChat("微信支付", false, "WxPaymentMainService", PaymentChannelType.BalancePayment),
     UnionFrictionlessPay("银联无感支付", true, "UnionFrictionlessPayMainService", null),
     LakalaFrictionlessPay("拉卡拉快捷支付", true, "", PaymentChannelType.SecretFreePayment),
     UserWallet("个人钱包", false, "WalletMainService", null),