m

src/main/java/cn/hanghui/outapi/platform/tenant/entity/config/device/template/DeviceTemplateDto.java

@@ -237,4 +237,8 @@ public class DeviceTemplateDto {
     @NotBlank(message = "用户信息输出模式不能为空")
     private String userOutputMode;
 
+    @ApiModelProperty(value = "身份证阅读器品牌 IdCardReaderBrandEnum")
+    @NotNull(message = "请选择身份证阅读器品牌")
+    private Integer idCardReaderBrand;
+
 }

src/main/java/cn/hanghui/outapi/platform/tenant/entity/config/iot/template/IotDeviceConfigTemplateDto.java

@@ -67,10 +67,6 @@ public class IotDeviceConfigTemplateDto {
     @NotNull(message = "请选择是否启用身份证功能")
     private Boolean useIdcard;
 
-    @ApiModelProperty(value = "身份证阅读器模式 1-在线身份证(默认) 2-离线身份证")
-    @NotNull(message = "请选择身份证阅读器模式")
-    private Integer idNumberReaderType;
-
     @ApiModelProperty(value = "启用二维码功能 false-不启用 true-启用(默认)")
     @NotNull(message = "请选择是否启用二维码功能")
     private Boolean useQrcode;
@@ -132,7 +128,6 @@ public class IotDeviceConfigTemplateDto {
     private Boolean isMirror;
 
 
-
     @ApiModelProperty(value = "在线日志推送地址")
     private String logPushUrl;
     /**
@@ -151,4 +146,13 @@ public class IotDeviceConfigTemplateDto {
     @ApiModelProperty(value = "是否应用侧获取三要素 false-否 true-是")
     @NotNull(message = "请选择是否应用侧获取三要素")
     private Boolean isAppGetUserInfo;
+
+    @Deprecated
+    @ApiModelProperty(value = "身份证阅读器模式 1-在线身份证(默认) 2-离线身份证")
+    private Integer idNumberReaderType;
+
+    @ApiModelProperty(value = "身份证阅读器品牌 IdCardReaderBrandEnum")
+    private Integer idCardReaderBrand;
+
+
 }

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

@@ -3,10 +3,13 @@ package cn.hanghui.outapi.platform.tenant.entity.dto;
 import cn.hanghui.outapi.platform.tenant.entity.enums.CameraBrandEnum;
 import cn.hanghui.outapi.platform.tenant.entity.enums.CameraTypeEnum;
 import cn.hanghui.outapi.platform.tenant.entity.enums.EntryFaceModeEnum;
+import cn.hanghui.outapi.platform.tenant.entity.enums.IdCardReaderBrandEnum;
 import cn.hanghui.outapi.platform.tenant.entity.enums.UserOutputModeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+
 @Data
 public class DeviceDefaultParam {
 
@@ -159,6 +162,9 @@ public class DeviceDefaultParam {
     @ApiModelProperty(value = "用户信息输出模式")
     public static  String defaultUserOutputMode = UserOutputModeEnum.NO_OUTPUT.getCode();
 
+    @ApiModelProperty(value = "身份证阅读器品牌 IdCardReaderBrandEnum")
+    public static Integer defaultIdCardReaderBrand = IdCardReaderBrandEnum.NFC.getCode();
+
     @ApiModelProperty(value = "zoloConfig摄像头配置")
     public static ZoloConfigDto initZoloConfig() {
         ZoloConfigDto dto = new ZoloConfigDto();

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

@@ -256,6 +256,10 @@ public class DeviceDto {
     @NotBlank(message = "用户信息输出模式不能为空")
     private String userOutputMode;
 
+    @ApiModelProperty(value = "身份证阅读器品牌 IdCardReaderBrandEnum")
+    @NotNull(message = "请选择身份证阅读器品牌")
+    private Integer idCardReaderBrand;
+
 
 
 }

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 @Data
 public class DeviceOpConfigDto {
@@ -198,4 +199,5 @@ public class DeviceOpConfigDto {
      */
     @ApiModelProperty(value = "用户信息输出模式  NoOutput:不输出（默认）， AnalogSignal:阅读器模拟信号")
     private String userOutputMode;
+
 }

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

@@ -256,5 +256,8 @@ public class DeviceVo {
     @ApiModelProperty(value = "用户信息输出模式  NoOutput:不输出（默认）， AnalogSignal:阅读器模拟信号")
     private String userOutputMode;
 
+    @ApiModelProperty(value = "身份证阅读器品牌 IdCardReaderBrandEnum")
+    private Integer idCardReaderBrand;
+
 
 }

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

@@ -8,6 +8,7 @@ import lombok.Data;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * @author shisl
@@ -47,6 +48,8 @@ public class IotDeviceAppletConfigVo {
     private Boolean useAlipayFace;
     @ApiModelProperty(value = "启用身份证功能 false-不启用 true-启用(默认)")
     private Boolean useIdcard;
+
+    @Deprecated
     @ApiModelProperty(value = "身份证阅读器模式 1-在线身份证(默认) 2-离线身份证")
     private Integer idNumberReaderType;
     @ApiModelProperty(value = "启用二维码功能 false-不启用 true-启用(默认)")
@@ -127,6 +130,7 @@ public class IotDeviceAppletConfigVo {
     @ApiModelProperty(value = "是否应用侧获取三要素 false-否 true-是")
     private Boolean isAppGetUserInfo;
 
-
+    @ApiModelProperty(value = "身份证阅读器品牌 IdCardReaderBrandEnum")
+    private Integer idCardReaderBrand;
 
 }

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

@@ -30,9 +30,8 @@ public class IotDeviceAppletUpdateConfigDto {
     private Boolean useAlipayFace;
     @ApiModelProperty(value = "启用身份证功能 false-不启用 true-启用(默认)")
     private Boolean useIdcard;
+    @Deprecated
     @ApiModelProperty(value = "身份证阅读器模式 1-在线身份证(默认) 2-离线身份证")
-    @Min(value = 1,message = "请选择正确的身份证阅读器模式")
-    @Max(value = 2,message = "请选择正确的身份证阅读器模式")
     private Integer idNumberReaderType;
     @ApiModelProperty(value = "启用二维码功能 false-不启用 true-启用(默认)")
     private Boolean useQrcode;

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

@@ -71,9 +71,8 @@ public class IotDeviceConfigDto {
     @ApiModelProperty(value = "启用身份证功能 false-不启用 true-启用(默认)")
     @NotNull(message = "请选择是否启用身份证功能")
     private Boolean useIdcard;
-
+    @Deprecated
     @ApiModelProperty(value = "身份证阅读器模式 1-在线身份证(默认) 2-离线身份证")
-    @NotNull(message = "请选择身份证阅读器模式")
     private Integer idNumberReaderType;
 
     @ApiModelProperty(value = "启用二维码功能 false-不启用 true-启用(默认)")
@@ -155,4 +154,8 @@ public class IotDeviceConfigDto {
     @NotNull(message = "请选择是否应用侧获取三要素")
     private Boolean isAppGetUserInfo;
 
+    @ApiModelProperty(value = "身份证阅读器品牌 IdCardReaderBrandEnum")
+    @NotNull(message = "请选择身份证阅读器品牌")
+    private Integer idCardReaderBrand;
+
 }

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 @Data
@@ -229,4 +230,7 @@ public class TenantVo implements Serializable {
     @ApiModelProperty(value = "用户信息输出模式  NoOutput:不输出（默认）， AnalogSignal:阅读器模拟信号")
     private String userOutputMode;
 
+    @ApiModelProperty(value = "身份证阅读器品牌 IdCardReaderBrandEnum")
+    private Integer idCardReaderBrand;
+
 }

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

@@ -0,0 +1,44 @@
+package cn.hanghui.outapi.platform.tenant.entity.enums;
+
+import cn.hanghui.outapi.platform.common.utils.Preconditions;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author shisl
+ * @package cn.hanghui.outapi.platform.tenant.entity.enums
+ * @class IdCardReaderBrandEnum
+ * @date 2024/3/12 下午1:21
+ * @description
+ */
+@AllArgsConstructor
+@Getter
+public enum IdCardReaderBrandEnum {
+
+    NFC(1, "NFC在线阅读器"),
+    TB(2, "天波阅读器"),
+    DX(3, "东信阅读器"),
+    XZX(4, "新中新阅读器"),
+    DK(5, "德卡阅读器"),
+    JL(6, "精伦阅读器"),
+    HS(7, "华视阅读器"),
+    ZAWL(8, "中安未来离线护照机阅读器模块"),
+    ;
+
+    public static IdCardReaderBrandEnum getEnumByCode(Integer code) {
+        if (Preconditions.isBlank(code)) {
+            return null;
+        }
+        for (IdCardReaderBrandEnum enumObject : values()) {
+            if (enumObject.code == code.intValue()) {
+                return enumObject;
+            }
+        }
+        return null;
+    }
+
+    private int code;
+    private String desc;
+
+
+}

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -326,6 +327,9 @@ public class Device extends Base {
     @ApiModelProperty(value = "用户信息输出模式  NoOutput:不输出（默认）， AnalogSignal:阅读器模拟信号")
     private String userOutputMode;
 
+    @ApiModelProperty(value = "身份证阅读器品牌 IdCardReaderBrandEnum")
+    private Integer idCardReaderBrand;
+
 
 
 }

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

@@ -17,6 +17,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * <p>
@@ -265,4 +266,7 @@ public class DeviceTemplate extends Base {
      */
     @ApiModelProperty(value = "用户信息输出模式  NoOutput:不输出（默认）， AnalogSignal:阅读器模拟信号")
     private String userOutputMode;
+
+    @ApiModelProperty(value = "身份证阅读器品牌 IdCardReaderBrandEnum")
+    private Integer idCardReaderBrand;
 }

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

@@ -12,6 +12,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+
 /**
  * <p>
  * iot设备配置
@@ -181,5 +184,8 @@ public class IotDeviceConfig extends Base {
     @ApiModelProperty(value = "是否应用侧获取三要素 false-否 true-是")
     private Boolean isAppGetUserInfo;
 
+    @ApiModelProperty(value = "身份证阅读器品牌 IdCardReaderBrandEnum")
+    private Integer idCardReaderBrand;
+
 
 }

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

@@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * <p>
@@ -153,4 +154,7 @@ public class IotDeviceConfigTemplate extends Base {
     @ApiModelProperty(value = "是否应用侧获取三要素 false-否 true-是")
     private Boolean isAppGetUserInfo;
 
+    @ApiModelProperty(value = "身份证阅读器品牌 IdCardReaderBrandEnum")
+    private Integer idCardReaderBrand;
+
 }

src/main/java/cn/hanghui/outapi/platform/tenant/service/impl/DeviceTemplateServiceImpl.java

@@ -1,6 +1,8 @@
 package cn.hanghui.outapi.platform.tenant.service.impl;
 
+import cn.hanghui.outapi.platform.common.entity.rest.RestCode;
 import cn.hanghui.outapi.platform.common.utils.ClassUtil;
+import cn.hanghui.outapi.platform.common.utils.Preconditions;
 import cn.hanghui.outapi.platform.tenant.entity.config.device.template.DeviceTemplateDto;
 import cn.hanghui.outapi.platform.tenant.entity.config.device.template.DeviceTemplateLessVo;
 import cn.hanghui.outapi.platform.tenant.entity.config.device.template.DeviceTemplateSearch;
@@ -111,6 +113,12 @@ public class DeviceTemplateServiceImpl implements DeviceTemplateService {
         //用户信息输出模式
         UserOutputModeEnum userOutputModeEnum = UserOutputModeEnum.getEnumByCode(dto.getUserOutputMode());
         ClassUtil.throwBusinessException(ObjectUtil.isNull(userOutputModeEnum), "用户信息输出模式不存在");
+
+        //身份证阅读器品牌
+        if (Preconditions.isNotBlank(dto.getIdCardReaderBrand())) {
+            IdCardReaderBrandEnum idCardReaderBrandEnum = IdCardReaderBrandEnum.getEnumByCode(dto.getIdCardReaderBrand());
+            ClassUtil.throwBusinessException(ObjectUtil.isNull(idCardReaderBrandEnum), RestCode.FAIL.getCode(),"身份证阅读器品牌不存在");
+        }
     }
 
     @Override

src/main/java/cn/hanghui/outapi/platform/tenant/service/impl/IotDeviceConfigServiceImpl.java

@@ -1,11 +1,14 @@
 package cn.hanghui.outapi.platform.tenant.service.impl;
 
+import cn.hanghui.outapi.platform.common.entity.rest.RestCode;
 import cn.hanghui.outapi.platform.common.entity.rest.RestResult;
 import cn.hanghui.outapi.platform.common.service.BaseService;
 import cn.hanghui.outapi.platform.common.utils.ClassUtil;
+import cn.hanghui.outapi.platform.common.utils.Preconditions;
 import cn.hanghui.outapi.platform.tenant.entity.dto.*;
 import cn.hanghui.outapi.platform.tenant.entity.enums.CameraBrandEnum;
 import cn.hanghui.outapi.platform.tenant.entity.enums.CameraTypeEnum;
+import cn.hanghui.outapi.platform.tenant.entity.enums.IdCardReaderBrandEnum;
 import cn.hanghui.outapi.platform.tenant.entity.enums.ModeEnum;
 import cn.hanghui.outapi.platform.tenant.entity.enums.SystemTypeEnum;
 import cn.hanghui.outapi.platform.tenant.entity.po.*;
@@ -26,8 +29,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-import java.util.Date;
 import java.util.Map;
 
 /**
@@ -126,6 +127,13 @@ public class IotDeviceConfigServiceImpl extends BaseService implements IotDevice
         //摄像头品牌
         CameraBrandEnum cameraBrandEnum = CameraBrandEnum.getEnumByCode(dto.getCameraBrand());
         ClassUtil.throwBusinessException(ObjectUtil.isNull(cameraBrandEnum),"摄像品牌不存在");
+
+        //身份证阅读器品牌
+        if (Preconditions.isNotBlank(dto.getIdCardReaderBrand())) {
+            IdCardReaderBrandEnum idCardReaderBrandEnum = IdCardReaderBrandEnum.getEnumByCode(dto.getIdCardReaderBrand());
+            ClassUtil.throwBusinessException(ObjectUtil.isNull(idCardReaderBrandEnum), RestCode.FAIL.getCode(),"身份证阅读器品牌不存在");
+        }
+
     }
 
     @Override
@@ -234,6 +242,7 @@ public class IotDeviceConfigServiceImpl extends BaseService implements IotDevice
         ClassUtil.throwBusinessException(ObjectUtil.isNull(config), "数据不存在或已删除");
         ClassUtil.throwBusinessException(!config.getStatus(), "设备商户平台未授权");
         IotDeviceAppletConfigVo configVo = BeanUtil.copyProperties(config, IotDeviceAppletConfigVo.class);
+        configVo.setIdNumberReaderType(config.getIdCardReaderBrand());
         this.dataInsert(configVo, config);
         return configVo;
     }

src/main/java/cn/hanghui/outapi/platform/tenant/service/impl/IotDeviceConfigTemplateServiceImpl.java

@@ -1,13 +1,15 @@
 package cn.hanghui.outapi.platform.tenant.service.impl;
 
+import cn.hanghui.outapi.platform.common.entity.rest.RestCode;
 import cn.hanghui.outapi.platform.common.utils.ClassUtil;
+import cn.hanghui.outapi.platform.common.utils.Preconditions;
 import cn.hanghui.outapi.platform.tenant.entity.config.iot.template.IotDeviceConfigTemplateDto;
 import cn.hanghui.outapi.platform.tenant.entity.config.iot.template.IotDeviceConfigTemplateLessVo;
 import cn.hanghui.outapi.platform.tenant.entity.config.iot.template.IotDeviceConfigTemplateSearch;
 import cn.hanghui.outapi.platform.tenant.entity.config.iot.template.IotDeviceConfigTemplateVo;
-import cn.hanghui.outapi.platform.tenant.entity.dto.IotDeviceConfigDto;
 import cn.hanghui.outapi.platform.tenant.entity.enums.CameraBrandEnum;
 import cn.hanghui.outapi.platform.tenant.entity.enums.CameraTypeEnum;
+import cn.hanghui.outapi.platform.tenant.entity.enums.IdCardReaderBrandEnum;
 import cn.hanghui.outapi.platform.tenant.entity.enums.ModeEnum;
 import cn.hanghui.outapi.platform.tenant.entity.enums.SystemTypeEnum;
 import cn.hanghui.outapi.platform.tenant.entity.po.*;
@@ -109,6 +111,11 @@ public class IotDeviceConfigTemplateServiceImpl implements IotDeviceConfigTempla
         //摄像头品牌
         CameraBrandEnum cameraBrandEnum = CameraBrandEnum.getEnumByCode(dto.getCameraBrand());
         ClassUtil.throwBusinessException(ObjectUtil.isNull(cameraBrandEnum),"摄像品牌不存在");
+        //身份证阅读器品牌
+        if (Preconditions.isNotBlank(dto.getIdCardReaderBrand())) {
+            IdCardReaderBrandEnum idCardReaderBrandEnum = IdCardReaderBrandEnum.getEnumByCode(dto.getIdCardReaderBrand());
+            ClassUtil.throwBusinessException(ObjectUtil.isNull(idCardReaderBrandEnum), RestCode.FAIL.getCode(),"身份证阅读器品牌不存在");
+        }
     }
     @Override
     public List<IotDeviceConfigTemplateLessVo> iotDeviceConfigTemplateList() {

src/main/java/cn/hanghui/outapi/platform/tenant/service/impl/TenantServiceImpl.java

@@ -3,6 +3,7 @@ package cn.hanghui.outapi.platform.tenant.service.impl;
 import cn.hanghui.outapi.platform.alipay.entity.rest.request.AlipayAppAuthCancelledMqRequest;
 import cn.hanghui.outapi.platform.common.entity.rest.RestResult;
 import cn.hanghui.outapi.platform.common.utils.ClassUtil;
+import cn.hanghui.outapi.platform.common.utils.Preconditions;
 import cn.hanghui.outapi.platform.tenant.entity.dto.DeviceDefaultParam;
 import cn.hanghui.outapi.platform.tenant.entity.dto.DeviceDto;
 import cn.hanghui.outapi.platform.tenant.entity.dto.DeviceOpConfigDto;
@@ -207,7 +208,7 @@ public class TenantServiceImpl implements TenantService {
         item.setEntryFaceMode(StrUtil.isNotBlank(device.getEntryFaceMode()) ? device.getEntryFaceMode() : DeviceDefaultParam.entryFaceMode);
         //TODO 20240228添加参数
         item.setUserOutputMode(StrUtil.isNotBlank(device.getUserOutputMode()) ? device.getUserOutputMode() : DeviceDefaultParam.defaultUserOutputMode);
-
+        item.setIdCardReaderBrand(Preconditions.isNotBlank(device.getIdCardReaderBrand()) ? device.getIdCardReaderBrand() : DeviceDefaultParam.defaultIdCardReaderBrand);
     }
 
     @Override