From e6228df7a1bc4eed3a069a0d94d830a83621a80f Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Wed, 11 Jun 2025 11:49:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?knife4j=E6=96=87=E6=A1=A3=EF=BC=8C=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=E4=BD=BF=E7=94=A8=E7=9B=B8=E5=AF=B9=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E4=BB=A5=E7=9B=B4=E6=8E=A5=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=AF=B9=E5=BA=94=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java index 6c495e31b..db5b6b4fc 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java @@ -39,9 +39,9 @@ public class SpringDocConfig { .info(new Info().title("WVP-PRO 接口文档") .contact(contact) .description("开箱即用的28181协议视频平台。
" + - "1. 打开http://127.0.0.1:18080/doc.html#/1.%20全部/用户管理/login_1" + + "1. 打开登录接口" + " 登录成功后返回AccessToken。
" + - "2. 填写到AccessToken到参数值 http://127.0.0.1:18080/doc.html#/Authorize/1.%20全部
" + + "2. 填写到AccessToken到参数值 Token配置
" + "后续接口就可以直接测试了") .version("v3.1.0") .license(new License().name("Apache 2.0").url("http://springdoc.org"))); From 68806b420262c8e60eff1cf0b9b22de8240fd816 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Wed, 11 Jun 2025 13:00:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=97=B6=E6=A0=B9=E6=8D=AEchannelId=E6=9F=A5=E8=AF=A2=E6=8A=A5?= =?UTF-8?q?=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #795 --- .../iot/vmp/gb28181/controller/AlarmController.java | 6 ++++-- .../genersoft/iot/vmp/gb28181/dao/DeviceAlarmMapper.java | 3 ++- .../iot/vmp/gb28181/service/IDeviceAlarmService.java | 2 +- .../vmp/gb28181/service/impl/DeviceAlarmServiceImpl.java | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/AlarmController.java b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/AlarmController.java index fdde8bf57..c219d9632 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/AlarmController.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/AlarmController.java @@ -148,6 +148,7 @@ public class AlarmController { @Parameter(name = "page",description = "当前页",required = true) @Parameter(name = "count",description = "每页查询数量",required = true) @Parameter(name = "deviceId",description = "设备id") + @Parameter(name = "channelId",description = "通道id") @Parameter(name = "alarmPriority",description = "查询内容") @Parameter(name = "alarmMethod",description = "查询内容") @Parameter(name = "alarmType",description = "每页查询数量") @@ -157,7 +158,8 @@ public class AlarmController { public PageInfo getAll( @RequestParam int page, @RequestParam int count, - @RequestParam(required = false) String deviceId, + @RequestParam(required = false) String deviceId, + @RequestParam(required = false) String channelId, @RequestParam(required = false) String alarmPriority, @RequestParam(required = false) String alarmMethod, @RequestParam(required = false) String alarmType, @@ -186,7 +188,7 @@ public class AlarmController { throw new ControllerException(ErrorCode.ERROR400.getCode(), "endTime格式为" + DateUtil.PATTERN); } - return deviceAlarmService.getAllAlarm(page, count, deviceId, alarmPriority, alarmMethod, + return deviceAlarmService.getAllAlarm(page, count, deviceId, channelId, alarmPriority, alarmMethod, alarmType, startTime, endTime); } } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceAlarmMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceAlarmMapper.java index e885e6b4c..c380e5906 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceAlarmMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceAlarmMapper.java @@ -26,6 +26,7 @@ public interface DeviceAlarmMapper { " SELECT * FROM wvp_device_alarm " + " WHERE 1=1 " + " AND device_id = #{deviceId}" + + " AND channel_id = #{channelId}" + " AND alarm_priority = #{alarmPriority} " + " AND alarm_method = #{alarmMethod} " + " AND alarm_type = #{alarmType} " + @@ -33,7 +34,7 @@ public interface DeviceAlarmMapper { " AND alarm_time <= #{endTime} " + " ORDER BY alarm_time ASC " + " "}) - List query(@Param("deviceId") String deviceId, @Param("alarmPriority") String alarmPriority, @Param("alarmMethod") String alarmMethod, + List query(@Param("deviceId") String deviceId, @Param("channelId") String channelId, @Param("alarmPriority") String alarmPriority, @Param("alarmMethod") String alarmMethod, @Param("alarmType") String alarmType, @Param("startTime") String startTime, @Param("endTime") String endTime); diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceAlarmService.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceAlarmService.java index 83716fa97..3677188cd 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceAlarmService.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceAlarmService.java @@ -23,7 +23,7 @@ public interface IDeviceAlarmService { * @param endTime 结束时间 * @return 报警列表 */ - PageInfo getAllAlarm(int page, int count, String deviceId, String alarmPriority, String alarmMethod, + PageInfo getAllAlarm(int page, int count, String deviceId, String channelId, String alarmPriority, String alarmMethod, String alarmType, String startTime, String endTime); /** diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceAlarmServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceAlarmServiceImpl.java index 9dd6e6410..7f73ddf3a 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceAlarmServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceAlarmServiceImpl.java @@ -17,9 +17,9 @@ public class DeviceAlarmServiceImpl implements IDeviceAlarmService { private DeviceAlarmMapper deviceAlarmMapper; @Override - public PageInfo getAllAlarm(int page, int count, String deviceId, String alarmPriority, String alarmMethod, String alarmType, String startTime, String endTime) { + public PageInfo getAllAlarm(int page, int count, String deviceId, String channelId, String alarmPriority, String alarmMethod, String alarmType, String startTime, String endTime) { PageHelper.startPage(page, count); - List all = deviceAlarmMapper.query(deviceId, alarmPriority, alarmMethod, alarmType, startTime, endTime); + List all = deviceAlarmMapper.query(deviceId, channelId, alarmPriority, alarmMethod, alarmType, startTime, endTime); return new PageInfo<>(all); }