‘liusuyi’
2023-07-04 2e81e44c7dc4945b9d1db55bf0357e4c79d59500
websocket推送ptz增加剩余秒数
已修改2个文件
19 ■■■■ 文件已修改
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -204,7 +204,7 @@
        // 获得两个时间的毫秒时间差异
        long diff = endDate.getTime() - nowDate.getTime();
        // 计算差多少秒//输出结果
        long sec = diff % nd % nh % nm / ns;
        long sec = diff/ ns;
        return sec;
    }
}
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java
@@ -11,6 +11,7 @@
import com.ruoyi.device.hiksdk.common.GlobalVariable;
import com.ruoyi.device.hiksdk.service.IHikClientService;
import com.ruoyi.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -26,6 +27,7 @@
 * @Version: 1.0
 **/
@Component("SdkTask")
@Slf4j(topic = "hikSdk")
public class SdkTask {
    /**
@@ -37,6 +39,7 @@
     * @修改人和其它信息
     */
    public void ptzPush() {
        try {
        ISysUserService sysUserService = SpringUtils.getBean(ISysUserService.class);
        IArdCamerasService ardCamerasService = SpringUtils.getBean(IArdCamerasService.class);
        IHikClientService hikClientService = SpringUtils.getBean(IHikClientService.class);
@@ -65,7 +68,14 @@
            }
            //获取时间差
            long secDatePoor = DateUtils.getSecDatePoor(camera.getOperatorExpired(), new Date());
                long secDatePoor = 0;
                if (StringUtils.isNotNull(camera.getOperatorExpired())) {
                    secDatePoor = DateUtils.getSecDatePoor(camera.getOperatorExpired(), new Date());
                    if(secDatePoor<0)
                    {
                        secDatePoor=0;
                    }
                }
            if (ptz.size() > 0) {
                ptz.put("cameraId", cmd.getCameraId());
@@ -81,4 +91,9 @@
            WebSocketUtils.sendMessageAll(sendMap);
        }
    }
        catch (Exception ex)
        {
            log.error("推送ptz异常:"+ex.getMessage());
        }
    }
}