修改视频监控问题

src/main/java/com/unissoft/SmartGrpNofDevicesApplication.java

@@ -1,10 +1,16 @@
 package com.unissoft;
 
+import com.alibaba.fastjson.JSONObject;
+import com.unissoft.pushMsg.AddressModel;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.client.RestTemplate;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
 @SpringBootApplication
 public class SmartGrpNofDevicesApplication {
 

src/main/java/com/unissoft/common/CommonMethod.java

@@ -33,8 +33,10 @@ public class CommonMethod {
             e.printStackTrace();
             throw e;
         } finally {
-            bos.close();
-            in.close();
+            if(bos != null)
+                bos.close();
+            if(in != null)
+                in.close();
         }
     }
 

src/main/java/com/unissoft/face/FaceMain.java

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.time.LocalDate;
@@ -77,7 +78,7 @@ public class FaceMain implements ApplicationRunner {
             hCNetSDK.NET_DVR_Init();
 
             //加载日志
-            hCNetSDK.NET_DVR_SetLogToFile(3, "..//sdklog", false);
+            hCNetSDK.NET_DVR_SetLogToFile(3, ".." + File.separator + "sdklog", false);
 
             //登录设备，每一台设备分别登录; 登录句柄是唯一的，可以区分设备
             HCNetSDK.NET_DVR_USER_LOGIN_INFO m_strLoginInfo = new HCNetSDK.NET_DVR_USER_LOGIN_INFO();//设备登录信息
@@ -130,52 +131,56 @@ public class FaceMain implements ApplicationRunner {
             Calendar c1 = Calendar.getInstance();
             c1.setTime(satart);
             while (true) {
+                /*
                 //这里加入控制台输入控制，是为了保持连接状态，当输入Y表示布防结束
                 log.info("监听进行中，输入字母Q可退出监听");
                 BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(System.in));
                 String str = bufferedReader.readLine();
                 if (str.toUpperCase().equals("Q")) {
                     break;
-                 /*
+                 */
                 Thread.sleep(60000);
                 Date end = new Date();
                 Calendar c2 = Calendar.getInstance();
                 c2.setTime(end);
                 long millis = c2.getTimeInMillis() - c1.getTimeInMillis();
-                long hours = millis/(1000*60*60);
-                if(hours > 10) {
+                long hours = millis / (1000 * 60 * 60);
+                /*if (hours > 10) {
                     log.info("时间过去10小时，退出程序");
                     break;
                 }
-                }*/
-                }
+                */
+            }
 
-                //退出之前判断布防监听状态，并做撤防和停止监听操作
-                if (lAlarmHandle >= 0) {
-                    if (!hCNetSDK.NET_DVR_CloseAlarmChan_V30(lAlarmHandle)) {
-                        log.error("撤防失败，错误码: {}", hCNetSDK.NET_DVR_GetLastError());
-                    } else {
-                        log.info("撤防成功！！！");
-                    }
-                }
-                if (lListenHandle >= 0) {
-                    if (!hCNetSDK.NET_DVR_StopListen_V30(lListenHandle)) {
-                        log.error("取消监听失败，错误码：{}", hCNetSDK.NET_DVR_GetLastError());
-                    } else {
-                        log.info("停止监听成功！！！");
-                    }
+            /*
+            //退出之前判断布防监听状态，并做撤防和停止监听操作
+            if (lAlarmHandle >= 0) {
+                if (!hCNetSDK.NET_DVR_CloseAlarmChan_V30(lAlarmHandle)) {
+                    log.error("撤防失败，错误码: {}", hCNetSDK.NET_DVR_GetLastError());
+                } else {
+                    log.info("撤防成功！！！");
                 }
-
-                //注销登录，程序退出时调用；程序同时对接多台设备时，每一台设备分别调用一次接口，传入不同的登录句柄
-                if (lUserID >= 0) {
-                    hCNetSDK.NET_DVR_Logout(lUserID);
+            }
+            if (lListenHandle >= 0) {
+                if (!hCNetSDK.NET_DVR_StopListen_V30(lListenHandle)) {
+                    log.error("取消监听失败，错误码：{}", hCNetSDK.NET_DVR_GetLastError());
+                } else {
+                    log.info("停止监听成功！！！");
                 }
+            }
 
-                //SDK反初始化，释放资源，程序退出时调用
-                boolean b = hCNetSDK.NET_DVR_Cleanup();
-                if (b)
-                    log.info("释放资源,程序退出!");
+            //注销登录，程序退出时调用；程序同时对接多台设备时，每一台设备分别调用一次接口，传入不同的登录句柄
+            if (lUserID >= 0) {
+                hCNetSDK.NET_DVR_Logout(lUserID);
             }
+
+            //SDK反初始化，释放资源，程序退出时调用
+            boolean b = hCNetSDK.NET_DVR_Cleanup();
+            if (b)
+                log.info("释放资源,程序退出!");
+
+             */
+
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -247,17 +252,17 @@ public class FaceMain implements ApplicationRunner {
         try {
             while (true) {
                 Thread.sleep(60000);
+                /*
                 log.info("监听进行中，如需退出监听请输入字母Q");
                 BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(System.in));
                 String str = bufferedReader.readLine();
                 if (str.toUpperCase().equals("Q")) {
                     break;
                 }
+                */
             }
         } catch (InterruptedException e) {
             e.printStackTrace();
-        } catch (IOException ioe) {
-            ioe.printStackTrace();
         }
 
         //停止监听

src/main/java/com/unissoft/face/FacePicManage.java

@@ -9,6 +9,7 @@ import org.dom4j.DocumentException;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.Iterator;
@@ -50,7 +51,7 @@ public class FacePicManage {
         struSendParam.read();
         
         //本地jpg图片转成二进制byte数组
-        byte[] picbyte = CommonMethod.toByteArray(".\\pic\\test1.jpg");
+        byte[] picbyte = CommonMethod.toByteArray("." + File.separator + "pic" + File.separator + "test1.jpg");
         HCNetSDK.BYTE_ARRAY arraybyte = new HCNetSDK.BYTE_ARRAY(picbyte.length);
         arraybyte.read();
         arraybyte.byValue = picbyte;
@@ -127,7 +128,7 @@ public class FacePicManage {
         stringRequest.write();
         
         //读取二进制文件
-        byte[] picbyte = CommonMethod.toByteArray(".\\pic\\FDLib.jpg");
+        byte[] picbyte = CommonMethod.toByteArray("." + File.separator + "pic" + File.separator + "FDLib.jpg");
         HCNetSDK.BYTE_ARRAY byte_array = new HCNetSDK.BYTE_ARRAY(picbyte.length);
         byte_array.read();
         byte_array.byValue = picbyte;

src/main/java/com/unissoft/mqtt/MqttTestSendController.java

@@ -30,5 +30,4 @@ public class MqttTestSendController {
         restTemplate.postForObject("http://localhost:8072/pushIntrusion", requestEntity, Object.class);
         return "200";
     }
-
 }

src/main/java/com/unissoft/netSDKDemo/FMSGCallBack_V31.java

@@ -29,7 +29,7 @@ public class FMSGCallBack_V31 implements HCNetSDK.FMSGCallBack_V31 {
     }
 
     public void AlarmDataHandle(int lCommand, HCNetSDK.NET_DVR_ALARMER pAlarmer, Pointer pAlarmInfo, int dwBufLen, Pointer pUser) {
-        log.info("报警事件发生,进入回调");
+        //log.info("报警事件发生,进入回调");
         /*String hexString = Integer.toHexString(lCommand);
         log.info("报警类型 hexString {}", hexString);*/
         HCNetSDK.NET_VCA_RULE_ALARM ruleAlarm;
@@ -46,11 +46,10 @@ public class FMSGCallBack_V31 implements HCNetSDK.FMSGCallBack_V31 {
                 System.out.println("行为类型：" + ruleAlarm.struRuleInfo.wEventTypeEx);
                 System.out.println("报警通道对应设备的通道号：" + ruleAlarm.struDevInfo.byChannel);
                 System.out.println("SDK接入设备的通道号：" + ruleAlarm.struDevInfo.byIvmsChannel);
-                System.out.println("报警通道对应设备的IP地址：" + ruleAlarm.struDevInfo.struDevIP.toString());
+                System.out.println("报警通道对应设备的IP地址：" +  new String(ruleAlarm.struDevInfo.struDevIP.sIpV4));
                 System.out.println("报警通道对应设备的端口号：" + ruleAlarm.struDevInfo.wPort);
 
-                
-                alarmDSService.pushLCommandEx(lCommand, ruleAlarm);
+                alarmDSService.pushLCommand(lCommand, ruleAlarm);
                 log.info(
                         "行为分析事件，lCommand {} -> pAlarmer {} -> pAlarmInfo {} -> dwBufLen {} -> pUser {}",
                         lCommand, JSON.toJSONString(pAlarmer), JSON.toJSONString(pAlarmInfo),dwBufLen,JSON.toJSONString(pUser)
@@ -68,7 +67,7 @@ public class FMSGCallBack_V31 implements HCNetSDK.FMSGCallBack_V31 {
                 ruleAlarmPointer.write(0, pAlarmInfo.getByteArray(0, ruleAlarm.size()), 0, ruleAlarm.size());
                 ruleAlarm.read();
                 //log.info("alarm type in the COMM_VEHICLE_CONTROL_ALARM ---------->: {}", JSON.toJSONString(ruleAlarm));
-                alarmDSService.pushLCommand(lCommand);
+                alarmDSService.pushLCommand(lCommand, ruleAlarm);
                 break;
             case HCNetSDK.COMM_ALARMHOST_CID_ALARM:
                 log.info("报警主机防区报警");
@@ -103,9 +102,9 @@ public class FMSGCallBack_V31 implements HCNetSDK.FMSGCallBack_V31 {
                 if ((strFaceSnapMatch.dwSnapPicLen > 0) && (strFaceSnapMatch.byPicTransType == 0)) {
                     SimpleDateFormat sf = new SimpleDateFormat("yyyyMMddHHmmss");
                     String newName = sf.format(new Date());
-                    FileOutputStream fout;
+                    FileOutputStream fout = null;
                     try {
-                        String filename = ".//pic//" + newName + "_pSnapPicBuffer" + ".jpg";
+                        String filename = "." + File.separator + "pic" + File.separator + newName + "_pSnapPicBuffer" + ".jpg";
                         fout = new FileOutputStream(filename);
                         //将字节写入文件
                         long offset = 0;
@@ -114,11 +113,18 @@ public class FMSGCallBack_V31 implements HCNetSDK.FMSGCallBack_V31 {
                         buffers.rewind();
                         buffers.get(bytes);
                         fout.write(bytes);
-                        fout.close();
                     } catch (IOException e) {
                         // TODO Auto-generated catch block
                         e.printStackTrace();
+                    }finally {
+                        try {
+                            if (fout != null)
+                                fout.close();
+                        }catch(IOException ioe){
+                            ioe.printStackTrace();
+                        }
                     }
+
                 }
                 //保存抓拍人脸图URL，图片数据传输方式: 1- URL 注：超脑设备人脸比对报警图片一般按照URL上传，根据URL去下载设备中存储的图片，认证方式选择：摘要认证
                 if ((strFaceSnapMatch.dwSnapPicLen > 0) && (strFaceSnapMatch.byPicTransType == 1)) {
@@ -132,9 +138,9 @@ public class FMSGCallBack_V31 implements HCNetSDK.FMSGCallBack_V31 {
                 if ((strFaceSnapMatch.struSnapInfo.dwSnapFacePicLen > 0) && (strFaceSnapMatch.byPicTransType == 0)) {
                     SimpleDateFormat sf = new SimpleDateFormat("yyyyMMddHHmmss");
                     String newName = sf.format(new Date());
-                    FileOutputStream fout;
+                    FileOutputStream fout = null;
                     try {
-                        String filename = ".//pic//" + newName + "_struSnapInfo_pBuffer1" + ".jpg";
+                        String filename = "." + File.separator + "pic" + File.separator + newName + "_struSnapInfo_pBuffer1" + ".jpg";
                         fout = new FileOutputStream(filename);
                         //将字节写入文件
                         long offset = 0;
@@ -143,10 +149,16 @@ public class FMSGCallBack_V31 implements HCNetSDK.FMSGCallBack_V31 {
                         buffers.rewind();
                         buffers.get(bytes);
                         fout.write(bytes);
-                        fout.close();
                     } catch (IOException e) {
                         // TODO Auto-generated catch block
                         e.printStackTrace();
+                    }finally {
+                        try {
+                            if (fout != null)
+                                fout.close();
+                        }catch(IOException ioe){
+                            ioe.printStackTrace();
+                        }
                     }
                 }
                 if ((strFaceSnapMatch.struSnapInfo.dwSnapFacePicLen > 0) && (strFaceSnapMatch.byPicTransType == 1)) {
@@ -161,9 +173,9 @@ public class FMSGCallBack_V31 implements HCNetSDK.FMSGCallBack_V31 {
                 if ((strFaceSnapMatch.struBlockListInfo.dwBlockListPicLen > 0) && (strFaceSnapMatch.byPicTransType == 0)) {
                     SimpleDateFormat sf = new SimpleDateFormat("yyyyMMddHHmmss");
                     String newName = sf.format(new Date());
-                    FileOutputStream fout;
+                    FileOutputStream  fout = null;
                     try {
-                        String filename = ".//pic//" + newName + "_fSimilarity_" + strFaceSnapMatch.fSimilarity + "_struBlackListInfo_pBuffer1" + ".jpg";
+                        String filename = "." + File.separator + "pic" + File.separator  + newName + "_fSimilarity_" + strFaceSnapMatch.fSimilarity + "_struBlackListInfo_pBuffer1" + ".jpg";
                         fout = new FileOutputStream(filename);
                         //将字节写入文件
                         long offset = 0;
@@ -172,11 +184,16 @@ public class FMSGCallBack_V31 implements HCNetSDK.FMSGCallBack_V31 {
                         buffers.rewind();
                         buffers.get(bytes);
                         fout.write(bytes);
-                        fout.close();
-
                     } catch (IOException e) {
                         // TODO Auto-generated catch block
                         e.printStackTrace();
+                    }finally {
+                        try {
+                            if (fout != null)
+                                fout.close();
+                        }catch(IOException ioe){
+                            ioe.printStackTrace();
+                        }
                     }
                 }
                 //保存人脸库图片，图片数据传输方式: 1-URL
@@ -197,16 +214,20 @@ public class FMSGCallBack_V31 implements HCNetSDK.FMSGCallBack_V31 {
                     buffers.get(bytes);
                     log.info("抓拍库附加信息: {}", new String(bytes));
                 }
-                alarmDSService.pushLCommand(lCommand);
+                //TODO 参数完善
+                alarmDSService.pushLCommand(lCommand, null);
                 break;
             default:
                 // TODO 单报警设备 目前不需要 sAlarmType alarmNow
                 //log.info("alarm type in the FMSGCallBack_V31 ->int: {}", lCommand);
+                /*
                 log.info(
                         "不分类事件，不返回报警具体数据，lCommand {} -> pAlarmer {} -> pAlarmInfo {} -> dwBufLen {} -> pUser {}",
                         lCommand, JSON.toJSONString(pAlarmer), JSON.toJSONString(pAlarmInfo),dwBufLen,JSON.toJSONString(pUser)
                 );
-                alarmDSService.pushLCommand(lCommand);
+                */
+                //TODO 参数完善
+                alarmDSService.pushLCommand(lCommand, null);
                 break;
         }
     }

src/main/java/com/unissoft/pushMsg/AddressModel.java

@@ -1,35 +1,79 @@
 package com.unissoft.pushMsg;
 
+import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author qingsong.han
  * @description:
  * @create 2022-10-14 16:50
  */
-@Data
+//@Data
 @Component
 public class AddressModel {
 
+    public AddressModel(){
+        String fileName = "./config.txt";
+        List<String> content = new ArrayList<>();
+        try {
+            content = Files.readAllLines(Paths.get(fileName));
+           if(content.size() > 0) {
+               JSONObject json = JSONObject.parseObject(content.get(0));
+               deviceIP = json.getString("deviceIP");
+               orgCode = json.getString("orgCode");
+               userName = json.getString("userName");
+               password = json.getString("password");
+               push = json.getString("push");
+           }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public String getPush() {
+        return push;
+    }
+
+    public String getDeviceIP() {
+        return deviceIP;
+    }
+
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
     // 推送地址
     //@Value("${address.pushToIntrusion}")
     //private String pushToIntrusion;
-    @Value("${address.push}")
+    //@Value("${address.push}")
     private String push;
-
     // 设备ip
-    @Value("${exceptionAlarm.deviceIP}")
+    //@Value("${exceptionAlarm.deviceIP}")
     private String deviceIP;
     // 设备ip
-    @Value("${exceptionAlarm.org-code}")
+    //@Value("${exceptionAlarm.org-code}")
     private String orgCode;
     // 设备登录用户名
-    @Value("${exceptionAlarm.userName}")
+    //@Value("${exceptionAlarm.userName}")
     private String userName;
     // 设备登录密码
-    @Value("${exceptionAlarm.password}")
+    //@Value("${exceptionAlarm.password}")
     private String password;
 
 }

src/main/java/com/unissoft/pushMsg/AlarmDSService.java

@@ -10,7 +10,7 @@ import com.unissoft.netSDKDemo.HCNetSDK;
  */
 public interface AlarmDSService extends Callback {
 
-    void pushLCommand(Integer lCommand);
+    //void pushLCommand(Integer lCommand);
 
-    void pushLCommandEx(Integer lCommand, HCNetSDK.NET_VCA_RULE_ALARM ruleAlarm);
+    void pushLCommand(Integer lCommand, HCNetSDK.NET_VCA_RULE_ALARM ruleAlarm);
 }

src/main/java/com/unissoft/pushMsg/AlarmDSServiceImpl.java

@@ -31,7 +31,7 @@ import java.util.Date;
 @Service
 public class AlarmDSServiceImpl implements AlarmDSService {
 
-    @Override
+/*    @Override
     public void pushLCommand(Integer lCommand) {
         // 获取spring RestTemple bean
         RestTemplate restTemplate = (RestTemplate) GetBeanUtil.getBean("restTemplate");
@@ -52,69 +52,64 @@ public class AlarmDSServiceImpl implements AlarmDSService {
         Object object = restTemplate.postForObject(addressModel.getPush(), requestEntity, Object.class);
         log.info("AlarmDSServiceImpl push alarm result: {}", object);
     }
-
+*/
     @Override
-    public void pushLCommandEx(Integer lCommand, HCNetSDK.NET_VCA_RULE_ALARM ruleAlarm) {
-        // 获取spring RestTemple bean
-        RestTemplate restTemplate = (RestTemplate) GetBeanUtil.getBean("restTemplate");
+    public void pushLCommand(Integer lCommand, HCNetSDK.NET_VCA_RULE_ALARM ruleAlarm) {
+        RestTemplate rest = new RestTemplate();
+        MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
+        headers.add("content-type", MediaType.APPLICATION_FORM_URLENCODED_VALUE);
+        // headers.add("Accept", MediaType.APPLICATION_FORM_URLENCODED_VALUE);
+        // 请求体
+        MultiValueMap<String, String> body = new LinkedMultiValueMap<>();
         // get push class AddressModel bean
         AddressModel addressModel = (AddressModel) GetBeanUtil.getBean("addressModel");
-        // MultiValueMap requestEntity
-        MultiValueMap<String, Object> requestEntity = new LinkedMultiValueMap<>();
         // 报警类型(异常闯入/入侵) int 4354
-        requestEntity.add("sAlarmType", lCommand);
+        body.add("sAlarmType", String.valueOf(lCommand));
         // 报警时间
-        requestEntity.add("alarmNow", new Date());
+        body.add("alarmNow",
+                (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"))
+                        .format(new Date()));
         // 设备ip
-        requestEntity.add("deviceIP", addressModel.getDeviceIP());
+        body.add("deviceIP", addressModel.getDeviceIP());
         // 机构编码
-        requestEntity.add("orgCode", addressModel.getOrgCode());
+        body.add("orgCode", addressModel.getOrgCode());
+        byte[] bytes = null;
+        if(ruleAlarm != null) {
+            body.add("cameraIP", ruleAlarm.struDevInfo.struDevIP.sIpV4.toString());
+            //将字节写入文件
+            SimpleDateFormat sf = new SimpleDateFormat("yyyyMMddHHmmss");
+            String newName = sf.format(new Date());
+            //FileOutputStream fout;
+            String filename = ".//pic//" + newName + "_pSnapPicBuffer" + ".jpg";
+            /*try {
+                long offset = 0;
+                fout = new FileOutputStream(filename);
+                ByteBuffer buffers = ruleAlarm.pImage.getByteBuffer(offset, ruleAlarm.dwPicDataLen);
+                bytes = new byte[ruleAlarm.dwPicDataLen];
+                buffers.rewind();
+                buffers.get(bytes);
+                fout.write(bytes);
+                fout.close();
+            } catch (FileNotFoundException e) {
+                throw new RuntimeException(e);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }*/
 
-        requestEntity.add("cameraIP", ruleAlarm.struDevInfo.struDevIP.toString());
-        //将字节写入文件
-        SimpleDateFormat sf = new SimpleDateFormat("yyyyMMddHHmmss");
-        String newName = sf.format(new Date());
-        FileOutputStream fout;
-        String filename = ".//pic//" + newName + "_pSnapPicBuffer" + ".jpg";
-        try {
             long offset = 0;
-            fout = new FileOutputStream(filename);
             ByteBuffer buffers = ruleAlarm.pImage.getByteBuffer(offset, ruleAlarm.dwPicDataLen);
-            byte[] bytes = new byte[ruleAlarm.dwPicDataLen];
+            bytes = new byte[ruleAlarm.dwPicDataLen];
             buffers.rewind();
             buffers.get(bytes);
-            fout.write(bytes);
-            fout.close();
-        } catch (FileNotFoundException e) {
-            throw new RuntimeException(e);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+            buffers.flip();
+            body.add("picByte", Base64.encodeBase64String(bytes));
+            body.add("picSize", String.valueOf(ruleAlarm.dwPicDataLen));
+            log.info("准备上传数据，报警类型: {}\t超脑IP：{}\t摄像头IP：{}",
+                    body.get("sAlarmType"), body.get("deviceIP"), body.get("cameraIP"));
 
-        long offset = 0;
-        ByteBuffer buffers = ruleAlarm.pImage.getByteBuffer(offset, ruleAlarm.dwPicDataLen);
-        byte[] bytes = new byte[ruleAlarm.dwPicDataLen];
-        buffers.rewind();
-        buffers.get(bytes);
-        buffers.flip();
-        String picStr = StandardCharsets.UTF_8.decode(buffers).toString();
-        log.info("pic-string length:"+picStr.length());
-        requestEntity.add("pic", picStr);
-        requestEntity.add("picSize", ruleAlarm.dwPicDataLen);
-        log.info("报警类型: %d", requestEntity.get("sAlarmType") + "超脑IP："+requestEntity.get("deviceIP")+"\t摄像头IP："+requestEntity.get("cameraIP"));
-        // push of post for object
-        //Object object = restTemplate.postForObject(addressModel.getPush(), requestEntity, Object.class);
-        //log.info("AlarmDSServiceImpl push alarm result: {}", object);
-
-        RestTemplate rest = new RestTemplate();
-        MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
-        headers.add("content-type", MediaType.APPLICATION_FORM_URLENCODED_VALUE);
-        // headers.add("Accept", MediaType.APPLICATION_FORM_URLENCODED_VALUE);
-        // 请求体
-        MultiValueMap<String, String> body = new LinkedMultiValueMap<>();
-        body.add("file", "picture");
-        body.add("base64", Base64.encodeBase64String(bytes));
-        body.add("key", "123456");
+        }else{
+            //log.info("报警类型: {}\t超脑IP：{}", body.get("sAlarmType"), body.get("deviceIP"));
+        }
 
         HttpEntity<MultiValueMap<String, String>> httpEntity = new HttpEntity<>(body, headers);
         ResponseEntity<String> response = rest.postForEntity(addressModel.getPush(), httpEntity, String.class);

src/main/resources/bootstrap.yml

@@ -46,5 +46,5 @@ exceptionAlarm:
 # 只支持post
 address:
   # 推送异常闯入/入侵信息地址
-  #push: http://23.99.21.201:59882/pushIntrusion
-  push: http://10.105.101.60:8072/pushIntrusion
+  push: http://23.99.21.201:59882/pushIntrusion
+  #push: http://10.105.101.60:8072/pushIntrusion

src/test/java/com/unissoft/SmartGrpNofDevicesApplicationTests.java

@@ -1,8 +1,14 @@
 package com.unissoft;
 
+import com.alibaba.fastjson.JSONObject;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.OpenOption;
+import java.nio.file.Paths;
+
 @SpringBootTest
 class SmartGrpNofDevicesApplicationTests {