浦江牧场rtsp流

huimv-admin/src/main/java/com/huimv/admin/service/impl/CameraBaseServiceImpl.java

@@ -195,41 +195,25 @@ public class CameraBaseServiceImpl extends ServiceImpl<CameraBaseMapper, CameraB
     public void NewSync(Map<String, Integer> params, List<CameraDetailDto> hkvsNewCameraDtoDatumList) throws Exception {
         Integer farmId = params.get("farmId");
 
-        List<CameraBase> huatongCameraBaseList = this.list(new QueryWrapper<CameraBase>().eq("farm_id", farmId));
-        List<String> haikangCarmearId = hkvsNewCameraDtoDatumList.stream().map(CameraDetailDto::getIndexCode).collect(Collectors.toList());
-        List<String> huatongCameraId = huatongCameraBaseList.stream().map(CameraBase::getCameraUuid).collect(Collectors.toList());
-        CopyOnWriteArrayList<String> haikangDeviceIdCopy = ListUtil.toCopyOnWriteArrayList(haikangCarmearId);
-        CopyOnWriteArrayList<String> huatongDeviceIdCopy = ListUtil.toCopyOnWriteArrayList(huatongCameraId);
-        haikangDeviceIdCopy.removeAll(huatongCameraId);
-        //TODO 想不出来，回头优化
-        if (haikangDeviceIdCopy.size() > 0) {
-            for (String s : haikangDeviceIdCopy) {
-                for (CameraDetailDto cameraDto : hkvsNewCameraDtoDatumList) {
-                    if (s.equals(cameraDto.getIndexCode())) {
-                        CameraBase cameraBase = new CameraBase();
-                        cameraBase.setAreaName(cameraDto.getRegionName());
-                        cameraBase.setCameraName(cameraDto.getName());
-                        cameraBase.setCameraUuid(cameraDto.getIndexCode());
-                        String callPostApiGetPreviewURLs = callPostApiGetPreviewURLs(cameraDto.getIndexCode());
-                        HkvsPreviewDto hkvsPreviewDto = JSONUtil.toBean(callPostApiGetPreviewURLs, HkvsPreviewDto.class);
-                        cameraBase.setUrl(hkvsPreviewDto.getData().getUrl());
-                        cameraBase.setCameraType(Integer.parseInt(cameraDto.getCameraType()));
-                        cameraBase.setCameraChannelNum(Integer.parseInt(cameraDto.getChanNum()));
-                        cameraBase.setUpdateTime(cameraDto.getUpdateTime());
-                        cameraBase.setUnitUuid(cameraDto.getParentIndexCode());
-                        cameraBase.setRegionUuid(cameraDto.getRegionIndexCode());
-                        cameraBase.setOrderNum(cameraDto.getSort());
-                        cameraBase.setBrandName("海康威视");
-                        cameraBase.setFarmId(farmId);
-                        this.save(cameraBase);
-                    }
-                }
-            }
-        }
-        //删除
-        huatongDeviceIdCopy.removeAll(haikangCarmearId);
-        if (huatongDeviceIdCopy.size() > 0) {
-            this.remove(new QueryWrapper<CameraBase>().in("camera_uuid", huatongDeviceIdCopy));
+        this.remove(new QueryWrapper<CameraBase>().eq("farm_id", farmId));
+        for (CameraDetailDto cameraDto : hkvsNewCameraDtoDatumList) {
+                CameraBase cameraBase = new CameraBase();
+                cameraBase.setAreaName(cameraDto.getRegionName());
+                cameraBase.setCameraName(cameraDto.getName());
+                cameraBase.setCameraUuid(cameraDto.getIndexCode());
+                String callPostApiGetPreviewURLs = callPostApiGetPreviewURLs(cameraDto.getIndexCode());
+                HkvsPreviewDto hkvsPreviewDto = JSONUtil.toBean(callPostApiGetPreviewURLs, HkvsPreviewDto.class);
+                cameraBase.setUrl(hkvsPreviewDto.getData().getUrl());
+                cameraBase.setCameraType(Integer.parseInt(cameraDto.getCameraType()));
+                cameraBase.setCameraChannelNum(Integer.parseInt(cameraDto.getChanNum()));
+                cameraBase.setUpdateTime(cameraDto.getUpdateTime());
+                cameraBase.setUnitUuid(cameraDto.getParentIndexCode());
+                cameraBase.setRegionUuid(cameraDto.getRegionIndexCode());
+                cameraBase.setOrderNum(cameraDto.getSort());
+                cameraBase.setBrandName("海康威视");
+                cameraBase.setFarmId(farmId);
+                this.save(cameraBase);
+
         }
     }
 
@@ -273,7 +257,7 @@ public class CameraBaseServiceImpl extends ServiceImpl<CameraBaseMapper, CameraB
         Map<String, Object> paramMap = new HashMap<String, Object>();// post请求Form表单参数
         paramMap.put("cameraIndexCode",cameraIndexCode);
         paramMap.put("streamType",1);
-        paramMap.put("protocol","hls");
+        paramMap.put("protocol","rtsp");
         paramMap.put("transmode",1);
         String body = JSON.toJSON(paramMap).toString();
         Map<String, String> path = new HashMap<String, String>(2) {