Merge remote-tracking branch 'origin/master'

zhoushihao

2024-09-18 4170df95c30c0e761ce14ed1a33d1bccfe542c34

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java

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



import cn.hutool.json.JSONObject;



import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;

import com.mes.rawglassdetails.entity.RawGlassStorageDetails;

import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;

import com.mes.rawglassstation.entity.RawGlassStorageStation;

import com.mes.rawglassstation.service.RawGlassStorageStationService;

import com.mes.rawglasstask.entity.RawGlassStorageTask;

import com.mes.rawglasstask.service.RawGlassStorageTaskService;

import com.mes.shelfrack.service.ShelfRackService;

import com.mes.storagetask.entity.request.StorageTaskRequest;

import com.mes.storagetask.service.StorageTaskService;

import com.mes.tools.WebSocketServer;

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

import org.springframework.scheduling.annotation.Scheduled;

import lombok.extern.slf4j.Slf4j;

import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;



import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Date;

import java.util.List;

import java.util.Map;



@Slf4j

@Component

@@ -26,20 +26,27 @@
    private StorageTaskService storageTaskService;

    @Autowired

    private ShelfRackService shelfRackService;

    @Autowired

    private RawGlassStorageDetailsService rawGlassStorageDetailsService;

    @Autowired

    private RawGlassStorageStationService rawGlassStorageStationService;

    @Autowired

    private RawGlassStorageTaskService rawGlassStorageTaskService;





    @Scheduled(fixedDelay = 2000)

    public void sendDownWorkstations() {

        log.info("发送任务信息和架子信息");

        JSONObject jsonObject = new JSONObject();



        List<RawUsageAndShelfRack> rack =  shelfRackService.selectshelf_rack();

        List<StorageTaskRequest>  tasks =  storageTaskService.Tasks();

        List<RawGlassStorageDetails> rack =  rawGlassStorageDetailsService.list();

        List<RawGlassStorageStation> state =  rawGlassStorageStationService.list();

        List<RawGlassStorageTask> tasks =  rawGlassStorageTaskService.list();



        jsonObject.append("rack",rack);

        jsonObject.append("state",state);

        jsonObject.append("tasks",tasks);

        log.info(jsonObject.toString());

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

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

        if (sendwServer != null) {

            for (WebSocketServer webserver : sendwServer) {

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