Merge remote-tracking branch 'origin/master'

zhoushihao

2024-09-18 4170df95c30c0e761ce14ed1a33d1bccfe542c34

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

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



import cn.hutool.json.JSONObject;



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.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;

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

@@ -46,7 +40,7 @@
        JSONObject jsonObject = new JSONObject();

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

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

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

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



        jsonObject.append("rack",rack);

        jsonObject.append("state",state);