From 68abebc90fabc37fd6e8e5e5f55e01e244629ffc Mon Sep 17 00:00:00 2001 From: 15683799673 Date: Sun, 7 Sep 2025 09:07:57 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=8A=B6=E6=80=81=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/job/snailjob/sis/HikDeviceCheckStateTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/sis/HikDeviceCheckStateTask.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/sis/HikDeviceCheckStateTask.java index 58c03ffe..071f1f0b 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/sis/HikDeviceCheckStateTask.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/sis/HikDeviceCheckStateTask.java @@ -159,7 +159,7 @@ public class HikDeviceCheckStateTask { // 调用设备登录验证次设备在线 Boolean isLogin = remoteHikSdkService.deviceLogin(item); int onLineState = isLogin ? 1 : 0; - if (item.getDeviceStatus() != onLineState) { + if (Objects.equals(item.getDeviceStatus(), onLineState)) { SnailJobLog.REMOTE.info("设备[{}]在线状态变更，开始更新状态。 old={}，new ={} ", item.getDeviceIp(), item.getDeviceStatus(), onLineState); item.setDeviceStatus(onLineState); Boolean result = remoteDeviceService.updateDeviceState(item); -- 2.43.0 From 71c82fa345187c39418546585f8e7a0d40efab5c Mon Sep 17 00:00:00 2001 From: 15683799673 Date: Mon, 8 Sep 2025 01:44:27 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E5=91=8A=E8=AD=A6=E6=95=B0=E9=87=8F=E4=B8=BA?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +++--- .../java/org/dromara/sis/mapper/SisAlarmEventsMapper.java | 2 +- .../dromara/sis/service/impl/SisAlarmEventsServiceImpl.java | 5 ++++- .../src/main/resources/mapper/sis/SisAlarmEventsMapper.xml | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 98677c70..9845f529 100644 --- a/pom.xml +++ b/pom.xml @@ -74,12 +74,12 @@ dev - 10.20.1.65:8848 - 10.20.1.65:4560 + 113.249.101.254:8848 + 113.249.101.254:4560 DEFAULT_GROUP DEFAULT_GROUP nacos - nacos + by@2025?? diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAlarmEventsMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAlarmEventsMapper.java index c929b4ee..9735d7e0 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAlarmEventsMapper.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAlarmEventsMapper.java @@ -17,7 +17,7 @@ import java.util.List; */ public interface SisAlarmEventsMapper extends BaseMapperPlus { - List queryStatisticsCurrDay(@Param("now") Date now); + List queryStatisticsCurrDay(@Param("start") Date start, @Param("end") Date end); List queryStatistics(); diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java index 2f59f655..a1167a8b 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java @@ -4,6 +4,7 @@ import cn.dev33.satoken.context.mock.SaTokenContextMockUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateField; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -354,7 +355,9 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService { @Override public List queryStatisticsCurrDay() { Date now = new Date(); - return this.baseMapper.queryStatisticsCurrDay(now); + DateTime start = DateUtil.beginOfDay(now); + DateTime end = DateUtil.endOfDay(now); + return this.baseMapper.queryStatisticsCurrDay(start, end); } @Override diff --git a/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAlarmEventsMapper.xml b/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAlarmEventsMapper.xml index 83318a47..f0579ab3 100644 --- a/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAlarmEventsMapper.xml +++ b/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAlarmEventsMapper.xml @@ -8,8 +8,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT small_type typeCode, sum(1) total FROM `sis_alarm_events` - WHERE report_time BETWEEN #{now} - AND #{now} + WHERE report_time BETWEEN #{start} + AND #{end} GROUP BY small_type + SELECT * + FROM sis_device_channel + WHERE device_ip = #{deviceIp} + AND (channel_no = #{channelNo} OR nvr_channel_no = #{channelNo}) + + + -- 2.43.0 From 64ec07d7b27bd7d1599f4798671204f40d7ceff7 Mon Sep 17 00:00:00 2001 From: bichangxiong <3057647414@qq.com> Date: Mon, 8 Sep 2025 18:50:21 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20pom.xml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 9845f529..be19fd9a 100644 --- a/pom.xml +++ b/pom.xml @@ -73,13 +73,13 @@ local - dev - 113.249.101.254:8848 - 113.249.101.254:4560 + dev + 10.20.1.65:8848 + 10.20.1.65:4560 DEFAULT_GROUP DEFAULT_GROUP nacos - by@2025?? + nacos -- 2.43.0