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

wangfei

2024-08-01 c1cb663f4308ddf02ee6ea435c809c8162585b03

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

@@ -2,7 +2,9 @@


import cn.hutool.json.JSONObject;



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

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;

@@ -10,7 +12,9 @@
import lombok.extern.slf4j.Slf4j;

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;



@@ -29,8 +33,9 @@
        log.info("发送任务信息和架子信息");

        JSONObject jsonObject = new JSONObject();



        List<Map<String, Object>> rack =  shelfRackService.selectshelf_rack();

        List<Map<String, Object>> tasks =  storageTaskService.Tasks();

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

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



        jsonObject.append("rack",rack);

        jsonObject.append("tasks",tasks);

        log.info(jsonObject.toString());

@@ -39,7 +44,7 @@
            for (WebSocketServer webserver : sendwServer) {

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

                    log.info("已发送");

                    webserver.sendMessage(jsonObject.toString());

                    webserver.sendMessage(String.valueOf(jsonObject));

                }

            }

        }