代储点视频播放问题和其他bug

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

@@ -206,10 +206,19 @@ 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(cameraList!=null&&!cameraList.isEmpty()){
+                list.add(ParameterUtil.slashCapitals(cameraList));
+            }
+        }
         return list;
     }
 

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

@@ -546,10 +546,21 @@
       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="getAgentDepot" resultType="java.util.HashMap" parameterType="java.util.Map" >
+      SELECT
+          depot_id depotId
+      FROM
+          business_agent_depot
+      WHERE
+          del_flag = 1
+      AND org_id = #{nowOrgid,jdbcType=INTEGER}
+      AND depot_id != 0
+  </select>
   <select id="getAgentVideo" resultType="java.util.HashMap" parameterType="java.util.Map" >
     select * from (
       SELECT
-        row_number() over(partition by to_date(camera.id, 'yyyy-mm-dd')) rn,
+        row_number() over(partition by camera.id) rn,
         camera.id camera_id,
         camera.alias,
         camera.factory,
@@ -564,7 +575,8 @@
         nvr. PASSWORD nvr_password,
         nvr. PORT nvr_port,
         nvr.factory nvr_factory,
-        camera.channel_number
+        camera.channel_number,
+        depot.agent_depot_name
       FROM
           business_agent_storehouse store
       INNER JOIN camera_storehouse bstore ON bstore.storehouse_id = store.storehouse_id
@@ -575,7 +587,6 @@
           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}

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

@@ -66,6 +66,11 @@ public class MonitorCameraServiceImpl implements MonitorCameraService {
         return cameraMapper.selectByNVRDates(map);
     }
 
+	@Override
+	public List<Map<String,Object>> getAgentDepot(Map<String,Object> map) {
+		return cameraMapper.getAgentDepot(map);
+	}
+
     @Override
     public List<Map<String,Object>> getAgentVideo(Map<String,Object> map) {
         return cameraMapper.getAgentVideo(map);