Commit 81761d3c38561fb0e068cec8c918d55711f6769f

Authored by 徐泉
1 parent fc345082
Exists in master

代码修改

cloud/dahua/src/main/java/com/example/dahua/async/SendUserInfoTask.java
@@ -294,6 +294,7 @@ public class SendUserInfoTask { @@ -294,6 +294,7 @@ public class SendUserInfoTask {
294 } catch (Exception e) { 294 } catch (Exception e) {
295 e.printStackTrace(); 295 e.printStackTrace();
296 } 296 }
  297 + log.info("下发人脸设备总数,size: "+ attendanceBeans.size());
297 //下发至所有设备 298 //下发至所有设备
298 for (AttendanceBean attendanceBean : attendanceBeans) { 299 for (AttendanceBean attendanceBean : attendanceBeans) {
299 pushCardAndFace(attendanceBean, userInfoBean.getUser_id(), userInfoBean.getStudent_num(), userInfoBean.getName(), memory, sendRecordBean,userType); 300 pushCardAndFace(attendanceBean, userInfoBean.getUser_id(), userInfoBean.getStudent_num(), userInfoBean.getName(), memory, sendRecordBean,userType);
@@ -345,7 +346,7 @@ public class SendUserInfoTask { @@ -345,7 +346,7 @@ public class SendUserInfoTask {
345 } 346 }
346 //登录设备 347 //登录设备
347 NetSDKLib.LLong loginHandleLong = MyTask.lLongMap.get(attendanceBean.getClint_id()); 348 NetSDKLib.LLong loginHandleLong = MyTask.lLongMap.get(attendanceBean.getClint_id());
348 - log.info("设备ID: {},设备登录句柄: {}",loginHandleLong,attendanceBean.getClint_id() ); 349 + log.info("设备ID: {},设备登录句柄: {}",attendanceBean.getClint_id(),loginHandleLong);
349 350
350 //若设备不在线时,且人脸下发失败表中存在记录,则执行修改下发失败状态为:设备不在线 351 //若设备不在线时,且人脸下发失败表中存在记录,则执行修改下发失败状态为:设备不在线
351 if (loginHandleLong == null) { 352 if (loginHandleLong == null) {
cloud/dahua/src/main/java/com/example/dahua/module/GateModule.java
@@ -784,11 +784,6 @@ public class GateModule { @@ -784,11 +784,6 @@ public class GateModule {
784 return true; 784 return true;
785 } 785 }
786 786
787 - public static void main(String[] args) {  
788 - String s = "(0x80000000|147)";  
789 - System.out.println(s.substring(s.indexOf("|") + 1, s.indexOf(")")));  
790 - }  
791 -  
792 /** 787 /**
793 * 删除卡信息(单个删除) 788 * 删除卡信息(单个删除)
794 * 789 *
cloud/dahua/src/main/java/com/example/dahua/service/imp/UserServiceImp.java
@@ -61,9 +61,8 @@ public class UserServiceImp implements UserService { @@ -61,9 +61,8 @@ public class UserServiceImp implements UserService {
61 //获取学校下的大华设备 61 //获取学校下的大华设备
62 List<AttendanceBean> attendanceBeans = getAttendanceBeans(schoolId, clint_type, devid); 62 List<AttendanceBean> attendanceBeans = getAttendanceBeans(schoolId, clint_type, devid);
63 if(attendanceBeans.size()<1){ 63 if(attendanceBeans.size()<1){
64 - log.info("下发用户人脸信息失败,学校ID: {},该学校下无设备!设备类型:{}",schoolId,clint_type); 64 + log.warn("下发用户人脸信息失败,学校ID: {},该学校下无设备!设备类型:{}",schoolId,clint_type);
65 } 65 }
66 - log.info("设备数量:" + attendanceBeans.size());  
67 UserInfoBean userInfoBean = null; 66 UserInfoBean userInfoBean = null;
68 try { 67 try {
69 if (userType == 2) { 68 if (userType == 2) {