Merge remote-tracking branch 'origin/dev' into dev

aijinhui

2024-04-15 dae6e068207ad1bff32dafd8c71f12d8a2a59aa2

 ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java

@@ -14,6 +14,7 @@
import com.ruoyi.inspect.domain.ArdVideoInspectRecord;

import com.ruoyi.inspect.mapper.ArdVideoInspectRecordMapper;

import com.ruoyi.inspect.mapper.ArdVideoInspectTaskStepMapper;

import com.ruoyi.utils.websocket.util.WebSocketUtils;

import lombok.extern.slf4j.Slf4j;

import org.springframework.stereotype.Service;

import com.ruoyi.common.utils.StringUtils;

@@ -457,6 +458,14 @@
                    if (setTargetPosition) {

                        /*控制相机巡检成功，开始录像*/

                        cameraSdkService.recordStart(cmd);

                        //region 通知前端

                        Map<String, Object> message = new HashMap<>();

                        Map<String, String> data = new HashMap<>();

                        data.put("cameraId", cmd.getCameraId());

                        data.put("wellId", well.getWellId());

                        message.put("70000", data);

                        WebSocketUtils.sendMessageAll(message);

                        //endregion

                    } else {

                        /*控制失败,当前步骤启动时间置null*/

                        ardVideoInspectTask.setCurrentStepStartTime("");

@@ -517,6 +526,14 @@
                        ardVideoInspectTaskMapper.updateArdVideoInspectTaskWithCurrentSetpInfo(ardVideoInspectTask);

                    } else {

                        log.debug("引导成功!");

                        //region 通知前端

                        Map<String, Object> message = new HashMap<>();

                        Map<String, String> data = new HashMap<>();

                        data.put("cameraId", cmd.getCameraId());

                        data.put("wellId", well.getWellId());

                        message.put("70000", data);

                        WebSocketUtils.sendMessageAll(message);

                        //endregion

                    }

                }

            }

@@ -652,6 +669,11 @@
    public List getCameraIdleTimeList(String cameraId) {

        LinkedList<String> timeList = new LinkedList();

        List<Map> usedPeriods = this.getTaskUsedCameraPeriods(cameraId);

        //事件段为空,则全天作为一个时间段

        if (usedPeriods.size() == 0) {

            timeList.add("00:00:00");

            timeList.add("23:59:59");

        }else{

        for (Map p :

                usedPeriods) {

            timeList.add((String) p.get("start_time"));

@@ -670,13 +692,11 @@
            } else {

                timeList.addLast("23:59:59");

            }

            //事件段为空,则全天作为一个时间段

            if (timeList.size() == 0) {

                timeList.add("00:00:00");

                timeList.add("23:59:59");

            }





        }

        }





        return timeList;

    }