Browse Source

[电表][修复]:更改返回值后的编译问题

release_toaliyun_real
hupeng 6 years ago
parent
commit
cea76e3fca
1 changed files with 10 additions and 5 deletions
  1. +10
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java

+ 10
- 5
mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java View File

@@ -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);
}
}

Loading…
Cancel
Save