Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

wangfei

2025-11-04 aea7379082d3a9d53a35f62e8ff435254be8d213

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java

@@ -8,7 +8,7 @@
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
import com.mes.tools.WebSocketServer;
import com.mes.tools.WebSocketUtils;
import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +36,9 @@
    private RedisUtil redisUtil;
    @Autowired
    private GlassInfoService glassInfoService;

    @Resource
    private WebSocketUtils webSocketUtils;

//    @Value("${mes.scan.ip}")
//    private String scanIp;
@@ -119,29 +122,7 @@
            queryDataSource1();
            //查询使用数据源2查询数据
            queryDataSource2();
            try {
                ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("slicecage");
                if (sendwServer != null) {
                    for (WebSocketServer webserver : sendwServer) {
                        if (webserver != null) {
                            webserver.sendMessage(jsonObject.toString());
                            List<String> messages = webserver.getMessages();
                            if (!messages.isEmpty()) {
                                // // 将最后一个消息转换为整数类型的列表
                                webserver.clearMessages();
                            }
                        } else {
                            log.info("Home is closed");
                        }
                    }
                }
            } catch (Exception e) {
                e.printStackTrace(); // 打印堆栈信息，方便定位问题
                System.out.println("webserver出现异常: " + e.getMessage());
                // TODO: handle exception
            }


            webSocketUtils.sendToWeb("slicecage", jsonObject);
        } catch (Exception e) {
            e.printStackTrace();
        }
@@ -156,16 +137,7 @@
        //出片任务数据
        List<BigStorageCageDetails> bigStorageCageDetailsOutTask = bigStorageCageDetailsService.selectOutTask();
        jsonObject.append("bigStorageCageDetailsOutTask", bigStorageCageDetailsOutTask);
        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("isRun");
        if (sendwServer != null) {
            for (WebSocketServer webserver : sendwServer) {
                if (webserver != null) {
                    webserver.sendMessage(jsonObject.toString());
                } else {
                    log.info("Home is closed");
                }
            }
        }
        webSocketUtils.sendToWeb("isRun", jsonObject);
    }

//    @Scheduled(fixedDelay = Long.MAX_VALUE)