工控网涉密网联调

yangys

2025-09-29 4c7296d45efe849dc70a3b2e2240c905481a91c9

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchTaskController.java

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -10,26 +9,21 @@
import org.apache.poi.ss.usermodel.DateUtil;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.engine.runtime.ProcessInstance;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.producedivision.entity.QinzheFgb;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.excution.StartDispatcher;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.flow.service.execute.*;
import org.springblade.mdm.flow.vo.BatchDispatchVO;
import org.springblade.mdm.flow.vo.DispathTaskQueryVO;
import org.springblade.mdm.flow.vo.FlowStartResult;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

import java.time.LocalDateTime;
import java.util.Map;

@Slf4j
@RestController
@@ -60,7 +54,7 @@
         .like(StringUtils.isNotBlank(queryVO.getDrawingNo()), TaskDispatch::getDrawingNo,queryVO.getDrawingNo())
            .ne(TaskDispatch::getStatus,TaskDispatch.STATUS_INIT).ne(TaskDispatch::getStatus,TaskDispatch.STATUS_STARTED)
         .ge(queryVO.getCreateTimeBegin()!=null, TaskDispatch::getCreateTime,queryVO.getCreateTimeBegin())
         .le(queryVO.getCreateTimeEnd()!=null, TaskDispatch::getCreateTime,end)
         .le(queryVO.getCreateTimeEnd()!=null, TaskDispatch::getCreateTime,end).orderByDesc(TaskDispatch::getCreateTime)
         .page(Condition.getPage(queryVO)));
   }
   /**
@@ -81,21 +75,26 @@

   @PostMapping("/force-start")
   @Operation(summary = "强制启动派工", description = "从任务异常记录启动派工流程")
   public R<Boolean> forceStart(long id) {
   public R<Boolean> forceStart(long id,Long producePlanId) {
      try {
         TaskDispatch dispatch = taskDispatchService.getById(id);

         TaskAssignVO startVO = new TaskAssignVO();
         BeanUtils.copyProperties(dispatch, startVO);
         startVO.setTitle(startVO.getDrawingNo()+"-"+startVO.getProcessNo()+"-"+startVO.getProcessEdition()+"数控程序编制");
         if(producePlanId != null){
            startVO.setProducePlanId(producePlanId);
         }
         try {
            String instId = dispatcher.start(startVO);
            FlowStartResult result = dispatcher.start(startVO);
            dispatch.setStatus(TaskDispatch.STATUS_STARTED);
            dispatch.setProcessInstanceId(instId);
            dispatch.setProcessInstanceId(result.getProcessInstanceId());
            dispatch.setProgramNo(result.getProgramNo());
            taskDispatchService.updateById(dispatch);
         } catch (Exception e) {
            log.error("流程启动异常",e);
            dispatch.setStatus(TaskDispatch.STATUS_EXCEPTION);
            dispatch.setErrMsg(e.getMessage());
            taskDispatchService.updateById(dispatch);
            return R.fail("任务启动异常");
         }