Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

wangfei

2024-08-23 051613aa73be3e75af5a6dfdb86a722bcb5af094

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

@@ -1,18 +1,22 @@
package com.mes.job;



import cn.hutool.json.JSONObject;

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

import com.mes.downglassinfo.entity.DownGlassInfo;

import com.mes.downglassinfo.service.DownGlassInfoService;

import com.mes.downstorage.service.DownStorageCageService;

import com.mes.downworkstation.entity.DownWorkstation;

import com.mes.downworkstation.service.DownWorkstationService;

import com.mes.tools.WebSocketServer;

import lombok.extern.slf4j.Slf4j;

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

import org.springframework.scheduling.annotation.Scheduled;

import lombok.extern.slf4j.Slf4j;

import org.springframework.stereotype.Component;



import java.util.ArrayList;

import java.util.List;

import java.util.Map;

import java.util.stream.Collectors;



@Slf4j

@Component

@@ -22,14 +26,16 @@
    private DownWorkstationService downWorkstationService;

    @Autowired

    private DownStorageCageService downStorageCageService;

    @Autowired

    private DownGlassInfoService downGlassInfoService;



    @Scheduled(fixedDelay = 1000)

    @Scheduled(fixedDelay = 2000)

    public void sendDownWorkstations() {

        log.info("发送工位玻璃信息");

        JSONObject jsonObject = new JSONObject();



        List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1,6);

        jsonObject.append("params",data);

        List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1, 6);

        jsonObject.append("params", data);

        log.info(jsonObject.toString());

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

        if (sendwServer != null) {

@@ -76,17 +82,36 @@
        }

    }



   @Scheduled(fixedDelay = 1000)

   @Scheduled(fixedDelay = 2000)

    public void sendDownStorageCages() {

        log.info("发送缓存玻璃信息");

        JSONObject jsonObject4 = new JSONObject();

        List<Map<String, Object>> list=downStorageCageService.selectDownStorageCages();

        jsonObject4.append("params2",list);

        log.info(jsonObject4.toString());

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

       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());

               }

           }

       }

   }



    @Scheduled(fixedDelay = 2000)

    public void sendDownGlassInfo() {

        log.info("发送当前正在执行工程已落架的玻璃信息");

        List<DownGlassInfo> downGlassInfos = downGlassInfoService.list(new LambdaQueryWrapper<DownGlassInfo>()

                .inSql(DownGlassInfo::getEngineerId, "select engineer_id from engineering where state = 1"));

        Map<Integer, List<DownGlassInfo>> listMap = downGlassInfos.stream().collect(Collectors.groupingBy(DownGlassInfo::getWorkStationId));

        JSONObject jsonObject4 = new JSONObject();

        List<Map<String, Object>> list = downStorageCageService.selectDownStorageCages();

        jsonObject4.append("params", listMap);

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

        if (sendwServer4 != null) {

            for (WebSocketServer webserver : sendwServer4) {

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

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

                    webserver.sendMessage(jsonObject4.toString());

                }

            }