门锁，自定义门锁，员工门锁添加卡片开锁信息，指纹开锁信息

src/main/java/com/template/controller/PasswordIssController.java

@@ -220,6 +220,8 @@ public class PasswordIssController {
             unlocking.setStartTime(start);
             unlocking.setEndTime(end);
             unlocking.setType("4");
+//            添加卡号
+            unlocking.setCard(ciq.getCard());
 
 
             return unlocking;
@@ -265,7 +267,8 @@ public class PasswordIssController {
             unlocking.setStartTime(start);
             unlocking.setEndTime(end);
             unlocking.setType("4");
-
+//            添加指纹
+            unlocking.setFingerprintData(fd.getFingerprintData());
 
             return unlocking;
 
@@ -427,6 +430,8 @@ public class PasswordIssController {
             unlocking.setStartTime(startTime);
             unlocking.setEndTime(endTime);
             unlocking.setType(keyCardDto.getType());
+//            添加卡号
+            unlocking.setCard(keyCardDto.getCard());
 
             return unlocking;
         } catch (Exception e) {
@@ -474,6 +479,8 @@ public class PasswordIssController {
             unlocking.setStartTime(startTime);
             unlocking.setEndTime(endTime);
             unlocking.setType(keyFingerprintDto.getType());
+//            添加指纹
+            unlocking.setFingerprintData(keyFingerprintDto.getFingerprintData());
 
             return unlocking;
         } catch (Exception e) {
@@ -571,6 +578,7 @@ public class PasswordIssController {
         System.out.println("l = " + l);
     }
 
+//    添加密码
     public UnlockingCustom saveCustomPassWord(CustomKeyPassWordDto dto) {
 //        将时间转成时间戳
         String startTime = dto.getStartTime();
@@ -625,6 +633,7 @@ public class PasswordIssController {
 
     }
 
+//添加卡片
     public UnlockingCustom addCustomCard(CustomKeyCardDto dto) {
         //        将时间转成时间戳
         String startTime = dto.getStartTime();
@@ -667,13 +676,15 @@ public class PasswordIssController {
             unlocking.setStartTime(startTime);
             unlocking.setEndTime(endTime);
             unlocking.setType(dto.getType());
-
+//            添加卡号
+            unlocking.setCard(dto.getCard());
             return unlocking;
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
     }
 
+//    添加指纹
     public UnlockingCustom addCustomFingerprintDto(CustomKeyFingerprintDto dto) {
         //        将时间转成时间戳
         String startTime = dto.getStartTime();
@@ -710,6 +721,8 @@ public class PasswordIssController {
             unlocking.setStartTime(startTime);
             unlocking.setEndTime(endTime);
             unlocking.setType(dto.getType());
+//            添加指纹
+            unlocking.setFingerprintData(dto.getFingerprintData());
 
             return unlocking;
         } catch (Exception e) {

src/main/java/com/template/model/pojo/Unlocking.java

@@ -49,6 +49,12 @@ public class Unlocking implements Serializable {
     @ApiModelProperty(value = "开锁密码")
     private String passWord;
 
+    @ApiModelProperty(value = "卡号")
+    private String card;
+
+    @ApiModelProperty(value = "指纹")
+    private String fingerprintData;
+
     @ApiModelProperty(value = "开始时间")
     private String startTime;
 

src/main/java/com/template/model/pojo/UnlockingAdmin.java

@@ -53,6 +53,13 @@ public class UnlockingAdmin implements Serializable {
     @ApiModelProperty(value = "开锁密码")
     private String passWord;
 
+
+    @ApiModelProperty(value = "卡号")
+    private String card;
+
+    @ApiModelProperty(value = "指纹")
+    private String fingerprintData;
+
     @ApiModelProperty(value = "开始时间")
     private String startTime;
 

src/main/java/com/template/model/pojo/UnlockingCustom.java

@@ -53,6 +53,12 @@ public class UnlockingCustom implements Serializable {
     @ApiModelProperty(value = "开锁密码")
     private String passWord;
 
+    @ApiModelProperty(value = "卡号")
+    private String card;
+
+    @ApiModelProperty(value = "指纹")
+    private String fingerprintData;
+
     @ApiModelProperty(value = "开始时间")
     private String startTime;
 

src/main/java/com/template/model/pojo/UnlockingEmployee.java

@@ -58,6 +58,12 @@ public class UnlockingEmployee implements Serializable {
     @ApiModelProperty(value = "开锁密码")
     private String passWord;
 
+    @ApiModelProperty(value = "卡号")
+    private String card;
+
+    @ApiModelProperty(value = "指纹")
+    private String fingerprintData;
+
     @ApiModelProperty(value = "开始时间")
     private String startTime;
 

src/main/java/com/template/model/vo/UnlockingEmployeeVo.java

@@ -31,6 +31,12 @@ public class UnlockingEmployeeVo {
     @ApiModelProperty(value = "开锁密码")
     private String passWord;
 
+    @ApiModelProperty(value = "卡号")
+    private String card;
+
+    @ApiModelProperty(value = "指纹")
+    private String fingerprintData;
+
     @ApiModelProperty(value = "开始时间")
     private String startTime;
 

src/main/java/com/template/model/vo/UnlockingKeyVo.java

@@ -1,5 +1,6 @@
 package com.template.model.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -18,4 +19,10 @@ public class UnlockingKeyVo {
 
     private String createTime;
 
+    @ApiModelProperty(value = "卡号")
+    private String card;
+
+    @ApiModelProperty(value = "指纹")
+    private String fingerprintData;
+
 }

src/main/resources/mapper/template/UnlockingMapper.xml

@@ -3,16 +3,18 @@
 <mapper namespace="com.template.mapper.UnlockingMapper">
 
     <select id="key" resultType="com.template.model.vo.UnlockingKeyVo">
-        SELECT u.type           as type,
-               u.lock_user_id   as lockUserId,
-               u.luid           as luid,
-               u.lock_status    as lockStatus,
-               u.pass_word      as passWord,
-               u.start_time     as startTime,
-               u.end_time       as endTime,
-               ho.live_name     as name,
-               ho.reserve_phone as phone,
-               u.create_time    as createTime
+        SELECT u.type             as type,
+               u.lock_user_id     as lockUserId,
+               u.luid             as luid,
+               u.lock_status      as lockStatus,
+               u.pass_word        as passWord,
+               u.start_time       as startTime,
+               u.end_time         as endTime,
+               ho.live_name       as name,
+               ho.reserve_phone   as phone,
+               u.create_time      as createTime,
+               u.card             as card,
+               u.fingerprint_data as fingerprintData
         FROM `unlocking` u
                  LEFT JOIN house_order ho on ho.order_number = u.order_number and ho.deleted = 0
         where u.deleted = 0