diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/GatewayDeviceController.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/GatewayDeviceController.java index 0c7d158..b417c0b 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/GatewayDeviceController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/GatewayDeviceController.java @@ -6,6 +6,7 @@ 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.GatewayDevice; +import com.yfd.platform.modules.auxcontrol.domain.GatewayDeviceRequest; import com.yfd.platform.modules.auxcontrol.service.IGatewayDeviceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -132,11 +133,11 @@ public class GatewayDeviceController { @Log(module = "数据变电站系统设备", value = "根据ID删除变电站网关设备", type = "1") @PostMapping("/batchDeleteGateway") @ApiOperation("根据ID批量删除变电站网关设备") - public ResponseResult batchDeleteGateway(@RequestBody List ids) { - if (ids.size() <= 0) { + public ResponseResult batchDeleteGateway(@RequestBody GatewayDeviceRequest gatewayDeviceRequest) { + if (gatewayDeviceRequest.getIds() == null || gatewayDeviceRequest.getIds().size() <= 0) { return ResponseResult.error("参数为空"); } - boolean isOk = gatewayDeviceService.removeByIds(ids); + boolean isOk = gatewayDeviceService.removeByIds(gatewayDeviceRequest.getIds()); if (isOk) { return ResponseResult.success(); } else { diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/MeterDeviceController.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/MeterDeviceController.java index 0dc9138..9381161 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/MeterDeviceController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/MeterDeviceController.java @@ -5,15 +5,14 @@ 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.MeterDeviceRequest; import com.yfd.platform.modules.auxcontrol.domain.MeterDevice; import com.yfd.platform.modules.auxcontrol.service.IMeterDeviceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.Arrays; import java.util.List; import java.util.Map; @@ -119,12 +118,15 @@ public class MeterDeviceController { @Log(module = "数据变电站辅控设备", value = "批量修改变电站辅控设备信息", type = "1") @PostMapping("/batchUpdateMeterDeviceIp") @ApiOperation("批量修改变电站辅控设备信息") - public ResponseResult batchUpdateMeterDeviceIp(@RequestParam String ids, @RequestParam String ip) { + public ResponseResult batchUpdateMeterDeviceIp(@RequestBody MeterDeviceRequest batchUpdateIpRequest) { - if (StrUtil.isBlank(ids) || StrUtil.isBlank(ip)) { + if (batchUpdateIpRequest.getIds() == null || batchUpdateIpRequest.getIds().size() <= 0) { return ResponseResult.error("参数为空"); } - boolean isOk = meterDeviceService.batchUpdateDeviceIp(ids, ip); + if (StrUtil.isBlank(batchUpdateIpRequest.getIp())) { + return ResponseResult.error("参数为空"); + } + boolean isOk = meterDeviceService.batchUpdateDeviceIp(batchUpdateIpRequest.getIds(), batchUpdateIpRequest.getIp()); if (isOk) { return ResponseResult.success(); } else { diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/GatewayDeviceRequest.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/GatewayDeviceRequest.java new file mode 100644 index 0000000..81d797b --- /dev/null +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/GatewayDeviceRequest.java @@ -0,0 +1,15 @@ +package com.yfd.platform.modules.auxcontrol.domain; + +import lombok.Data; + +import java.util.List; + +/** + * @Date: 2025/4/29 14:26 + * @Description: + */ +@Data +public class GatewayDeviceRequest { + + private List ids; +} diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/MeterDeviceRequest.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/MeterDeviceRequest.java new file mode 100644 index 0000000..91a5517 --- /dev/null +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/MeterDeviceRequest.java @@ -0,0 +1,14 @@ +package com.yfd.platform.modules.auxcontrol.domain; + +import lombok.Data; + +import java.util.List; + +@Data +public class MeterDeviceRequest { + + private String ip; + + private List ids; + +} diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IMeterDeviceService.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IMeterDeviceService.java index 3b5aeb3..a7b5317 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IMeterDeviceService.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IMeterDeviceService.java @@ -49,7 +49,7 @@ public interface IMeterDeviceService extends IService { * 参数说明 ip 设备ip * 返回值说明: boolean ***********************************/ - boolean batchUpdateDeviceIp(String ids, String ip); + boolean batchUpdateDeviceIp(List ids, String ip); /********************************** * 用途说明: 根据系统编号查询设备 diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/MeterDeviceServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/MeterDeviceServiceImpl.java index 4c872d7..48be773 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/MeterDeviceServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/MeterDeviceServiceImpl.java @@ -89,10 +89,9 @@ public class MeterDeviceServiceImpl extends ServiceImpl idList = StrUtil.split(ids, ","); + public boolean batchUpdateDeviceIp(List ids, String ip) { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.in(MeterDevice::getDeviceId, idList).set(MeterDevice::getNetdeviceIp, ip); + updateWrapper.in(MeterDevice::getDeviceId, ids).set(MeterDevice::getNetdeviceIp, ip); return this.update(updateWrapper); }