视频诊断优化

src/main/java/com/chinaitop/depot/basic/mapper/MonitorCameraMapper.xml

@@ -539,7 +539,8 @@
         nvr. PASSWORD nvr_password,
         nvr. PORT nvr_port,
         nvr.factory nvr_factory,
-        camera.channel_number
+        camera.channel_number,
+        camera.org_id
       FROM
           monitor_camera camera
       LEFT JOIN monitor_nvr nvr ON nvr.id = camera.nvr_id
@@ -595,7 +596,7 @@
 
   <select id="selectByGroupId" parameterType="java.lang.String" resultType="java.util.HashMap">
     SELECT
-      c.id,c.alias,c.ip,c.username,c.password,c.port,c.factory, c.type,c.org_id
+      c.id camera_id,c.alias,c.ip camera_ip,c.name camera_name,c.password camera_password,c.port camera_port,c.factory, c.type camera_type,c.org_id
     FROM
       monitor_camera c
     LEFT JOIN monitor_gorup_camera gc ON gc.cameraid = c.id

src/main/java/com/chinaitop/depot/monitor/service/impl/MonitorZDService.java

@@ -19,10 +19,7 @@ import org.springframework.beans.factory.annotation.Value;
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
 
 /**
  * @auther mafy
@@ -64,20 +61,27 @@ public class MonitorZDService {
         MonitorCameraMapper monitorCameraMapper = SpringContextHolder.getBean(MonitorCameraMapper.class);
         List<List<MonitorCamera>> groupList = new ArrayList();
         for (int i = 0; i <groupStr.length; i++) {//每一个分组
-            List<Map<String,Object>> CameraList = monitorCameraMapper.selectByGroupId(groupStr[i]);
+            List<Map<String,Object>> CameraList;
+            if(ParameterUtil.isequal(groupStr[0],"0")){
+                Map<String,Object> retMap = new HashMap<String,Object>();
+                retMap.put("orgid",this.diagPlan.getOrgId());
+                CameraList = monitorCameraMapper.selectByNVRDates(retMap);
+            }else{
+                CameraList = monitorCameraMapper.selectByGroupId(groupStr[i]);
+            }
             List<MonitorCamera> monitorCameraList = new ArrayList<MonitorCamera>();
             for (int j = 0; j < CameraList.size(); j++) {
                 //c.id,c.ip,c.username,c.`password`,c.`port`,c.factory, c.type
                 MonitorCamera monitorCamera = new MonitorCamera();
                 monitorCamera.setOrgId(CameraList.get(j).get("org_id").toString());
-                monitorCamera.setId(Integer.parseInt(CameraList.get(j).get("id").toString()));
+                monitorCamera.setId(Integer.parseInt(CameraList.get(j).get("camera_id").toString()));
                 monitorCamera.setAlias(CameraList.get(j).get("alias").toString());
-                monitorCamera.setIp(CameraList.get(j).get("ip").toString());
-                monitorCamera.setUsername(CameraList.get(j).get("username").toString());
-                monitorCamera.setPassword(CameraList.get(j).get("password").toString());
-                monitorCamera.setPort(CameraList.get(j).get("port").toString());
+                monitorCamera.setIp(CameraList.get(j).get("camera_ip").toString());
+                monitorCamera.setUsername(CameraList.get(j).get("camera_name").toString());
+                monitorCamera.setPassword(CameraList.get(j).get("camera_password").toString());
+                monitorCamera.setPort(CameraList.get(j).get("camera_port").toString());
                 monitorCamera.setFactory(CameraList.get(j).get("factory").toString());
-                monitorCamera.setType(CameraList.get(j).get("type").toString());
+                monitorCamera.setType(CameraList.get(j).get("camera_type").toString());
                 monitorCameraList.add(monitorCamera);
             }
             groupList.add(monitorCameraList);

src/main/resources/bootstrap.yml

@@ -19,6 +19,9 @@ eureka:
     # 告知服务端30秒还未收到心跳的话，就将该服务移除列表(默认90s)
     lease-expiration-duration-in-seconds: 30
 
+mybatis:
+  config-location: classpath:mybatis/mybatis-config.xml
+
 spring:
   profiles: agentLv
   application: