Commit 7b516e88 authored by 赵啸非's avatar 赵啸非

修改校验

parent 85e06e2e
...@@ -403,6 +403,7 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe ...@@ -403,6 +403,7 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
if (!ObjectUtils.isEmpty(entity.getProductId())) { if (!ObjectUtils.isEmpty(entity.getProductId())) {
ProductEntity productEntity = productService.get(entity.getProductId()); ProductEntity productEntity = productService.get(entity.getProductId());
entity.setProductCode(productEntity.getProductCode()); entity.setProductCode(productEntity.getProductCode());
entity.setProductName(productEntity.getProductName());
} }
return super.editAfter(id, model, entity, context); return super.editAfter(id, model, entity, context);
} }
...@@ -412,7 +413,15 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe ...@@ -412,7 +413,15 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
protected void saveBefore(DeviceEntity entity, Map<String, Object> model, Context context) throws AppException { protected void saveBefore(DeviceEntity entity, Map<String, Object> model, Context context) throws AppException {
super.saveBefore(entity, model, context); super.saveBefore(entity, model, context);
if(ObjectUtils.isEmpty(entity.getProductId())) throw new AppException("所属产品ID不能为空!"); if(ObjectUtils.isEmpty(entity.getProductId())) throw new AppException("所属产品ID不能为空!");
if(ObjectUtils.isEmpty(entity.getPlatformId())) throw new AppException("所属平台ID不能为空!"); ProductEntity productEntity = productService.get(entity.getProductId());
if (!ObjectUtils.isEmpty(productEntity.getPlatformId())) {
PlatformEntity platformEntity = platformService.getCache(productEntity.getPlatformId().toString());
entity.setPlatformId(platformEntity.getId());
entity.setPlatformCode(platformEntity.getPlatformSn());
entity.setPlatformName(platformEntity.getPlatformName());
}
// if(ObjectUtils.isEmpty(entity.getPlatformId())) throw new AppException("所属平台ID不能为空!");
//判断如果存在相同的 //判断如果存在相同的
DeviceEntity deviceEntity = this.service.selectOne(new DeviceQuery().deviceCode(entity.getDeviceCode())); DeviceEntity deviceEntity = this.service.selectOne(new DeviceQuery().deviceCode(entity.getDeviceCode()));
if(!ObjectUtils.isEmpty(deviceEntity)){ if(!ObjectUtils.isEmpty(deviceEntity)){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment