|
|
|
@@ -62,6 +62,7 @@ public class KwMeterController extends BaseController { |
|
|
|
KwMeter record = new KwMeter(); |
|
|
|
record.setTenantId(getTenantId()); |
|
|
|
record.setAddress(kwMeter.getAddress()); |
|
|
|
record.setStatus(EnumMeterStatus.VALID.getCode()); |
|
|
|
List<KwMeter> KwMeters = kwMeterService.findList(record); |
|
|
|
if (KwMeters.size() > 0) |
|
|
|
return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); |
|
|
|
@@ -85,21 +86,22 @@ public class KwMeterController extends BaseController { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); |
|
|
|
|
|
|
|
KwBox kwBox = kwBoxService.getById(kwMeter.getBoxId()); |
|
|
|
if (kwBox == null) |
|
|
|
if (kwBox == null || kwBox.getStatus().equals(EnumBoxStatus.INVALID.getCode())) |
|
|
|
return new ResultData(ErrorCode.DEVICE_NOT_FOUND); |
|
|
|
|
|
|
|
KwMeter record = new KwMeter(); |
|
|
|
record.setBoxId(kwMeter.getBoxId()); |
|
|
|
record.setStatus(EnumMeterStatus.VALID.getCode()); |
|
|
|
List<KwMeter> KwMeters = kwMeterService.findList(record); |
|
|
|
if (KwMeters.size() > kwBox.getMaxTagNum()) |
|
|
|
if (KwMeters.size() >= kwBox.getMaxTagNum()) |
|
|
|
return new ResultData(ErrorCode.DEVICE_REACHED_MAX_NUMBER); |
|
|
|
|
|
|
|
record.setBoxId(kwMeter.getBoxId()); |
|
|
|
record.setAddress(kwMeter.getAddress()); |
|
|
|
KwMeters = kwMeterService.findList(record); |
|
|
|
if (KwMeters.size() > 0) |
|
|
|
record = kwMeterService.getById(kwMeter.getId()); |
|
|
|
if (record == null) |
|
|
|
return new ResultData(ErrorCode.DEVICE_NOT_FOUND); |
|
|
|
if (record.getBoxId() != 0) |
|
|
|
return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); |
|
|
|
kwMeter.setTenantId(getTenantId()); |
|
|
|
|
|
|
|
kwMeter.setBindStatus(EnumMeterBindStatus.BIND.getCode()); |
|
|
|
return kwMeterService.saveOrUpdate(kwMeter); |
|
|
|
} |
|
|
|
@@ -123,7 +125,6 @@ public class KwMeterController extends BaseController { |
|
|
|
KwMeter record = kwMeterService.getById(kwMeter.getId()); |
|
|
|
if (record == null) |
|
|
|
return new ResultData(ErrorCode.DEVICE_NOT_FOUND); |
|
|
|
kwMeter.setTenantId(getTenantId()); |
|
|
|
kwMeter.setBoxId(0L); |
|
|
|
kwMeter.setBindStatus(EnumMeterBindStatus.UNBIND.getCode()); |
|
|
|
return kwMeterService.saveOrUpdate(kwMeter); |
|
|
|
@@ -137,7 +138,6 @@ public class KwMeterController extends BaseController { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); |
|
|
|
if (kwMeter.getId() == null) |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); |
|
|
|
kwMeter.setTenantId(getTenantId()); |
|
|
|
return kwMeterService.saveOrUpdate(kwMeter); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -162,7 +162,6 @@ public class KwMeterController extends BaseController { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); |
|
|
|
KwMeter kwMeter = new KwMeter(); |
|
|
|
kwMeter.setId(id); |
|
|
|
kwMeter.setTenantId(getTenantId()); |
|
|
|
kwMeter.setStatus(EnumBoxStatus.INVALID.getCode()); |
|
|
|
return kwMeterService.saveOrUpdate(kwMeter); |
|
|
|
} |
|
|
|
|