优化

‘liusuyi’

2023-12-16 373663be9204a1ca36cd20a47d0e1487f87bb0a8

优化

 ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java

@@ -1269,7 +1269,7 @@
        try {
            String cameraId = guideDataDto.getCameraId();
            if (!IsEnableGuide(cameraId)) {
                log.info("相机:" + cameraId + "未开启报警引导功能");
                log.debug("相机:" + cameraId + "未开启报警引导功能");
                return;
            }
            GuideTask guideTask = new GuideTask();

 ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java

@@ -14,14 +14,18 @@
import com.ruoyi.alarm.radar.service.IArdAlarmRadarPumpService;
import com.ruoyi.alarm.tube.domain.ArdAlarmTube;
import com.ruoyi.alarm.tube.service.IArdAlarmTubeService;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.ICameraSdkService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.time.Duration;
import java.time.Instant;
import java.util.HashMap;
@@ -37,6 +41,9 @@
@Slf4j(topic = "guideQueue")
@Component
public class QueueHandler {
    @Resource
    private RedisCache redisCache;

    /**
     * å¼•å¯¼ä»»åŠ¡å…¥é˜Ÿ
     * åˆ˜è‹ä¹‰
@@ -46,7 +53,7 @@
        /*通过相机ID获取引导队列，并将引导任务加入队列*/
        PriorityBlockingQueue<GuideTask> guideTaskQueue = GuidePriorityQueue.cameraQueueMap.get(cameraId);
        if (StringUtils.isNull(guideTaskQueue)) {
            log.info("相机未登录,没有队列,无法入队引导");
            log.debug("相机未登录,没有队列,无法入队引导");
            return;
        }
        log.debug("新任务入队:" + task.getAlarmId());
@@ -100,6 +107,9 @@

    public void processTask(GuideTask guideTask) {
        try {
            if (!IsEnableGuide(guideTask.getCameraId())) {
                return;
            }
            String url = "";
            CameraCmd cmd = new CameraCmd();
            cmd.setCameraId(guideTask.getCameraId());
@@ -144,8 +154,11 @@
                    Instant currentTime = Instant.now();
                    long elapsedSeconds = Duration.between(startTime, currentTime).getSeconds();
                    if (elapsedSeconds >= 30) {
                        recordFlag = false;
                        recordFlag = false;//达到30秒录像停止
                        url = cameraSdkService.recordStopToMinio(cmd);//停止录像返回url
                    }
                    if (!IsEnableGuide(guideTask.getCameraId())) {
                        recordFlag = false;//相机关闭引导录像停止
                    }
                    //判断队列中第一条数据的优先级是否大于当前数据的优先级
                    PriorityBlockingQueue<GuideTask> guideTasks = GuidePriorityQueue.cameraQueueMap.get(guideTask.getCameraId());
@@ -207,4 +220,20 @@
            log.info("线程任务异常:" + ex.getMessage());
        }
    }

    /**
     * å…‰ç”µæ˜¯å¦å¼€å¯æŠ¥è­¦å¼•å¯¼åŠŸèƒ½
     * åˆ˜è‹ä¹‰
     * 2023/7/7 14:03
     */
    private Boolean IsEnableGuide(String cameraId) {
        boolean enabled = false;
        ArdCameras ardCameras = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
        if (ardCameras != null) {
            if (ardCameras.getCamAlarmGuideEnable().equals(1)) {
                enabled = true;
            }
        }
        return enabled;
    }
}

 bin/clean.bat

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
@echo off
echo.
echo [信息] æ¸…理工程target生成路径。
echo.

%~d0
cd %~dp0

cd ..
call mvn clean

pause

 bin/package.bat

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
@echo off
echo.
echo [信息] æ‰“包Web工程，生成war/jar包文件。
echo.

%~d0
cd %~dp0

cd ..
call mvn clean package -Dmaven.test.skip=true

pause

 bin/run.bat

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
@echo off
echo.
echo [信息] ä½¿ç”¨Jar命令运行Web工程。
echo.

cd %~dp0
cd ../ruoyi-admin

set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m

java -Dloader.path="jarLib/" -jar %JAVA_OPTS% ruoyi-admin.jar

cd bin
pause