新增摄像头，立即更新可捕捉的画面

smartcity-facilities/src/main/java/com/zcxk/facilities/controller/CameraController.java

@@ -184,13 +184,13 @@ public class CameraController {
 
         return new AjaxMessage<>(ResultStatus.OK, videoRecorderInfo);
     }
-    /*@RequestMapping(value = "capture", method = RequestMethod.GET)
+    @RequestMapping(value = "capture", method = RequestMethod.GET)
     @ApiOperation(value = "操控云台")
     public AjaxMessage capture() {
-       // cameraService.capture();
-        cameraService.syncStatus();
+       cameraService.capture();
+        //cameraService.syncStatus();
         return new AjaxMessage<>(ResultStatus.OK);
-    }*/
+    }
     @RequestMapping(value = "getManufacturer", method = RequestMethod.GET)
     @ApiOperation(value = "操控云台")
     public AjaxMessage<List<Manufacturer>>getManufacturer() {

smartcity-facilities/src/main/java/com/zcxk/facilities/entity/CameraUser.java

@@ -85,4 +85,9 @@ public class CameraUser implements Serializable {
      */
     @ApiModelProperty(value = "监控场景名",hidden = true)
     private String monitorSceneName;
+    /**
+     * 通道名称
+     */
+    @ApiModelProperty(value = "通道名称")
+    private String channelName;
 }

smartcity-facilities/src/main/java/com/zcxk/facilities/service/impl/CameraServiceImpl.java

@@ -459,6 +459,7 @@ public class CameraServiceImpl implements CameraService {
     }
      @Scheduled(cron = "${sync.time}")
     public void capture(){
+        log.info("抓图ia");
         List<Camera> cameras = cameraMapper.selectAll();
         ExecutorService executorService = Executors.newFixedThreadPool(10);
 

smartcity-facilities/src/main/java/com/zcxk/facilities/service/impl/CameraUserServiceImpl.java

@@ -52,6 +52,7 @@ public class CameraUserServiceImpl implements CameraUserService {
     @Override
     public List<CameraUser> selectList(CameraUser cameraUser) {
         cameraUser.setUserId(UserUtil.getCurrentUser().getId());
+        cameraUser.setSiteId(UserUtil.getCurrentUser().getSiteId());
         return this.cameraUserMapper.selectList(cameraUser);
     }
 

smartcity-facilities/src/main/java/com/zcxk/facilities/service/impl/MonitorPointServiceImpl.java

@@ -138,33 +138,41 @@ public class MonitorPointServiceImpl implements MonitorPointService {
 
     @Override
     public List<CameraTreeDTO> selectTree() {
+        Integer siteId=UserUtil.getCurrentUser().getSiteId();
         List<MonitorPointTreeDTO> trees=
-                monitorPointMapper.selectTree(UserUtil.getCurrentUser().getSiteId());
+                monitorPointMapper.selectTree(siteId);
         Map<Integer, List<MonitorPointTreeDTO>> detailmap = trees.stream()
                 .collect(Collectors.groupingBy(d -> d.getMonitorSceneId() ));
-        Iterator<List<MonitorPointTreeDTO>> iterator = detailmap.values().iterator();
-        trees.clear();
         List<CameraTreeDTO>newTress=new ArrayList<>();
-        while (iterator.hasNext()){
-            List<MonitorPointTreeDTO> next = iterator.next();
-            CameraTreeDTO cameraTreeDTO=new CameraTreeDTO();
-            MonitorPointTreeDTO monitorPointTreeDTO = next.get(0);
-            cameraTreeDTO.setId(monitorPointTreeDTO.getMonitorSceneId());
-            cameraTreeDTO.setName(monitorPointTreeDTO.getMonitorSceneName());
-            cameraTreeDTO.setParentId(0);
-            List<CameraTreeDTO>cameraTreeDTOS=new ArrayList<>();
-            next.forEach(n->{
-                CameraTreeDTO cameraTreeDTOChild=new CameraTreeDTO();
-                cameraTreeDTOChild.setParentId(cameraTreeDTO.getId());
-                cameraTreeDTOChild.setId(n.getMonitorPointId());
-                cameraTreeDTOChild.setName(n.getMonitorPointName());
-                cameraTreeDTOS.add(cameraTreeDTOChild);
-            });
-            cameraTreeDTO.setChild(cameraTreeDTOS);
-            cameraTreeDTO.setSize(cameraTreeDTOS.size());
-            newTress.add(cameraTreeDTO);
+       List<Integer>scenes=new ArrayList<>();
+       trees.forEach(tree->{
+           if(!scenes.contains(tree.getMonitorSceneId())){
+               scenes.add(tree.getMonitorSceneId());
+           }
+       });
+        scenes.forEach(sceneId->{
+           List<MonitorPointTreeDTO> next = detailmap.get(sceneId);
+           CameraTreeDTO cameraTreeDTO=new CameraTreeDTO();
+           MonitorPointTreeDTO monitorPointTreeDTO = next.get(0);
+           cameraTreeDTO.setId(monitorPointTreeDTO.getMonitorSceneId());
+           cameraTreeDTO.setName(monitorPointTreeDTO.getMonitorSceneName());
+           cameraTreeDTO.setParentId(0);
+           List<CameraTreeDTO>cameraTreeDTOS=new ArrayList<>();
+           next.forEach(n->{
+               CameraTreeDTO cameraTreeDTOChild=new CameraTreeDTO();
+               if(n.getMonitorPointName()!=null){
+                   cameraTreeDTOChild.setParentId(cameraTreeDTO.getId());
+                   cameraTreeDTOChild.setId(n.getMonitorPointId());
+                   cameraTreeDTOChild.setName(n.getMonitorPointName());
+                   cameraTreeDTOS.add(cameraTreeDTOChild);
+               }
+
+           });
+           cameraTreeDTO.setChild(cameraTreeDTOS);
+           cameraTreeDTO.setSize(cameraTreeDTOS.size());
+           newTress.add(cameraTreeDTO);
+       });
 
-        }
 
         return  newTress;
     }

smartcity-facilities/src/main/resources/application-dev.properties

@@ -39,7 +39,7 @@ spring.jackson.time-zone=GMT+8
 spring.redis.host=114.135.61.188
 spring.redis.port=26379
 spring.redis.password=zoniot
-spring.redis.database=3
+spring.redis.database=13
 
 #mongodb
 spring.data.mongodb.uri=mongodb://114.135.61.188:17017/smartcity

smartcity-facilities/src/main/resources/mapper/CameraUserMapper.xml

@@ -37,7 +37,7 @@
     <!--通过实体作为筛选条件查询-->
     <select id="selectList" resultType="com.zcxk.facilities.entity.CameraUser">
         select
-               a.id,b.channel_no,
+               a.id,b.channel_no,b.channel_name,
         a.camera_id,c.monitor_point_name,b.monitor_point_id,b.pic_url,
         IFNULL(b.date_update, b.date_create) date_update,d.monitor_scene_name
         from sc_camera_user a join sc_camera b on a.camera_id=b.id join sc_monitor_point c
@@ -69,7 +69,7 @@
                 and status = #{status}
             </if>
             <if test="siteId != null">
-                and site_id = #{siteId}
+                and a.site_id = #{siteId}
             </if>
         </where>
     </select>

smartcity-facilities/src/main/resources/mapper/MonitorPointMapper.xml

@@ -167,14 +167,16 @@
     </select>
     <select id="selectTree" resultType="com.zcxk.facilities.dto.MonitorPointTreeDTO">
         select a.monitor_scene_name,a.id monitorSceneId,b.id monitorPointId,b.monitor_point_name
-        from sc_monitor_scene a join sc_monitor_point b
+        from sc_monitor_scene a left join
+        (select id,monitor_point_name,monitor_scene_id ,seq from sc_monitor_point where status=1) b
         on a.id=b.monitor_scene_id
         <where>
-            a.status=1 and b.status=1
+            a.status=1
             <if test="siteId != null">
-                and b.site_id = #{siteId}
+                and a.site_id = #{siteId}
             </if>
         </where>
+        order by a.seq,b.seq
     </select>
     <select id="queryByName" resultType="com.zcxk.facilities.entity.MonitorPoint">
         select