|
@ -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(); |
|
|