剔除测温分机提交的带NULL的异常数据

pom.xml

@@ -3,31 +3,42 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.unitssoft</groupId>
-        <artifactId>smart-grp-nof-pom</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../smart-grp-nof-pom/pom.xml</relativePath>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.3.12.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
+    <groupId>com.unissoft</groupId>
     <artifactId>smart-grp-nof-dev-test</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0</version>
     <name>smart-grp-nof-dev-test</name>
-    <description>Demo project for Spring Boot</description>
     <properties>
+        <skipTests>true</skipTests>
         <java.version>1.8</java.version>
+        <nof.version>1.0</nof.version>
+        <fastjson.version>1.2.83</fastjson.version>
+        <lombok.version>1.18.20</lombok.version>
+        <spring-web.version>5.2.15.RELEASE</spring-web.version>
     </properties>
     <dependencies>
         <!-- 引入公共模块 -->
         <dependency>
             <groupId>com.unissoft</groupId>
             <artifactId>smart-grp-nof-common</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-            <exclusions>
+            <version>1.0</version>
+            <!--<exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-web</artifactId>
                 </exclusion>
-            </exclusions>
+            </exclusions>-->
+        </dependency>
+        <!-- SpringWeb模块-->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${spring-web.version}</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -38,6 +49,27 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.14</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+            <version>2.3.12.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -47,6 +79,14 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <!--打包时跳过测试-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

src/main/java/com/unissoft/intrusion/GetIntrusionController.java

@@ -21,7 +21,8 @@ public class GetIntrusionController {
     // 底代码业务平台获取海康摄像头异常信息接口
     @GetMapping("/pullIntrusion")
     public Object pullIntrusion() {
-        return getIntrusionService.pullIntrusion();
+        Object val = getIntrusionService.pullIntrusion();
+        return val;
     }
 
 }

src/main/java/com/unissoft/intrusion/GetIntrusionService.java

@@ -1,17 +1,22 @@
 package com.unissoft.intrusion;
 
+import cn.hutool.core.convert.Convert;
 import com.unissoft.common.MyConstant;
 import com.unissoft.utils.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.transaction.HashKey;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.MultiValueMap;
 
 import javax.annotation.Resource;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -36,9 +41,46 @@ public interface GetIntrusionService {
                 // 转list
                 if (!CollectionUtils.isEmpty(hmget)) {
                     Collection<Object> values = hmget.values();
-                    log.info("GetIntrusionService: {}", values);
+                    Iterator iterator = values.iterator();
+                    log.info("values:{}", values);
+                    while(iterator.hasNext()){
+                        log.info("next item:{}",iterator.next());
+                    }
+                    //MultiValueMap<String, Object> newVal = (MultiValueMap)values;
+                    //log.info("pullIntrusion, deviceIP:{}, cameraIP:{}", newVal.get("deviceIP"), newVal.get("cameraIP"));
+/*
+                    MultiValueMap<String, Object> newVal = (MultiValueMap)values;
+                    System.out.println("ip:" + newVal.get("cameraIP"));
+
+                    SimpleDateFormat sf = new SimpleDateFormat("yyyyMMddHHmmss");
+                    String newName = sf.format(new Date());
+                    FileOutputStream fout;
+                    try {
+                        File file = new File( ".//pic//");
+                        if(!file.exists())
+                            file.mkdir();
+                        String filename = ".//pic//" + newName + "VCA_TRAVERSE_PLANE" + ".jpg";
+                        fout = new FileOutputStream(filename);
+                        //将字节写入文件
+                        Byte[]  oBytes = Convert.toByteArray(newVal.get("pic"));
+                        byte[] bytes = new byte[oBytes.length];
+
+                        for(int i = 0; i < oBytes.length; i++) {
+                            bytes[i] = oBytes[i];
+                        }
+                        fout.write(bytes);
+                        fout.close();
+                    } catch (FileNotFoundException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    } catch (IOException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    }*/
                     // 成功返回数据,清除redis缓存
                     redisUtil.del(MyConstant.INTRUSION_ALARM_IP);
+
+
                     return values;
                 }
             }

src/main/java/com/unissoft/intrusion/IntrusionController.java

@@ -1,12 +1,16 @@
 package com.unissoft.intrusion;
 
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.apache.tomcat.util.codec.binary.Base64;
+import org.springframework.util.ClassUtils;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -21,10 +25,57 @@ public class IntrusionController {
     private IntrusionService intrusionService;
 
     // 接收库点海康摄像头异常信息
+    /*
     @PostMapping("/pushIntrusion")
-    public void pushIntrusion(Integer sAlarmType, String alarmNow, String deviceIP, String orgCode) {
-        intrusionService.pushIntrusion(sAlarmType, alarmNow, deviceIP, orgCode);
+    public void pushIntrusion(Integer sAlarmType, String alarmNow, String deviceIP, String orgCode,
+                              String cameraIP, String bytes, Integer size) {
+        intrusionService.pushIntrusion(sAlarmType, alarmNow, deviceIP, orgCode, cameraIP, bytes, size);
     }
+    */
+    @RequestMapping("/pushIntrusion")
+    @ResponseBody
+    public void pushIntrusion(@RequestParam Map<String,String> map){
+        Integer alarmType = Integer.parseInt(map.get("sAlarmType").toString());
+        String alarmNow = map.get("alarmNow").toString();
+        String deviceIP = map.get("deviceIP").toString();
+        String orgCode = map.get("orgCode").toString();
+        String cameraIP = "";
+        String picByte = "";
+        Integer size = 0;
+        if(map.containsKey("picByte")) {
+            cameraIP = map.get("cameraIP").toString();
+            picByte = map.get("picByte").toString();
+            size = Integer.parseInt(map.get("sAlarmType").toString());
+        }
+        intrusionService.pushIntrusion(alarmType, alarmNow, deviceIP, orgCode, cameraIP, picByte, size);
+
+        byte[] bytes = Base64.decodeBase64(picByte); // Base64解码
+        //将字节写入文件
+        SimpleDateFormat sf = new SimpleDateFormat("yyyyMMddHHmmss");
+        String newName = sf.format(new Date());
+        FileOutputStream fout;
+        String path = "." + File.separator + "pic" + File.separator + newName + "_pSnapPicBuffer" + ".jpg";
+        System.out.println("path:"+ path);
+        FileOutputStream fis = null;
+        try {
+            File file =new File(path);
+            file.createNewFile();
+            fis = new FileOutputStream(file);
+            fis.write(bytes);
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (fis != null) {
+                try {
+                    fis.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+    }
+
 
     // 修改ICC通道号编码接口ICC_CHANNEL_CODE key:value(IP:channelCode)
     @GetMapping("/editChannelCode")

src/main/java/com/unissoft/intrusion/IntrusionService.java

@@ -1,11 +1,13 @@
 package com.unissoft.intrusion;
 
+import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson.JSON;
 import com.unissoft.common.DateUtils;
 import com.unissoft.common.MyConstant;
 import com.unissoft.utils.RedisUtil;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.tomcat.util.codec.binary.Base64;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
@@ -17,6 +19,12 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -27,10 +35,13 @@ import java.util.Map;
  * @create 2022-11-07 10:21
  */
 public interface IntrusionService {
-    void pushIntrusion(Integer sAlarmType, String alarmNow, String deviceIP, String orgCode);
+
+    void pushIntrusion(Integer sAlarmType, String alarmNow, String deviceIP, String orgCode,
+                       String cameraIP, String picByte, Integer size);
 
     void editChannelCode(Map<String, String> channelCodes);
 
+
     @Data
     @Component
     class IntrusionModel {
@@ -38,12 +49,18 @@ public interface IntrusionService {
         private Integer alarmType;
         // 报警时间
         private String alarmNow;
-        // 设备ip
+        // 超脑设备ip
         private String deviceIP;
         // 机构编码
         private String orgCode;
         // ICC通道号
         private String channelCode;
+        //图片base64格式字节
+        private String picByte;
+        //图片大小
+        private Integer picSize;
+        //报警摄像头IP
+        private String cameraIP;
     }
 
     // 定义内部类
@@ -63,30 +80,54 @@ public interface IntrusionService {
         private IntrusionModel intrusionModel;
 
         @Override
-        public void pushIntrusion(Integer sAlarmType, String alarmNow, String deviceIP, String orgCode) {
-            /*// redis key
-            if (redisUtil.hasKey(deviceIP)) {
-                // key 存在丢弃报警数据,不上报
-                log.info("Don't up!-> sAlarmType: {} alarmNow: {} deviceIP: {} orgCode: {}", sAlarmType, alarmNow, deviceIP, orgCode);
-            } else {
-                // 上报数据-接口
-                log.info("Up it!-> sAlarmType: {} alarmNow: {} deviceIP: {} orgCode: {}", sAlarmType, alarmNow, deviceIP, orgCode);
-                intrusionModel.setDeviceIP(deviceIP);
-                intrusionModel.setSAlarmType(sAlarmType);
-                intrusionModel.setAlarmNow(alarmNow);
-                intrusionModel.setOrgCode(orgCode);
-                HttpEntity<IntrusionModel> httpEntity = new HttpEntity<>(intrusionModel);
-                restTemplate.exchange(pushToIntrusion, HttpMethod.POST, httpEntity, Object.class);
-                // 设置缓存
-                redisUtil.set(deviceIP, JSON.toJSONString(intrusionModel), tenMinutes);
-            }*/
+        public void pushIntrusion(Integer sAlarmType, String alarmNow, String deviceIP, String orgCode,
+                                  String cameraIP, String picByte, Integer size) {
+
             // TODO 物联网到业务平台推送数据网络不通,修改为业务平台主动获取数据
             // 上报数据-接口
+            //
+            log.info("接收到报警数据，类型：" + sAlarmType + "\t时间：" + alarmNow + "\t超脑IP：" + deviceIP);
+            SimpleDateFormat sf = new SimpleDateFormat("yyyyMMddHHmmss");
+            String newName = sf.format(new Date());
+            String filename = "";
+            FileOutputStream fout;
+            byte[] bytes = Base64.decodeBase64(picByte);
+            log.info("pic size:{}", bytes.length);
+            try {
+                File file = new File( "." + File.separator + "mypic" + File.separator);
+                if(!file.exists())
+                    file.mkdir();
+                filename = "." + File.separator + "mypic" + File.separator + newName + "VCA_TRAVERSE_PLANE" + ".jpg";
+                file = new File(filename);
+                file.createNewFile();
+                fout = new FileOutputStream(file);
+                //将字节写入文件
+                fout.write(bytes);
+                fout.close();
+                System.out.println("pic save ok");
+            } catch (FileNotFoundException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            } catch (IOException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }finally {
+                try {
+                    if (fout != null)
+                        fout.close();
+                }catch (IOException ioe){
+                    ioe.printStackTrace();
+                }
+            }
+
+
 
             intrusionModel.setDeviceIP(deviceIP);
             intrusionModel.setAlarmType(sAlarmType);
             intrusionModel.setAlarmNow(alarmNow);
             intrusionModel.setOrgCode(orgCode);
+            //intrusionModel.setPicByte(picByte);
+            intrusionModel.setCameraIP(cameraIP);
             // 添加通道号
             intrusionModel.setChannelCode(this.getChannelCode(deviceIP));
             // 设置异常闯入设备数据-hashCode
@@ -95,14 +136,26 @@ public interface IntrusionService {
         }
 
         private String getChannelCode(String deviceIP) {
-            String channelCode = redisUtil.hget(MyConstant.ICC_CHANNEL_CODE, deviceIP).toString();
-            if (StringUtils.isEmpty(channelCode))
-                channelCode = this.staticChannelCode(deviceIP);
-            return channelCode;
+
+            Object oIP = redisUtil.hget(MyConstant.ICC_CHANNEL_CODE, deviceIP);
+
+            if (oIP != null) {
+
+                String channelCode = redisUtil.hget(MyConstant.ICC_CHANNEL_CODE, deviceIP).toString();
+                if (StringUtils.isEmpty(channelCode))
+                    channelCode = this.staticChannelCode(deviceIP);
+                return channelCode;
+            }else {
+                log.info("VALUE OF MyConstant.ICC_CHANNEL_CODE IS NULL");
+                return null;
+            }
         }
 
         private String staticChannelCode(String deviceIP) {
+            log.info("IntrusionServiceImpl.staticChannelCode");
             switch (deviceIP) {
+                case "192.168.193.1":
+                    return "1000384$1$0$1";
                 case "192.168.193.16":
                     return "1000384$1$0$10";
                 case "192.168.193.17":