From 09faed7bf8c78c83bffac978e8a2cfe10d2aa261 Mon Sep 17 00:00:00 2001
From: George <sumuxi9797926@163.com>
Date: Wed, 4 Mar 2026 09:09:34 +0800
Subject: [PATCH] =?UTF-8?q?20260304:=E4=BF=AE=E5=A4=8Dbug=EF=BC=9A?=
 =?UTF-8?q?=E7=BD=91=E5=85=B3=E4=BA=A7=E5=93=81=E4=BF=AE=E6=94=B9=E5=AD=90?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=BB=8E=E6=9C=BA=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProductSubGatewayServiceImpl.java     | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/ProductSubGatewayServiceImpl.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/ProductSubGatewayServiceImpl.java
index 13ca9793..be52cb0d 100644
--- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/ProductSubGatewayServiceImpl.java
+++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/ProductSubGatewayServiceImpl.java
@@ -3,6 +3,7 @@ package com.fastbee.iot.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fastbee.common.exception.ServiceException;
 import com.fastbee.common.utils.SecurityUtils;
 import com.fastbee.iot.domain.ModbusParams;
 import com.fastbee.iot.domain.ProductModbusJob;
@@ -176,25 +177,28 @@ public class ProductSubGatewayServiceImpl extends ServiceImpl<ProductSubGatewayM
         List<ProductSubGateway> productSubGatewayList = baseMapper.selectList(queryWrapper);
         Map<Long, Integer> productSubGatewayMap = productSubGatewayList.stream().collect(Collectors.toMap(ProductSubGateway::getSubProductId, ProductSubGateway::getSlaveId));
         List<ProductSubGateway> editList = list.stream().filter(i -> !i.getSlaveId().equals(productSubGatewayMap.get(i.getSubProductId()))).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(editList)) {
+            throw new ServiceException("地址已修改，请勿重复修改！");
+        }
         baseMapper.updateBatch(list, list.size());
         List<Long> editSubProductIdList = editList.stream().map(ProductSubGateway::getSubProductId).collect(Collectors.toList());
         Map<Long, ProductSubGateway> oldEdidMap = productSubGatewayList.stream().filter(i -> editSubProductIdList.contains(i.getSubProductId())).collect(Collectors.toList())
                 .stream().collect(Collectors.toMap(ProductSubGateway::getSubProductId, Function.identity()));
-        LambdaQueryWrapper<ProductModbusJob> queryWrapper1 = new LambdaQueryWrapper<>();
-        queryWrapper1.in(ProductModbusJob::getProductId, editSubProductIdList);
-        List<ProductModbusJob> modbusJobList = productModbusJobMapper.selectList(queryWrapper1);
+        LambdaQueryWrapper<ProductModbusJob> modbusJobQueryWrapper = new LambdaQueryWrapper<>();
+        modbusJobQueryWrapper.in(ProductModbusJob::getProductId, editSubProductIdList);
+        List<ProductModbusJob> modbusJobList = productModbusJobMapper.selectList(modbusJobQueryWrapper);
         Map<Long, List<ProductModbusJob>> oldMap = new HashMap<>(2);
         if (CollectionUtils.isNotEmpty(modbusJobList)) {
             oldMap = modbusJobList.stream().collect(Collectors.groupingBy(ProductModbusJob::getProductId));
         }
-        LambdaQueryWrapper<ModbusParams> queryWrapper2 = new LambdaQueryWrapper<>();
-        queryWrapper2.in(ModbusParams::getProductId, editSubProductIdList);
-        List<ModbusParams> modbusParamsList = modbusParamsMapper.selectList(queryWrapper2);
+        LambdaQueryWrapper<ModbusParams> modbusParamsQueryWrapper = new LambdaQueryWrapper<>();
+        modbusParamsQueryWrapper.in(ModbusParams::getProductId, editSubProductIdList);
+        List<ModbusParams> modbusParamsList = modbusParamsMapper.selectList(modbusParamsQueryWrapper);
         for (ProductSubGateway productSubGateway : editList) {
             Integer slaveId = productSubGateway.getSlaveId();
             ProductSubGateway oldProductSubGateway = oldEdidMap.get(productSubGateway.getSubProductId());
             int subIndex = String.valueOf(oldProductSubGateway.getSlaveId()).length() == 1 ? 2 : String.valueOf(oldProductSubGateway.getSlaveId()).length();
-            List<ProductModbusJob> productModbusJobList = oldMap.get(productSubGateway.getSubProductId());
+            List<ProductModbusJob> productModbusJobList = oldMap.getOrDefault(productSubGateway.getSubProductId(), Collections.emptyList());
             for (ProductModbusJob productModbusJob : productModbusJobList) {
                 String oldCommand = productModbusJob.getCommand();
                 String substring = oldCommand.substring(subIndex);