是否启用有效时间

sql.md

@@ -857,5 +857,6 @@ ADD COLUMN `microphone_type` int DEFAULT NULL COMMENT '麦克风类型Microphone
 ALTER TABLE `hanghui_outapi_platform`.`iot_device_config_template`
 ADD COLUMN `is_open_microphone` tinyint(1) DEFAULT '0' COMMENT '是否开启麦克风 默认false' AFTER `applet_enter_page_url`,
 ADD COLUMN `microphone_type` int DEFAULT NULL COMMENT '麦克风类型MicrophoneTypeEnum' AFTER `is_open_microphone`;
-  
+alter TABLE hh_local_device add `valid_time_switch` tinyint(1) DEFAULT '0' COMMENT '是否启用有效时间 默认-false';
 
+alter TABLE hh_local_device_template add `valid_time_switch` tinyint(1) DEFAULT '0' COMMENT '是否启用有效时间 默认-false';

src/main/java/cn/hanghui/outapi/platform/tenant/entity/dto/hhlocal/HhLocalDeviceBase.java

@@ -415,4 +415,7 @@ public class HhLocalDeviceBase implements Serializable {
     @ApiModelProperty(value = "进出记录推送数据是否加解密PrivateKey")
     private String transitPushEncryptPrivateKey;
 
+    @ApiModelProperty(value = "是否启用有效时间 默认-false")
+    private Boolean validTimeSwitch;
+
 }

src/main/java/cn/hanghui/outapi/platform/tenant/entity/dto/hhlocal/HhLocalDeviceVo.java

@@ -33,4 +33,9 @@ public class HhLocalDeviceVo extends HhLocalDeviceBase {
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
+
+
+    @ApiModelProperty(value = "当前服务器时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date serverTime = new Date();
 }

src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/IdCardReaderBrandEnum.java

@@ -26,6 +26,7 @@ public enum IdCardReaderBrandEnum {
     DXDHY(9, "东信多合一"),
     ER301(10, "在线身份证NFC（ER301）"),
     LJ(11, "数信研究所"),
+    EST_M20(12, "EST-M20东信手持机阅读器"),
     ;
 
     public static IdCardReaderBrandEnum queryEnumByCode(Integer code) {

src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/PushFailedRecordTypeEnum.java

@@ -16,7 +16,11 @@ import lombok.Getter;
 public enum PushFailedRecordTypeEnum {
 
     AGE_MISMATCH(1, "年龄不符"),
-    BLACKLIST(2, "黑名单"),;
+    BLACKLIST(2, "黑名单"),
+    ONE_N_FAIL(3, "1:N比对失败"),
+    ONE_ONE_FAIL(4, "1:1比对失败"),
+
+    ;
 
     private Integer code;
     private String desc;

src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/QrCodeReaderBrandEnum.java

@@ -23,6 +23,7 @@ public enum QrCodeReaderBrandEnum {
     DX_UNION(6, "东信多合一一体式二维码"),
     XDL(7, "新大陆"),
     DX_M4500(8, "东信M4500高速二维码读头"),
+    EST_M20(9, "EST-M20东信手持机二维码读头"),
     OTHER(99, "其他"),
     ;
 

src/main/java/cn/hanghui/outapi/platform/tenant/entity/po/HhLocalDevice.java

@@ -426,5 +426,8 @@ public class HhLocalDevice extends Base {
     @ApiModelProperty(value = "人脸框跟随框是否镜像")
     private Boolean rgbRevert;
 
+    @ApiModelProperty(value = "是否启用有效时间 默认-false")
+    private Boolean validTimeSwitch;
+
 }