HHLocal优化（良渚派出所

sql.md

@@ -857,8 +857,8 @@ 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 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';
 
 ALTER TABLE `hanghui_outapi_platform`.`provisional_identity_proof_device` 
@@ -868,4 +868,14 @@ ALTER TABLE `hanghui_outapi_platform`.`provisional_identity_proof_template`
 ADD COLUMN `official_seal_switch` tinyint(1) NULL COMMENT '是否加盖公章 false-关闭 true-开启 默认false' AFTER `expiration_date`,
 ADD COLUMN `official_seal_url` varchar(500) NULL COMMENT '公章图片' AFTER `official_seal_switch`;
 
+alter TABLE hh_local_device add `same_face_interval` int DEFAULT '0' COMMENT '同人脸间隔时间（s）',
+add `success_show_persenal_info_json` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '[1,2,3,4]' COMMENT '成功显示人员信息列表-SuccessShowPersenalInfoListEnum枚举',
+add `set_personal_json` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '设置——人员列表”【控制设置页里的人员数据的信息】-SetPersenalListEnum';
+alter TABLE hh_local_device_template add `same_face_interval` int DEFAULT '0' COMMENT '同人脸间隔时间（s）',
+add `success_show_persenal_info_json` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '[1,2,3,4]' COMMENT '成功显示人员信息列表-SuccessShowPersenalInfoListEnum枚举',
+add `set_personal_json` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '设置——人员列表”【控制设置页里的人员数据的信息】-SetPersenalListEnum';
+
+alter TABLE hh_local_device add `show_personal_num_switch` tinyint(1) DEFAULT '1' COMMENT '预览页是否显示人员数量 默认-true';
+alter TABLE hh_local_device_template add `show_personal_num_switch` tinyint(1) DEFAULT '1' COMMENT '预览页是否显示人员数量 默认-true';
+
 

src/main/java/cn/hanghui/outapi/platform/tenant/controller/HhLocalDeviceController.java

@@ -14,9 +14,7 @@ import cn.hanghui.outapi.platform.tenant.entity.dto.hhlocal.HhLocalDeviceTemplat
 import cn.hanghui.outapi.platform.tenant.entity.dto.hhlocal.HhLocalDeviceTemplateSearch;
 import cn.hanghui.outapi.platform.tenant.entity.dto.hhlocal.HhLocalDeviceTemplateVo;
 import cn.hanghui.outapi.platform.tenant.entity.dto.hhlocal.HhLocalDeviceVo;
-import cn.hanghui.outapi.platform.tenant.entity.enums.CameraTypeEnum;
-import cn.hanghui.outapi.platform.tenant.entity.enums.LiveTypeEnum;
-import cn.hanghui.outapi.platform.tenant.entity.enums.ManualInParamsEnum;
+import cn.hanghui.outapi.platform.tenant.entity.enums.*;
 import cn.hanghui.outapi.platform.tenant.service.HhLocalDeviceService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -154,11 +152,21 @@ public class HhLocalDeviceController extends BaseController {
     public RestResult<List<Map<String, String>>> getCameraTypeEnum() {
         return RestResult.ok(EnumUtils.enumToListMap(CameraTypeEnum.class));
     }
-
     @ApiOperation(value = "获取活体检测模式")
     @GetMapping("/getLiveTypeEnum")
     public RestResult<List<Map<String, String>>> getLiveTypeEnum() {
         return RestResult.ok(EnumUtils.enumToListMap(LiveTypeEnum.class));
     }
+    @ApiOperation(value = "获取成功显示人员信息列表")
+    @GetMapping("/getSuccessShowPersenalInfoListEnum")
+    public RestResult<List<Map<String, String>>> getSuccessShowPersenalInfoListEnum() {
+        return RestResult.ok(EnumUtils.enumToListMap(SuccessShowPersenalInfoListEnum.class));
+    }
+
+    @ApiOperation(value = "设置——人员列表")
+    @GetMapping("/getSetPersenalListEnum")
+    public RestResult<List<Map<String, String>>> getSetPersenalListEnum() {
+        return RestResult.ok(EnumUtils.enumToListMap(SetPersenalListEnum.class));
+    }
 
 }

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

@@ -273,7 +273,7 @@ public class HhLocalDeviceBase implements Serializable {
     /**
      * @see cn.hanghui.outapi.platform.tenant.entity.enums.ResultPageTemplateEnum
      */
-    @ApiModelProperty(value = "结果页模版 1-通用版 2-悬浮版")
+    @ApiModelProperty(value = "结果页模版 1-通用版 2-悬浮版 3-弹窗")
     private Integer resultPageTemplate;
     @ApiModelProperty(value = "刷脸失败是否静默显示 false-关闭 true-开启 默认false")
     private Boolean compareSilentDisplay;
@@ -417,5 +417,15 @@ public class HhLocalDeviceBase implements Serializable {
 
     @ApiModelProperty(value = "是否启用有效时间 默认-false")
     private Boolean validTimeSwitch;
+    @ApiModelProperty(value = "同人脸间隔时间（s）")
+    private Integer sameFaceInterval;
+    /** @see cn.hanghui.outapi.platform.tenant.entity.enums.SuccessShowPersenalInfoListEnum */
+    @ApiModelProperty(value = "成功显示人员信息列表-枚举")
+    private List<Integer> successShowPersenalInfoList;
+    /** @see cn.hanghui.outapi.platform.tenant.entity.enums.SetPersenalListEnum */
+    @ApiModelProperty(value = "“设置——人员列表”【控制设置页里的人员数据的信息】-枚举")
+    private List<Integer> setPersonalList;
+    @ApiModelProperty(value = "预览页是否显示人员数量 默认-true")
+    private Boolean showPersonalNumSwitch;
 
 }

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

@@ -13,8 +13,9 @@ import lombok.Getter;
 @AllArgsConstructor
 @Getter
 public enum ResultPageTemplateEnum {
-    COMMON(1, "通用版"),
-    FLOAT(2, "悬浮版"),
+    COMMON(1, "通用"),
+    FLOAT(2, "悬浮"),
+    POP(3, "悬浮（无核验）"),
             ;
 
     public static ResultPageTemplateEnum getEnumByCode(Integer code){

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

@@ -0,0 +1,35 @@
+package cn.hanghui.outapi.platform.tenant.entity.enums;
+
+import cn.hanghui.outapi.platform.common.utils.Preconditions;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum SetPersenalListEnum {
+    /**
+     * 设置——人员列表”【控制设置页里的人员数据的信息】-SetPersenalListEnum
+     */
+
+    PHOTO(1, "照片"),
+    CERT_NO(2, "证件号"),
+    PHONE(3, "手机号"),
+
+    ;
+
+    private Integer code;
+    private String desc;
+
+    public static SetPersenalListEnum findByCode(Integer code) {
+        if (Preconditions.isBlank(code)) {
+            return null;
+        }
+        for (SetPersenalListEnum enumObject : values()) {
+            if (enumObject.code == code.intValue()) {
+                return enumObject;
+            }
+        }
+        return null;
+    }
+
+}

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

@@ -0,0 +1,35 @@
+package cn.hanghui.outapi.platform.tenant.entity.enums;
+
+import cn.hanghui.outapi.platform.common.utils.Preconditions;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum SuccessShowPersenalInfoListEnum {
+    /**
+     * 成功显示人员信息列表-SuccessShowPersenalInfoListEnum枚举
+     */
+    PHOTO(1, "照片"),
+    CERT_NAME(2, "姓名"),
+    CERT_NO(3, "证件号"),
+    PHONE(4, "手机号"),
+
+    ;
+
+    private Integer code;
+    private String desc;
+
+    public static SuccessShowPersenalInfoListEnum findByCode(Integer code) {
+        if (Preconditions.isBlank(code)) {
+            return null;
+        }
+        for (SuccessShowPersenalInfoListEnum enumObject : values()) {
+            if (enumObject.code == code.intValue()) {
+                return enumObject;
+            }
+        }
+        return null;
+    }
+
+}

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

@@ -428,6 +428,19 @@ public class HhLocalDevice extends Base {
 
     @ApiModelProperty(value = "是否启用有效时间 默认-false")
     private Boolean validTimeSwitch;
+    @ApiModelProperty(value = "同人脸间隔时间（s）")
+    private Integer sameFaceInterval;
+    /** @see cn.hanghui.outapi.platform.tenant.entity.enums.SuccessShowPersenalInfoListEnum */
+    @ApiModelProperty(value = "成功显示人员信息列表-枚举")
+    @TableField(value = "success_show_persenal_info_json", typeHandler = IntegerTypeHandler.class)
+    private List<Integer> successShowPersenalInfoList;
+    /** @see cn.hanghui.outapi.platform.tenant.entity.enums.SetPersenalListEnum */
+    @ApiModelProperty(value = "“设置——人员列表”【控制设置页里的人员数据的信息】-枚举")
+    @TableField(value = "set_personal_json", typeHandler = IntegerTypeHandler.class)
+    private List<Integer> setPersonalList;
+    @ApiModelProperty(value = "预览页是否显示人员数量 默认-true")
+    private Boolean showPersonalNumSwitch;
+
 
 }
 

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

@@ -419,6 +419,21 @@ public class HhLocalDeviceTemplate extends Base {
     @ApiModelProperty(value = "人脸框跟随框是否镜像")
     private Boolean rgbRevert;
 
+    @ApiModelProperty(value = "是否启用有效时间 默认-false")
+    private Boolean validTimeSwitch;
+    @ApiModelProperty(value = "同人脸间隔时间（s）")
+    private Integer sameFaceInterval;
+    /** @see cn.hanghui.outapi.platform.tenant.entity.enums.SuccessShowPersenalInfoListEnum */
+    @ApiModelProperty(value = "成功显示人员信息列表-枚举")
+    @TableField(value = "success_show_persenal_info_json", typeHandler = IntegerTypeHandler.class)
+    private List<Integer> successShowPersenalInfoList;
+    /** @see cn.hanghui.outapi.platform.tenant.entity.enums.SetPersenalListEnum */
+    @ApiModelProperty(value = "“设置——人员列表”【控制设置页里的人员数据的信息】-枚举")
+    @TableField(value = "set_personal_json", typeHandler = IntegerTypeHandler.class)
+    private List<Integer> setPersonalList;
+    @ApiModelProperty(value = "预览页是否显示人员数量 默认-true")
+    private Boolean showPersonalNumSwitch;
+
 
 }
 

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

@@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(value = "Scene", autoResultMap = true)
+@TableName(value = "scene", autoResultMap = true)
 public class Scene extends Base {
 
     /**