From 1b28ba602c3613e15db4cbd1a57c07b997ee7680 Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 16 Jul 2019 15:20:57 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=92=8C=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=9A=84=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/device/KwBoxController.java | 11 +++++++---- .../iformall/service/kw/KwBoxCmdHistoryService.java | 2 +- .../java/com/iformall/service/kw/KwBoxService.java | 2 +- .../iformall/service/kw/KwMerchantMeterService.java | 2 +- .../service/kw/impl/KwBoxCmdHistoryServiceImpl.java | 3 +-- .../iformall/service/kw/impl/KwBoxServiceImpl.java | 3 +-- .../service/kw/impl/KwMerchantMeterServiceImpl.java | 3 +-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java index 129a46cf0..ce33db6c0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java @@ -54,7 +54,8 @@ public class KwBoxController extends BaseController { return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); kwBox.setTenantId(getTenantId()); kwBox.setStatus(EnumBoxStatus.VALID.getCode()); - return kwBoxService.saveOrUpdate(kwBox); + kwBoxService.saveOrUpdate(kwBox); + return new ResultData(kwBox); } @ApiOperation("更新设备") @@ -65,7 +66,8 @@ public class KwBoxController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); if (kwBox.getId() == null) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); - return kwBoxService.saveOrUpdate(kwBox); + kwBoxService.saveOrUpdate(kwBox); + return new ResultData(kwBox); } @ApiOperation("设备详情") @@ -76,7 +78,7 @@ public class KwBoxController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); KwBox kwBox = kwBoxService.getById(id); if (kwBox == null) - return new ResultData(ErrorCode.SCREENAD_NOT_FOUND); + return new ResultData(ErrorCode.DEVICE_NOT_FOUND); kwBox.setMeters(kwBoxService.findMeters(kwBox)); return new ResultData(kwBox); @@ -91,6 +93,7 @@ public class KwBoxController extends BaseController { KwBox kwBox = new KwBox(); kwBox.setId(id); kwBox.setStatus(EnumBoxStatus.INVALID.getCode()); - return kwBoxService.saveOrUpdate(kwBox); + kwBoxService.saveOrUpdate(kwBox); + return new ResultData(kwBox); } } diff --git a/mallinkService/src/main/java/com/iformall/service/kw/KwBoxCmdHistoryService.java b/mallinkService/src/main/java/com/iformall/service/kw/KwBoxCmdHistoryService.java index 735f1ef46..c2d817a48 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/KwBoxCmdHistoryService.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/KwBoxCmdHistoryService.java @@ -35,7 +35,7 @@ public interface KwBoxCmdHistoryService { * * @param record */ - ResultData saveOrUpdate(KwBoxCmdHistory record); + void saveOrUpdate(KwBoxCmdHistory record); /** diff --git a/mallinkService/src/main/java/com/iformall/service/kw/KwBoxService.java b/mallinkService/src/main/java/com/iformall/service/kw/KwBoxService.java index 5edcaef47..c60fbfb0d 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/KwBoxService.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/KwBoxService.java @@ -57,7 +57,7 @@ public interface KwBoxService { * * @param record */ - ResultData saveOrUpdate(KwBox record); + void saveOrUpdate(KwBox record); /** diff --git a/mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java b/mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java index 133b7729f..387b35814 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java @@ -36,7 +36,7 @@ public interface KwMerchantMeterService { * * @param record */ - ResultData saveOrUpdate(KwMerchantMeter record); + void saveOrUpdate(KwMerchantMeter record); /** diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxCmdHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxCmdHistoryServiceImpl.java index 9f8e763b3..d7b75f7c9 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxCmdHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxCmdHistoryServiceImpl.java @@ -35,7 +35,7 @@ public class KwBoxCmdHistoryServiceImpl implements KwBoxCmdHistoryService { @Override - public ResultData saveOrUpdate(KwBoxCmdHistory record) { + public void saveOrUpdate(KwBoxCmdHistory record) { if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); @@ -43,7 +43,6 @@ public class KwBoxCmdHistoryServiceImpl implements KwBoxCmdHistoryService { } else { kwBoxCmdHistoryMapper.updateByPrimaryKeySelective(record); } - return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java index 03356252b..8f1b4b7d7 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java @@ -50,7 +50,7 @@ public class KwBoxServiceImpl implements KwBoxService { @Override - public ResultData saveOrUpdate(KwBox record) { + public void saveOrUpdate(KwBox record) { if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); @@ -61,7 +61,6 @@ public class KwBoxServiceImpl implements KwBoxService { record.setUpdateTime(new Date()); kwBoxMapper.updateByPrimaryKeySelective(record); } - return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java index 2c7ca4460..7b9857240 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java @@ -46,7 +46,7 @@ public class KwMerchantMeterServiceImpl implements KwMerchantMeterService { @Override - public ResultData saveOrUpdate(KwMerchantMeter record) { + public void saveOrUpdate(KwMerchantMeter record) { if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); @@ -57,7 +57,6 @@ public class KwMerchantMeterServiceImpl implements KwMerchantMeterService { record.setUpdateTime(new Date()); kwMerchantMeterMapper.updateByPrimaryKeySelective(record); } - return new ResultData(); }