|
|
|
@ -115,7 +115,11 @@ public class RecycleBucketController {
|
|
|
|
|
//只会查询出来一个
|
|
|
|
|
recycleBucketForm.setCompanyId(companyId.get(0));
|
|
|
|
|
}
|
|
|
|
|
return ActionResult.success(recycleBucketService.saveOrUpdate(recycleBucketForm, null, true));
|
|
|
|
|
String result = recycleBucketService.saveOrUpdate(recycleBucketForm, null, true);
|
|
|
|
|
if (result.contains("失败") || result.contains("两")) {
|
|
|
|
|
return ActionResult.fail(result);
|
|
|
|
|
}
|
|
|
|
|
return ActionResult.success(result);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -144,16 +148,13 @@ public class RecycleBucketController {
|
|
|
|
|
//只会查询出来一个
|
|
|
|
|
recycleBucketForm.setCompanyId(companyId.get(0));
|
|
|
|
|
}
|
|
|
|
|
try {
|
|
|
|
|
recycleBucketService.saveOrUpdate(recycleBucketForm, id, false);
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
return ActionResult.fail("修改数据失败");
|
|
|
|
|
String result = recycleBucketService.saveOrUpdate(recycleBucketForm, null, true);
|
|
|
|
|
if (result.contains("失败") || result.contains("该设备已存在两台回收桶")) {
|
|
|
|
|
return ActionResult.fail(result);
|
|
|
|
|
}
|
|
|
|
|
return ActionResult.success("更新成功");
|
|
|
|
|
} else {
|
|
|
|
|
return ActionResult.fail("更新失败,数据不存在");
|
|
|
|
|
return ActionResult.success(result);
|
|
|
|
|
}
|
|
|
|
|
return ActionResult.fail("更新失败,数据不存在");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -241,7 +242,8 @@ public class RecycleBucketController {
|
|
|
|
|
return ActionResult.success(recycleBucketMap);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private RecycleBucketEntity buildEntity(RecycleBucketEntity entity, Map<String, RecycleDeviceConfigEntity> configCollect) {
|
|
|
|
|
private RecycleBucketEntity buildEntity(RecycleBucketEntity
|
|
|
|
|
entity, Map<String, RecycleDeviceConfigEntity> configCollect) {
|
|
|
|
|
if (configCollect.containsKey(entity.getCompanyId())) {
|
|
|
|
|
RecycleDeviceConfigEntity deviceConfig = configCollect.get(entity.getCompanyId());
|
|
|
|
|
//如果为空 则获取公共配置
|
|
|
|
|