src/main/java/com/dpkj/modules/cardReader/constant/StatusConstant.java

@@ -1,139 +1,69 @@
 package com.dpkj.modules.cardReader.constant;
 
-/**
+public interface StatusConstant {
- * StatusConstant 枚举类，用于表示读卡器的各种状态。
+    // 执行成功
- * 该枚举包含了不同的状态码及其对应的状态描述，提供了根据状态码获取状态描述的方法。
+    String IFD_OK = "0";
- */
-public enum StatusConstant {
-    /**
-     * 执行成功
-     */
-    IFD_OK("0", "执行成功"),
-    /**
-     * 卡片类型不对
-     */
-    IFD_ICC_TypeError("-1", "卡片类型不对"),
-    /**
-     * 无卡
-     */
-    IFD_ICC_NoExist("-2", "无卡"),
-    /**
-     * 有卡未上电
-     */
-    IFD_ICC_NoPower("-3", "有卡未上电"),
-    /**
-     * 卡片无应答
-     */
-    IFD_ICC_NoResponse("-4", "卡片无应答"),
-    /**
-     * 卡片状态异常
-     */
-    IFD_ICC_StatusErr("-5", "卡片状态异常"),
-    /**
-     * 读写器执行指令失败
-     */
-    IFD_ICC_ExecuteErr("-6", "读写器执行指令失败"),
-    /**
-     * 读卡器连接错
-     */
-    IFD_ConnectError("-11", "读卡器连接错"),
-    /**
-     * 未建立连接(没有执行打开设备函数)
-     */
-    IFD_UnConnected("-12", "未建立连接(没有执行打开设备函数)"),
-    /**
-     * (动态库)不支持该命令
-     */
-    IFD_BadCommand("-13", "(动态库)不支持该命令"),
-    /**
-     * (发给动态库的)命令参数出错
-     */
-    IFD_ParameterError("-14", "(发给动态库的)命令参数出错"),
-    /**
-     * 信息校验和出错
-     */
-    IFD_CheckSumError("-15", "信息校验和出错"),
-    /**
-     * 超时
-     */
-    IFD_TimeOut("-16", "超时"),
-    /**
-     * 读取固件信息错误
-     */
-    IFD_ReadErr("-17", "读取固件信息错误"),
-    /**
-     * 底层返回数据长度错误
-     */
-    IFD_DeviceDataLen("-18", "底层返回数据长度错误"),
-    /**
-     * 卡片数据异常错误
-     */
-    IFD_CardDataErr("-19", "卡片数据异常错误"),
-    /**
-     * 标志位不支持
-     */
-    IFD_TAGNoExist("-20", "标志位不支持"),
-    /**
-     * 读取文件异常
-     */
-    IFD_FileDataErr("-21", "读取文件异常"),
-    /**
-     * 设备返回数据异常
-     */
-    IFD_DeviceDataErr("-22", "设备返回数据异常"),
-    /**
-     * 加载动态库失败
-     */
-    IFD_LoadDllError("-23", "加载动态库失败"),
-    /**
-     * 用户取消操作
-     */
-    IFD_UserCancel("-24", "用户取消操作"),
-    /**
-     * 密码长度错误
-     */
-    IFD_KeyLengthErr("-25", "密码长度错误");
 
-    private final String code;
+    // 卡片类型不对
-    private final String message;
+    String IFD_ICC_TypeError = "-1";
 
-    /**
+    // 无卡
-     * 构造函数，用于初始化枚举的状态码和状态信息
+    String IFD_ICC_NoExist = "-2";
-     * @param code 状态码
-     * @param message 状态信息
-     */
-    StatusConstant(String code, String message) {
-        this.code = code;
-        this.message = message;
-    }
 
-    /**
+    // 有卡未上电
-     * 获取状态码
+    String IFD_ICC_NoPower = "-3";
-     * @return 状态码
-     */
-    public String getCode() {
-        return code;
-    }
 
-    /**
+    // 卡片无应答
-     * 获取状态信息
+    String IFD_ICC_NoResponse = "-4";
-     * @return 状态信息
-     */
-    public String getMessage() {
-        return message;
-    }
 
-    /**
+    // 卡片状态异常
-     * 根据状态码获取相应的枚举实例
+    String IFD_ICC_StatusErr = "-5";
-     * @param code 状态码
+
-     * @return 对应的枚举实例，如果不存在则返回 null
+    // 读写器执行指令失败
-     */
+    String IFD_ICC_ExecuteErr = "-6";
-    public static String fromCode(String code) {
+
-        for (StatusConstant status : values()) {
+    // 读卡器连接错
-            if (status.code.equals(code)) {
+    String IFD_ConnectError = "-11";
-                return status.getMessage();
+
-            }
+    // 未建立连接(没有执行打开设备函数)
-        }
+    String IFD_UnConnected = "-12";
-        return null;
+
-    }
+    // (动态库)不支持该命令
+    String IFD_BadCommand = "-13";
+
+    // (发给动态库的)命令参数出错
+    String IFD_ParameterError = "-14";
+
+    // 信息校验和出错
+    String IFD_CheckSumError = "-15";
+
+    // 超时
+    String IFD_TimeOut = "-16";
+
+    // 读取固件信息错误
+    String IFD_ReadErr = "-17";
+
+    // 底层返回数据长度错误
+    String IFD_DeviceDataLen = "-18";
+
+    // 卡片数据异常错误
+    String IFD_CardDataErr = "-19";
+
+    // 标志位不支持
+    String IFD_TAGNoExist = "-20";
+
+    // 读取文件异常
+    String IFD_FileDataErr = "-21";
+
+    // 设备返回数据异常
+    String IFD_DeviceDataErr = "-22";
+
+    // 加载动态库失败
+    String IFD_LoadDllError = "-23";
+
+    // 用户取消操作
+    String IFD_UserCancel = "-24";
+
+    // 密码长度错误
+    String IFD_KeyLengthErr = "-25";
 }

src/main/java/com/dpkj/modules/cardReader/controller/CardReaderController.java

@@ -14,19 +14,20 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @Slf4j
 @RestController
-@RequestMapping("readCard")
+@RequestMapping("cardReader")
 public class CardReaderController {
     @Autowired
     private CardReaderService cardReaderService;
 
     /**
      * 连接设备并读取身份证信息
+     *
      * @return
      */
-    @GetMapping("IDCardReader")
+    @GetMapping("connectedDevice")
-    public Result IDCardReader() {
+    public Result<?> connectedDevice(@RequestParam(name = "devName") String devName) {
         try {
-            return cardReaderService.IDCardReader();
+            return cardReaderService.connectedDevice(devName);
         } catch (Exception e) {
             e.printStackTrace();
             log.info("设备连接失败 {}", e.getMessage());
@@ -37,12 +38,13 @@ public class CardReaderController {
 
     /**
      * 连接设备并读取社保卡信息
+     *
      * @return
      */
-    @GetMapping("SocialSecurityCardReader")
+    @GetMapping("readSocialSecurityCard")
-    public Result<?> SocialSecurityCardReader() {
+    public Result<?> readSocialSecurityCard(@RequestParam(name = "devName") String devName) {
         try {
-            return cardReaderService.SocialSecurityCardReader();
+            return cardReaderService.readSocialSecurityCard(devName);
         } catch (Exception e) {
             e.printStackTrace();
             log.info("连接设备并读取社保卡信息失败 {}", e.getMessage());

src/main/java/com/dpkj/modules/cardReader/service/CardReaderService.java

@@ -5,7 +5,7 @@ import com.dpkj.common.vo.Result;
 
 public interface CardReaderService {
 
-    Result IDCardReader();
+    Result<?> connectedDevice(String devName);
 
-    Result SocialSecurityCardReader();
+    Result<?> readSocialSecurityCard(String devName);
 }

src/main/java/com/dpkj/modules/cardReader/service/impl/CardReaderServiceImpl.java

@@ -4,88 +4,39 @@ import com.dpkj.common.vo.Result;
 import com.dpkj.modules.cardReader.service.CardReaderService;
 import com.dpkj.modules.cardReader.utils.CardReaderSdk;
 import com.dpkj.modules.cardReader.utils.CardReaderUtil;
-import com.dpkj.modules.cardReader.utils.SocialSecurityCardInfoVO;
+import com.dpkj.modules.cardReader.utils.IdCardInfo;
-import com.dpkj.modules.cardReader.utils.UserInfoVO;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+
 @Slf4j
 @Service
 public class CardReaderServiceImpl implements CardReaderService {
 
-    private CardReaderSdk cardReaderSdk = CardReaderUtil.getCardReaderSDK();
+    private final CardReaderSdk cardReaderSdk = CardReaderUtil.getCardReaderSDK();
-    @Value("${IDCardReader.waitingTime}")
-    private Long waitingTime;
 
     @Override
-    public Result IDCardReader() {
+    public Result<IdCardInfo> connectedDevice(String devName) {
         Long handle = null;
-        UserInfoVO userInfo = null;
-        try {
         // 连接指定设备与电脑端口，即打开端口
-            handle = cardReaderSdk.ICC_Reader_Open("USB1");
+        handle = cardReaderSdk.ICC_Reader_Open(devName);
         log.info("连接指定设备与电脑端口，即打开端口:{}", handle);
 
-            long startTime = System.currentTimeMillis();
+        IdCardInfo userInfo = new IdCardInfo(this.cardReaderSdk, handle);
-            while (true) {
-                try {
-                    Long idCard = cardReaderSdk.PICC_Reader_ReadIDCard(handle);
-                    userInfo = new UserInfoVO(cardReaderSdk);
-                    if (!"".equals(userInfo.getName()) && userInfo.getName() != null) {
-                        break;
-                    }
-                } catch (Exception e) {
-                    // 处理创建 UserInfoVO 时可能出现的异常
-                    log.info("创建 UserInfoVO 对象时发生异常", e);
-                }
-
-                long elapsedTime = System.currentTimeMillis() - startTime;
-                if (elapsedTime >= waitingTime) {
-                    log.info("读取 ID 卡信息超时，等待了 {} 秒。", waitingTime);
-                    return Result.error("读取 ID 卡信息超时，请重试。");
-                }
-                try {
-                    // 短暂休眠，避免 CPU 空转
-                    Thread.sleep(100);
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                }
-            }
         return Result.ok(userInfo);
-        } finally {
-            if (handle != null) {
-                // 不管什么情况最终都要关闭端口
-                cardReaderSdk.ICC_Reader_Close(handle);
-            }
-        }
     }
 
     @Override
-    public Result SocialSecurityCardReader() {
+    public Result<IdCardInfo> readSocialSecurityCard(String devName) {
+
         Long handle = null;
         try {
             // 连接指定设备与电脑端口，即打开端口
-            handle = cardReaderSdk.ICC_Reader_Open("USB1");
+            handle = cardReaderSdk.ICC_Reader_Open(devName);
             log.info("连接指定设备与电脑端口，即打开端口:{}", handle);
             // 读基本信息
-            String bas = cardReaderSdk.iReadCardBas(3);
+            String bas = cardReaderSdk.iReadCardBas(1);
             log.info("读基本信息:{}", bas);
-            String[] split = bas.split("\\|");
-            SocialSecurityCardInfoVO socialSecurityCardInfoVO = new SocialSecurityCardInfoVO();
-            // 区号代码截取
-            socialSecurityCardInfoVO.setAreaCode(split[0].substring(split[0].length() - 6));
-            socialSecurityCardInfoVO.setSocialSecurityNo(split[1]);
-            socialSecurityCardInfoVO.setCardNumber(split[2]);
-            socialSecurityCardInfoVO.setIdentificationCode(split[3]);
-            socialSecurityCardInfoVO.setName(split[4]);
-            socialSecurityCardInfoVO.setCardResetInformation(split[5]);
-            socialSecurityCardInfoVO.setSpecificationVersion(split[6]);
-            socialSecurityCardInfoVO.setIssuanceDate(split[7]);
-            socialSecurityCardInfoVO.setExpireDate(split[8]);
-            socialSecurityCardInfoVO.setTerminalNumber(split[9]);
-            socialSecurityCardInfoVO.setTerminalDeviceNumber(split[10]);
-            return Result.ok(socialSecurityCardInfoVO);
         } catch (Exception e) {
             log.error("Error occurred during card reader operation: ", e);
             if (handle != null) {
@@ -94,5 +45,6 @@ public class CardReaderServiceImpl implements CardReaderService {
             }
             return Result.error("操作失败：" + e.getMessage());
         }
+        return null;
     }
 }

src/main/java/com/dpkj/modules/cardReader/utils/CardReaderSdk.java

@@ -273,7 +273,7 @@ public interface CardReaderSdk extends Library {
      * @param ReaderHandle ICCReaderOpen函数所返回的值
      * @return 返回错误信息   = 0 表示成功,非0失败
      */
-    Long PICC_Reader_ReadIDCard(Long ReaderHandle);
+    Long PICC_Reader_ReadIDCard(Long ReaderHandle, byte[] errMsg);
 
     /** 以下函数须在 “PICC_Reader_ReadIDCard” 函数执行成功之后调用，否则获取不到有效信息 */
     /**

src/main/java/com/dpkj/modules/cardReader/utils/IdCardInfo.java

@@ -0,0 +1,181 @@
+package com.dpkj.modules.cardReader.utils;
+
+import com.dpkj.common.exception.RRException;
+import lombok.Data;
+
+import java.io.UnsupportedEncodingException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.function.Consumer;
+
+/**
+ * 有关身份证的基本信息
+ */
+@Data
+public class IdCardInfo {
+
+    /**
+     * 名字
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 民族
+     */
+    private String nation;
+
+    /**
+     * 出生日期
+     */
+    private LocalDateTime brith;
+
+    /**
+     * 住址
+     */
+    private String address;
+
+    /**
+     * 身份证号码
+     */
+    private String certNo;
+
+    /**
+     * 签发机关
+     */
+    private String department;
+
+    /**
+     * 有效日期
+     */
+    private LocalDateTime effectDate;
+
+    /**
+     * 截至日期
+     */
+    private LocalDateTime expireDate;
+
+    /**
+     * 外国人姓名
+     */
+    private String enName;
+
+    /**
+     * 外国人国籍
+     */
+    private String nationalityCode;
+
+    /**
+     * 注册过的sdk实例
+     */
+    private CardReaderSdk cardReaderSdk;
+
+    /**
+     * 是否有指纹
+     */
+    private Boolean fingerExist;
+
+    /**
+     * 指纹数据
+     */
+    private byte[] fingerData;
+
+    /**
+     * 港澳台通行证号码
+     */
+    private String TXZHM;
+
+    /**
+     * 港澳台通行证签发次数
+     */
+    private Integer TXZQFCS;
+
+    /**
+     * 外国人换证次数
+     */
+    private Integer HZCS;
+
+
+    public IdCardInfo(CardReaderSdk cardReaderSdk, Long handle){
+        if ( cardReaderSdk == null ){
+            throw new RRException("sdk初始化失败");
+        }
+        this.cardReaderSdk = cardReaderSdk;
+
+        byte[] errMsg = new byte[999];
+        cardReaderSdk.PICC_Reader_ReadIDCard(handle, errMsg);
+        try {
+            String gbk = new String(errMsg, "GBK").trim();
+            if (!gbk.equals("")) {
+                throw new RRException();
+            }
+        } catch (Exception e) {
+            throw new RRException("身份证信息读取失败");
+        }
+
+        this.name = this.convert2Str(this.cardReaderSdk::GetName, "姓名转换失败");
+        this.sex = this.convert2Str(this.cardReaderSdk::GetSex, "性别转换失败");
+        this.nation = this.convert2Str(this.cardReaderSdk::GetNation, "民族转换失败");
+        String br = this.convert2Str(this.cardReaderSdk::GetBirth, "出生日期转换失败");
+        if ( br != null && br != "" ){
+            this.brith = this.str2LocalDateTime(br);
+        }
+        this.address = this.convert2Str(this.cardReaderSdk::GetAddress, "住址转换失败");
+        this.certNo = this.convert2Str(this.cardReaderSdk::GetCertNo, "身份证转换失败");
+        this.department = this.convert2Str(this.cardReaderSdk::GetDepartemt, "签发机关转换失败");
+        String eff = this.convert2Str(this.cardReaderSdk::GetEffectDate, "过期时间转换失败");
+        if ( eff != null && eff != "" ){
+            this.effectDate = this.str2LocalDateTime(eff);
+        }
+        String exp = this.convert2Str(this.cardReaderSdk::GetExpireDate, "截至日期转换失败");
+        if ( exp != null && exp != "" ){
+            this.expireDate = this.str2LocalDateTime(exp);
+        }
+        this.enName = this.convert2Str(this.cardReaderSdk::GetEnName, "外国人姓名转换失败");
+        this.nationalityCode = this.convert2Str(this.cardReaderSdk::GetNationalityCode, "外国人国籍转换失败");
+//        this.fingerExist = this.cardReaderSdk.IsFingerExist() != 0;
+//        if ( this.fingerExist ) {
+//            this.fingerData = this.convert2Str(this.cardReaderSdk::GetFingerprint, "指纹数据转换失败").getBytes(StandardCharsets.UTF_8);
+//        }
+
+    }
+
+
+    private String convert2Str(Consumer<byte[]> function, String tip) {
+        byte[] param = new byte[256];
+        function.accept(param);
+        try {
+            // 检查字节数组是否为空或者只包含值为 0 的字节
+            boolean isAllZero = true;
+            for (byte b : param) {
+                if (b != 0) {
+                    isAllZero = false;
+                    break;
+                }
+            }
+
+            if (isAllZero) {
+                return null;
+            }
+
+            return new String(param, "GBK").trim();
+        }catch (Exception e){
+            throw new RRException(tip == null ? "参数转换失败" : tip);
+        }
+    }
+
+    private LocalDateTime str2LocalDateTime(String str){
+        // 定义日期格式化器
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+        // 将字符串解析为 LocalDate
+        LocalDate localDate = LocalDate.parse(str, formatter);
+        // 将 LocalDate 转换为 LocalDateTime，设置时间为 00:00:00
+        return localDate.atStartOfDay();
+    }
+
+}

src/main/java/com/dpkj/modules/cardReader/utils/SocialSecurityCardInfoVO.java

@@ -1,29 +0,0 @@
-package com.dpkj.modules.cardReader.utils;
-
-import lombok.Data;
-
-@Data
-public class SocialSecurityCardInfoVO {
-    // 发卡地区行政区划代码
-    private String areaCode;
-    // 社会保障号码
-    private String socialSecurityNo;
-    // 卡号
-    private String cardNumber;
-    // 卡识别码
-    private String identificationCode;
-    // 姓名
-    private String name;
-    // 卡复位信息
-    private String cardResetInformation;
-    // 规范版本
-    private String specificationVersion;
-    // 发卡日期
-    private String issuanceDate;
-    // 卡有效期
-    private String expireDate;
-    // 终端机编号
-    private String terminalNumber;
-    // 终端设备号
-    private String terminalDeviceNumber;
-}

src/main/java/com/dpkj/modules/cardReader/utils/UserInfoVO.java

@@ -1,73 +0,0 @@
-package com.dpkj.modules.cardReader.utils;
-
-import com.dpkj.common.exception.RRException;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.function.Consumer;
-
-@Data
-public class UserInfoVO {
-
-    // 姓名
-    private String name;
-    // 性别
-    private String sex;
-    // 民族
-    private String nation;
-    // 出生年月
-    private String born;
-    // 地址
-    private String address;
-    // 身份证号
-    private String IDCardNo;
-    // 签发机关
-    private String grantDept;
-    // 有效期开始日期
-
-    private String userLifeBegin;
-    // 有效期过期时间
-    private String userLifeEnd;
-    @JsonIgnore
-    private CardReaderSdk cardReaderSdk;
-
-    public UserInfoVO(CardReaderSdk cardReaderSdk) {
-        if (cardReaderSdk == null) {
-            throw new RRException("sdk初始化失败");
-        }
-        this.cardReaderSdk = cardReaderSdk;
-        this.name = this.convert2Str(this.cardReaderSdk::GetName, "姓名转换失败");
-        this.sex = this.convert2Str(this.cardReaderSdk::GetSex, "性别转换失败");
-        this.nation = this.convert2Str(this.cardReaderSdk::GetNation, "民族转换失败");
-        this.born = this.convert2Str(this.cardReaderSdk::GetBirth, "出生日期转换失败");
-        this.address = this.convert2Str(this.cardReaderSdk::GetAddress, "住址转换失败");
-        this.IDCardNo = this.convert2Str(this.cardReaderSdk::GetCertNo, "身份证转换失败");
-        this.grantDept = this.convert2Str(this.cardReaderSdk::GetDepartemt, "签发机关转换失败");
-        this.userLifeBegin = this.convert2Str(this.cardReaderSdk::GetEffectDate, "有效期开始日期转换失败");
-        this.userLifeEnd = this.convert2Str(this.cardReaderSdk::GetExpireDate, "有效期截至日期转换失败");
-
-    }
-
-    private String convert2Str(Consumer<byte[]> function, String tip) {
-        byte[] param = new byte[256];
-        function.accept(param);
-        try {
-            return new String(param, "GBK").trim();
-        } catch (Exception e) {
-            throw new RRException(tip == null ? "参数转换失败" : tip);
-        }
-    }
-
-    private LocalDateTime str2LocalDateTime(String str) {
-        // 定义日期格式化器
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
-        // 将字符串解析为 LocalDate
-        LocalDate localDate = LocalDate.parse(str, formatter);
-        // 将 LocalDate 转换为 LocalDateTime，设置时间为 00:00:00
-        return localDate.atStartOfDay();
-    }
-
-}

src/main/resources/application-dev.yml

@@ -11,7 +11,3 @@ dpkj:
     # 波特率 串口连接下使用
     baud-rate:
 
-# 身份证读取等待时间
-IDCardReader:
-  waitingTime: 30000
-

src/main/resources/application-pro.yml

@@ -11,7 +11,3 @@ dpkj:
     # 波特率 串口连接下使用
     baud-rate:
 
-# 身份证读取等待时间
-IDCardReader:
-  waitingTime: 30000
-