信息牌接口 指纹和刷卡 2023-04-05

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/face/feign/FaceCompare.java

@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @Date: 2021/10/12/17:54
  * @Description:
  */
-@ApiModel("人脸对比提交参数")
+@ApiModel("提交参数")
 public class FaceCompare {
     @ApiModelProperty("userId")
     private Long userId;

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/feign/RemoteDutyService.java

@@ -1,6 +1,7 @@
 package com.zd.laboratory.api.feign;
 
 import com.zd.laboratory.api.feign.fallback.RemoteDutyFailback;
+import com.zd.laboratory.api.vo.XxpUserAuthVo;
 import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.domain.ResultData;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -137,4 +138,29 @@ public interface RemoteDutyService {
     @RequestMapping("/apply/app/securityNumList")
     ResultData securityNumList(@RequestParam("labId") Long labId);
 
+
+    /**
+     * 指纹录入
+     * @param xxpUserAuthVo
+     * @return
+     */
+    @RequestMapping("/XxpUserAuth/addUserAuth")
+    ResultData addUserAuth(@RequestBody XxpUserAuthVo xxpUserAuthVo);
+
+
+    /**
+     * 根据用户id查询指纹信息
+     * @param userId
+     * @return
+     */
+    @RequestMapping("/XxpUserAuth/getFingerByUserId")
+    ResultData getFingerByUserId(@RequestParam("userId") Long userId);
+
+    /**
+     * 根据用户id查询指纹信息
+     * @param id
+     * @return
+     */
+    @RequestMapping("/XxpUserAuth/deleteFingerById")
+    ResultData deleteFingerById(@RequestParam("id") Long id);
 }

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/feign/fallback/RemoteDutyFailback.java

@@ -1,6 +1,7 @@
 package com.zd.laboratory.api.feign.fallback;
 
 import com.zd.laboratory.api.feign.RemoteDutyService;
+import com.zd.laboratory.api.vo.XxpUserAuthVo;
 import com.zd.model.domain.ResultData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -94,6 +95,21 @@ public class RemoteDutyFailback implements FallbackFactory<RemoteDutyService> {
             public ResultData securityNumList(Long labId) {
                 return ResultData.fail("电子信息牌获取准入人员的指纹信息列表：" + cause.getMessage());
             }
+
+            @Override
+            public ResultData addUserAuth(XxpUserAuthVo xxpUserAuthVo) {
+                return ResultData.fail("指纹录入失败：" + cause.getMessage());
+            }
+
+            @Override
+            public ResultData getFingerByUserId(Long userId) {
+                return ResultData.fail("根据用户获取指纹列表失败：" + cause.getMessage());
+             }
+
+            @Override
+            public ResultData deleteFingerById(Long id) {
+                return ResultData.fail("删除指纹失败：" + cause.getMessage());
+            }
         };
     }
 }

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/vo/XxpUserAuthVo.java

@@ -0,0 +1,270 @@
+package com.zd.laboratory.api.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zd.model.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 信息牌人员权限表 对象 xxp_user_auth
+ *
+ * @author xxf
+ * @date 2023-03-22
+ */
+@ApiModel("信息牌人员权限")
+public class XxpUserAuthVo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 人员id
+     */
+    @ApiModelProperty(value = "人员id",required=true)
+    private Long userId;
+
+    /**
+     * 人员姓名
+     */
+    @ApiModelProperty(value = "人员姓名")
+    private String userName;
+
+
+    /**
+     * 实验室id
+     */
+    @ApiModelProperty(value = "实验室id",required = true)
+    private Integer subjectId;
+
+    /**
+     * 实验室名称
+     */
+    @ApiModelProperty(value = "实验室名称")
+    private String subjectName;
+
+    /**
+     * 授权方式
+     */
+    @ApiModelProperty(value = "授权方式")
+    private String  authType;
+
+    /**
+     * 人员类型
+     */
+    @ApiModelProperty(value = "人员类型")
+    private String userType;
+
+    /**
+     * 部门id
+     */
+    @ApiModelProperty(value = "部门id ")
+    private Long deptId;
+
+    /**
+     * 部门名称
+     */
+    @ApiModelProperty(value = "部门名称 ")
+    private String deptName;
+
+    /**
+     * 指纹
+     */
+    @ApiModelProperty(value = "指纹 ",required = true)
+    private String finger;
+
+    /**
+     * 密码
+     */
+    @ApiModelProperty(value = "密码")
+    private String userPassword;
+
+    /**
+     * 硬件id
+     */
+    @ApiModelProperty(value = "硬件id")
+    private Long hardwareId;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModel("指纹信息")
+    public class FingerVo{
+        @ApiModelProperty(value = "指纹key",required = true)
+        private String fingerKey;
+        @ApiModelProperty(value = "指纹",required = true)
+        private String finger;
+
+        public String getFingerKey() {
+            return fingerKey;
+        }
+
+        public void setFingerKey(String fingerKey) {
+            this.fingerKey = fingerKey;
+        }
+
+        public String getFinger() {
+            return finger;
+        }
+
+        public void setFinger(String finger) {
+            this.finger = finger;
+        }
+    }
+    @ApiModelProperty(value = "指纹vo列表",required = true)
+    private List<FingerVo> fingerVoList;
+
+    public List<FingerVo> getFingerVoList() {
+        return fingerVoList;
+    }
+
+    public void setFingerVoList(List<FingerVo> fingerVoList) {
+        this.fingerVoList = fingerVoList;
+    }
+
+    /***
+     * 开始时间
+     */
+    private String beginTime;
+
+    /***
+     * 结束时间
+     */
+    private String endTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Override
+    public Long getUserId() {
+        return userId;
+    }
+
+    @Override
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    public String getAuthType() {
+        return authType;
+    }
+
+    public void setAuthType(String authType) {
+        this.authType = authType;
+    }
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
+    @Override
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    @Override
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    @Override
+    public String getDeptName() {
+        return deptName;
+    }
+
+    @Override
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public String getFinger() {
+        return finger;
+    }
+
+    public void setFinger(String finger) {
+        this.finger = finger;
+    }
+
+    public String getUserPassword() {
+        return userPassword;
+    }
+
+    public void setUserPassword(String userPassword) {
+        this.userPassword = userPassword;
+    }
+
+    public Long getHardwareId() {
+        return hardwareId;
+    }
+
+    public void setHardwareId(Long hardwareId) {
+        this.hardwareId = hardwareId;
+    }
+
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(String beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+}

zd-modules/zd-base/src/main/java/com/zd/base/app/controller/LabBoardApi.java

@@ -8,6 +8,7 @@ import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.FileConfigUtils;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.laboratory.api.feign.RemoteDutyService;
+import com.zd.laboratory.api.vo.XxpUserAuthVo;
 import com.zd.model.constant.HttpStatus;
 import com.zd.model.domain.R;
 import com.zd.model.domain.ResultData;
@@ -39,8 +40,6 @@ public class LabBoardApi {
     @Autowired
     private RemoteXxpService remoteXxpService;
     @Autowired
-    private TokenService tokenService;
-    @Autowired
     private FileConfigUtils fileConfigUtils;
 
     /**
@@ -410,4 +409,46 @@ public class LabBoardApi {
         }
         return ResultData.success(isOpen);
     }
+
+
+    /**
+     * 电子信息牌指纹录入
+     * @param xxpUserAuthVo
+     * @return
+     */
+    @ApiOperation(value = "指纹录入")
+    @PostMapping(value = "/addUserFinger")
+    public ResultData addUserFinger(@RequestParam("num") String num,@RequestBody XxpUserAuthVo xxpUserAuthVo) {
+        ResultData resultData=remoteDutyService.addUserAuth(xxpUserAuthVo);
+        return resultData;
+    }
+
+
+    /**
+     * 根据用户查询指纹列表
+     * @param userId
+     * @return
+     */
+    @ApiOperation(value = "根据用户查询指纹列表")
+    @GetMapping(value = "/getFingerByUserId")
+    public ResultData getFingerByUserId(@RequestParam Long userId){
+        ResultData resultData=remoteDutyService.getFingerByUserId(userId);
+        return resultData;
+    }
+
+
+    /**
+     * 根据id删除指纹
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "根据id删除指纹")
+    @GetMapping(value = "/deleteFingerById")
+    public ResultData deleteFingerById(@RequestParam Long id){
+        ResultData resultData=remoteDutyService.deleteFingerById(id);
+        if(null==resultData || resultData.getCode()!=HttpStatus.SUCCESS){
+             return ResultData.fail("删除指纹失败");
+        }
+        return ResultData.success();
+    }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpUserAuthController.java

@@ -9,7 +9,12 @@ import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.DictUtils;
 import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
+import com.zd.laboratory.api.vo.XxpUserAuthVo;
+import com.zd.laboratory.domain.LabSubject;
+import com.zd.laboratory.domain.XxpCardInfo;
 import com.zd.laboratory.domain.XxpUserAuth;
+import com.zd.laboratory.service.ILabSubjectService;
+import com.zd.laboratory.service.IXxpCardInfoService;
 import com.zd.laboratory.service.IXxpUserAuthService;
 import com.zd.model.domain.ResultData;
 import com.zd.model.domain.per.PerFun;
@@ -41,10 +46,7 @@ public class LabXxpUserAuthController extends BaseController
     private IXxpUserAuthService xxpUserAuthService;
 
     @Autowired
-    private TokenService tokenService;
-
-    @Autowired
-    RedisService redisService;
+    private IXxpCardInfoService iXxpCardInfoService;
 
     /**
      * 查询列表
@@ -160,4 +162,50 @@ public class LabXxpUserAuthController extends BaseController
         return ResultData.result(xxpUserAuthService.deleteXxpUserAuthById(id));
     }
 
+    /**
+     * 电子信息牌指纹录入
+     * @param xxpUserAuthVo
+     * @return
+     */
+    @ApiOperation(value = "电子信息牌指纹录入")
+    @PostMapping("/addUserAuth")
+    public ResultData addUserAuth(@RequestParam String num, @RequestBody XxpUserAuthVo xxpUserAuthVo)
+    {
+        XxpCardInfo xxpCardInfo=iXxpCardInfoService.selectXxpInfoByCard(num);
+        if(null==xxpCardInfo){
+            return ResultData.fail("电子班牌查询错误");
+        }
+        XxpUserAuth xxpUserAuth=new XxpUserAuth();
+        xxpUserAuth.setSubjectId(xxpCardInfo.getSubjectId());
+        xxpUserAuth.setSubjectName(xxpCardInfo.getSubjectName());
+        xxpUserAuth.setDeptId(xxpCardInfo.getCollegeId());
+        xxpUserAuth.setDeptName(xxpCardInfo.getCollege());
+        return ResultData.result(xxpUserAuthService.insertXxpUserAppAuthBatch(xxpUserAuthVo,xxpUserAuth));
+    }
+
+
+    /**
+     * 根据用户id查询指纹信息
+     * @param userId
+     * @return
+     */
+    @GetMapping("/getFingerByUserId")
+    public ResultData getFingerByUserId(@RequestParam Long userId)
+    {
+        List<Map<String,Object>> mapList= xxpUserAuthService.getFingerByUserId(userId);
+        return ResultData.success(mapList);
+    }
+
+
+    /**
+     * 根据用户id查询指纹信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/deleteFingerById")
+    public ResultData deleteFingerById(@RequestParam Long id)
+    {
+        return ResultData.result(xxpUserAuthService.deleteXxpUserAuthById(id));
+    }
+
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/LabSubject.java

@@ -86,6 +86,13 @@ public class LabSubject extends BaseEntity implements QCInterface {
     @ApiModelProperty("创建人")
     @Excel(name = "创建人", readConverterExp = "用=于数据权限")
     private Long userId;
+
+
+    /**
+     * 创建人（用于数据权限）
+     */
+    @ApiModelProperty("创建人名称")
+    private Long userName;
     /**
      * 是否是实验室
      */
@@ -640,4 +647,40 @@ public class LabSubject extends BaseEntity implements QCInterface {
     public void setHardwareType(Integer hardwareType) {
         this.hardwareType = hardwareType;
     }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Boolean getDel() {
+        return isDel;
+    }
+
+    public void setDel(Boolean del) {
+        isDel = del;
+    }
+
+    public Long getUserName() {
+        return userName;
+    }
+
+    public void setUserName(Long userName) {
+        this.userName = userName;
+    }
+
+    public Long getIsSubject() {
+        return isSubject;
+    }
+
+    public void setIsSubject(Long isSubject) {
+        this.isSubject = isSubject;
+    }
+
+    public Long getSubOrder() {
+        return subOrder;
+    }
+
+    public void setSubOrder(Long subOrder) {
+        this.subOrder = subOrder;
+    }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/XxpUserAuth.java

@@ -52,7 +52,7 @@ public class XxpUserAuth extends BaseEntity {
      */
     @Excel(name = "实验室id")
     @ApiModelProperty(value = "实验室id")
-    private Integer subjectId;
+    private Long subjectId;
 
     /**
      * 实验室名称
@@ -110,6 +110,14 @@ public class XxpUserAuth extends BaseEntity {
     @ApiModelProperty(value = "硬件id")
     private Long hardwareId;
 
+
+    /**
+     * 手指标识
+     */
+    @Excel(name = "手指标识")
+    @ApiModelProperty(value = "手指标识")
+    private String fingerKey;
+
     /**
      * 创建时间
      */
@@ -168,4 +176,6 @@ public class XxpUserAuth extends BaseEntity {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
+
+
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/LabSubjectMapper.java

@@ -320,4 +320,11 @@ public interface LabSubjectMapper {
      * @return
      */
     String getSubjectNameById(Long id);
+
+    /**
+     * 根据实验室编号查询实验室信息
+     * @param number
+     * @return
+     */
+    LabSubject selectLabSubjectByNum(String number);
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/XxpCardInfoMapper.java

@@ -68,4 +68,12 @@ public interface XxpCardInfoMapper
      * @return
      */
     List<Map<String,Object>> selectXxpCardInfoByCard(String cardNum);
+
+
+    /**
+     * 根据电子信息牌查询
+     * @param cardNum
+     * @return
+     */
+    XxpCardInfo selectXxpInfoByCard(String cardNum);
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/XxpUserAuthMapper.java

@@ -65,4 +65,10 @@ public interface XxpUserAuthMapper
      */
     public int deleteXxpUserAuthByIds(Long[] ids);
 
+    /**
+     * 根据用户id查询指纹信息
+     * @param userId
+     * @return
+     */
+    List<Map<String, Object>> getFingerByUserId(Long userId);
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/ILabSubjectService.java

@@ -297,4 +297,14 @@ public interface ILabSubjectService {
      * @return
      */
     public List<LabSubject> cardinfoSubList(LabSubject labSubject);
+
+
+    /**
+     * 查询实验室根据编号
+     *
+     * @param number 实验室编号
+     * @return 实验室
+     */
+    public LabSubject selectLabSubjectByNum(String number);
+
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/IXxpCardInfoService.java

@@ -71,4 +71,11 @@ public interface IXxpCardInfoService
      * @return
      */
     public List<Map<String,Object>> selectXxpCardInfoByCard(String card);
+
+    /**
+     * 根据电子信息牌查询
+     * @param cardNum
+     * @return
+     */
+    XxpCardInfo selectXxpInfoByCard(String cardNum);
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/IXxpUserAuthService.java

@@ -1,5 +1,6 @@
 package com.zd.laboratory.service;
 
+import com.zd.laboratory.api.vo.XxpUserAuthVo;
 import com.zd.laboratory.domain.XxpDuty;
 import com.zd.laboratory.domain.XxpInspection;
 import com.zd.laboratory.domain.XxpUserAuth;
@@ -52,8 +53,19 @@ public interface IXxpUserAuthService
     public int insertXxpUserAuthBatch(XxpUserAuth xxpUserAuth);
 
 
+
+    /**
+     * 新增
+     *
+     * @param xxpUserAuth
+     * @return 结果
+     */
+    public int insertXxpUserAppAuthBatch(XxpUserAuthVo xxpUserAuthVo,XxpUserAuth xxpUserAuth);
+
+
+
     /**
-     * 修改
+     * 新增
      *
      * @param xxpUserAuth
      * @return 结果
@@ -76,4 +88,10 @@ public interface IXxpUserAuthService
      */
     public int deleteXxpUserAuthById(Long id);
 
+    /**
+     * 根据用户id查询指纹信息
+     * @param userId
+     * @return
+     */
+    List<Map<String, Object>> getFingerByUserId(Long userId);
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSubjectServiceImpl.java

@@ -569,4 +569,9 @@ public class LabSubjectServiceImpl implements ILabSubjectService {
     public List<LabSubject> cardinfoSubList(LabSubject labSubject) {
         return labSubjectMapper.cardinfoSubList(labSubject);
     }
+
+    @Override
+    public LabSubject selectLabSubjectByNum(String number) {
+        return labSubjectMapper.selectLabSubjectByNum(number);
+    }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/XxpCardInfoServiceImpl.java

@@ -152,4 +152,14 @@ public class XxpCardInfoServiceImpl implements IXxpCardInfoService
     public List<Map<String,Object>> selectXxpCardInfoByCard(String cardNum) {
         return xxpCardInfoMapper.selectXxpCardInfoByCard(cardNum);
     }
+
+    /**
+     * 根据电子信息牌查询
+     * @param cardNum
+     * @return
+     */
+    @Override
+    public XxpCardInfo selectXxpInfoByCard(String cardNum) {
+        return xxpCardInfoMapper.selectXxpInfoByCard(cardNum);
+    }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/XxpUserAuthServiceImpl.java

@@ -4,6 +4,7 @@ import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.StringUtils;
+import com.zd.laboratory.api.vo.XxpUserAuthVo;
 import com.zd.laboratory.domain.XxpDuty;
 import com.zd.laboratory.domain.XxpUserAuth;
 import com.zd.laboratory.domain.vo.XxpDutyVO;
@@ -105,6 +106,17 @@ public class XxpUserAuthServiceImpl implements IXxpUserAuthService
         return 1;
     }
 
+    @Override
+    public int insertXxpUserAppAuthBatch(XxpUserAuthVo xxpUserAuthVo,XxpUserAuth xxpUserAuth) {
+       List<XxpUserAuthVo.FingerVo> fingerVoList=xxpUserAuthVo.getFingerVoList();
+       for(XxpUserAuthVo.FingerVo fingerVo: fingerVoList){
+           xxpUserAuth.setFingerKey(fingerVo.getFingerKey());
+           xxpUserAuth.setFinger(fingerVo.getFinger());
+           xxpUserAuthMapper.insertXxpUserAuth(xxpUserAuth);
+       }
+        return 0;
+    }
+
     /**
      * 修改巡查
      *
@@ -140,4 +152,9 @@ public class XxpUserAuthServiceImpl implements IXxpUserAuthService
     public int deleteXxpUserAuthById(Long id) {
         return xxpUserAuthMapper.deleteXxpUserAuthById(id);
     }
+
+    @Override
+    public List<Map<String, Object>> getFingerByUserId(Long userId) {
+        return xxpUserAuthMapper.getFingerByUserId(userId);
+    }
 }

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSubjectMapper.xml

@@ -1245,7 +1245,12 @@
     <select id="getSubjectDetailsById" resultType="java.lang.String">
         SELECT details FROM  lab_subject WHERE id=#{id} AND is_del=0
     </select>
+
     <select id="getSubjectNameById" resultType="java.lang.String">
            SELECT name as subjectName FROM  lab_subject WHERE id=#{id} AND is_del=0
     </select>
+
+    <select id="selectLabSubjectByNum" resultMap="LabSubjectResult">
+           SELECT  ls.id,ls.name,ls.dept_id,ls.dept_name  FROM  lab_subject ls INNER JOIN `xxp_card_info` xci ON ls.id=xci.subject_id WHERE ls.is_del=0 AND xci.card_num=#{number}
+    </select>
 </mapper>

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/XxpCardInfoMapper.xml

@@ -93,6 +93,10 @@
          ORDER BY id DESC
     </select>
 
+    <select id="selectXxpInfoByCard" resultMap="XxpCardInfoResult">
+         SELECT  ls.id subject_id,ls.name subject_name,ls.dept_id college_id,ls.dept_name college,xci.id id  FROM  lab_subject ls INNER JOIN `xxp_card_info` xci ON ls.id=xci.subject_id WHERE ls.is_del=0 AND xci.card_num=#{cardNum}
+    </select>
+
     <insert id="insertXxpCardInfo" parameterType="com.zd.laboratory.domain.XxpCardInfo">
         insert into xxp_card_info
         <trim prefix="(" suffix=")" suffixOverrides=",">

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/XxpUserAuthMapper.xml

@@ -15,6 +15,7 @@
         <result property="hardwareId" column="hardware_id"/>
         <result property="deptId" column="dept_id"/>
         <result property="deptName" column="dept_name"/>
+        <result property="fingerKey" column="finger_key"/>
         <result property="finger" column="finger"/>
         <result property="userPassword" column="user_password"/>
         <result property="updateBy" column="update_by"/>
@@ -84,10 +85,9 @@
         where t.id = #{id}
     </select>
 
-
-
-
-
+    <select id="getFingerByUserId" resultType="java.util.Map">
+        SELECT id AS id, finger as finger,finger_key as fingerKey FROM  `xxp_user_auth` WHERE user_id=#{userId}
+    </select>
 
     <insert id="insertXxpUserAuth" parameterType="com.zd.laboratory.domain.XxpUserAuth">
         insert into xxp_user_auth
@@ -101,6 +101,7 @@
             <if test="hardwareId != null">hardware_id,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="deptName != null">dept_name,</if>
+            <if test="fingerKey != null">finger_key,</if>
             <if test="finger != null">finger,</if>
             <if test="userPassword != null">user_password,</if>
             <if test="createBy != null">create_by,</if>
@@ -116,6 +117,7 @@
             <if test="hardwareId != null">#{hardwareId},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="deptName != null">#{deptName},</if>
+            <if test="fingerKey != null">fingerKey,</if>
             <if test="finger != null">#{finger},</if>
             <if test="userPassword != null">#{userPassword},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -135,6 +137,7 @@
             <if test="hardwareId != null">hardware_id = #{hardwareId},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="deptName != null">dept_name = #{deptName},</if>
+            <if test="fingerKey != null">finger_key = #{fingerKey},</if>
             <if test="finger != null">finger = #{finger},</if>
             <if test="userPassword != null">user_password = #{userPassword},</if>
             <if test="createBy != null">create_by = #{createBy},</if>