录像改为4个

web/src/main/java/com/zhehekeji/web/entity/SteeringEngine.java

@@ -5,7 +5,7 @@ import com.zhehekeji.web.service.PlcCmdInfo;
 import lombok.Data;
 
 @Data
-@TableName("\"steeringEngine\"")
+@TableName("flK.CRANESTATUS")
 public class SteeringEngine {
     private String workunitid;
     private String dloc;

web/src/main/java/com/zhehekeji/web/service/CameraService.java

@@ -82,6 +82,7 @@ public class CameraService {
         camera.setPort(configProperties.getCameraConfig().getCameraPort());
         camera.setUpdateTime(LocalDateTime.now());
         camera.setRtsp(getRtsp(camera));
+
         if(StringUtils.isEmpty(camera.getRtcServer())){
             camera.setRtcServer("127.0.0.1");
         }

web/src/main/java/com/zhehekeji/web/service/InitService.java

@@ -107,7 +107,8 @@ public class InitService implements ApplicationRunner {
                     log.error("streetId:{}：初始plc连接失败,url:{},port:{}",street.getId(),street.getPlcIp(),street.getPlcPort());
                 }
             });
-        }else if(configProperties.getServerMode() == 1){
+        }else
+            if(configProperties.getServerMode() == 1){
             Thread thread = new Thread(()->{
                 log.info("KESC JSON MODE");
                 // 昆船协议

web/src/main/java/com/zhehekeji/web/service/PlcService.java

@@ -88,12 +88,8 @@ public class PlcService {
 
     public Integer plcStatus() {
         Integer count = 2;
-        if(configProperties.getServerMode() == 0){
-            count = streetMapper.selectCount(new QueryWrapper<>());
-        }
 
-        List<Integer> connIds = StreetConn.connList();
-        return (count - connIds.size());
+        return 0;
     }
 
     /**
@@ -147,7 +143,6 @@ public class PlcService {
         LocalDateTime endTime = LocalDateTime.now();
         Street street = streetMapper.getStreetByPlcId(plcCmdInfo.getPlcId());
 
-        List<LightSource> lightSources = lightSourceMapper.selectList(new QueryWrapper<LightSource>().eq("street_id",street.getId()));
         if (street == null) {
             return;
         }
@@ -171,18 +166,26 @@ public class PlcService {
         if(duration.toMinutes() > 50){
             endDownLoadTime = order.getStartTime().plusMinutes(50);
         }
+        String path ="";
+        String path1 ="";
         if (street.getCamera1Id() != null) {
-            String path = cameraVideo(street.getCamera1Id(),order.getStartTime(),endDownLoadTime);
+            path = cameraVideo(street.getCamera1Id(),order.getStartTime(),endDownLoadTime);
             update.setVideoPath1(path);
         }
         if (street.getCamera2Id() != null) {
-            String path = cameraVideo(street.getCamera2Id(),order.getStartTime(),endDownLoadTime);
+            path1 = cameraVideo(street.getCamera2Id(),order.getStartTime(),endDownLoadTime);
             update.setVideoPath2(path);
         }
+
+        if (street.getCamera3Id() != null) {
+             cameraVideo(street.getCamera1Id(),order.getStartTime(),endDownLoadTime ,path+".mp4");
+
+        }
+        if (street.getCamera4Id() != null) {
+            cameraVideo(street.getCamera2Id(),order.getStartTime(),endDownLoadTime,path1+".mp4");
+        }
         orderMapper.updateById(update);
-        lightSources.forEach(lightSource -> {
-            lightSourceService.controllerLightSource(lightSource,0);
-        });
+
     }
 
     public void orderStopByWarn(String orderNum) {
@@ -214,6 +217,21 @@ public class PlcService {
         return path;
     }
 
+    public String cameraVideo(Integer cameraId, LocalDateTime startTime, LocalDateTime endTime,String path) {
+
+        Camera camera = cameraService.detail(cameraId);
+        Thread thread = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                String realPath = configProperties.getSavePath().getMp4Path() + path;
+                TaskDelayExecutor.addMp4DelayTask(camera,realPath,startTime,endTime,configProperties.getCameraConfig().getDelayDownloadMp4());
+            }
+        });
+        thread.start();
+        //cameraControlModule.downloadMp4(cameraId,realPath,startTime,endTime);
+        return path;
+    }
+
     /**
      * //times == 1 ,做动作
      * //times == 2 ,拍照

web/src/main/java/com/zhehekeji/web/service/SteeringEngineService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhehekeji.web.entity.SteeringEngine;
 import com.zhehekeji.web.mapper.SteeringEngineMapper;
 import com.zhehekeji.web.mapper.StockLogMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
@@ -17,6 +18,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Service
+@Slf4j
 @DS("slave")
 public class SteeringEngineService extends ServiceImpl<SteeringEngineMapper,SteeringEngine> implements IService<SteeringEngine>{
     @Resource
@@ -35,11 +37,15 @@ public class SteeringEngineService extends ServiceImpl<SteeringEngineMapper,Stee
 
                 //在跑随行
                 if(!newMap.get(streetId).getJobnum().equals("0")){
+                    log.info("随行开始");
                     plcService.orderStart(SteeringEngine.getPlcCmdInfo(newMap.get(streetId)));
                 }
 
                 //随行结束
                 else {
+                    log.info("随行结束");
+                    PlcCmdInfo plcCmdInfo = SteeringEngine.getPlcCmdInfo(newMap.get(streetId));
+                    plcCmdInfo.setOrderNum(steeringEngineMap.get(streetId).getPltnum());
                     plcService.orderStop(SteeringEngine.getPlcCmdInfo(newMap.get(streetId)));
                 }