修改报表，界面添加查询流程卡个数，调整推送数据到前端的间隔

ZengTao

2025-03-28 f68d3c71819feb59e7a227a5d992b059b900916c

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java

@@ -18,7 +18,7 @@

/**
 * <p>
 *  前端控制器
 * 前端控制器
 * </p>
 *
 * @author wu
@@ -36,36 +36,38 @@
    private GlassInfoService glassInfoService;
    @Autowired
    private OptimizeProjectService optimizeProjectService;

    @ApiOperation("开始/暂停任务/传递工程号和状态,开始是1 暂停是0")
    @PostMapping("/pauseTask") //暂停上片任务
    @ResponseBody
    public  Result <List<UpPattenUsage>> pauseTask(@RequestBody Engineering engineering) {
        boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
    public Result<List<UpPattenUsage>> pauseTask(@RequestBody Engineering engineering) {
        boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState());
        List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
        if(work){
            return Result.build(200,"成功",glass);
        }else {
            return Result.build(100,"失败",glass);
        if (work) {
            return Result.build(200, "成功", glass);
        } else {
            return Result.build(100, "失败", glass);
        }
    }

    @ApiOperation("暂停")
    @PostMapping("/pause") //暂停上片任务
    @ResponseBody
    public  Result <List<UpPattenUsage>> pause(@RequestBody Engineering engineering) {
        boolean work=engineeringService.pauseTask(engineering.getEngineerId(),engineering.getState());
//        List<UpPattenUsage> glass = upPattenUsageService.prioritylist();String message;
        if(work){
            return Result.build(200, "成功", null);
        }else {
            return Result.build(100, "成功", null);
    public Result<List<UpPattenUsage>> pause(@RequestBody Engineering engineering) {
        boolean work = engineeringService.pauseTask(engineering.getEngineerId(), engineering.getState());
        List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
        String message;
        if (work) {
            return Result.build(200, "成功", glass);
        } else {
            return Result.build(100, "成功", glass);
        }
    }

    @ApiOperation("开始上片")
    @PostMapping("/changeTask") //调用上片任务
    @ResponseBody
    public  Result <Boolean> changeTask(@RequestBody Engineering engineering) {
    public Result<Boolean> changeTask(@RequestBody Engineering engineering) {
        log.info("engineeringId:{}", engineering);
        UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
        if (upPattenUsage != null) {
@@ -89,10 +91,32 @@
            List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
            optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
            if (work) {
                return Result.build(200, "保存成功"+engineering.getEngineerId(), true);
            }else {
                return Result.build(200, "保存失败"+engineering.getEngineerId(), false);
                return Result.build(200, "保存成功" + engineering.getEngineerId(), true);
            } else {
                return Result.build(200, "保存成功" + engineering.getEngineerId(), false);
            }
        }

    }

    @ApiOperation("删除工程上片")
    @PostMapping("/deleteTask") //调用上片任务
    @ResponseBody
    public Result<Boolean> deleteTask(@RequestBody Engineering engineering) {
        //删除工程表、小片表、上片表，更改优化表状态
        boolean work = false;
        Engineering engineeringState = engineeringService.selectEngineeringState(engineering.getEngineerId());
        if (engineeringState == null) {
            work = engineeringService.deleteTask(engineering.getEngineerId());
            glassInfoService.deleteTask(engineering.getEngineerId());
            upPattenUsageService.deleteTask(engineering.getEngineerId());
            optimizeProjectService.changeTask(engineering.getEngineerId(), 100);
        }

        if (work) {
            return Result.build(200, "删除成功" + engineering.getEngineerId(), true);
        } else {
            return Result.build(200, "删除失败" + engineering.getEngineerId(), false);
        }

    }
@@ -100,10 +124,10 @@
    @ApiOperation("查询可以上片的工程号")
    @GetMapping("/selectTask") //调用上片任务
    @ResponseBody
    public Result <List<Engineering>> selectTask() {
        List<Engineering> engineering=engineeringService.selectTask();
    public Result<List<Engineering>> selectTask() {
        List<Engineering> engineering = engineeringService.selectTask();
        log.info("可领取任务返回:{}", engineering);
        return Result.build(200, "",engineering);
        return Result.build(200, "", engineering);
    }
}