diff --git a/business-css/src/main/java/com/yfd/business/css/controller/DeviceController.java b/business-css/src/main/java/com/yfd/business/css/controller/DeviceController.java index 64f0ecb..1601649 100644 --- a/business-css/src/main/java/com/yfd/business/css/controller/DeviceController.java +++ b/business-css/src/main/java/com/yfd/business/css/controller/DeviceController.java @@ -34,7 +34,13 @@ public class DeviceController { @PostMapping public boolean create(@RequestBody Device device) { device.setModifier(currentUsername()); - return deviceService.save(device); + return deviceService.createDevice(device); + } + + @PostMapping("/saveOrUpdate") + public boolean saveOrUpdate(@RequestBody Device device) { + device.setModifier(currentUsername()); + return deviceService.saveOrUpdateByBusiness(device); } /** diff --git a/business-css/src/main/java/com/yfd/business/css/service/DeviceService.java b/business-css/src/main/java/com/yfd/business/css/service/DeviceService.java index 9e44e17..5b755e5 100644 --- a/business-css/src/main/java/com/yfd/business/css/service/DeviceService.java +++ b/business-css/src/main/java/com/yfd/business/css/service/DeviceService.java @@ -9,5 +9,7 @@ public interface DeviceService extends IService { */ boolean importDevices(MultipartFile file, String deviceType); - public boolean createDevice(Device device) ; + boolean createDevice(Device device) ; + + boolean saveOrUpdateByBusiness(Device device); } diff --git a/business-css/src/main/java/com/yfd/business/css/service/impl/DeviceServiceImpl.java b/business-css/src/main/java/com/yfd/business/css/service/impl/DeviceServiceImpl.java index c706ff6..921fe5e 100644 --- a/business-css/src/main/java/com/yfd/business/css/service/impl/DeviceServiceImpl.java +++ b/business-css/src/main/java/com/yfd/business/css/service/impl/DeviceServiceImpl.java @@ -67,6 +67,28 @@ public class DeviceServiceImpl // 2. 如果前端传了 deviceId,直接使用 return this.save(device); } + + @Override + public boolean saveOrUpdateByBusiness(Device device) { + + String deviceId = device.getDeviceId(); + + // 情况 1:未传 deviceId → 直接新增 + if (StrUtil.isBlank(deviceId)) { + return this.save(device); + } + + // 情况 2:传了 deviceId,判断是否存在 + Device dbDevice = this.getById(deviceId); + + if (dbDevice == null) { + // 数据库不存在 → 新增(使用传入的 deviceId) + return this.save(device); + } else { + // 数据库存在 → 更新 + return this.updateById(device); + } + } private boolean importExcel(Workbook workbook, String deviceType) { try (Workbook wb = workbook) {