|
@ -43,6 +43,7 @@ public class DfPlanService extends BaseService<DfPlanMapper, DfPlan> { |
|
|
DfPlanDetailDto dto = BeanCopyUtils.copy(dfPlan, DfPlanDetailDto.class); |
|
|
DfPlanDetailDto dto = BeanCopyUtils.copy(dfPlan, DfPlanDetailDto.class); |
|
|
if (dto != null) { |
|
|
if (dto != null) { |
|
|
dto.setOtherConfig(JSON.parseObject(dfPlan.getOtherConfig())); |
|
|
dto.setOtherConfig(JSON.parseObject(dfPlan.getOtherConfig())); |
|
|
|
|
|
dto.setFiles(JSON.parseArray(dfPlan.getFiles(), String.class)); |
|
|
Wrapper<DfPlanOperator> wp = Wrappers.<DfPlanOperator>lambdaQuery() |
|
|
Wrapper<DfPlanOperator> wp = Wrappers.<DfPlanOperator>lambdaQuery() |
|
|
.select(DfPlanOperator::getId, DfPlanOperator::getOperatorUid, |
|
|
.select(DfPlanOperator::getId, DfPlanOperator::getOperatorUid, |
|
|
DfPlanOperator::getOperatorName) |
|
|
DfPlanOperator::getOperatorName) |
|
@ -66,6 +67,7 @@ public class DfPlanService extends BaseService<DfPlanMapper, DfPlan> { |
|
|
dfPlan.setId(null); |
|
|
dfPlan.setId(null); |
|
|
if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) { |
|
|
if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) { |
|
|
dfPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig())); |
|
|
dfPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig())); |
|
|
|
|
|
dfPlan.setFiles(JSON.toJSONString(dto.getFiles())); |
|
|
getBaseMapper().insert(dfPlan); |
|
|
getBaseMapper().insert(dfPlan); |
|
|
String id = dfPlan.getId(); |
|
|
String id = dfPlan.getId(); |
|
|
if (CollectionUtil.isNotEmpty(dto.getOperators())) { |
|
|
if (CollectionUtil.isNotEmpty(dto.getOperators())) { |
|
@ -97,6 +99,7 @@ public class DfPlanService extends BaseService<DfPlanMapper, DfPlan> { |
|
|
if (dfPlan != null) { |
|
|
if (dfPlan != null) { |
|
|
if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) { |
|
|
if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) { |
|
|
dfPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig())); |
|
|
dfPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig())); |
|
|
|
|
|
dfPlan.setFiles(JSON.toJSONString(dto.getFiles())); |
|
|
getBaseMapper().updateById(dfPlan); |
|
|
getBaseMapper().updateById(dfPlan); |
|
|
String id = dfPlan.getId(); |
|
|
String id = dfPlan.getId(); |
|
|
deleteItems(id); |
|
|
deleteItems(id); |
|
|