代储点下边的视频列表修改

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.chinaitop</groupId>
     <artifactId>depot-monitor</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.1</version>
     <packaging>jar</packaging>
 
     <name>depot-monitor</name>
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.0.RELEASE</version>
+        <version>2.0.4.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -158,18 +158,6 @@
             <artifactId>log4j</artifactId>
             <version>1.2.17</version>
         </dependency>
-
-        <!-- gbase依赖包 -->
-        <dependency>
-            <groupId>com.gbase8s</groupId>
-            <artifactId>ifxjdbc</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.gbase</groupId>
-            <artifactId>druid</artifactId>
-            <version>1.0.28</version>
-        </dependency>
     </dependencies>
 
     <dependencyManagement>
@@ -230,5 +218,4 @@
         </repository>
     </repositories>
 
-
 </project>

src/main/java/com/chinaitop/depot/basic/controller/MonitorCameraController.java

@@ -5,13 +5,13 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Logger;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import com.chinaitop.depot.basic.model.MonitorNvr;
 import com.chinaitop.depot.basic.service.MonitorNvrService;
-import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
@@ -43,9 +43,6 @@ import io.swagger.annotations.ApiOperation;
 @Api(value= "MonitorCameraController", description = "摄像头操作类")
 public class MonitorCameraController {
 
-    @SuppressWarnings("unused")
-	private static Logger log = LoggerFactory.getLogger(MonitorCameraController.class);
-
     @Resource
     private MonitorCameraService cameraService;
 
@@ -206,10 +203,20 @@ public class MonitorCameraController {
     @ApiImplicitParams({
             @ApiImplicitParam(name="orgid", value="组织机构id", paramType="query")
     })
-    public List<Map<String,Object>> getAgentVideo(Integer orgid) {
+    public List<List<Map<String,Object>>> getAgentVideo(Integer orgid) {
         Map<String,Object> map = new HashMap<>();
-        map.put("orgid",orgid.toString());
-        List<Map<String,Object>> list = cameraService.getAgentVideo(map);
+        map.put("nowOrgid",orgid.toString());
+        //先查询出来粮库下边的所有代储库
+        List<Map<String,Object>> depotList = cameraService.getAgentDepot(map);
+        List<List<Map<String,Object>>> list = new ArrayList<List<Map<String,Object>>>();
+        for (Map<String,Object> depot : depotList) {
+            map.put("orgid",depot.get("depotId"));
+            List<Map<String,Object>> cameraList = cameraService.getAgentVideo(map);
+            if(ParameterUtil.isnotnull(cameraList)){
+                list.add(cameraList);
+            }
+        }
+
         return list;
     }
 

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

@@ -99,10 +99,7 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.chinaitop.depot.basic.model.CameraStorehouse">
-    <selectKey keyProperty="csId" resultType="java.lang.Integer" order="BEFORE">
-      select seq_camera_storehouse.nextVal from dual
-    </selectKey>
-    insert into camera_storehouse (cs_id, org_id, camera_id, 
+    insert into camera_storehouse (cs_id, org_id, camera_id,
       storehouse_id)
     values (#{csId,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{cameraId,jdbcType=INTEGER}, 
       #{storehouseId,jdbcType=INTEGER})

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

@@ -34,6 +34,8 @@ public interface MonitorCameraMapper {
 
     List<Map<String,Object>> selectByNVRDates(Map<String, Object> map);
 
+    List<Map<String,Object>> getAgentDepot(Map<String, Object> map);
+
     List<Map<String,Object>> getAgentVideo(Map<String, Object> map);
 
     List<Map<String,Object>> selectByGroupId(String groupIds);

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

@@ -130,10 +130,7 @@
     </if>
   </delete>
   <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.basic.model.MonitorCamera" >
-    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
-      select seq_monitor_camera.nextVal from dual
-    </selectKey>
-    insert into monitor_camera (id, org_id, nvr_id, 
+    insert into monitor_camera (id, org_id, nvr_id,
       name, alias, username, 
       password, ip, subnetmask, 
       gateway, type, port, 
@@ -522,10 +519,8 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByNVRDates" resultType="java.util.HashMap" parameterType="java.util.Map" >
-    select * from (
-      SELECT
-        row_number() over(partition by camera.id) rn,
-        camera.id camera_id,
+     SELECT
+        DISTINCT camera.id camera_id,
         camera.alias,
         camera.factory,
         camera.live,
@@ -544,27 +539,36 @@
           monitor_camera camera
       LEFT JOIN monitor_nvr nvr ON nvr.id = camera.nvr_id
       WHERE camera.isremove = '1' AND nvr.delete_mark = '1' AND camera.org_id = #{orgid,jdbcType=VARCHAR} AND nvr.org_id = #{orgid,jdbcType=VARCHAR}
-    )a where rn = 1
   </select>
-  <select id="getAgentVideo" resultType="java.util.HashMap" parameterType="java.util.Map" >
-    select * from (
+
+  <select id="getAgentDepot" resultType="java.util.HashMap" parameterType="java.util.Map" >
       SELECT
-        row_number() over(partition by to_date(camera.id, 'yyyy-mm-dd')) rn,
-        camera.id camera_id,
+          depot_id depotId
+      FROM
+          business_agent_depot
+      WHERE
+          del_flag = 1
+      AND org_id = #{nowOrgid,jdbcType=INTEGER}
+  </select>
+
+  <select id="getAgentVideo" resultType="java.util.HashMap" parameterType="java.util.Map" >
+     SELECT
+        DISTINCT camera.id cameraId,
         camera.alias,
         camera.factory,
         camera.live,
-        camera.ip camera_ip,
-        camera.username camera_name,
-        camera. PASSWORD camera_password,
-        camera. PORT camera_port,
-        camera.type camera_type,
-        nvr.ip nvr_ip,
-        nvr.username nvr_name,
-        nvr. PASSWORD nvr_password,
-        nvr. PORT nvr_port,
-        nvr.factory nvr_factory,
-        camera.channel_number
+        camera.ip cameraIp,
+        camera.username cameraName,
+        camera. PASSWORD cameraPassword,
+        camera. PORT cameraPort,
+        camera.type cameraType,
+        nvr.ip nvrIp,
+        nvr.username nvrName,
+        nvr. PASSWORD nvrPassword,
+        nvr. PORT nvrPort,
+        nvr.factory nvrFactory,
+        camera.channel_number channelNumber,
+        depot.agent_depot_name agentDepotName
       FROM
           business_agent_storehouse store
       INNER JOIN camera_storehouse bstore ON bstore.storehouse_id = store.storehouse_id
@@ -575,11 +579,9 @@
           camera.isremove = '1'
       AND nvr.delete_mark = '1'
       AND store.del_flag = 1
-      AND depot.depot_id = #{orgid,jdbcType=VARCHAR}
       AND bstore.org_id = #{orgid,jdbcType=VARCHAR}
       AND camera.org_id = #{orgid,jdbcType=VARCHAR}
       AND nvr.org_id = #{orgid,jdbcType=VARCHAR}
-    )a where rn = 1
   </select>
 
   <select id="selectByGroupId" parameterType="java.lang.String" resultType="java.util.HashMap">

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

@@ -121,10 +121,7 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.chinaitop.depot.basic.model.MonitorNvr">
-    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
-      select seq_monitor_nvr.nextVal from dual
-    </selectKey>
-    insert into monitor_nvr (id, name, ip, 
+    insert into monitor_nvr (id, name, ip,
       username, password, type, 
       factory, port, model_num, 
       department, serialno, warden, 

src/main/java/com/chinaitop/depot/basic/service/MonitorCameraService.java

@@ -30,6 +30,8 @@ public interface MonitorCameraService {
 
     List<Map<String,Object>> selectByNVRDates(Map<String, Object> map);
 
+    List<Map<String,Object>> getAgentDepot(Map<String, Object> map);
+
     List<Map<String,Object>> getAgentVideo(Map<String, Object> map);
 
     /**

src/main/java/com/chinaitop/depot/basic/service/impl/MonitorCameraServiceImpl.java

@@ -71,6 +71,11 @@ public class MonitorCameraServiceImpl implements MonitorCameraService {
         return cameraMapper.getAgentVideo(map);
     }
 
+    @Override
+    public List<Map<String,Object>> getAgentDepot(Map<String,Object> map) {
+        return cameraMapper.getAgentDepot(map);
+    }
+
 	@Override
 	public String importData(List<List<String>> list, Integer orgId) {
 		Date date = new Date();