刷卡，接口优化 2023-04-07

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

@@ -182,14 +182,14 @@ public interface RemoteDutyService {
     /**
      * 验证密码是否正确
      *
-     * @param cardNum   电子班牌号码
+     * @param num   电子班牌号码
      * @param pwd       用户密码
-     * @param subjectId 实验室id
+     * @param labId 实验室id
      * @param userId    用户id
      * @return
      */
     @RequestMapping("/XxpCardInfo/pwdValidate")
-    ResultData pwdValidate(@RequestParam("cardNum") String cardNum, @RequestParam("pwd") String pwd, @RequestParam("subjectId") Long subjectId, @RequestParam("userId") Long userId);
+    ResultData pwdValidate(@RequestParam("num") String num, @RequestParam("pwd") String pwd, @RequestParam("labId") Long labId, @RequestParam("userId") Long userId);
 
     /**
      * 判断是不是实验室管理员或者安全责任人

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

@@ -112,7 +112,7 @@ public class RemoteDutyFailback implements FallbackFactory<RemoteDutyService> {
             }
 
             @Override
-            public ResultData pwdValidate(String cardNum, String pwd, Long subjectId, Long userId) {
+            public ResultData pwdValidate(String num, String pwd, Long labId, Long userId) {
                 return ResultData.fail("密码对比失败：" + cause.getMessage());
             }
 

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

@@ -472,16 +472,16 @@ public class LabBoardApi {
 
     /**
      * 密码验证
-     * @param cardNum
+     * @param num
      * @param pwd
-     * @param subjectId
+     * @param labId
      * @param userId
      * @return
      */
     @ApiOperation(value = "密码验证")
     @GetMapping(value = "/pwdValidate")
-    public ResultData pwdValidate(@RequestParam("cardNum") String cardNum,@RequestParam("pwd") String pwd,@RequestParam("subjectId") Long subjectId,@RequestParam("userId") Long userId){
-        return remoteDutyService.pwdValidate(cardNum,pwd,subjectId,userId);
+    public ResultData pwdValidate(@RequestParam("num") String num,@RequestParam("pwd") String pwd,@RequestParam("labId") Long labId,@RequestParam("userId") Long userId){
+        return remoteDutyService.pwdValidate(num,pwd,labId,userId);
     }
 
     /**

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

@@ -191,19 +191,19 @@ public class LabXxpCardInfoController extends BaseController {
     /**
      * 验证密码是否正确
      *
-     * @param cardNum 电子班牌号码
+     * @param num 电子班牌号码
      * @param pwd 用户密码
-     * @param subjectId 实验室id
+     * @param labId 实验室id
      * @param userId 用户id
      * @return
      */
     @RequestMapping("/pwdValidate")
-    public ResultData pwdValidate(String cardNum, String pwd,Long subjectId, Long userId) {
-        Map<String,Object> map=iLabSecurityApplyService.selectCountLabSecurityUserId(subjectId,userId);
+    public ResultData pwdValidate(String num, String pwd,Long labId, Long userId) {
+        Map<String,Object> map=iLabSecurityApplyService.selectCountLabSecurityUserId(labId,userId);
         if(null==map){
             return ResultData.fail("未获得实验室准入资格；");
         }
-        int count = xxpCardInfoService.selectPwdCountByPwd(cardNum, pwd);
+        int count = xxpCardInfoService.selectPwdCountByPwd(num, pwd);
         if (count == 0) {
             return ResultData.fail("密码输入错误，请重新输入；");
         }
@@ -213,9 +213,9 @@ public class LabXxpCardInfoController extends BaseController {
         if(userType.equals("22") || (userType.equals("11") && isWhite.equals("0"))){
             map.put("pageType",2);
         }
-        int num=iLabSubjectService.isAdminOrSafeUser(subjectId,userId);
+        int number=iLabSubjectService.isAdminOrSafeUser(labId,userId);
         //一类首页对应身份为白名单老师、实验室负责人、安全责任人
-        if(num>0 || (userType.equals("11") && isWhite.equals("1"))){
+        if(number>0 || (userType.equals("11") && isWhite.equals("1"))){
             map.put("pageType",1);
         }
         map.remove("isWhite");