sanlin.shi 1 week ago
parent
commit
c473f2bd16
23 changed files with 546 additions and 33 deletions
  1. 15 4
      sql.md
  2. 68 0
      src/main/java/cn/hanghui/outapi/platform/common/config/CustomApiModelPropertyPositionBuilder.java
  3. 54 0
      src/main/java/cn/hanghui/outapi/platform/common/entity/po/AccountAuthConfig.java
  4. 1 1
      src/main/java/cn/hanghui/outapi/platform/common/utils/EnumUtils.java
  5. 110 0
      src/main/java/cn/hanghui/outapi/platform/tenant/controller/AccountController.java
  6. 6 6
      src/main/java/cn/hanghui/outapi/platform/tenant/controller/HhLocalDeviceController.java
  7. 18 0
      src/main/java/cn/hanghui/outapi/platform/tenant/entity/dto/EnumCommonVo.java
  8. 49 0
      src/main/java/cn/hanghui/outapi/platform/tenant/entity/dto/account/AccountDto.java
  9. 44 0
      src/main/java/cn/hanghui/outapi/platform/tenant/entity/dto/account/AccountVo.java
  10. 8 2
      src/main/java/cn/hanghui/outapi/platform/tenant/entity/dto/hhlocal/HhLocalDeviceBase.java
  11. 4 4
      src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/SetPersonalListEnum.java
  12. 4 4
      src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/SuccessShowPersonalInfoListEnum.java
  13. 18 0
      src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/fkj/FkjCollectConfigEnum.java
  14. 27 0
      src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/fkj/FkjFuncConfigEnum.java
  15. 15 0
      src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/fkj/FkjPushConfigEnum.java
  16. 16 0
      src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/fkj/FkjQuseyAddressConfigEnum.java
  17. 14 0
      src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/fkj/FkjSystemConfigEnum.java
  18. 23 0
      src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/fkj/FkjTimeoutDurationConfigEnum.java
  19. 15 0
      src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/fkj/FkjUseConfigEnum.java
  20. 21 0
      src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/fkj/FkjVoiceConfigEnum.java
  21. 6 4
      src/main/java/cn/hanghui/outapi/platform/tenant/entity/po/HhLocalDevice.java
  22. 6 4
      src/main/java/cn/hanghui/outapi/platform/tenant/entity/po/HhLocalDeviceTemplate.java
  23. 4 4
      src/main/resources/application-api.yml

+ 15 - 4
sql.md

@@ -869,13 +869,24 @@ ADD COLUMN `official_seal_switch` tinyint(1) NULL COMMENT '是否加盖公章 fa
 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';
+add `success_show_personal_info_json` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '[1,2,3,4]' COMMENT '成功显示人员信息列表-SuccessShowPersonalInfoListEnum枚举',
+add `set_personal_json` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '设置——人员列表”【控制设置页里的人员数据的信息】-SetPersonalListEnum';
 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';
+add `success_show_personal_info_json` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '[1,2,3,4]' COMMENT '成功显示人员信息列表-SuccessShowPersonalInfoListEnum枚举',
+add `set_personal_json` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '设置——人员列表”【控制设置页里的人员数据的信息】-SetPersonalListEnum';
 
 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';
 
+alter TABLE account_auth_config
+add `fkj_switch` tinyint(1) DEFAULT '0' COMMENT '访客机权限开关 默认false',
+add `fkj_use_config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '访客机使用配置 FkjUseConfigEnum',
+add `fkj_collect_config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '访客机采集配置 FkjCollectConfigEnum',
+add `fkj_query_address_config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '访客机查询地址配置 FkjQuseyAddressConfigEnum',
+add `fkj_push_config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '访客机推送配置 FkjPushConfigEnum',
+add `fkj_func_config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '访客机功能配置 FkjFuncConfigEnum',
+add `fkj_timeout_duration_config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '访客机超时时长配置 FkjTimeoutDurationConfigEnum',
+add `fkj_voice_config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '访客机语音配置 FkjVoiceConfigEnum',
+add `fkj_system_config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '访客机系统配置 FkjSystemConfigEnum';
+
 

+ 68 - 0
src/main/java/cn/hanghui/outapi/platform/common/config/CustomApiModelPropertyPositionBuilder.java

@@ -0,0 +1,68 @@
+package cn.hanghui.outapi.platform.common.config;
+
+import com.fasterxml.jackson.databind.introspect.AnnotatedField;
+import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.stereotype.Component;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spi.schema.ModelPropertyBuilderPlugin;
+import springfox.documentation.spi.schema.contexts.ModelPropertyContext;
+import springfox.documentation.swagger.common.SwaggerPluginSupport;
+
+import java.lang.reflect.Field;
+import java.util.Optional;
+
+import static java.util.Optional.empty;
+import static springfox.documentation.schema.Annotations.findPropertyAnnotation;
+import static springfox.documentation.swagger.schema.ApiModelProperties.findApiModePropertyAnnotation;
+
+@Component
+public class CustomApiModelPropertyPositionBuilder implements ModelPropertyBuilderPlugin {
+    private Log log = LogFactory.getLog(getClass());
+
+    @Override
+    public boolean supports(DocumentationType delimiter) {
+        return SwaggerPluginSupport.pluginDoesApply(delimiter);
+    }
+
+    @Override
+    public void apply(ModelPropertyContext context) {
+        Optional<ApiModelProperty> annotation = empty();
+
+        if (context.getAnnotatedElement().isPresent()) {
+            annotation =
+                    annotation.map(Optional::of)
+                            .orElse(findApiModePropertyAnnotation(context.getAnnotatedElement().get()));
+        }
+        if (context.getBeanPropertyDefinition().isPresent()) {
+            annotation = annotation.map(Optional::of).orElse(findPropertyAnnotation(
+                    context.getBeanPropertyDefinition().get(),
+                    ApiModelProperty.class));
+        }
+        Optional<BeanPropertyDefinition> beanPropertyDefinitionOpt = context.getBeanPropertyDefinition();
+        if (annotation.isPresent() && beanPropertyDefinitionOpt.isPresent()) {
+            BeanPropertyDefinition beanPropertyDefinition = beanPropertyDefinitionOpt.get();
+            /*获取到注解字段*/
+            AnnotatedField field = beanPropertyDefinition.getField();
+            /*获取到字段所在的类*/
+            Class clazz = field.getDeclaringClass();
+            /*获取类中所有字段*/
+            Field[] declaredFields = clazz.getDeclaredFields();
+            Field declaredField;
+            /*获取当前字段的Field*/
+            try {
+                declaredField = clazz.getDeclaredField(field.getName());
+            } catch (NoSuchFieldException | SecurityException e) {
+                log.error("", e);
+                return;
+            }
+            /*获取当前字段在数组中的位置。然后设置position属性*/
+            int indexOf = ArrayUtils.indexOf(declaredFields, declaredField);
+            if (indexOf != -1) context.getBuilder().position(indexOf);
+        }
+    }
+}
+

+ 54 - 0
src/main/java/cn/hanghui/outapi/platform/common/entity/po/AccountAuthConfig.java

@@ -154,4 +154,58 @@ public class AccountAuthConfig extends Base {
     private List<String> hhfaceSystemConfig;
 
 
+    /**-------------访客机权限配置---------------**/
+
+    @ApiModelProperty(value = "访客机权限开关 默认false:关闭 true:开启")
+    private Boolean fkjSwitch;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjUseConfigEnum
+     */
+    @ApiModelProperty(value = "访客机使用配置 FkjUseConfigEnum 获取枚举列表")
+    @TableField(value = "fkj_use_config", typeHandler = StringTypeHandler.class)
+    private List<String> fkjUseConfig;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjCollectConfigEnum
+     */
+    @ApiModelProperty(value = "访客机采集配置 FkjCollectConfigEnum 获取枚举列表")
+    @TableField(value = "fkj_collect_config", typeHandler = StringTypeHandler.class)
+    private List<String> fkjCollectConfig;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjQuseyAddressConfigEnum
+     */
+    @ApiModelProperty(value = "访客机查询地址配置 FkjQuseyAddressConfigEnum 获取枚举列表")
+    @TableField(value = "fkj_query_address_config", typeHandler = StringTypeHandler.class)
+    private List<String> fkjQueryAddressConfig;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjPushConfigEnum
+     */
+    @ApiModelProperty(value = "访客机推送配置 FkjPushConfigEnum 获取枚举列表")
+    @TableField(value = "fkj_push_config", typeHandler = StringTypeHandler.class)
+    private List<String> fkjPushConfig;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjFuncConfigEnum
+     */
+    @ApiModelProperty(value = "访客机功能配置 FkjFuncConfigEnum 获取枚举列表")
+    @TableField(value = "fkj_func_config", typeHandler = StringTypeHandler.class)
+    private List<String> fkjFuncConfig;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjTimeoutDurationConfigEnum
+     */
+    @ApiModelProperty(value = "访客机超时时长配置 FkjTimeoutDurationConfigEnum 获取枚举列表")
+    @TableField(value = "fkj_timeout_duration_config", typeHandler = StringTypeHandler.class)
+    private List<String> fkjTimeoutDurationConfig;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjVoiceConfigEnum
+     */
+    @ApiModelProperty(value = "访客机语音配置 FkjVoiceConfigEnum 获取枚举列表")
+    @TableField(value = "fkj_voice_config", typeHandler = StringTypeHandler.class)
+    private List<String> fkjVoiceConfig;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjSystemConfigEnum
+     */
+    @ApiModelProperty(value = "访客机系统配置 FkjSystemConfigEnum 获取枚举列表")
+    @TableField(value = "fkj_system_config", typeHandler = StringTypeHandler.class)
+    private List<String> fkjSystemConfig;
+
+
 }

+ 1 - 1
src/main/java/cn/hanghui/outapi/platform/common/utils/EnumUtils.java

@@ -41,7 +41,7 @@ public class EnumUtils {
                 Field field = enumClass.getDeclaredField(StringUtils.uncapitalize(methodName.substring(3)));
                 fieldList.add(field);
             } catch (NoSuchFieldException | SecurityException e) {
-                log.error(e.getMessage(), e);
+//                log.error(e.getMessage(), e);
             }
         });
 

+ 110 - 0
src/main/java/cn/hanghui/outapi/platform/tenant/controller/AccountController.java

@@ -3,6 +3,7 @@ package cn.hanghui.outapi.platform.tenant.controller;
 import cn.hanghui.outapi.platform.common.controller.BaseController;
 import cn.hanghui.outapi.platform.common.entity.rest.RestResult;
 import cn.hanghui.outapi.platform.common.utils.EnumUtils;
+import cn.hanghui.outapi.platform.tenant.entity.dto.EnumCommonVo;
 import cn.hanghui.outapi.platform.tenant.entity.dto.account.AccountDto;
 import cn.hanghui.outapi.platform.tenant.entity.dto.account.AccountSearch;
 import cn.hanghui.outapi.platform.tenant.entity.dto.account.AccountVo;
@@ -19,6 +20,7 @@ import cn.hanghui.outapi.platform.tenant.entity.enums.ModuleTypeEnum;
 import cn.hanghui.outapi.platform.tenant.entity.enums.PushConfigEnum;
 import cn.hanghui.outapi.platform.tenant.entity.enums.SystemConfigEnum;
 import cn.hanghui.outapi.platform.tenant.entity.enums.UseConfigEnum;
+import cn.hanghui.outapi.platform.tenant.entity.enums.fkj.*;
 import cn.hanghui.outapi.platform.tenant.service.AccountService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -33,6 +35,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -86,20 +89,66 @@ public class AccountController extends BaseController {
         return accountService.query(getAccount());
     }
 
+
+
+
     @ApiOperation(value = "查询授权模块枚举列表")
     @PostMapping("/module/type/list")
+    @ApiOperationSupport(order = 5)
     public RestResult<List<Map<Integer, String>>> queryModuleTypeList() {
         return RestResult.ok(EnumUtils.enumToListMap(ModuleTypeEnum.class));
     }
 
+
+    @ApiOperation(value = "哇达西配置枚举合并")
+    @PostMapping("/enum/common/list")
+    @ApiOperationSupport(order = 5)
+    public RestResult<Map<String, EnumCommonVo>> enumCommonMap() {
+        Map<String, EnumCommonVo> map = new HashMap<>();
+        this.addMap(map,"queryModuleTypeList","查询授权模块枚举列表",ModuleTypeEnum.class);
+        this.addMap(map,"querySystemConfigList","查询系统配置枚举列表",SystemConfigEnum.class);
+        this.addMap(map,"queryUseConfigList","查询使用配置枚举列表",UseConfigEnum.class);
+        this.addMap(map,"queryPushConfigList","查询推送配置枚举列表",PushConfigEnum.class);
+        this.addMap(map,"queryHhfaceFaceConfigList","查询HHFace支付宝人脸采集配置枚举列表",HhFaceFaceConfigEnum.class);
+        this.addMap(map,"queryHhfaceCollectConfigList","查询HHFace采集配置枚举列表",HhFaceCollectConfigEnum.class);
+        this.addMap(map,"queryHhfaceFuncConfigList","查询HHFace功能配置枚举列表",HhFaceFuncConfigEnum.class);
+        this.addMap(map,"queryHhfaceHardwareConfigList","查询HHFace硬件配置枚举列表",HhFaceHardwareConfigEnum.class);
+        this.addMap(map,"queryHhfacePushConfigList","查询HHFace推送配置枚举列表",HhFacePushConfigEnum.class);
+        this.addMap(map,"queryHhfaceResultConfigList","查询HHFace结果页配置枚举列表",HhFaceResultConfigEnum.class);
+        this.addMap(map,"queryHhfaceSystemConfigList","查询HHFace系统配置枚举列表",HhFaceSystemConfigEnum.class);
+        this.addMap(map,"queryHhFaceThirdConfigList","查询HHFace三方接口配置枚举列表",HhFaceThirdConfigEnum.class);
+        this.addMap(map,"queryHhFaceUseConfigList","查询HHFace使用配置枚举列表",HhFaceUseConfigEnum.class);
+        this.addMap(map,"fkjUseConfigList","访客机使用配置枚举列表",FkjUseConfigEnum.class);
+        this.addMap(map,"fkjCollectConfigList","访客机采集配置枚举列表",FkjCollectConfigEnum.class);
+        this.addMap(map,"fkjQueryAddressConfigList","访客机查询地址配置枚举列表",FkjQuseyAddressConfigEnum.class);
+        this.addMap(map,"fkjPushConfigList","访客机推送配置枚举列表",FkjPushConfigEnum.class);
+        this.addMap(map,"fkjFuncConfigList","访客机功能配置枚举列表",FkjFuncConfigEnum.class);
+        this.addMap(map,"fkjTimeoutDurationConfigList","访客机超时时长配置枚举列表",FkjTimeoutDurationConfigEnum.class);
+        this.addMap(map,"fkjVoiceConfigList","访客机语音配置枚举列表",FkjVoiceConfigEnum.class);
+        this.addMap(map,"fkjSystemConfigList","访客机系统配置枚举列表",FkjSystemConfigEnum.class);
+
+        return RestResult.ok(map);
+    }
+
+    private void addMap(Map<String, EnumCommonVo> map, String code, String desc, Class<?> enumClass) {
+        EnumCommonVo enumCommonVo = new EnumCommonVo();
+        enumCommonVo.setCode(code);
+        enumCommonVo.setDesc(desc);
+        enumCommonVo.setList(EnumUtils.enumToListMap(enumClass));
+
+        map.put(code,enumCommonVo);
+    }
+
     @ApiOperation(value = "查询系统配置枚举列表")
     @PostMapping("/system/config/list")
+    @ApiOperationSupport(order = 6)
     public RestResult<List<Map<String, String>>> querySystemConfigList() {
         return RestResult.ok(EnumUtils.enumToListMap(SystemConfigEnum.class));
     }
 
     @ApiOperation(value = "查询使用配置枚举列表")
     @PostMapping("/use/config/list")
+    @ApiOperationSupport(order = 7)
     public RestResult<List<Map<String, String>>> queryUseConfigList() {
         return RestResult.ok(EnumUtils.enumToListMap(UseConfigEnum.class));
     }
@@ -107,62 +156,123 @@ public class AccountController extends BaseController {
 
     @ApiOperation(value = "查询推送配置枚举列表")
     @PostMapping("/push/config/list")
+    @ApiOperationSupport(order = 8)
     public RestResult<List<Map<String, String>>> queryPushConfigList() {
         return RestResult.ok(EnumUtils.enumToListMap(PushConfigEnum.class));
     }
 
     @ApiOperation(value = "查询HHFace支付宝人脸采集配置枚举列表")
     @PostMapping("/hhface/face/config/list")
+    @ApiOperationSupport(order = 9)
     public RestResult<List<Map<String, String>>> queryHhfaceFaceConfigList() {
         return RestResult.ok(EnumUtils.enumToListMap(HhFaceFaceConfigEnum.class));
     }
 
     @ApiOperation(value = "查询HHFace采集配置枚举列表")
     @PostMapping("/hhface/collect/config/list")
+    @ApiOperationSupport(order = 10)
     public RestResult<List<Map<String, String>>> queryHhfaceCollectConfigList() {
         return RestResult.ok(EnumUtils.enumToListMap(HhFaceCollectConfigEnum.class));
     }
 
     @ApiOperation(value = "查询HHFace功能配置枚举列表")
     @PostMapping("/hhface/func/config/list")
+    @ApiOperationSupport(order = 11)
     public RestResult<List<Map<String, String>>> queryHhfaceFuncConfigList() {
         return RestResult.ok(EnumUtils.enumToListMap(HhFaceFuncConfigEnum.class));
     }
 
     @ApiOperation(value = "查询HHFace硬件配置枚举列表")
     @PostMapping("/hhface/hardware/config/list")
+    @ApiOperationSupport(order = 12)
     public RestResult<List<Map<String, String>>> queryHhfaceHardwareConfigList() {
         return RestResult.ok(EnumUtils.enumToListMap(HhFaceHardwareConfigEnum.class));
     }
 
     @ApiOperation(value = "查询HHFace推送配置枚举列表")
     @PostMapping("/hhface/push/config/list")
+    @ApiOperationSupport(order = 13)
     public RestResult<List<Map<String, String>>> queryHhfacePushConfigList() {
         return RestResult.ok(EnumUtils.enumToListMap(HhFacePushConfigEnum.class));
     }
 
     @ApiOperation(value = "查询HHFace结果页配置枚举列表")
     @PostMapping("/hhface/result/config/list")
+    @ApiOperationSupport(order = 14)
     public RestResult<List<Map<String, String>>> queryHhfaceResultConfigList() {
         return RestResult.ok(EnumUtils.enumToListMap(HhFaceResultConfigEnum.class));
     }
 
     @ApiOperation(value = "查询HHFace系统配置枚举列表")
     @PostMapping("/hhface/system/config/list")
+    @ApiOperationSupport(order = 15)
     public RestResult<List<Map<String, String>>> queryHhfaceSystemConfigList() {
         return RestResult.ok(EnumUtils.enumToListMap(HhFaceSystemConfigEnum.class));
     }
 
     @ApiOperation(value = "查询HHFace三方接口配置枚举列表")
     @PostMapping("/hhface/third/config/list")
+    @ApiOperationSupport(order = 16)
     public RestResult<List<Map<String, String>>> queryHhFaceThirdConfigList() {
         return RestResult.ok(EnumUtils.enumToListMap(HhFaceThirdConfigEnum.class));
     }
 
     @ApiOperation(value = "查询HHFace使用配置枚举列表")
     @PostMapping("/hhface/use/config/list")
+    @ApiOperationSupport(order = 17)
     public RestResult<List<Map<String, String>>> queryHhFaceUseConfigList() {
         return RestResult.ok(EnumUtils.enumToListMap(HhFaceUseConfigEnum.class));
     }
+    /**
+     * 访客机配置
+     */
+    @ApiOperation(value = "访客机使用配置枚举列表")
+    @PostMapping("/fkj/use/config/list")
+    @ApiOperationSupport(order = 18)
+    public RestResult<List<Map<String, String>>> fkjUseConfigList() {
+        return RestResult.ok(EnumUtils.enumToListMap(FkjUseConfigEnum.class));
+    }
+    @ApiOperation(value = "访客机采集配置枚举列表")
+    @PostMapping("/fkj/collect/config/list")
+    @ApiOperationSupport(order = 19)
+    public RestResult<List<Map<String, String>>> fkjCollectConfigList() {
+        return RestResult.ok(EnumUtils.enumToListMap(FkjCollectConfigEnum.class));
+    }
+    @ApiOperation(value = "访客机查询地址配置枚举列表")
+    @PostMapping("/fkj/query/address/config/list")
+    @ApiOperationSupport(order = 20)
+    public RestResult<List<Map<String, String>>> fkjQueryAddressConfigList() {
+        return RestResult.ok(EnumUtils.enumToListMap(FkjQuseyAddressConfigEnum.class));
+    }
+    @ApiOperation(value = "访客机推送配置枚举列表")
+    @PostMapping("/fkj/push/config/list")
+    @ApiOperationSupport(order = 21)
+    public RestResult<List<Map<String, String>>> fkjPushConfigList() {
+        return RestResult.ok(EnumUtils.enumToListMap(FkjPushConfigEnum.class));
+    }
+    @ApiOperation(value = "访客机功能配置枚举列表")
+    @PostMapping("/fkj/func/config/list")
+    @ApiOperationSupport(order = 22)
+    public RestResult<List<Map<String, String>>> fkjFuncConfigList() {
+        return RestResult.ok(EnumUtils.enumToListMap(FkjFuncConfigEnum.class));
+    }
+    @ApiOperation(value = "访客机超时时长配置枚举列表")
+    @PostMapping("/fkj/timeout/duration/config/list")
+    @ApiOperationSupport(order = 23)
+    public RestResult<List<Map<String, String>>> fkjTimeoutDurationConfigList() {
+        return RestResult.ok(EnumUtils.enumToListMap(FkjTimeoutDurationConfigEnum.class));
+    }
+    @ApiOperation(value = "访客机语音配置枚举列表")
+    @PostMapping("/fkj/voice/config/list")
+    @ApiOperationSupport(order = 24)
+    public RestResult<List<Map<String, String>>> fkjVoiceConfigList() {
+        return RestResult.ok(EnumUtils.enumToListMap(FkjVoiceConfigEnum.class));
+    }
+    @ApiOperation(value = "访客机系统配置枚举列表")
+    @PostMapping("/fkj/system/config/list")
+    @ApiOperationSupport(order = 25)
+    public RestResult<List<Map<String, String>>> fkjSystemConfigList() {
+        return RestResult.ok(EnumUtils.enumToListMap(FkjSystemConfigEnum.class));
+    }
 
 }

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

@@ -158,15 +158,15 @@ public class HhLocalDeviceController extends BaseController {
         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));
+    @GetMapping("/getSuccessShowPersonalInfoListEnum")
+    public RestResult<List<Map<String, String>>> getSuccessShowPersonalInfoListEnum() {
+        return RestResult.ok(EnumUtils.enumToListMap(SuccessShowPersonalInfoListEnum.class));
     }
 
     @ApiOperation(value = "设置——人员列表")
-    @GetMapping("/getSetPersenalListEnum")
-    public RestResult<List<Map<String, String>>> getSetPersenalListEnum() {
-        return RestResult.ok(EnumUtils.enumToListMap(SetPersenalListEnum.class));
+    @GetMapping("/getSetPersonalListEnum")
+    public RestResult<List<Map<String, String>>> getSetPersonalListEnum() {
+        return RestResult.ok(EnumUtils.enumToListMap(SetPersonalListEnum.class));
     }
 
 }

+ 18 - 0
src/main/java/cn/hanghui/outapi/platform/tenant/entity/dto/EnumCommonVo.java

@@ -0,0 +1,18 @@
+package cn.hanghui.outapi.platform.tenant.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class EnumCommonVo implements Serializable {
+    @ApiModelProperty("唯一值")
+    private String code;
+    @ApiModelProperty("说明")
+    private String desc;
+    @ApiModelProperty("参数")
+    private List<Map<Object, Object>> list;
+}

+ 49 - 0
src/main/java/cn/hanghui/outapi/platform/tenant/entity/dto/account/AccountDto.java

@@ -1,6 +1,7 @@
 package cn.hanghui.outapi.platform.tenant.entity.dto.account;
 
 import cn.hanghui.outapi.platform.tenant.entity.config.auth.DeviceConfigBean;
+import cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjCollectConfigEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -115,4 +116,52 @@ public class AccountDto implements Serializable {
     @ApiModelProperty(value = "hhface系统配置")
     private List<String> hhfaceSystemConfig;
 
+
+    /**-------------访客机权限配置---------------**/
+
+    @ApiModelProperty(value = "访客机权限开关 默认false:关闭 true:开启")
+    private Boolean fkjSwitch;
+
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjUseConfigEnum
+     */
+    @ApiModelProperty(value = "访客机使用配置 FkjUseConfigEnum 获取枚举列表")
+    private List<String> fkjUseConfig;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjCollectConfigEnum
+     */
+    @ApiModelProperty(value = "访客机采集配置 FkjCollectConfigEnum 获取枚举列表")
+    private List<String> fkjCollectConfig;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjQuseyAddressConfigEnum
+     */
+    @ApiModelProperty(value = "访客机查询地址配置 FkjQuseyAddressConfigEnum 获取枚举列表")
+    private List<String> fkjQueryAddressConfig;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjPushConfigEnum
+     */
+    @ApiModelProperty(value = "访客机推送配置 FkjPushConfigEnum 获取枚举列表")
+    private List<String> fkjPushConfig;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjFuncConfigEnum
+     */
+    @ApiModelProperty(value = "访客机功能配置 FkjFuncConfigEnum 获取枚举列表")
+    private List<String> fkjFuncConfig;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjTimeoutDurationConfigEnum
+     */
+    @ApiModelProperty(value = "访客机超时时长配置 FkjTimeoutDurationConfigEnum 获取枚举列表")
+    private List<String> fkjTimeoutDurationConfig;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjVoiceConfigEnum
+     */
+    @ApiModelProperty(value = "访客机语音配置 FkjVoiceConfigEnum 获取枚举列表")
+    private List<String> fkjVoiceConfig;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjSystemConfigEnum
+     */
+    @ApiModelProperty(value = "访客机系统配置 FkjSystemConfigEnum 获取枚举列表")
+    private List<String> fkjSystemConfig;
+
+
 }

+ 44 - 0
src/main/java/cn/hanghui/outapi/platform/tenant/entity/dto/account/AccountVo.java

@@ -121,4 +121,48 @@ public class AccountVo implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
+
+    /**-------------访客机权限配置---------------**/
+    @ApiModelProperty(value = "访客机权限开关 默认false:关闭 true:开启")
+    private Boolean fkjSwitch;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjUseConfigEnum
+     */
+    @ApiModelProperty(value = "访客机使用配置 FkjUseConfigEnum 获取枚举列表")
+    private List<String> fkjUseConfig;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjCollectConfigEnum
+     */
+    @ApiModelProperty(value = "访客机采集配置 FkjCollectConfigEnum 获取枚举列表")
+    private List<String> fkjCollectConfig;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjQuseyAddressConfigEnum
+     */
+    @ApiModelProperty(value = "访客机查询地址配置 FkjQuseyAddressConfigEnum 获取枚举列表")
+    private List<String> fkjQueryAddressConfig;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjPushConfigEnum
+     */
+    @ApiModelProperty(value = "访客机推送配置 FkjPushConfigEnum 获取枚举列表")
+    private List<String> fkjPushConfig;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjFuncConfigEnum
+     */
+    @ApiModelProperty(value = "访客机功能配置 FkjFuncConfigEnum 获取枚举列表")
+    private List<String> fkjFuncConfig;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjTimeoutDurationConfigEnum
+     */
+    @ApiModelProperty(value = "访客机超时时长配置 FkjTimeoutDurationConfigEnum 获取枚举列表")
+    private List<String> fkjTimeoutDurationConfig;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjVoiceConfigEnum
+     */
+    @ApiModelProperty(value = "访客机语音配置 FkjVoiceConfigEnum 获取枚举列表")
+    private List<String> fkjVoiceConfig;
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.fkj.FkjSystemConfigEnum
+     */
+    @ApiModelProperty(value = "访客机系统配置 FkjSystemConfigEnum 获取枚举列表")
+    private List<String> fkjSystemConfig;
 }

+ 8 - 2
src/main/java/cn/hanghui/outapi/platform/tenant/entity/dto/hhlocal/HhLocalDeviceBase.java

@@ -1,6 +1,8 @@
 package cn.hanghui.outapi.platform.tenant.entity.dto.hhlocal;
 
 import cn.hanghui.outapi.platform.tenant.entity.dto.ManualInIdCardAuthDto;
+import cn.hanghui.outapi.platform.tenant.entity.enums.SetPersonalListEnum;
+import cn.hanghui.outapi.platform.tenant.entity.enums.SuccessShowPersonalInfoListEnum;
 import cn.hanghui.outapi.platform.tenant.typehandle.IntegerTypeHandler;
 import cn.hanghui.outapi.platform.tenant.typehandle.LongTypeHandler;
 import cn.hanghui.outapi.platform.tenant.typehandle.ManualInIdCardAuthHandler;
@@ -419,10 +421,14 @@ public class HhLocalDeviceBase implements Serializable {
     private Boolean validTimeSwitch;
     @ApiModelProperty(value = "同人脸间隔时间(s)")
     private Integer sameFaceInterval;
-    /** @see cn.hanghui.outapi.platform.tenant.entity.enums.SuccessShowPersenalInfoListEnum */
+    /**
+     * @see SuccessShowPersonalInfoListEnum
+     */
     @ApiModelProperty(value = "成功显示人员信息列表-枚举")
     private List<Integer> successShowPersonalInfoList;
-    /** @see cn.hanghui.outapi.platform.tenant.entity.enums.SetPersenalListEnum */
+    /**
+     * @see cn.hanghui.outapi.platform.tenant.entity.enums.SetPersonalListEnum
+     */
     @ApiModelProperty(value = "“设置——人员列表”【控制设置页里的人员数据的信息】-枚举")
     private List<Integer> setPersonalList;
     @ApiModelProperty(value = "预览页是否显示人员数量 默认-true")

+ 4 - 4
src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/SetPersenalListEnum.java → src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/SetPersonalListEnum.java

@@ -6,9 +6,9 @@ import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
-public enum SetPersenalListEnum {
+public enum SetPersonalListEnum {
     /**
-     * 设置——人员列表”【控制设置页里的人员数据的信息】-SetPersenalListEnum
+     * 设置——人员列表”【控制设置页里的人员数据的信息】-SetPersonalListEnum
      */
 
     PHOTO(1, "照片"),
@@ -20,11 +20,11 @@ public enum SetPersenalListEnum {
     private Integer code;
     private String desc;
 
-    public static SetPersenalListEnum findByCode(Integer code) {
+    public static SetPersonalListEnum findByCode(Integer code) {
         if (Preconditions.isBlank(code)) {
             return null;
         }
-        for (SetPersenalListEnum enumObject : values()) {
+        for (SetPersonalListEnum enumObject : values()) {
             if (enumObject.code == code.intValue()) {
                 return enumObject;
             }

+ 4 - 4
src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/SuccessShowPersenalInfoListEnum.java → src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/SuccessShowPersonalInfoListEnum.java

@@ -6,9 +6,9 @@ import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
-public enum SuccessShowPersenalInfoListEnum {
+public enum SuccessShowPersonalInfoListEnum {
     /**
-     * 成功显示人员信息列表-SuccessShowPersenalInfoListEnum枚举
+     * 成功显示人员信息列表-SuccessShowPersonalInfoListEnum枚举
      */
     PHOTO(1, "照片"),
     CERT_NAME(2, "姓名"),
@@ -20,11 +20,11 @@ public enum SuccessShowPersenalInfoListEnum {
     private Integer code;
     private String desc;
 
-    public static SuccessShowPersenalInfoListEnum findByCode(Integer code) {
+    public static SuccessShowPersonalInfoListEnum findByCode(Integer code) {
         if (Preconditions.isBlank(code)) {
             return null;
         }
-        for (SuccessShowPersenalInfoListEnum enumObject : values()) {
+        for (SuccessShowPersonalInfoListEnum enumObject : values()) {
             if (enumObject.code == code.intValue()) {
                 return enumObject;
             }

+ 18 - 0
src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/fkj/FkjCollectConfigEnum.java

@@ -0,0 +1,18 @@
+package cn.hanghui.outapi.platform.tenant.entity.enums.fkj;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum FkjCollectConfigEnum {
+    ZFB_FACE_POWER("USE_LINKAGE","启用支付宝人脸能力"),
+    LICENSE_REGISTRATION("LICENSE_REGISTRATION","启用刷身份证登记"),
+    UNLICENSED_REGISTRATION("UNLICENSED_REGISTRATION","启用无证登记"),
+    WX_CODE_REGISTRATION("WX_CODE_REGISTRATION","启用微信扫码登记"),
+    ZFB_CODE_REGISTRATION("ZFB_CODE_REGISTRATION","启用支付宝扫码登记"),
+    ;
+
+    private String code;
+    private String desc;
+}

+ 27 - 0
src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/fkj/FkjFuncConfigEnum.java

@@ -0,0 +1,27 @@
+package cn.hanghui.outapi.platform.tenant.entity.enums.fkj;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum FkjFuncConfigEnum {
+    PRINT_VISITOR_LIST("PRINT_VISITOR_LIST","是否打印访客单"),
+    SIGN_OUT("SIGN_OUT","是否启用签离"),
+    RISK_PERSONNEL("RISK_PERSONNEL","启用风险人员核查"),
+    HOME_PAGE_HIDDEN("HOME_PAGE_HIDDEN","首页隐藏“设置”、“通讯录”等按钮"),
+    GENERAL_QRCODE("GENERAL_QRCODE","启用通用二维码"),
+    ETH_QRCODE("ETH_QRCODE","启用梯控二维码"),
+    VISITOR_NOT_DESENSITIZED("VISITOR_NOT_DESENSITIZED","访客记录不脱敏"),
+    REGISTRATION_PAGE_NOT_DESENSITIZED("REGISTRATION_PAGE_NOT_DESENSITIZED","登记页不脱敏"),
+    FACE_FAIL_JUMP_HAND("FACE_FAIL_JUMP_HAND","刷脸失败跳转手输"),
+    VISIT_REASON("VISIT_REASON","拜访事由选项"),
+    REMINDER_AUTH("REMINDER_AUTH","是否启用注意事项提示语"),
+    SECONDARY_PAGE_SWITCH("SECONDARY_PAGE_SWITCH","是否启用副屏轮播图"),
+    PROCESSING_PAGE_SWITCH("PROCESSING_PAGE_SWITCH","是否启用副屏处理中页面"),
+
+    ;
+
+    private String code;
+    private String desc;
+}

+ 15 - 0
src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/fkj/FkjPushConfigEnum.java

@@ -0,0 +1,15 @@
+package cn.hanghui.outapi.platform.tenant.entity.enums.fkj;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum FkjPushConfigEnum {
+    FACE_LOG_PUSH("FACE_LOG_PUSH","启用进出记录推送"),
+
+    ;
+
+    private String code;
+    private String desc;
+}

+ 16 - 0
src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/fkj/FkjQuseyAddressConfigEnum.java

@@ -0,0 +1,16 @@
+package cn.hanghui.outapi.platform.tenant.entity.enums.fkj;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum FkjQuseyAddressConfigEnum {
+    VISITEE_URL("VISITEE_URL","获取受访人列表地址"),
+    AREA_URL("AREA_URL","获取辖区配置地址"),
+    ;
+
+    private String code;
+    private String desc;
+}

+ 14 - 0
src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/fkj/FkjSystemConfigEnum.java

@@ -0,0 +1,14 @@
+package cn.hanghui.outapi.platform.tenant.entity.enums.fkj;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum FkjSystemConfigEnum {
+    M_PASSWORD("M_PASSWORD", "设备管理员密码"),
+    ;
+
+    private String code;
+    private String desc;
+}

+ 23 - 0
src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/fkj/FkjTimeoutDurationConfigEnum.java

@@ -0,0 +1,23 @@
+package cn.hanghui.outapi.platform.tenant.entity.enums.fkj;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum FkjTimeoutDurationConfigEnum {
+    CHOOSE_VISITEE_TIMEOUT("CHOOSE_VISITEE_TIMEOUT","选择受访人超时时长"),
+    READ_IDCARD_TIMEOUT("READ_IDCARD_TIMEOUT","刷身份证超时时长"),
+    INPUT_IDCARD_TIMEOUT("INPUT_IDCARD_TIMEOUT","输身份证超时时长"),
+    INPUT_PHONE_TIMEOUT("INPUT_PHONE_TIMEOUT","输手机号超时时长"),
+    SIGN_OUT_TIMEOUT("SIGN_OUT_TIMEOUT","签离扫码超时时长"),
+    RESULT_PAGE_TIMEOUT("RESULT_PAGE_TIMEOUT","结果页超时时长"),
+    FACE_TIMEOUT("FACE_TIMEOUT","刷脸超时时间"),
+    ONE_TO_ONE_TIMEOUT("ONE_TO_ONE_TIMEOUT","1v1比对超时时间"),
+    CONNECT_SEARCH_TIMEOUT("CONNECT_SEARCH_TIMEOUT","联网查询超时时间"),
+
+    ;
+
+    private String code;
+    private String desc;
+}

+ 15 - 0
src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/fkj/FkjUseConfigEnum.java

@@ -0,0 +1,15 @@
+package cn.hanghui.outapi.platform.tenant.entity.enums.fkj;
+
+import cn.hanghui.outapi.platform.common.utils.Preconditions;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum FkjUseConfigEnum {
+
+    USE_EXPIRATION_DATE("USE_EXPIRATION_DATE", "使用时间期限"),
+            ;
+    private String code;
+    private String desc;
+}

+ 21 - 0
src/main/java/cn/hanghui/outapi/platform/tenant/entity/enums/fkj/FkjVoiceConfigEnum.java

@@ -0,0 +1,21 @@
+package cn.hanghui.outapi.platform.tenant.entity.enums.fkj;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum FkjVoiceConfigEnum {
+    FACE_SUCCESS_VOICE("FACE_SUCCESS_VOICE","支付宝刷脸人脸比对成功提示音"),
+    FACE_FAIL_VOICE("FACE_FAIL_VOICE","支付宝刷脸人脸比对失败提示音"),
+    REGISTER_SUCCESS_VOICE("REGISTER_SUCCESS_VOICE","访客信息登记成功提示音"),
+    READ_IDCARD_VOICE("READ_IDCARD_VOICE","刷身份证提示音"),
+    INPUT_IDCARD_VOICE("INPUT_IDCARD_VOICE","输身份证号提示音"),
+    INPUT_PHONE_VOICE("INPUT_PHONE_VOICE","输手机号提示音"),
+    CONNECT_SEARCH_VOICE("CONNECT_SEARCH_VOICE","联网信息查询提示音"),
+    SIGN_OUT_VOICE("SIGN_OUT_VOICE","签离扫码提示音"),
+    ;
+
+    private String code;
+    private String desc;
+}

+ 6 - 4
src/main/java/cn/hanghui/outapi/platform/tenant/entity/po/HhLocalDevice.java

@@ -2,6 +2,8 @@ package cn.hanghui.outapi.platform.tenant.entity.po;
 
 import cn.hanghui.outapi.platform.common.entity.po.Base;
 import cn.hanghui.outapi.platform.tenant.entity.dto.ManualInIdCardAuthDto;
+import cn.hanghui.outapi.platform.tenant.entity.enums.SetPersonalListEnum;
+import cn.hanghui.outapi.platform.tenant.entity.enums.SuccessShowPersonalInfoListEnum;
 import cn.hanghui.outapi.platform.tenant.typehandle.IntegerTypeHandler;
 import cn.hanghui.outapi.platform.tenant.typehandle.LongTypeHandler;
 import cn.hanghui.outapi.platform.tenant.typehandle.ManualInIdCardAuthHandler;
@@ -430,11 +432,11 @@ public class HhLocalDevice extends Base {
     private Boolean validTimeSwitch;
     @ApiModelProperty(value = "同人脸间隔时间(s)")
     private Integer sameFaceInterval;
-    /** @see cn.hanghui.outapi.platform.tenant.entity.enums.SuccessShowPersenalInfoListEnum */
+    /** @see SuccessShowPersonalInfoListEnum */
     @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 */
+    @TableField(value = "success_show_personal_info_json", typeHandler = IntegerTypeHandler.class)
+    private List<Integer> successShowPersonalInfoList;
+    /** @see SetPersonalListEnum */
     @ApiModelProperty(value = "“设置——人员列表”【控制设置页里的人员数据的信息】-枚举")
     @TableField(value = "set_personal_json", typeHandler = IntegerTypeHandler.class)
     private List<Integer> setPersonalList;

+ 6 - 4
src/main/java/cn/hanghui/outapi/platform/tenant/entity/po/HhLocalDeviceTemplate.java

@@ -2,6 +2,8 @@ package cn.hanghui.outapi.platform.tenant.entity.po;
 
 import cn.hanghui.outapi.platform.common.entity.po.Base;
 import cn.hanghui.outapi.platform.tenant.entity.dto.ManualInIdCardAuthDto;
+import cn.hanghui.outapi.platform.tenant.entity.enums.SetPersonalListEnum;
+import cn.hanghui.outapi.platform.tenant.entity.enums.SuccessShowPersonalInfoListEnum;
 import cn.hanghui.outapi.platform.tenant.typehandle.IntegerTypeHandler;
 import cn.hanghui.outapi.platform.tenant.typehandle.LongTypeHandler;
 import cn.hanghui.outapi.platform.tenant.typehandle.ManualInIdCardAuthHandler;
@@ -423,11 +425,11 @@ public class HhLocalDeviceTemplate extends Base {
     private Boolean validTimeSwitch;
     @ApiModelProperty(value = "同人脸间隔时间(s)")
     private Integer sameFaceInterval;
-    /** @see cn.hanghui.outapi.platform.tenant.entity.enums.SuccessShowPersenalInfoListEnum */
+    /** @see SuccessShowPersonalInfoListEnum */
     @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 */
+    @TableField(value = "success_show_personal_info_json", typeHandler = IntegerTypeHandler.class)
+    private List<Integer> successShowPersonalInfoList;
+    /** @see SetPersonalListEnum */
     @ApiModelProperty(value = "“设置——人员列表”【控制设置页里的人员数据的信息】-枚举")
     @TableField(value = "set_personal_json", typeHandler = IntegerTypeHandler.class)
     private List<Integer> setPersonalList;

+ 4 - 4
src/main/resources/application-api.yml

@@ -47,14 +47,14 @@ spring:
       datasource:
         master:
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://192.168.1.4:3306/hanghui_outapi_platform?characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://127.0.0.1:3306/hanghui_outapi_platform?characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
           username: root
-          password: Nqj##361
+          password: Nqj##117521
         mysqltiprove:
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://192.168.1.4:3306/ti_prove?characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://127.0.0.1:3306/ti_prove?characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
           username: root
-          password: Nqj##361
+          password: Nqj##117521
 
 --- # redis
 spring: