From cea76e3fca11f200424012a8aaf0c3aa11edd5cb Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 16 Jul 2019 14:34:24 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=BF=94=E5=9B=9E=E5=80=BC=E5=90=8E=E7=9A=84?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/device/KwMeterController.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java index a1289c551..3b4e2ffa8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java @@ -70,7 +70,8 @@ public class KwMeterController extends BaseController { kwMeter.setBoxId(0L); kwMeter.setStatus(EnumMeterStatus.VALID.getCode()); kwMeter.setBindStatus(EnumMeterBindStatus.UNBIND.getCode()); - return kwMeterService.saveOrUpdate(kwMeter); + kwMeterService.saveOrUpdate(kwMeter); + return new ResultData(kwMeter); } @ApiOperation("绑定设备") @@ -103,7 +104,8 @@ public class KwMeterController extends BaseController { return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); kwMeter.setBindStatus(EnumMeterBindStatus.BIND.getCode()); - return kwMeterService.saveOrUpdate(kwMeter); + kwMeterService.saveOrUpdate(kwMeter); + return new ResultData(kwMeter); } @ApiOperation("绑定设备") @@ -127,7 +129,8 @@ public class KwMeterController extends BaseController { return new ResultData(ErrorCode.DEVICE_NOT_FOUND); kwMeter.setBoxId(0L); kwMeter.setBindStatus(EnumMeterBindStatus.UNBIND.getCode()); - return kwMeterService.saveOrUpdate(kwMeter); + kwMeterService.saveOrUpdate(kwMeter); + return new ResultData(kwMeter); } @ApiOperation("更新设备") @@ -138,7 +141,8 @@ public class KwMeterController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); if (kwMeter.getId() == null) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); - return kwMeterService.saveOrUpdate(kwMeter); + kwMeterService.saveOrUpdate(kwMeter); + return new ResultData(kwMeter); } @ApiOperation("设备详情") @@ -163,6 +167,7 @@ public class KwMeterController extends BaseController { KwMeter kwMeter = new KwMeter(); kwMeter.setId(id); kwMeter.setStatus(EnumBoxStatus.INVALID.getCode()); - return kwMeterService.saveOrUpdate(kwMeter); + kwMeterService.saveOrUpdate(kwMeter); + return new ResultData(kwMeter); } }