| @@ -70,7 +70,8 @@ public class KwMeterController extends BaseController { | |||||
| kwMeter.setBoxId(0L); | kwMeter.setBoxId(0L); | ||||
| kwMeter.setStatus(EnumMeterStatus.VALID.getCode()); | kwMeter.setStatus(EnumMeterStatus.VALID.getCode()); | ||||
| kwMeter.setBindStatus(EnumMeterBindStatus.UNBIND.getCode()); | kwMeter.setBindStatus(EnumMeterBindStatus.UNBIND.getCode()); | ||||
| return kwMeterService.saveOrUpdate(kwMeter); | |||||
| kwMeterService.saveOrUpdate(kwMeter); | |||||
| return new ResultData(kwMeter); | |||||
| } | } | ||||
| @ApiOperation("绑定设备") | @ApiOperation("绑定设备") | ||||
| @@ -103,7 +104,8 @@ public class KwMeterController extends BaseController { | |||||
| return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); | return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); | ||||
| kwMeter.setBindStatus(EnumMeterBindStatus.BIND.getCode()); | kwMeter.setBindStatus(EnumMeterBindStatus.BIND.getCode()); | ||||
| return kwMeterService.saveOrUpdate(kwMeter); | |||||
| kwMeterService.saveOrUpdate(kwMeter); | |||||
| return new ResultData(kwMeter); | |||||
| } | } | ||||
| @ApiOperation("绑定设备") | @ApiOperation("绑定设备") | ||||
| @@ -127,7 +129,8 @@ public class KwMeterController extends BaseController { | |||||
| return new ResultData(ErrorCode.DEVICE_NOT_FOUND); | return new ResultData(ErrorCode.DEVICE_NOT_FOUND); | ||||
| kwMeter.setBoxId(0L); | kwMeter.setBoxId(0L); | ||||
| kwMeter.setBindStatus(EnumMeterBindStatus.UNBIND.getCode()); | kwMeter.setBindStatus(EnumMeterBindStatus.UNBIND.getCode()); | ||||
| return kwMeterService.saveOrUpdate(kwMeter); | |||||
| kwMeterService.saveOrUpdate(kwMeter); | |||||
| return new ResultData(kwMeter); | |||||
| } | } | ||||
| @ApiOperation("更新设备") | @ApiOperation("更新设备") | ||||
| @@ -138,7 +141,8 @@ public class KwMeterController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| if (kwMeter.getId() == null) | if (kwMeter.getId() == null) | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| return kwMeterService.saveOrUpdate(kwMeter); | |||||
| kwMeterService.saveOrUpdate(kwMeter); | |||||
| return new ResultData(kwMeter); | |||||
| } | } | ||||
| @ApiOperation("设备详情") | @ApiOperation("设备详情") | ||||
| @@ -163,6 +167,7 @@ public class KwMeterController extends BaseController { | |||||
| KwMeter kwMeter = new KwMeter(); | KwMeter kwMeter = new KwMeter(); | ||||
| kwMeter.setId(id); | kwMeter.setId(id); | ||||
| kwMeter.setStatus(EnumBoxStatus.INVALID.getCode()); | kwMeter.setStatus(EnumBoxStatus.INVALID.getCode()); | ||||
| return kwMeterService.saveOrUpdate(kwMeter); | |||||
| kwMeterService.saveOrUpdate(kwMeter); | |||||
| return new ResultData(kwMeter); | |||||
| } | } | ||||
| } | } | ||||