From 1f45c25ea725445d7e78e8d5da6e72150f35f2eb Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 20 十二月 2024 11:09:30 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-platform/src/test/java/com/ycl/sccgplatform/Test1.java |   34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/ycl-platform/src/test/java/com/ycl/sccgplatform/Test1.java b/ycl-platform/src/test/java/com/ycl/sccgplatform/Test1.java
index 0821b45..21f988b 100644
--- a/ycl-platform/src/test/java/com/ycl/sccgplatform/Test1.java
+++ b/ycl-platform/src/test/java/com/ycl/sccgplatform/Test1.java
@@ -1,17 +1,16 @@
 package com.ycl.sccgplatform;
 
+import com.dahua.netsdk.lib.callback.impl.AnalyzerDataCB;
 import com.ycl.common.util.UtilNumber;
 import com.ycl.entity.dingding.DingUserInfo;
 import com.ycl.entity.user.UmsAdmin;
 import com.ycl.mapper.unlawful.UnlawfulMapper;
 import com.ycl.service.oss.OssService;
-import com.ycl.util.dahua.alarm.AlarmDataCB;
-import com.ycl.util.dahua.lib.module.LoginModule;
-import com.ycl.util.dahua.module.AlarmListenModule;
 import net.coobird.thumbnailator.Thumbnails;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.ComponentScan;
 
 import javax.annotation.Resource;
 import javax.xml.bind.DatatypeConverter;
@@ -20,6 +19,7 @@
 import java.net.URL;
 import java.util.*;
 
+@ComponentScan("com.dahua.netsdk")
 @SpringBootTest
 public class Test1 {
 
@@ -46,7 +46,7 @@
                 ByteArrayOutputStream outs = new ByteArrayOutputStream();
                 Thumbnails.of(in).scale(0.6).outputQuality(1).toOutputStream(outs);
                 InputStream ins = new ByteArrayInputStream(outs.toByteArray());
-                String picData = ossService.uploadImages(ins, ".png");
+                String picData = ossService.uploadImages(ins, ".png",0);
                 System.out.println(picData);
             }
         } catch (IOException e) {
@@ -86,7 +86,7 @@
         String PicData = br.readLine();
         byte[] data = DatatypeConverter.parseBase64Binary(PicData);
         InputStream inputStream = new ByteArrayInputStream(data);
-        String s = ossService.uploadImages(inputStream, extension);
+        String s = ossService.uploadImages(inputStream, extension,0);
         System.out.println(s);
 
         br.close();
@@ -94,17 +94,25 @@
         fis.close();
     }
 
+    @Autowired
+    AnalyzerDataCB analyzerDataCB;
+
     @Test
     void alarmTest() {
-        AlarmDataCB cbMessage = new AlarmDataCB();
-        String m_strIp = "192.168.202.123";
-        int m_nPort = 37777;
-        String m_strUser = "admin";
-        String m_strPassword = "scdx@123";
-        LoginModule.login(m_strIp, m_nPort, m_strUser, m_strPassword);
-        AlarmListenModule.startListen(cbMessage);
 
-        System.out.println(cbMessage.data);
+        analyzerDataCB.invoke(null, 0, null, null, 0, null, 0, null);
+
+//        AlarmDataCB cbMessage = new AlarmDataCB();
+//        String m_strIp = "172.28.194.177";
+//        int m_nPort = 37777;
+//        String m_strUser = "admin";
+//        String m_strPassword = "scdx@123";
+//        LoginModule.login(m_strIp, m_nPort, m_strUser, m_strPassword);
+//        AlarmListenModule.startListen(cbMessage);
+//
+//        System.out.println(cbMessage.data);
     }
+
+
 }
 

--
Gitblit v1.8.0