Browse Source

feat: 添加计划执行者名称

master_tdsql
hxh 1 year ago
parent
commit
5f42e58b84
  1. 9
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java
  2. 9
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java

9
shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java

@ -5,12 +5,12 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.kms.yxgh.base.DfException; import com.kms.yxgh.base.DfException;
import com.kms.yxgh.df.dto.DfPlanDetailDto;
import com.kms.yxgh.df.dto.DfPlanDetailDto.OperatorDto;
import com.kms.yxgh.df.dto.DfPointDto;
import com.kms.yxgh.df.domain.DfPlan; import com.kms.yxgh.df.domain.DfPlan;
import com.kms.yxgh.df.domain.DfPlanOperator; import com.kms.yxgh.df.domain.DfPlanOperator;
import com.kms.yxgh.df.domain.DfPoint; import com.kms.yxgh.df.domain.DfPoint;
import com.kms.yxgh.df.dto.DfPlanDetailDto;
import com.kms.yxgh.df.dto.DfPlanDetailDto.OperatorDto;
import com.kms.yxgh.df.dto.DfPointDto;
import com.kms.yxgh.df.mapper.DfPlanMapper; import com.kms.yxgh.df.mapper.DfPlanMapper;
import com.kms.yxgh.df.mapper.DfPlanOperatorMapper; import com.kms.yxgh.df.mapper.DfPlanOperatorMapper;
import com.kms.yxgh.df.mapper.DfPointMapper; import com.kms.yxgh.df.mapper.DfPointMapper;
@ -44,7 +44,8 @@ public class DfPlanService extends BaseService<DfPlanMapper, DfPlan> {
if (dto != null) { if (dto != null) {
dto.setOtherConfig(JSON.parseObject(dfPlan.getOtherConfig())); dto.setOtherConfig(JSON.parseObject(dfPlan.getOtherConfig()));
Wrapper<DfPlanOperator> wp = Wrappers.<DfPlanOperator>lambdaQuery() Wrapper<DfPlanOperator> wp = Wrappers.<DfPlanOperator>lambdaQuery()
.select(DfPlanOperator::getId, DfPlanOperator::getOperatorUid) .select(DfPlanOperator::getId, DfPlanOperator::getOperatorUid,
DfPlanOperator::getOperatorName)
.eq(DfPlanOperator::getPlanId, id); .eq(DfPlanOperator::getPlanId, id);
dto.setOperators(StreamUtils.toList(dfPlanOperatorMapper.selectList(wp), (o) -> { dto.setOperators(StreamUtils.toList(dfPlanOperatorMapper.selectList(wp), (o) -> {
OperatorDto itemDto = new OperatorDto(); OperatorDto itemDto = new OperatorDto();

9
shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java

@ -5,12 +5,12 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.kms.yxgh.base.SzException; import com.kms.yxgh.base.SzException;
import com.kms.yxgh.sz.dto.SzPlanDetailDto.OperatorDto;
import com.kms.yxgh.sz.dto.SzPlanDetailDto;
import com.kms.yxgh.sz.dto.SzPointDto;
import com.kms.yxgh.sz.domain.SzPlan; import com.kms.yxgh.sz.domain.SzPlan;
import com.kms.yxgh.sz.domain.SzPlanOperator; import com.kms.yxgh.sz.domain.SzPlanOperator;
import com.kms.yxgh.sz.domain.SzPoint; import com.kms.yxgh.sz.domain.SzPoint;
import com.kms.yxgh.sz.dto.SzPlanDetailDto;
import com.kms.yxgh.sz.dto.SzPlanDetailDto.OperatorDto;
import com.kms.yxgh.sz.dto.SzPointDto;
import com.kms.yxgh.sz.mapper.SzPlanMapper; import com.kms.yxgh.sz.mapper.SzPlanMapper;
import com.kms.yxgh.sz.mapper.SzPlanOperatorMapper; import com.kms.yxgh.sz.mapper.SzPlanOperatorMapper;
import com.kms.yxgh.sz.mapper.SzPointMapper; import com.kms.yxgh.sz.mapper.SzPointMapper;
@ -44,7 +44,8 @@ public class SzPlanService extends BaseService<SzPlanMapper, SzPlan> {
if (dto != null) { if (dto != null) {
dto.setOtherConfig(JSON.parseObject(SzPlan.getOtherConfig())); dto.setOtherConfig(JSON.parseObject(SzPlan.getOtherConfig()));
Wrapper<SzPlanOperator> wp = Wrappers.<SzPlanOperator>lambdaQuery() Wrapper<SzPlanOperator> wp = Wrappers.<SzPlanOperator>lambdaQuery()
.select(SzPlanOperator::getId, SzPlanOperator::getOperatorUid) .select(SzPlanOperator::getId, SzPlanOperator::getOperatorUid,
SzPlanOperator::getOperatorName)
.eq(SzPlanOperator::getPlanId, id); .eq(SzPlanOperator::getPlanId, id);
dto.setOperators(StreamUtils.toList(SzPlanOperatorMapper.selectList(wp), (o) -> { dto.setOperators(StreamUtils.toList(SzPlanOperatorMapper.selectList(wp), (o) -> {
OperatorDto itemDto = new OperatorDto(); OperatorDto itemDto = new OperatorDto();

Loading…
Cancel
Save