添加摄像头回放

huimv-farm-video/src/main/java/com/huimv/video/HuimvVideoApplication.java

@@ -19,7 +19,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableScheduling
 @SpringBootApplication
 @MapperScan("com.huimv.video.*.mapper")
-//@Import(InterceptorConfig.class)
+@Import(InterceptorConfig.class)
 public class HuimvVideoApplication {
     public static void main(String[] args) {
         SpringApplication.run(HuimvVideoApplication.class, args);

huimv-farm-video/src/main/java/com/huimv/video/dhicc/timmer/SysTelcomEnentTimmer.java

@@ -84,7 +84,8 @@ public class SysTelcomEnentTimmer {
 
                 }
             }
-            if (Double.parseDouble(sysThreshold.getBenconValue()) < count * 5) {
+//            if (Double.parseDouble(sysThreshold.getBenconValue()) < count * 5) {
+            if (count >0 ) {
                 System.out.println("高于阈值温度时间" + count * 5);
                 //正确烘干为1
 
@@ -100,9 +101,10 @@ public class SysTelcomEnentTimmer {
     }
 
     //每小时执行一次
-    //@Scheduled(cron = " 0 */59 * * * ? ")
+
     // @Scheduled(cron = " 0/5 * * * * ? ")
-     @Scheduled(cron = " 0/50 * * * * ? ")
+//     @Scheduled(cron = " 0/50 * * * * ? ")
+    @Scheduled(cron = " 0 */59 * * * ? ")
     private void updateBox() {
         //获得设备列表 查找烘干数据
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

huimv-farm-video/src/main/java/com/huimv/video/video/service/impl/CameraServiceImpl.java

@@ -62,6 +62,10 @@ public class CameraServiceImpl extends ServiceImpl<CameraMapper, Camera> impleme
         Integer farmId = cameraListVo.getFarmId();
 
         QueryWrapper<Camera> wrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(strchStr)) {
+            wrapper.like("camera_name", strchStr)
+                    .or().like("camera_ip", strchStr);
+        }
 
         if (farmId != null) {
             wrapper.eq("farm_id", farmId);
@@ -74,10 +78,6 @@ public class CameraServiceImpl extends ServiceImpl<CameraMapper, Camera> impleme
         if (brandId != null) {
             wrapper.eq("brand_id", brandId);
         }
-        if (StringUtils.isNotBlank(strchStr)) {
-            wrapper.like("camera_name", strchStr)
-                    .or().like("camera_ip", strchStr);
-        }
 
 
 
@@ -136,8 +136,13 @@ public class CameraServiceImpl extends ServiceImpl<CameraMapper, Camera> impleme
                     }
                     CameraVo cameraVo= new CameraVo();
                     cameraVo.setAreaId(areaId);
-                    cameraVo.setWsUrl("ws://" + url + "/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword + "%40" + camerIp);
-                    cameraVo.setRtspUrl("rtsp://" + cameraAccount + ":" + cameraPassword + "@" + camerIp + rtsp);
+                    if (camera.getId() == 767){
+                        cameraVo.setWsUrl("ws://" + url + "/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword + "%40" + camerIp);
+                        cameraVo.setRtspUrl("rtsp://" + cameraAccount + ":" + cameraPassword + "@" + camerIp + "/cam/realmonitor?channel=2&subtype=0");
+                    }else {
+                        cameraVo.setWsUrl("ws://" + url + "/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword + "%40" + camerIp);
+                        cameraVo.setRtspUrl("rtsp://" + cameraAccount + ":" + cameraPassword + "@" + camerIp + rtsp);
+                    }
                     cameraVo.setCameraName(cameraName);
                     cameraVo.setHttpUrl(handleHlsHttpUrl(url,cameraAccount,cameraPassword,camerIp,farmAppPort,farmVideoApp,hlsMediaPort));
                     if (i > 0){
@@ -431,8 +436,16 @@ public class CameraServiceImpl extends ServiceImpl<CameraMapper, Camera> impleme
 
         CameraVo cameraVo = new CameraVo();
         cameraVo.setAreaId(areaId);
-        cameraVo.setWsUrl("ws://" + url + "/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword + "%40" + camerIp);
-        cameraVo.setRtspUrl("rtsp://" + cameraAccount + ":" + cameraPassword + "@" + camerIp + rtsp);
+
+        if (camera.getId() == 767){
+            cameraVo.setWsUrl("ws://" + url + "/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword + "%40" + camerIp);
+            cameraVo.setRtspUrl("rtsp://" + cameraAccount + ":" + cameraPassword + "@" + camerIp + "/cam/realmonitor?channel=2&subtype=0");
+        }else {
+            cameraVo.setWsUrl("ws://" + url + "/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword + "%40" + camerIp);
+            cameraVo.setRtspUrl("rtsp://" + cameraAccount + ":" + cameraPassword + "@" + camerIp + rtsp);
+        }
+//        cameraVo.setWsUrl("ws://" + url + "/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword + "%40" + camerIp);
+//        cameraVo.setRtspUrl("rtsp://" + cameraAccount + ":" + cameraPassword + "@" + camerIp + rtsp);
         cameraVo.setCameraName(cameraName);
         return cameraVo;
     }

huimv-farm-video/src/main/resources/application-prod.yml

@@ -32,6 +32,6 @@ spring:
   #pool-max: 30
   # 线程队列容量 10
   #pool-queue-init: 10
-#mybatis-plus:
-#  configuration:
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl