From fb56ca7f72887a0edae799693a63afda18440ef5 Mon Sep 17 00:00:00 2001
From: 1099815072@qq.com <1099815072@qq.com>
Date: Wed, 18 Nov 2020 08:10:40 +0800
Subject: [PATCH] 代码修改

---
 cloud/dahua/src/main/java/com/example/dahua/MyTask.java                            | 36 ++++++++++++++++++------------------
 cloud/dahua/src/main/java/com/example/dahua/service/imp/PermissFaceServiceImp.java |  2 +-
 cloud/dahua/src/main/resources/application.yml                                     |  3 +--
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/cloud/dahua/src/main/java/com/example/dahua/MyTask.java b/cloud/dahua/src/main/java/com/example/dahua/MyTask.java
index 8ec3e2f..27e7ae3 100644
--- a/cloud/dahua/src/main/java/com/example/dahua/MyTask.java
+++ b/cloud/dahua/src/main/java/com/example/dahua/MyTask.java
@@ -73,22 +73,22 @@ public class MyTask implements ApplicationRunner {
 
     public boolean isHasNewDevice = false;//判断是否有新设备上线
 
-    @Autowired
-    private MyScheduledTask myScheduledTask;
-
     @Override
     public void run(ApplicationArguments args) throws Exception {
-        /**
-         * 设备初始化、自注册
-         */
-        new MyTask();
+//        121.40.109.21
+        // 打开工程，初始化
+        LoginModule.init(disConnect, haveReConnect);
+        //自注册
+        autoRegister();
+
+//        System.out.println(" sendRecordDao:"+sendRecordDao.getSenSuccess());
     }
 
-    private MyTask() {
-        /**
-         * 打开工程，初始化
-          */
-        LoginModule.init(disConnect, haveReConnect);
+
+    /**
+     * 设备自注册
+     */
+    private void autoRegister() {
 
         /**
          * 开启监听服务
@@ -102,7 +102,7 @@ public class MyTask implements ApplicationRunner {
     // 设备断线回调: 通过 CLIENT_Init 设置该回调函数，当设备出现断线时，SDK会调用该函数
     private class DisConnect implements NetSDKLib.fDisConnect {
         public void invoke(NetSDKLib.LLong m_hLoginHandle, String pchDVRIP, int nDVRPort, Pointer dwUser) {
-            System.out.printf("Device[%s] Port[%d] DisConnect!\n", pchDVRIP, nDVRPort);
+            log.info("Device[%s] Port[%d] DisConnect!\n", pchDVRIP, nDVRPort);
             String deviceId = getDeviceId(pchDVRIP, nDVRPort);
             if (!StringUtils.isEmpty(deviceId)) {
                 attendanceService.updateConnectStateWithDevid(0, deviceId);
@@ -123,7 +123,7 @@ public class MyTask implements ApplicationRunner {
         public void invoke(NetSDKLib.LLong m_hLoginHandle, String pchDVRIP, int nDVRPort, Pointer dwUser) {
             // 重连提示
             String deviceId = getDeviceId(pchDVRIP, nDVRPort);
-            System.out.printf("ReConnect Device[%s] IP[%S] Port[%d]\n", deviceId,pchDVRIP, nDVRPort);
+            log.info("ReConnect Device[%s] IP[%S] Port[%d]\n", deviceId,pchDVRIP, nDVRPort);
             if (!StringUtils.isEmpty(deviceId)) {
                 attendanceService.updateConnectStateWithDevid(1, deviceId);
 //                devMap.put(deviceId,"");
@@ -199,15 +199,15 @@ public class MyTask implements ApplicationRunner {
             } catch (UnsupportedEncodingException e) {
                 e.printStackTrace();
             }
-            System.out.printf("Register Device Info [Device address %s][port %s][DeviceID %s] \n", pIp, wPort, deviceId);
+            log.info("Register Device Info [Device address %s][port %s][DeviceID %s] \n", pIp, wPort, deviceId);
             switch (lCommand) {
                 case NetSDKLib.EM_LISTEN_TYPE.NET_DVR_DISCONNECT: {  // 验证期间设备断线回调
-                    System.out.println("EM_LISTEN_TYPE:验证期间设备断线回调");
+                    log.info("EM_LISTEN_TYPE:验证期间设备断线回调");
 
                     break;
                 }
                 case NetSDKLib.EM_LISTEN_TYPE.NET_DVR_SERIAL_RETURN: { // 设备注册携带序列号
-                    System.out.println("EM_LISTEN_TYPE:设备注册携带序列号");
+                    log.info("EM_LISTEN_TYPE:设备注册携带序列号");
                     /**
                      * 主动注册调用的登录接口,获取登录句柄
                      */
@@ -251,7 +251,7 @@ public class MyTask implements ApplicationRunner {
                 DeviceInfoBean dev = it.next();
                 if (lLongMap.get(dev.getDevcieId()).intValue() > 0) {
                     NetSDKLib.LLong lLong = GateModule.realLoadPic2(0, analyzerCallback, lLongMap.get(dev.getDevcieId()),dev.getDevcieId());
-                    System.out.println("监听成功："+dev.getDevcieId());
+                    log.info("监听成功："+dev.getDevcieId());
                     if (lLong.intValue() != -1) {
                         //it.remove();
                     }
diff --git a/cloud/dahua/src/main/java/com/example/dahua/service/imp/PermissFaceServiceImp.java b/cloud/dahua/src/main/java/com/example/dahua/service/imp/PermissFaceServiceImp.java
index 2d138d3..35d58bf 100644
--- a/cloud/dahua/src/main/java/com/example/dahua/service/imp/PermissFaceServiceImp.java
+++ b/cloud/dahua/src/main/java/com/example/dahua/service/imp/PermissFaceServiceImp.java
@@ -87,7 +87,7 @@ public class PermissFaceServiceImp implements PermissFaceService {
                         permissionBean.setChannel(permissionFaceBean.getChannel());
                     }
                     if(!StringUtils.isEmpty(permissionFaceBean.getCustomName())){
-                        permissionBean.setChannel(permissionFaceBean.getCustomName());
+                        permissionBean.setCustomName(permissionFaceBean.getCustomName());
                     }
                     responseBean.setData(null);
                     sendPermiss2Dev(permissionFaceBean);
diff --git a/cloud/dahua/src/main/resources/application.yml b/cloud/dahua/src/main/resources/application.yml
index bbe6518..77f2da6 100644
--- a/cloud/dahua/src/main/resources/application.yml
+++ b/cloud/dahua/src/main/resources/application.yml
@@ -46,8 +46,7 @@ mybatis:
     mapper-locations: classpath:xiaoanmapper/*.xml
   config-location: classpath:mybatis-config.xml
 
-#logging:
-#  config: classpath:logback-spring.xml
+
 
 #haikangpic: E:\wwwhtdocs\HFface\FaceLogs\
 
--
libgit2 0.21.0