From f5375826989b8286d7c402763877f7cfa48aa7ea Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Sat, 2 May 2026 22:49:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=BE=E5=A4=87=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=8C=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E8=81=94=E5=8A=A8=E6=8E=A7=E5=88=B6=E7=AD=89=EF=BC=8C?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BC=96=E5=8F=B7=E6=94=AF=E6=8C=81=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DeviceBindRecordServiceImpl.java | 2 +- .../service/impl/DeviceCorrectRecordServiceImpl.java | 2 +- .../intc/fishery/service/impl/DeviceServiceImpl.java | 12 ++++++------ .../service/impl/DeviceWarnCombineServiceImpl.java | 2 +- .../fishery/service/impl/LinkedCtrlServiceImpl.java | 4 ++++ 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceBindRecordServiceImpl.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceBindRecordServiceImpl.java index 0e8b4ee..ac213d1 100644 --- a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceBindRecordServiceImpl.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceBindRecordServiceImpl.java @@ -95,7 +95,7 @@ public class DeviceBindRecordServiceImpl implements IDeviceBindRecordService { // 基础查询条件 wrapper.like(StringUtils.isNotBlank(bo.getIotId()), DeviceBindRecord::getIotId, bo.getIotId()); wrapper.eq(bo.getDeviceType() != null, DeviceBindRecord::getDeviceType, bo.getDeviceType()); - wrapper.eq(StringUtils.isNotBlank(bo.getSerialNum()), DeviceBindRecord::getSerialNum, bo.getSerialNum()); + wrapper.like(StringUtils.isNotBlank(bo.getSerialNum()), DeviceBindRecord::getSerialNum, bo.getSerialNum()); wrapper.eq(bo.getUserId() != null, DeviceBindRecord::getUserId, bo.getUserId()); wrapper.eq(bo.getIsBind() != null, DeviceBindRecord::getIsBind, bo.getIsBind()); diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceCorrectRecordServiceImpl.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceCorrectRecordServiceImpl.java index 315b462..28509e1 100644 --- a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceCorrectRecordServiceImpl.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceCorrectRecordServiceImpl.java @@ -94,7 +94,7 @@ public class DeviceCorrectRecordServiceImpl implements IDeviceCorrectRecordServi // 查询条件 wrapper.eq(bo.getDeviceId() != null, DeviceCorrectRecord::getDeviceId, bo.getDeviceId()) .eq(bo.getUserId() != null, DeviceCorrectRecord::getUserId, bo.getUserId()) - .eq(StringUtils.isNotBlank(bo.getSerialNum()), DeviceCorrectRecord::getSerialNum, bo.getSerialNum()) + .like(StringUtils.isNotBlank(bo.getSerialNum()), DeviceCorrectRecord::getSerialNum, bo.getSerialNum()) .eq(bo.getDeviceType() != null, DeviceCorrectRecord::getDeviceType, bo.getDeviceType()) .eq(bo.getValueDissolvedOxygen() != null, DeviceCorrectRecord::getValueDissolvedOxygen, bo.getValueDissolvedOxygen()) .eq(bo.getValueTemperature() != null, DeviceCorrectRecord::getValueTemperature, bo.getValueTemperature()) diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceServiceImpl.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceServiceImpl.java index 04effda..55ff2bd 100644 --- a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceServiceImpl.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceServiceImpl.java @@ -128,7 +128,7 @@ public class DeviceServiceImpl implements IDeviceService { } wrapper.eq(bo.getUserId() != null, Device::getUserId, bo.getUserId()); - wrapper.eq(StringUtils.isNotBlank(bo.getSerialNum()), Device::getSerialNum, bo.getSerialNum()); + wrapper.like(StringUtils.isNotBlank(bo.getSerialNum()), Device::getSerialNum, bo.getSerialNum()); wrapper.like(StringUtils.isNotBlank(bo.getDeviceName()), Device::getDeviceName, bo.getDeviceName()); wrapper.eq(bo.getDeviceType() != null, Device::getDeviceType, bo.getDeviceType()); wrapper.eq(bo.getBindTime() != null, Device::getBindTime, bo.getBindTime()); @@ -237,19 +237,19 @@ public class DeviceServiceImpl implements IDeviceService { if(isValid){ //TODO 做一些业务上的校验，判断是否需要校验 } - + // 1. 删除设备关联的故障码记录 deviceErrorCodeMapper.delete( new LambdaQueryWrapper() .in(DeviceErrorCode::getDeviceId, ids) ); - + // 2. 删除设备关联的校准记录 deviceCorrectRecordMapper.delete( new LambdaQueryWrapper() .in(DeviceCorrectRecord::getDeviceId, ids) ); - + // 3. 查询设备关联的开关 List switches = deviceSwitchMapper.selectList( new LambdaQueryWrapper() @@ -307,7 +307,7 @@ public class DeviceServiceImpl implements IDeviceService { List devicesToDelete = baseMapper.selectList( new LambdaQueryWrapper() .in(Device::getId, ids) - .select(Device::getId, Device::getUserId, Device::getIotId, + .select(Device::getId, Device::getUserId, Device::getIotId, Device::getDeviceType, Device::getSerialNum) ); @@ -321,7 +321,7 @@ public class DeviceServiceImpl implements IDeviceService { unbindRecord.setDeviceType(device.getDeviceType() != null ? Long.valueOf(device.getDeviceType()) : null); unbindRecord.setSerialNum(device.getSerialNum()); deviceBindRecordMapper.insert(unbindRecord); - log.info("添加设备解绑记录: deviceId={}, userId={}, serialNum={}", + log.info("添加设备解绑记录: deviceId={}, userId={}, serialNum={}", device.getId(), device.getUserId(), device.getSerialNum()); } catch (Exception e) { log.error("添加设备解绑记录失败: deviceId={}, error={}", device.getId(), e.getMessage(), e); diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceWarnCombineServiceImpl.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceWarnCombineServiceImpl.java index 5fbcd99..d517dbf 100644 --- a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceWarnCombineServiceImpl.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceWarnCombineServiceImpl.java @@ -81,7 +81,7 @@ public class DeviceWarnCombineServiceImpl implements IDeviceWarnCombineService { .selectAll(DeviceWarnCombine.class) .selectCount(DeviceWarnOne::getId, DeviceWarnCombineVo::getTotalCount) .leftJoin(DeviceWarnOne.class, DeviceWarnOne::getWarnCombineId, DeviceWarnCombine::getId) - .eq(StringUtils.isNotBlank(bo.getDeviceSerialNum()), DeviceWarnCombine::getDeviceSerialNum, bo.getDeviceSerialNum()) + .like(StringUtils.isNotBlank(bo.getDeviceSerialNum()), DeviceWarnCombine::getDeviceSerialNum, bo.getDeviceSerialNum()) .eq(bo.getDeviceType() != null, DeviceWarnCombine::getDeviceType, bo.getDeviceType()) .eq(bo.getThresholdType() != null, DeviceWarnCombine::getThresholdType, bo.getThresholdType()) .eq(bo.getProcessStatus() != null, DeviceWarnCombine::getProcessStatus, bo.getProcessStatus()) diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/LinkedCtrlServiceImpl.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/LinkedCtrlServiceImpl.java index 448d35d..de1c060 100644 --- a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/LinkedCtrlServiceImpl.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/LinkedCtrlServiceImpl.java @@ -154,6 +154,10 @@ public class LinkedCtrlServiceImpl implements ILinkedCtrlService { .eq(bo.getOxyUpperOpen() != null, LinkedCtrl::getOxyUpperOpen, bo.getOxyUpperOpen()) .eq(bo.getOxyLowerOpen() != null, LinkedCtrl::getOxyLowerOpen, bo.getOxyLowerOpen()) .eq(bo.getIsOxyUpperTrigger() != null, LinkedCtrl::getIsOxyUpperTrigger, bo.getIsOxyUpperTrigger()); + // 处理额外的查询参数 + if (params != null && !params.isEmpty()) { + handleExtraParams(wrapper, params); + } return wrapper; }