陶汉栋 / MyCloud

Download as
Browse Code »

Commit 0135242b5493211f8410fff3ac235359e960a569

Authored by 徐泉
1 parent ab8cfc43
Exists in master

修改提交

Showing 2 changed files with 5 additions and 10 deletions   Show diff stats
cloud/dahua/src/main/java/com/example/dahua/async/SendUserInfoTask2.java
  Diff comments   View file @0135242
... ... @@ -598,10 +598,6 @@ public class SendUserInfoTask2 {
598 598 * @return
599 599 */
600 600 public boolean deleteFaceByCard(Integer schoolId,String cardNum,String deviceId) {
601   - if(Objects.isNull(schoolId) && StringUtils.isEmpty(cardNum) && StringUtils.isEmpty(deviceId)){
602   - log.error("删除人脸时，学校ID、卡号、设备ID不能为空.");
603   - return false;
604   - }
605 601 if(MyTask.lLongSendMap.get(deviceId) ==null){
606 602 log.error("设备不在线");
607 603 return false;
... ... @@ -611,11 +607,7 @@ public class SendUserInfoTask2 {
611 607 log.error("此卡号：{},未查询到相应学生信息。",cardNum);
612 608 return false;
613 609 }
614   - String userId = userDao.getUerIdWithNumTest(cardNum,schoolId);
615   - if(StringUtils.isEmpty(userId)){
616   - log.error("删除人脸时，用户卡号不存在。");
617   - return false;
618   - }
  610 + String userId = studentBean.getUser_id();
619 611 List<AttendanceBean> attendanceBeanList = userDao.queryClintList(schoolId,deviceId);
620 612 if(attendanceBeanList.size()>0){
621 613 for(AttendanceBean bean : attendanceBeanList){
... ... @@ -624,6 +616,7 @@ public class SendUserInfoTask2 {
624 616 String recordNo = userDao.getRecordNo(userId, deviceId);
625 617 if(StringUtils.isEmpty(recordNo)){
626 618 log.info("删除人脸时，该用户卡号未添加过人脸");
  619 + continue;
627 620 }
628 621 if(GateModule2.deleteUser(userId,MyTask.lLongSendMap.get(deviceId)) ==0){
629 622 userDao.deleteRecordNoTest(userId,deviceId);
... ...
cloud/dahua/src/main/java/com/example/dahua/control/UserOperateController.java
  Diff comments   View file @0135242
... ... @@ -87,7 +87,9 @@ public class UserOperateController {
87 87  
88 88 @RequestMapping(value = "deleteFaceByCard", method = RequestMethod.GET)
89 89 @ApiOperation(value = "21服务器根据卡号删除人脸")
90   - public boolean deleteFaceByCard(Integer schoolId,String cardNum,String deviceId) {
  90 + public boolean deleteFaceByCard(@RequestParam Integer schoolId,
  91 + @RequestParam String cardNum,
  92 + @RequestParam(required = false) String deviceId) {
91 93 return sendUserInfoTask.deleteFaceByCard(schoolId,cardNum,deviceId);
92 94 }
93 95  
... ...