1、前端推送数据新增两条线空闲信号用于前端展示

zhoushihao

2025-01-07 7742c87a5de7e49eaeab705510759cfd6b039617

 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java

@@ -6,12 +6,14 @@
import com.mes.hollow.service.HollowGlassOutRelationInfoService;
import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.io.IOException;
import java.util.List;

/**
@@ -20,6 +22,7 @@
 * @author makejava
 * @since 2024-11-30 13:57:28
 */
@Api(tags = "中空任务关系")
@RestController
@RequestMapping("hollowGlassOutRelationInfo")
public class HollowGlassOutRelationInfoController {
@@ -32,7 +35,7 @@
    public Result<HollowGlassOutRelationInfo> receiveTask(HollowTaskRequest request) {
        HollowGlassOutRelationInfo hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService.receiveTask(request);
        if (null == hollowGlassOutRelationInfo) {
            return Result.error(500, "有正在执行的任务，请先确保任务完成后，再次领取任务");
            return Result.error(500, "当前流程卡有未完成的任务，请先确保任务完成后，再次领取任务");
        } else {
            return Result.success(hollowGlassOutRelationInfo);
        }
@@ -43,7 +46,7 @@
    public Result<HollowGlassOutRelationInfo> forceOutGlass(HollowTaskRequest request) {
        HollowGlassOutRelationInfo hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService.forceOutGlass(request);
        if (null == hollowGlassOutRelationInfo) {
            return Result.error(500, "有正在执行的任务，请先确保任务完成后，再次强制执行任务");
            return Result.error(500, "当前流程卡有未完成的任务，请先确保任务完成后，再次强制执行任务");
        } else {
            return Result.success(hollowGlassOutRelationInfo);
        }
@@ -91,5 +94,11 @@
        return Result.build(200, "修改成功", hollowGlassOutRelationInfoService.dispatchHollowSwitch(flag));
    }

    @ApiOperation("手动生成李赛克文件")
    @PostMapping("/generateHollowLisecFile")
    public Result<String> generateHollowLisecFile(String flowCardId, int cell, int isForce) throws IOException {
        return Result.build(200, "修改成功", hollowGlassOutRelationInfoService.generateHollowLisecFile(flowCardId, cell, isForce, 1));
    }

}