Merge branch 'master' into production

src/main/java/com/censoft/flink/StreamingJob.java

@@ -79,11 +79,12 @@ public class StreamingJob {
             AlgorithmWarnPushDto warnPushBase = new AlgorithmWarnPushDto();
             warnPushBase.setOrderName("AI预警平台");
             //获取摄像头名称
-            warnPushBase.setAlarmDeviceName(getAlgorithmCameraPoByRtsp(algorithmCameraPoList,algorithmPushDto.getCameraName())
-                    .getCameraName());
+            AlgorithmCameraPo cameraPo = getAlgorithmCameraPoByRtsp(algorithmCameraPoList, algorithmPushDto.getCameraName());
+            warnPushBase.setAlarmDeviceName(cameraPo.getCameraName());
             //获取摄像头归属
-            warnPushBase.setBelong(getAlgorithmCameraPoByRtsp(algorithmCameraPoList,algorithmPushDto.getCameraName())
-                    .getBelong());
+            warnPushBase.setBelong(cameraPo.getBelong());
+            //获取摄像头Id
+            warnPushBase.setChannelId(cameraPo.getRtsp()+"$1$0$0");
             warnPushBase.setGradeName("二级预警");
             //获取摄像头名称
             warnPushBase.setGradeType(getAlgorithmPoById(algorithmPoList,Long.valueOf(algorithmPushDto.getAlgorithmName()))

src/main/java/com/censoft/flink/domain/AlgorithmWarnPushDto.java

@@ -42,4 +42,7 @@ public class AlgorithmWarnPushDto {
 
     /** 备注 */
     private String remark;
+
+    /** 摄像头id */
+    private String channelId;
 }