From b1ec3216a3964287ae77d371611694cedadfff69 Mon Sep 17 00:00:00 2001 From: weitang Date: Wed, 30 Apr 2025 12:08:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=8F=82=E6=95=B0=E5=92=8C?= =?UTF-8?q?=E8=BE=85=E6=8E=A7=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeviceAlarmParameterController.java | 24 +++++++++ .../controller/DeviceSignalController.java | 6 +-- .../auxcontrol/domain/DeviceSignal.java | 5 ++ .../mapper/DeviceAlarmParameterMapper.java | 3 ++ .../service/IDeviceAlarmParameterService.java | 3 ++ .../impl/DeviceAlarmParameterServiceImpl.java | 17 ++++++- .../service/impl/DeviceSignalServiceImpl.java | 49 +++++++++++++++---- .../impl/GatewayDeviceServiceImpl.java | 1 - .../auxcontrol/DeviceAlarmParameterMapper.xml | 39 +++++++++++++++ 9 files changed, 132 insertions(+), 15 deletions(-) diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceAlarmParameterController.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceAlarmParameterController.java index 9a4d8b0..d5259b0 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceAlarmParameterController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceAlarmParameterController.java @@ -2,6 +2,7 @@ package com.yfd.platform.modules.auxcontrol.controller; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.annotation.Log; import com.yfd.platform.config.ResponseResult; import com.yfd.platform.modules.auxcontrol.domain.DeviceAlarmParameter; @@ -30,6 +31,29 @@ public class DeviceAlarmParameterController { @Resource private IDeviceAlarmParameterService deviceAlarmParameterService; + + /********************************** + * 用途说明: 分页查询变电站辅控设备告警参数设置 + * 参数说明 + * alarmType 告警类型 + * alarmLevel 告警等级 + * deviceId 设备ID + * signalId 信号id + * pageNum 当前页 + * 返回值说明: com.yfd.platform.config.ResponseResult 返回分页查询结果 + ***********************************/ + @GetMapping("/page") + @ApiOperation("分页查询变电站辅控设备告警参数设置") + public ResponseResult getDeviceAlarmParameterPage(String meterDeviceId, String signalId, String alarmType, String alarmLevel, Page page) { + //参数校验 设备id 信号id不能为空 + if (StrUtil.isBlank(meterDeviceId) || StrUtil.isBlank(signalId)) { + return ResponseResult.error("参数为空"); + } + //分页查询 + Page deviceAlarmParameterPage = deviceAlarmParameterService.getDeviceAlarmParameterPage(meterDeviceId, signalId, alarmType, alarmLevel, page); + return ResponseResult.successData(deviceAlarmParameterPage); + } + /*********************************** * 用途说明：新增变电站辅控设备信息 * 参数说明 diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceSignalController.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceSignalController.java index b481b0b..9a7ae31 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceSignalController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceSignalController.java @@ -49,12 +49,12 @@ public class DeviceSignalController { ***********************************/ @GetMapping("/page") @ApiOperation("分页查询变电站辅控设备信号") - public ResponseResult getDeviceSignalPage(String mainDeviceId, String componentId, String signalName, Page page) { + public ResponseResult getDeviceSignalPage(String mainDeviceId, String mainComponentId, String signalName, Page page) { //参数校验 辅控设备ID不能为空 - if (StrUtil.isBlank(componentId)) { + if (StrUtil.isBlank(mainComponentId)) { return ResponseResult.error("参数为空"); } - Page deviceSignalPage = deviceSignalService.getDeviceSignalPage(mainDeviceId,componentId, signalName, page); + Page deviceSignalPage = deviceSignalService.getDeviceSignalPage(mainDeviceId,mainComponentId, signalName, page); return ResponseResult.successData(deviceSignalPage); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/DeviceSignal.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/DeviceSignal.java index 90cfce9..769073a 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/DeviceSignal.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/DeviceSignal.java @@ -35,6 +35,11 @@ public class DeviceSignal implements Serializable { @TableId(type = IdType.ASSIGN_UUID) private String signalId; + /** + * 所属系统：01-在线监测 02-消防系统 03-安防系统 04-动环系统 05-锁控系统 06-辅控系统 07-照明系统 + */ + private String systemcode; + /** * 辅控设备ID--fk_meter_device */ diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceAlarmParameterMapper.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceAlarmParameterMapper.java index 710a62b..046362a 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceAlarmParameterMapper.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceAlarmParameterMapper.java @@ -1,5 +1,6 @@ package com.yfd.platform.modules.auxcontrol.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.modules.auxcontrol.domain.DeviceAlarmParameter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -13,4 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface DeviceAlarmParameterMapper extends BaseMapper { + Page getDeviceAlarmParameterPage(String meterDeviceId, String signalId, String alarmType, String alarmLevel, Page page); + } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceAlarmParameterService.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceAlarmParameterService.java index 0df31c3..1481dcc 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceAlarmParameterService.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceAlarmParameterService.java @@ -1,5 +1,6 @@ package com.yfd.platform.modules.auxcontrol.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.modules.auxcontrol.domain.DeviceAlarmParameter; import com.baomidou.mybatisplus.extension.service.IService; @@ -27,4 +28,6 @@ public interface IDeviceAlarmParameterService extends IService getDeviceAlarmParameterPage(String meterDeviceId, String signalId, String alarmType, String alarmLevel, Page page); + } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceAlarmParameterServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceAlarmParameterServiceImpl.java index 0c013a7..0f8ed85 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceAlarmParameterServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceAlarmParameterServiceImpl.java @@ -1,11 +1,14 @@ package com.yfd.platform.modules.auxcontrol.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yfd.platform.modules.auxcontrol.domain.DeviceAlarmParameter; import com.yfd.platform.modules.auxcontrol.mapper.DeviceAlarmParameterMapper; import com.yfd.platform.modules.auxcontrol.service.IDeviceAlarmParameterService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import javax.annotation.Resource; + /** *

* 变电站-辅控设备-告警参数设置 服务实现类 @@ -17,6 +20,9 @@ import org.springframework.stereotype.Service; @Service public class DeviceAlarmParameterServiceImpl extends ServiceImpl implements IDeviceAlarmParameterService { + @Resource + private DeviceAlarmParameterMapper deviceAlarmParameterMapper; + /********************************** * 用途说明: 新增辅控设备告警参数 * 参数说明 deviceAlarmParameter 告警参数对象 @@ -36,4 +42,13 @@ public class DeviceAlarmParameterServiceImpl extends ServiceImpl getDeviceAlarmParameterPage(String meterDeviceId, String signalId, + String alarmType, String alarmLevel, + Page page) { + Page deviceAlarmParameterPage = deviceAlarmParameterMapper.getDeviceAlarmParameterPage(meterDeviceId, signalId, alarmType, alarmLevel + , page); + return deviceAlarmParameterPage; + } } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceSignalServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceSignalServiceImpl.java index 95842ee..ba6bf8f 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceSignalServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceSignalServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.modules.auxcontrol.domain.DeviceSignal; import com.yfd.platform.modules.auxcontrol.mapper.DeviceSignalMapper; @@ -89,16 +90,34 @@ public class DeviceSignalServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(DeviceSignal::getMainComponentId, deviceSignal.getMainComponentId()); + int count = deviceSignalMapper.selectCount(queryWrapper); + //序号加1 + int orderNo = count + 1; + deviceSignal.setOrderno(orderNo); + + String signalCode = deviceSignal.getSignalCode(); + if (StrUtil.isBlank(signalCode)) { + throw new RuntimeException("信号编号不能为空"); + } + LambdaQueryWrapper signalCodeWrapper = new LambdaQueryWrapper<>(); + signalCodeWrapper.eq(DeviceSignal::getSignalCode, signalCode); + int signalCount = deviceSignalMapper.selectCount(signalCodeWrapper); + if (signalCount > 0) { + throw new RuntimeException("当前信号编号已存在"); + } deviceSignal.setLastmodifier(SecurityUtils.getCurrentUsername()); deviceSignal.setLastmodifydate(new Timestamp(System.currentTimeMillis())); - String compnentId = deviceSignal.getMainComponentId(); - if (StrUtil.isNotBlank(compnentId)) { - SubstationComponent substationComponent = substationComponentMapper.selectById(compnentId); - if (substationComponent == null) { - throw new RuntimeException("当前部件不存在"); - } - deviceSignal.setMainDeviceId(substationComponent.getMainDeviceId()); - } return this.saveOrUpdate(deviceSignal); } @@ -109,8 +128,7 @@ public class DeviceSignalServiceImpl extends ServiceImpl signalCodeWrapper = new LambdaQueryWrapper<>(); + signalCodeWrapper.ne(DeviceSignal::getSignalId, deviceSignal.getSignalId()).eq(DeviceSignal::getSignalCode, signalCode); + int signalCount = deviceSignalMapper.selectCount(signalCodeWrapper); + if (signalCount > 0) { + throw new RuntimeException("当前信号编号已存在"); + } + } + deviceSignal.setLastmodifier(SecurityUtils.getCurrentUsername()); + deviceSignal.setLastmodifydate(new Timestamp(System.currentTimeMillis())); return this.saveOrUpdate(deviceSignal); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/GatewayDeviceServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/GatewayDeviceServiceImpl.java index 6ec2f0e..2f2dcfa 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/GatewayDeviceServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/GatewayDeviceServiceImpl.java @@ -138,7 +138,6 @@ public class GatewayDeviceServiceImpl extends ServiceImpl +