diff --git a/cloud/dahua/src/main/java/com/example/dahua/async/SendUserInfoTask2.java b/cloud/dahua/src/main/java/com/example/dahua/async/SendUserInfoTask2.java index cc110b7..de48636 100644 --- a/cloud/dahua/src/main/java/com/example/dahua/async/SendUserInfoTask2.java +++ b/cloud/dahua/src/main/java/com/example/dahua/async/SendUserInfoTask2.java @@ -598,10 +598,6 @@ public class SendUserInfoTask2 { * @return */ public boolean deleteFaceByCard(Integer schoolId,String cardNum,String deviceId) { - if(Objects.isNull(schoolId) && StringUtils.isEmpty(cardNum) && StringUtils.isEmpty(deviceId)){ - log.error("删除人脸时,学校ID、卡号、设备ID不能为空."); - return false; - } if(MyTask.lLongSendMap.get(deviceId) ==null){ log.error("设备不在线"); return false; @@ -611,11 +607,7 @@ public class SendUserInfoTask2 { log.error("此卡号:{},未查询到相应学生信息。",cardNum); return false; } - String userId = userDao.getUerIdWithNumTest(cardNum,schoolId); - if(StringUtils.isEmpty(userId)){ - log.error("删除人脸时,用户卡号不存在。"); - return false; - } + String userId = studentBean.getUser_id(); List attendanceBeanList = userDao.queryClintList(schoolId,deviceId); if(attendanceBeanList.size()>0){ for(AttendanceBean bean : attendanceBeanList){ @@ -624,6 +616,7 @@ public class SendUserInfoTask2 { String recordNo = userDao.getRecordNo(userId, deviceId); if(StringUtils.isEmpty(recordNo)){ log.info("删除人脸时,该用户卡号未添加过人脸"); + continue; } if(GateModule2.deleteUser(userId,MyTask.lLongSendMap.get(deviceId)) ==0){ userDao.deleteRecordNoTest(userId,deviceId); diff --git a/cloud/dahua/src/main/java/com/example/dahua/control/UserOperateController.java b/cloud/dahua/src/main/java/com/example/dahua/control/UserOperateController.java index 18bca18..a230fab 100644 --- a/cloud/dahua/src/main/java/com/example/dahua/control/UserOperateController.java +++ b/cloud/dahua/src/main/java/com/example/dahua/control/UserOperateController.java @@ -87,7 +87,9 @@ public class UserOperateController { @RequestMapping(value = "deleteFaceByCard", method = RequestMethod.GET) @ApiOperation(value = "21服务器根据卡号删除人脸") - public boolean deleteFaceByCard(Integer schoolId,String cardNum,String deviceId) { + public boolean deleteFaceByCard(@RequestParam Integer schoolId, + @RequestParam String cardNum, + @RequestParam(required = false) String deviceId) { return sendUserInfoTask.deleteFaceByCard(schoolId,cardNum,deviceId); } -- libgit2 0.21.0