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

ZengTao

2025-03-28 f68d3c71819feb59e7a227a5d992b059b900916c

 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java

@@ -1,4 +1,5 @@
package com.mes.job;

import cn.hutool.json.JSONObject;
import com.mes.order.entity.Orders;
import com.mes.order.service.OrdersService;
@@ -31,6 +32,7 @@
    private OptimizeProjectService optimizeProjectService;
    @Autowired
    private OrdersService ordersService;

    /**
     * fixedRate : 上一个调用开始后再次调用的延时（不用等待上一次调用完成）
     * fixedDelay : 上一个调用结束后再次调用的延时
@@ -39,40 +41,41 @@
    @Scheduled(fixedDelay = 10000)
    public void screenHome() {
        JSONObject jsonObject = new JSONObject();
        Reportingdamage reportingdamage = new Reportingdamage();
        //reportingdamage.setReportingWorkTime("2024-05-11");
        // 获取当前日期
        LocalDate today = LocalDate.now();
        // 计算最近七天的开始日期
        LocalDate startOfPeriod = today.minusDays(6); // 7天的范围包括今天，所以减去6天
        // 最近七天的结束日期就是今天
        LocalDate endOfPeriod = today;
        // 格式化日期为字符串
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
        String startOfPeriodStr = startOfPeriod.format(formatter);
        String endOfPeriodStr = endOfPeriod.format(formatter);
        // 设置为最近七天的时间范围
        reportingdamage.setReportingWorkTime(startOfPeriodStr + " to " + endOfPeriodStr);
        //reportingdamage.setReportingWorkTime(startOfPeriodStr + " to " + endOfPeriodStr);
        //扇形图各设备的加工破损数量
        List<Reportingdamage> device = reportingWorkService.selectDamage(reportingdamage);
        jsonObject.append("device", device);

        //获取次破未补信息
        List<AwaitingRepair> awaitingRepairs = reportingWorkService.selectAwaitingRepair();
        jsonObject.append("awaitingRepairs", awaitingRepairs);
        //获取正在进行的工程
        List<OptimizeProject> optimizeProjects = optimizeProjectService.getDoingTask();
        jsonObject.append("DoingTask", optimizeProjects);
        //获取当前订单
        List<Orders> orders = ordersService.selectOrders();
        jsonObject.append("orders", orders);

        /*现场规划图显示*/


        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("screen");
        if (sendwServer != null) {
            Reportingdamage reportingdamage = new Reportingdamage();
            // 获取当前日期
            LocalDate today = LocalDate.now();
            // 计算最近七天的开始日期
            LocalDate startOfPeriod = today.minusDays(6); // 7天的范围包括今天，所以减去6天
            // 最近七天的结束日期就是今天
            LocalDate endOfPeriod = today;
            // 格式化日期为字符串
            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
            String startOfPeriodStr = startOfPeriod.format(formatter);
            String endOfPeriodStr = endOfPeriod.format(formatter);
            // 设置为最近七天的时间范围
//        reportingdamage.setReportingWorkTime("2024-05-11");
            reportingdamage.setReportingWorkTime(startOfPeriodStr);
            reportingdamage.setReportingWorkTime2(endOfPeriodStr);
            //扇形图各设备的加工破损数量
            List<Reportingdamage> device = reportingWorkService.selectDamage(reportingdamage);
            jsonObject.append("device", device);

            //获取次破未补信息
            List<AwaitingRepair> awaitingRepairs = reportingWorkService.selectAwaitingRepair();
            jsonObject.append("awaitingRepairs", awaitingRepairs);
            //获取正在进行的工程
            List<OptimizeProject> optimizeProjects = optimizeProjectService.getDoingTask();
            jsonObject.append("DoingTask", optimizeProjects);
            //获取当前订单
            List<Orders> orders = ordersService.selectOrders();
            jsonObject.append("orders", orders);
            for (WebSocketServer webserver : sendwServer) {
                if (webserver != null) {
                    webserver.sendMessage(jsonObject.toString());