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

wangfei

2025-11-04 aea7379082d3a9d53a35f62e8ff435254be8d213

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java

@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

import com.mes.common.config.Const;

import com.mes.common.utils.RedisUtil;

import com.mes.downglassinfo.entity.DownGlassInfo;

import com.mes.downglassinfo.entity.DownGlassTask;

import com.mes.downglassinfo.entity.request.DownGlassInfoRequest;

@@ -18,6 +17,8 @@
import com.mes.glassinfo.service.GlassInfoService;

import com.mes.tools.DateUtil;

import com.mes.tools.WebSocketServer;

import com.mes.tools.WebSocketUtils;

import com.mes.utils.RedisUtil;

import lombok.extern.slf4j.Slf4j;

import org.apache.commons.lang.StringUtils;

import org.springframework.beans.factory.annotation.Autowired;

@@ -25,6 +26,7 @@
import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;



import javax.annotation.Resource;

import java.io.BufferedReader;

import java.io.InputStreamReader;

import java.net.Socket;

@@ -47,6 +49,8 @@
    private DownGlassTaskService downGlassTaskService;

    @Autowired

    private GlassInfoService glassInfoService;

    @Resource

    private WebSocketUtils webSocketUtils;



    @Value("${mes.scan.ip}")

    private String scanIp;

@@ -65,15 +69,8 @@
        List<DownWorkstation> data = downWorkstationService.list();

        jsonObject.append("params", data);

        log.info(jsonObject.toString());

        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unloadglass");

        if (sendwServer != null) {

            for (WebSocketServer webserver : sendwServer) {

                if (webserver != null && webserver.session.isOpen()) {

                    log.info("已发送");

                    webserver.sendMessage(jsonObject.toString());

                }

            }

        }

        webSocketUtils.sendToWeb("unloadglass", jsonObject);



    }



    @Scheduled(fixedDelay = 1000)

@@ -83,14 +80,7 @@
        List<Map<String, Object>> glassinfodata = downWorkstationService.getTotalGlassDimensionsByWorkstation(1, 3);

        jsonObject2.append("glassinfo", glassinfodata);

        log.info(jsonObject2.toString());

        ArrayList<WebSocketServer> sendwServer2 = WebSocketServer.sessionMap.get("unloadglass2");

        if (sendwServer2 != null) {

            for (WebSocketServer webserver : sendwServer2) {

                if (webserver != null && webserver.session.isOpen()) {

                    webserver.sendMessage(jsonObject2.toString());

                }

            }

        }

        webSocketUtils.sendToWeb("unloadglass2", jsonObject2);

    }



    @Scheduled(fixedDelay = 1000)

@@ -100,14 +90,7 @@
        List<Map<String, Object>> glassinfodata2 = downWorkstationService.getTotalGlassDimensionsByWorkstation(4, 6);

        jsonObject3.append("glassinfo2", glassinfodata2);

        log.info(jsonObject3.toString());

        ArrayList<WebSocketServer> sendwServer3 = WebSocketServer.sessionMap.get("unloadglass3");

        if (sendwServer3 != null) {

            for (WebSocketServer webserver : sendwServer3) {

                if (webserver != null && webserver.session.isOpen()) {

                    webserver.sendMessage(jsonObject3.toString());

                }

            }

        }

        webSocketUtils.sendToWeb("unloadglass3", jsonObject3);

    }



    @Scheduled(fixedDelay = 2000)

@@ -117,14 +100,7 @@
        List<Map<String, Object>> list = downStorageCageService.selectDownStorageCages();

        jsonObject4.append("params2", list);

        log.info(jsonObject4.toString());

        ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("downcache");

        if (sendwServer4 != null) {

            for (WebSocketServer webserver : sendwServer4) {

                if (webserver != null && webserver.session.isOpen()) {

                    webserver.sendMessage(jsonObject4.toString());

                }

            }

        }

        webSocketUtils.sendToWeb("downcache", jsonObject4);

    }



    @Scheduled(fixedDelay = 2000)

@@ -154,7 +130,7 @@
        jsonObject4.append("downGlassInfos", downGlassInfos);

        jsonObject4.append("engineerIdList", engineerIdList);



        //钢化开关

        //打印开关

        boolean autoPrint = false;

        if (redisUtil.getCacheObject("autoPrint") == null) {

            redisUtil.setCacheObject("autoPrint", false);

@@ -167,20 +143,14 @@
                new QueryWrapper<DownGlassTask>()

                        .select("Top 1 *")

                        .eq("end_cell", Const.G13_WORK_STATION)

                        .orderByDesc("id")



                        .lt("task_status", Const.UNLOAD_GLASS_DOWN)

                        .orderByAsc("id")

        );

        jsonObject4.append("takeGlass", takeGlass);





        ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("unloadglass");

        if (sendwServer4 != null) {

            for (WebSocketServer webserver : sendwServer4) {

                if (webserver != null && webserver.session.isOpen()) {

                    webserver.sendMessage(jsonObject4.toString());

                }

            }

        if (takeGlass != null) {

            jsonObject4.append("takeGlass", takeGlass);

        }



        webSocketUtils.sendToWeb("unloadglass", jsonObject4);

    }



    @Scheduled(fixedDelay = 1000)

@@ -191,38 +161,29 @@
        jsonObject.append("downWorkstation", downWorkstation);

        List<DownGlassTask> downGlassTask = downGlassTaskService.selectOutTaskCache();

        jsonObject.append("downGlassTask", downGlassTask);

        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unLoadGlassIsRun");

        if (sendwServer != null) {

            for (WebSocketServer webserver : sendwServer) {

                if (webserver != null) {

                    webserver.sendMessage(jsonObject.toString());

                } else {

                    log.info("unLoadGlassIsRun is closed");

                }

            }

        }



        webSocketUtils.sendToWeb("unLoadGlassIsRun", jsonObject);

    }



    @Scheduled(fixedDelay = Long.MAX_VALUE)

    public void scanCodeTask() {

        log.info("扫描任务已启动");

        while (true) {

            JSONObject jsonObject = new JSONObject();

            try (Socket socket = new Socket(scanIp, scanPort);

                 BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()))) {

                // 接收服务器响应

                String response;

                while ((response = in.readLine()) != null) {

                    List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("scanCode");

                    if (CollectionUtils.isNotEmpty(sendwServer)) {

                        //按照玻璃id获取玻璃信息返回给前端界面，具体需要哪些数据待确认

                        GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()

                                .eq(GlassInfo::getGlassId, response).last("limit 1"));

                        if (null == glassInfo) {

                            log.info("按照玻璃id：{}，无法找到玻璃信息", response);

                        } else {

                            sendwServer.get(0).sendMessage(glassInfo.toString());

                        }

                    }

                log.info("等待扫码中......");

                String glassId = in.readLine();

                log.info("扫描到的玻璃id：{}", glassId);

                //按照玻璃id获取玻璃信息返回给前端界面，具体需要哪些数据待确认

                GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()

                        .eq(GlassInfo::getGlassId, glassId).last("limit 1"));

                if (null == glassInfo) {

                    log.info("按照玻璃id：{}，无法找到玻璃信息", glassId);

                    return;

                }

                webSocketUtils.sendToWeb("scanGlass", glassInfo);

            } catch (Exception exception) {

                log.info("读取异常，原因为{}", exception.getMessage());

            }