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

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

@@ -141,6 +141,7 @@ public interface RemoteDutyService {
 
     /**
      * 指纹录入
+     * num 一体机编号
      * @param xxpUserAuthVo
      * @return
      */

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

@@ -15,145 +15,47 @@ import java.util.List;
  * @date 2023-03-22
  */
 @ApiModel("信息牌人员权限")
-public class XxpUserAuthVo extends BaseEntity {
-
-    /**
-     * 主键
-     */
-    private Long id;
-
+public class XxpUserAuthVo {
     /**
      * 人员id
      */
-    @ApiModelProperty(value = "人员id",required=true)
+    @ApiModelProperty(value = "人员id", required = true)
     private Long userId;
 
     /**
      * 人员姓名
      */
-    @ApiModelProperty(value = "人员姓名")
+    @ApiModelProperty(value = "人员姓名", required = true)
     private String userName;
 
-
-    /**
-     * 实验室id
-     */
-    @ApiModelProperty(value = "实验室id",required = true)
-    private Integer subjectId;
-
-    /**
-     * 实验室名称
-     */
-    @ApiModelProperty(value = "实验室名称")
-    private String subjectName;
-
     /**
-     * 授权方式
+     * 设备编号
      */
-    @ApiModelProperty(value = "授权方式")
-    private String  authType;
+    @ApiModelProperty(value = "设备编号", required = true)
+    private String num;
 
     /**
      * 人员类型
      */
-    @ApiModelProperty(value = "人员类型")
+    @ApiModelProperty(value = "人员类型", required = true)
     private String userType;
 
     /**
-     * 部门id
-     */
-    @ApiModelProperty(value = "部门id ")
-    private Long deptId;
-
-    /**
-     * 部门名称
-     */
-    @ApiModelProperty(value = "部门名称 ")
-    private String deptName;
-
-    /**
      * 指纹
      */
-    @ApiModelProperty(value = "指纹 ",required = true)
+    @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;
+    @ApiModelProperty(value = "指纹位置 ", required = true)
+    private String fingerKey;
 
-    /***
-     * 结束时间
-     */
-    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;
     }
@@ -166,28 +68,12 @@ public class XxpUserAuthVo extends BaseEntity {
         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 String getNum() {
+        return num;
     }
 
-    public void setAuthType(String authType) {
-        this.authType = authType;
+    public void setNum(String num) {
+        this.num = num;
     }
 
     public String getUserType() {
@@ -198,26 +84,6 @@ public class XxpUserAuthVo extends BaseEntity {
         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;
     }
@@ -226,45 +92,16 @@ public class XxpUserAuthVo extends BaseEntity {
         this.finger = finger;
     }
 
-    public String getUserPassword() {
-        return userPassword;
+    public String getFingerKey() {
+        return fingerKey;
     }
 
-    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;
+    public void setFingerKey(String fingerKey) {
+        this.fingerKey = fingerKey;
     }
+}
 
-    @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

@@ -418,7 +418,7 @@ public class LabBoardApi {
      */
     @ApiOperation(value = "指纹录入")
     @PostMapping(value = "/addUserFinger")
-    public ResultData addUserFinger(@RequestParam("num") String num,@RequestBody XxpUserAuthVo xxpUserAuthVo) {
+    public ResultData addUserFinger(@RequestBody XxpUserAuthVo xxpUserAuthVo) {
         ResultData resultData=remoteDutyService.addUserAuth(xxpUserAuthVo);
         return resultData;
     }

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

@@ -169,18 +169,26 @@ public class LabXxpUserAuthController extends BaseController
      */
     @ApiOperation(value = "电子信息牌指纹录入")
     @PostMapping("/addUserAuth")
-    public ResultData addUserAuth(@RequestParam String num, @RequestBody XxpUserAuthVo xxpUserAuthVo)
+    public ResultData addUserAuth(@RequestBody XxpUserAuthVo xxpUserAuthVo)
     {
-        XxpCardInfo xxpCardInfo=iXxpCardInfoService.selectXxpInfoByCard(num);
+        XxpCardInfo xxpCardInfo=iXxpCardInfoService.selectXxpInfoByCard(xxpUserAuthVo.getNum());
         if(null==xxpCardInfo){
             return ResultData.fail("电子班牌查询错误");
         }
         XxpUserAuth xxpUserAuth=new XxpUserAuth();
+        xxpUserAuth.setUserId(xxpUserAuthVo.getUserId());
+        xxpUserAuth.setUserName(xxpUserAuthVo.getUserName());
+        xxpUserAuth.setUserType(xxpUserAuthVo.getUserType());
         xxpUserAuth.setSubjectId(xxpCardInfo.getSubjectId());
         xxpUserAuth.setSubjectName(xxpCardInfo.getSubjectName());
         xxpUserAuth.setDeptId(xxpCardInfo.getCollegeId());
         xxpUserAuth.setDeptName(xxpCardInfo.getCollege());
-        return ResultData.result(xxpUserAuthService.insertXxpUserAppAuthBatch(xxpUserAuthVo,xxpUserAuth));
+        xxpUserAuth.setCreateBy(xxpUserAuthVo.getUserName());
+        xxpUserAuth.setCreateTime(new Date());
+        xxpUserAuth.setHardwareId(xxpCardInfo.getId());
+        xxpUserAuth.setFinger(xxpUserAuthVo.getFinger());
+        xxpUserAuth.setFingerKey(xxpUserAuthVo.getFingerKey());
+        return ResultData.result(xxpUserAuthService.insertXxpUserAppAuth(xxpUserAuth));
     }
 
 

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

@@ -57,6 +57,16 @@ public interface XxpUserAuthMapper
      */
     public int deleteXxpUserAuthById(Long id);
 
+
+
+    /**
+     * 删除
+     *
+     * @param userId 用户ID
+     * @return 结果
+     */
+    public int deleteXxpByUserId(Long userId);
+
     /**
      * 批量删除
      *

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

@@ -60,7 +60,7 @@ public interface IXxpUserAuthService
      * @param xxpUserAuth
      * @return 结果
      */
-    public int insertXxpUserAppAuthBatch(XxpUserAuthVo xxpUserAuthVo,XxpUserAuth xxpUserAuth);
+    public int insertXxpUserAppAuth(XxpUserAuth xxpUserAuth);
 
 
 
@@ -94,4 +94,13 @@ public interface IXxpUserAuthService
      * @return
      */
     List<Map<String, Object>> getFingerByUserId(Long userId);
+
+
+    /**
+     * 批量删除
+     *
+     * @param userId 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteXxpByUserId(Long userId);
 }

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

@@ -107,14 +107,8 @@ public class XxpUserAuthServiceImpl implements IXxpUserAuthService
     }
 
     @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;
+    public int insertXxpUserAppAuth(XxpUserAuth xxpUserAuth) {
+         return xxpUserAuthMapper.insertXxpUserAuth(xxpUserAuth);
     }
 
     /**
@@ -157,4 +151,15 @@ public class XxpUserAuthServiceImpl implements IXxpUserAuthService
     public List<Map<String, Object>> getFingerByUserId(Long userId) {
         return xxpUserAuthMapper.getFingerByUserId(userId);
     }
+
+    /**
+     * 批量删除
+     *
+     * @param userId 需要删除的数据主键集合
+     * @return 结果
+     */
+    @Override
+    public int deleteXxpByUserId(Long userId){
+        return xxpUserAuthMapper.deleteXxpByUserId(userId);
+    }
 }

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

@@ -117,7 +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="fingerKey != null">#{fingerKey},</if>
             <if test="finger != null">#{finger},</if>
             <if test="userPassword != null">#{userPassword},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -154,6 +154,12 @@
         where id = #{id}
     </delete>
 
+    <delete id="deleteXxpByUserId">
+        delete
+        from xxp_user_auth
+        where user_id = #{user_id}
+    </delete>
+
     <delete id="deleteXxpUserAuthByIds">
         delete from xxp_user_auth where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">