From a616ef04bdda173d4f992a1e18fe56473cb00a1d Mon Sep 17 00:00:00 2001 From: yangxiaozhong <429869597@qq.com> Date: Fri, 12 Dec 2025 14:01:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=92=8C=E4=BC=A0=E6=84=9F?= =?UTF-8?q?=E5=99=A8=E7=9A=84=E5=90=8D=E7=A7=B0=E5=92=8C=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E5=B1=9E=E6=80=A7=E9=83=BD=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E4=B8=80=E6=A0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IotDeviceController.java | 15 ++++++++++++++ .../controller/IotSensorController.java | 20 +++++++++++++++++++ .../hazard/service/IIotDeviceService.java | 2 ++ .../hazard/service/IIotSensorService.java | 2 ++ .../service/impl/IotDeviceServiceImpl.java | 5 +++++ .../service/impl/IotSensorServiceImpl.java | 18 ++++++++++++----- 6 files changed, 57 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/controller/IotDeviceController.java b/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/controller/IotDeviceController.java index 0991f1b4f..e3c8dedc4 100644 --- a/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/controller/IotDeviceController.java +++ b/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/controller/IotDeviceController.java @@ -85,6 +85,16 @@ public class IotDeviceController extends BaseController { @RepeatSubmit() @PostMapping() public R add(@Validated(AddGroup.class) @RequestBody IotDeviceBo bo) { + String deviceCode = bo.getDeviceCode(); + String name = bo.getName(); + IotDeviceVo deviceVo = iotDeviceService.queryByDeviceCode(deviceCode); + IotDeviceVo deviceVo1 = iotDeviceService.queryByDeviceName(name); + if (deviceVo!=null && deviceVo.getDeviceCode() != null){ + return R.fail("设备编号已存在"); + } + if (deviceVo1!=null && deviceVo1.getName() != null){ + return R.fail("设备名称已存在"); + } return toAjax(iotDeviceService.insertByBo(bo)); } @@ -96,6 +106,11 @@ public class IotDeviceController extends BaseController { @RepeatSubmit() @PutMapping() public R edit(@Validated(EditGroup.class) @RequestBody IotDeviceBo bo) { + String deviceCode = bo.getDeviceCode(); + IotDeviceVo deviceVo = iotDeviceService.queryByDeviceCode(deviceCode); + if (deviceVo!=null && deviceVo.getDeviceCode() != null){ + return R.fail("设备编号已存在"); + } return toAjax(iotDeviceService.updateByBo(bo)); } diff --git a/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/controller/IotSensorController.java b/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/controller/IotSensorController.java index 0f59568b0..2efa784ee 100644 --- a/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/controller/IotSensorController.java +++ b/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/controller/IotSensorController.java @@ -93,6 +93,16 @@ public class IotSensorController extends BaseController { @RepeatSubmit() @PostMapping() public R add(@Validated(AddGroup.class) @RequestBody IotSensorBo bo) { + String code = bo.getCode(); + String name = bo.getName(); + IotSensorVo iotSensorVo = iotSensorService.queryByCode(code); + IotSensorVo iotSensorVo1 = iotSensorService.queryByName(name); + if (iotSensorVo!=null && iotSensorVo.getCode()!=null){ + return R.fail("传感器代号已存在"); + } + if (iotSensorVo1!=null && iotSensorVo1.getName()!=null){ + return R.fail("传感器名称已存在"); + } return toAjax(iotSensorService.insertByBo(bo)); } @@ -104,6 +114,16 @@ public class IotSensorController extends BaseController { @RepeatSubmit() @PutMapping() public R edit(@Validated(EditGroup.class) @RequestBody IotSensorBo bo) { + String code = bo.getCode(); + String name = bo.getName(); + IotSensorVo iotSensorVo = iotSensorService.queryByCode(code); + IotSensorVo iotSensorVo1 = iotSensorService.queryByName(name); + if (iotSensorVo!=null && iotSensorVo.getCode()!=null){ + return R.fail("传感器已存在"); + } + if (iotSensorVo1!=null && iotSensorVo1.getName()!=null){ + return R.fail("传感器已存在"); + } return toAjax(iotSensorService.updateByBo(bo)); } diff --git a/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/service/IIotDeviceService.java b/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/service/IIotDeviceService.java index f6e6e6d40..5efb19ea3 100644 --- a/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/service/IIotDeviceService.java +++ b/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/service/IIotDeviceService.java @@ -70,4 +70,6 @@ public interface IIotDeviceService { IotDeviceVo queryByDeviceCode(String deviceCode); void updateStatusByBo(IotDevice iotDeviceBo); + + IotDeviceVo queryByDeviceName(String name); } diff --git a/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/service/IIotSensorService.java b/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/service/IIotSensorService.java index 062d96402..ba45d83c6 100644 --- a/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/service/IIotSensorService.java +++ b/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/service/IIotSensorService.java @@ -69,4 +69,6 @@ public interface IIotSensorService { List queryByNoBound(IotSensorBo bo); IotSensorVo queryByCode(String sensorCode); + + IotSensorVo queryByName(String name); } diff --git a/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/service/impl/IotDeviceServiceImpl.java b/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/service/impl/IotDeviceServiceImpl.java index d2036a71f..05d6fd748 100644 --- a/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/service/impl/IotDeviceServiceImpl.java +++ b/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/service/impl/IotDeviceServiceImpl.java @@ -226,4 +226,9 @@ public class IotDeviceServiceImpl implements IIotDeviceService { public void updateStatusByBo(IotDevice iotDevice) { baseMapper.updateById(iotDevice); } + + @Override + public IotDeviceVo queryByDeviceName(String name) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(IotDevice::getName, name)); + } } diff --git a/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/service/impl/IotSensorServiceImpl.java b/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/service/impl/IotSensorServiceImpl.java index c88ced370..578e560b7 100644 --- a/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/service/impl/IotSensorServiceImpl.java +++ b/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/service/impl/IotSensorServiceImpl.java @@ -139,12 +139,15 @@ public class IotSensorServiceImpl implements IIotSensorService { //TODO 做一些业务上的校验,判断是否需要校验 } //查询传感器是否被使用，被使用则不能删除:当device_bound不为空的时候代表该设备被使用中无法删除 - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.isNotNull("device_bound"); - List iotSensorVos = baseMapper.selectVoList(wrapper); - if (iotSensorVos != null && iotSensorVos.size() > 0){ - return false; + for (Long id : ids) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.isNotNull("device_bound").eq("id", id); + List iotSensorVos = baseMapper.selectVoList(wrapper); + if (iotSensorVos != null && iotSensorVos.size() > 0){ + return false; + } } + return baseMapper.deleteByIds(ids) > 0; } @@ -159,6 +162,11 @@ public class IotSensorServiceImpl implements IIotSensorService { return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(IotSensor::getCode, sensorCode)); } + @Override + public IotSensorVo queryByName(String name) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(IotSensor::getName, name)); + } + private LambdaQueryWrapper buildQueryWrapper1(IotSensorBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery();