‘liusuyi’
2023-06-24 83d4497dd072f2478171a5442d9b5c7ce83594b8
增加ptz的websocket推送
已添加1个文件
已修改2个文件
64 ■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java
@@ -13,16 +13,10 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.propertyeditors.CustomDateEditor;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
import static com.ruoyi.common.utils.PageUtils.startPage;
/**
 * @ClassName: globalAlarmController
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
@@ -596,7 +596,7 @@
            double p = b.setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
            double t = c.setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
            double z = d.setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
            log.debug("T垂直参数为: " + p + "P水平参数为: " + t + "Z变倍参数为: " + z);
//            log.debug("T垂直参数为: " + p + "P水平参数为: " + t + "Z变倍参数为: " + z);
            Map<String, Object> ptzMap = new HashMap<>();
            ptzMap.put("p", p);
            ptzMap.put("t", t);
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,56 @@
package com.ruoyi.quartz.task;
import com.ruoyi.common.websocket.util.WebSocketUtils;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.device.hiksdk.service.IHikClientService;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import static com.ruoyi.common.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;
/**
 * @Description:
 * @ClassName: SdkTask
 * @Author: åˆ˜è‹ä¹‰
 * @Date: 2023å¹´06月24日14:23
 * @Version: 1.0
 **/
@Component("SdkTask")
public class SdkTask {
    @Resource
    IArdCamerasService ardCamerasService;
    @Resource
    IHikClientService hikClientService;
    /**
     * @描述 å®šæ—¶æŽ¨é€ptz
     * @参数 []
     * @返回值 void
     * @创建人 åˆ˜è‹ä¹‰
     * @创建时间 2023/6/15 15:43
     * @修改人和其它信息
     */
    public void ptzPush() {
        List<Map<String, Object>> list = new ArrayList<>();
        ArdCameras ardCameras = new ArdCameras();
        ardCameras.setGdtype("1");
        List<ArdCameras> ardCamerasList = ardCamerasService.selectArdCamerasListNoDataScope(ardCameras);
        for (ArdCameras camera : ardCamerasList) {
            CameraCmd cmd = new CameraCmd();
            cmd.setCameraId(camera.getId());
            cmd.setChannelNum(1);
            Map<String, Object> ptz = hikClientService.getPtz(cmd);
            if (ptz.size() > 0) {
                ptz.put("cameraId", camera.getId());
                list.add(ptz);
            }
        }
        if (ONLINE_USER_SESSIONS.size() > 0) {
            WebSocketUtils.sendMessageAll(list.toString());
        }
    }
}