Merge remote-tracking branch 'origin/master'

wangfei

2025-05-13 0b41a5c59028a61bff22f60e74cb1d6d53a40e61

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java

@@ -13,6 +13,7 @@
import com.mes.largenscreen.entity.DailyProductionVO;
import com.mes.largenscreen.entity.DateRequest;
import com.mes.largenscreen.entity.PieChartVO;
import com.mes.largenscreen.entity.RunTime;
import com.mes.largenscreen.service.LargenScreenService;
import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
@@ -151,11 +152,10 @@
    @Scheduled(fixedDelay = 1000)
    public void querySameDayProductionTask() {
        JSONObject jsonObject = new JSONObject();
        List<DailyProductionVO> productionVO = largenScreenService.querySameDayProduction(new DateRequest());
        jsonObject.append("productionVO", productionVO);

        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreenProduction");
        if (sendwServer != null) {
            List<DailyProductionVO> productionVO = largenScreenService.querySameDayProduction(new DateRequest());
            jsonObject.append("productionVO", productionVO);
            for (WebSocketServer webserver : sendwServer) {
                if (webserver != null) {
                    webserver.sendMessage(jsonObject.toString());
@@ -171,10 +171,13 @@
        }
    }

    @Scheduled(fixedDelay = 1000)
    @Scheduled(fixedDelay = 500)
    public void largenScreen() {
        JSONObject jsonObject = new JSONObject();
        //磨边信息

        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
        if (sendwServer != null) {
        List<EdgGlassTaskInfo> edgOneTasks = edgGlassTaskInfoService.list(
                new LambdaQueryWrapper<EdgGlassTaskInfo>()
                        .lt(EdgGlassTaskInfo::getState, 2)
@@ -201,8 +204,8 @@
        jsonObject.append("engineeringTwo", engineeringTow);
        List<PieChartVO> pieChartVOS = edgStorageCageDetailsService.queryPieChart();
        jsonObject.append("pieChartVOS", pieChartVOS);
        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
        if (sendwServer != null) {
            List<RunTime> loadRunTimes = edgStorageDeviceTaskHistoryService.queryRunTimes();
            jsonObject.append("loadRunTimes", loadRunTimes);
            for (WebSocketServer webserver : sendwServer) {
                if (webserver != null) {
                    webserver.sendMessage(jsonObject.toString());