|
|
@@ -221,13 +221,13 @@ public class ParkingChangeStrategyService {
|
|
|
* 保存单位分配
|
|
|
* @param param
|
|
|
*/
|
|
|
- public void saveChangeStrategyEnt(ParkingChangeStrategyUnitSaveParam param) {
|
|
|
+ public ParkingChangeStrategyUnitSaveResp saveChangeStrategyEnt(ParkingChangeStrategyUnitSaveParam param) {
|
|
|
log.info("保存单位分配,param:{}", JSON.toJSONString(param));
|
|
|
-
|
|
|
+ ParkingChangeStrategyUnitSaveResp resp = new ParkingChangeStrategyUnitSaveResp();
|
|
|
// 清空逻辑
|
|
|
if (CollectionUtils.isEmpty(param.getEntIds())) {
|
|
|
parkingChangeStrategyUnitRepository.deleteByStrategyId(param.getStrategyId());
|
|
|
- return;
|
|
|
+ return resp;
|
|
|
}
|
|
|
|
|
|
// 校验冲突
|
|
|
@@ -237,7 +237,10 @@ public class ParkingChangeStrategyService {
|
|
|
.map(KwtParkingChargeStrategyUnit::getEntId)
|
|
|
.collect(Collectors.toSet());
|
|
|
String conflictNames = conflictIds.stream().map(this::getEntName).collect(Collectors.joining(","));
|
|
|
- throw new BusinessPlatfromException(ErrorCodeEnum.DATA_SAVE_FAIL, conflictNames + "已存在策略, 是否确认替换?");
|
|
|
+ resp.setEntNames(conflictNames);
|
|
|
+ resp.setErrorCode(ErrorCodeEnum.DATA_SAVE_FAIL.getCode());
|
|
|
+ resp.setErrorMsg(conflictNames + "已存在策略, 是否确认替换?");
|
|
|
+ return resp;
|
|
|
}
|
|
|
|
|
|
// 如果是强制模式,先清理掉旧的关联关系(替换)
|
|
|
@@ -262,6 +265,7 @@ public class ParkingChangeStrategyService {
|
|
|
|
|
|
// 批量插入
|
|
|
parkingChangeStrategyUnitRepository.saveBatch(insertList);
|
|
|
+ return resp;
|
|
|
}
|
|
|
|
|
|
/**
|