From 81761d3c38561fb0e068cec8c918d55711f6769f Mon Sep 17 00:00:00 2001
From: 1099815072@qq.com <1099815072@qq.com>
Date: Thu, 12 Nov 2020 08:38:53 +0800
Subject: [PATCH] 代码修改

---
 cloud/dahua/src/main/java/com/example/dahua/async/SendUserInfoTask.java     | 3 ++-
 cloud/dahua/src/main/java/com/example/dahua/module/GateModule.java          | 5 -----
 cloud/dahua/src/main/java/com/example/dahua/service/imp/UserServiceImp.java | 3 +--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/cloud/dahua/src/main/java/com/example/dahua/async/SendUserInfoTask.java b/cloud/dahua/src/main/java/com/example/dahua/async/SendUserInfoTask.java
index 13de833..8c36d6c 100644
--- a/cloud/dahua/src/main/java/com/example/dahua/async/SendUserInfoTask.java
+++ b/cloud/dahua/src/main/java/com/example/dahua/async/SendUserInfoTask.java
@@ -294,6 +294,7 @@ public class SendUserInfoTask {
         } catch (Exception e) {
             e.printStackTrace();
         }
+        log.info("下发人脸设备总数，size: "+ attendanceBeans.size());
         //下发至所有设备
         for (AttendanceBean attendanceBean : attendanceBeans) {
             pushCardAndFace(attendanceBean, userInfoBean.getUser_id(), userInfoBean.getStudent_num(), userInfoBean.getName(), memory, sendRecordBean,userType);
@@ -345,7 +346,7 @@ public class SendUserInfoTask {
             }
             //登录设备
             NetSDKLib.LLong loginHandleLong = MyTask.lLongMap.get(attendanceBean.getClint_id());
-            log.info("设备ID: {},设备登录句柄: {}",loginHandleLong,attendanceBean.getClint_id() );
+            log.info("设备ID: {},设备登录句柄: {}",attendanceBean.getClint_id(),loginHandleLong);
 
             //若设备不在线时，且人脸下发失败表中存在记录，则执行修改下发失败状态为:设备不在线
             if (loginHandleLong == null) {
diff --git a/cloud/dahua/src/main/java/com/example/dahua/module/GateModule.java b/cloud/dahua/src/main/java/com/example/dahua/module/GateModule.java
index eacb451..7e043ec 100644
--- a/cloud/dahua/src/main/java/com/example/dahua/module/GateModule.java
+++ b/cloud/dahua/src/main/java/com/example/dahua/module/GateModule.java
@@ -784,11 +784,6 @@ public class GateModule {
         return true;
     }
 
-    public static void main(String[] args) {
-        String s = "(0x80000000|147)";
-        System.out.println(s.substring(s.indexOf("|") + 1, s.indexOf(")")));
-    }
-
     /**
      * 删除卡信息(单个删除)
      *
diff --git a/cloud/dahua/src/main/java/com/example/dahua/service/imp/UserServiceImp.java b/cloud/dahua/src/main/java/com/example/dahua/service/imp/UserServiceImp.java
index 38b75f5..d542939 100644
--- a/cloud/dahua/src/main/java/com/example/dahua/service/imp/UserServiceImp.java
+++ b/cloud/dahua/src/main/java/com/example/dahua/service/imp/UserServiceImp.java
@@ -61,9 +61,8 @@ public class UserServiceImp implements UserService {
         //获取学校下的大华设备
         List<AttendanceBean> attendanceBeans = getAttendanceBeans(schoolId, clint_type, devid);
         if(attendanceBeans.size()<1){
-            log.info("下发用户人脸信息失败，学校ID: {},该学校下无设备！设备类型：{}",schoolId,clint_type);
+            log.warn("下发用户人脸信息失败，学校ID: {},该学校下无设备！设备类型：{}",schoolId,clint_type);
         }
-        log.info("设备数量:" + attendanceBeans.size());
         UserInfoBean userInfoBean = null;
         try {
             if (userType == 2) {
--
libgit2 0.21.0