diff --git a/cmvr-iot-ti/src/main/java/com/cmvr/ti/service/impl/TiProjectServiceImpl.java b/cmvr-iot-ti/src/main/java/com/cmvr/ti/service/impl/TiProjectServiceImpl.java index e29f45c..8ff2e76 100644 --- a/cmvr-iot-ti/src/main/java/com/cmvr/ti/service/impl/TiProjectServiceImpl.java +++ b/cmvr-iot-ti/src/main/java/com/cmvr/ti/service/impl/TiProjectServiceImpl.java @@ -9,12 +9,16 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.cmvr.common.exception.GlobalException; +import com.cmvr.test.enums.FlowSceneTypeEnum; import com.cmvr.test.enums.RunModeEnum; import com.cmvr.test.flow.runtime.engine.FlowTaskRuntimeService; +import com.cmvr.test.model.domain.TeDetectionItem; import com.cmvr.test.model.domain.TeTaskConfigInfo; import com.cmvr.test.model.domain.TeTaskInst; import com.cmvr.test.model.vo.TeQueryTaskOrchestraItemVO; import com.cmvr.test.model.vo.TeTaskExecuteProjectVO; +import com.cmvr.test.model.vo.TeTaskOrchestraVO; +import com.cmvr.test.service.ITeDetectionItemService; import com.cmvr.test.service.ITeTaskConfigInfoService; import com.cmvr.test.service.ITeTaskOrchestrationService; import com.cmvr.ti.mapper.TiProjectMapper; @@ -24,8 +28,10 @@ import com.cmvr.ti.service.ITiProjectService; import com.cmvr.ti.service.ITiVehicleFunctionService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -34,6 +40,7 @@ import java.util.stream.Collectors; public class TiProjectServiceImpl extends ServiceImpl implements ITiProjectService { private final ITeTaskOrchestrationService taskOrchestrationService; + private final ITeDetectionItemService detectionItemService; private final ITeTaskConfigInfoService taskConfigInfoService; private final FlowTaskRuntimeService flowTaskRuntimeService; private final ITiVehicleFunctionService tiVehicleFunctionService; @@ -52,6 +59,7 @@ public class TiProjectServiceImpl extends ServiceImpl ids = StrUtil.split(tiProject.getTestFuncs(), CharPool.COMMA) @@ -79,6 +87,13 @@ public class TiProjectServiceImpl extends ServiceImpl