diff --git a/storeroom/src/main/java/com/storeroom/modules/device/controller/DeseCabinetController.java b/storeroom/src/main/java/com/storeroom/modules/device/controller/DeseCabinetController.java index a00e72c..e4efbee 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/controller/DeseCabinetController.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/controller/DeseCabinetController.java @@ -29,7 +29,11 @@ public class DeseCabinetController { @ApiOperation("新增密集架") @AnonymousPostMapping("create") public ApiResponse create(@RequestBody DeseCabinetDto deseCabinetDto) { - verifyDate(deseCabinetDto); + + if (!StringUtils.isEmpty(deseCabinetDto.getId())) { + throw new BaseException("id不为空"); + } + verifyValues(deseCabinetDto); deseCabinetService.create(deseCabinetDto); return ApiResponse.success(ResponseStatus.SUCCESS); } @@ -37,19 +41,15 @@ public class DeseCabinetController { @ApiOperation("新增密集架") @AnonymousPutMapping("update") public ApiResponse update(@RequestBody DeseCabinetDto deseCabinetDto) { - verifyDate(deseCabinetDto); + if (StringUtils.isEmpty(deseCabinetDto.getId())) { + throw new BaseException("id不能为空"); + } + verifyValues(deseCabinetDto); deseCabinetService.update(deseCabinetDto); return ApiResponse.success(ResponseStatus.SUCCESS); } - /** - * 验证数据 - * @param deseCabinetDto - */ - private void verifyDate(DeseCabinetDto deseCabinetDto) { - if (!StringUtils.isEmpty(deseCabinetDto.getId())) { - throw new BaseException("id不为空"); - } + private void verifyValues(@RequestBody DeseCabinetDto deseCabinetDto) { if (deseCabinetDto.getAreaNo() != null && deseCabinetDto.getRowNo() != null && deseCabinetDto.getSumColumnNo() != null @@ -64,4 +64,5 @@ public class DeseCabinetController { } } + } diff --git a/storeroom/src/main/java/com/storeroom/modules/device/repository/DeseCabinetRepository.java b/storeroom/src/main/java/com/storeroom/modules/device/repository/DeseCabinetRepository.java index 788e967..42b736b 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/repository/DeseCabinetRepository.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/repository/DeseCabinetRepository.java @@ -12,11 +12,12 @@ public interface DeseCabinetRepository extends JpaRepository findIpAndPortAndAreaNo(Integer areaNo, String ip, Integer port); } diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DenseCabinetImpl.java b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DenseCabinetImpl.java index 16d8148..c4ce393 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DenseCabinetImpl.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DenseCabinetImpl.java @@ -97,6 +97,7 @@ public class DenseCabinetImpl implements DeseCabinetService { if (ObjectUtils.isEmpty(deseCabinet2)) { throw new BaseException("数据不存在"); } + deseCabinet2.getDeviceInfo().setDeviceName(deseCabinetDto.getDeviceInfo().getDeviceName()); deseCabinet2.getDeviceInfo().setDeviceIp(deseCabinetDto.getDeviceInfo().getDeviceIp()); deseCabinet2.getDeviceInfo().setDevicePort(deseCabinetDto.getDeviceInfo().getDevicePort());