From 5c2e8a80d739c5659d74bfd2cbe232b5d72ce21f Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 15 十月 2024 16:47:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java | 72 +++++++++--------------------------
1 files changed, 19 insertions(+), 53 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java
index a06a933..a3c0e25 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java
@@ -2,10 +2,7 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.json.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
-import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
import com.mes.rawglassstation.service.RawGlassStorageStationService;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
@@ -16,7 +13,6 @@
import javax.annotation.Resource;
import java.util.List;
-import java.util.stream.Collectors;
/**
* @author wangfei
@@ -25,56 +21,26 @@
@Component
public class RawGlassPushMessage {
- @Resource private RawGlassStorageStationService rawGlassStorageStationService;
+ @Resource
+ private RawGlassStorageStationService rawGlassStorageStationService;
- @Resource private RawGlassStorageTaskService rawGlassStorageTaskService;
+ @Resource
+ private RawGlassStorageTaskService rawGlassStorageTaskService;
- @Resource private RawGlassStorageDetailsService rawGlassStorageDetailsService;
-
- @Scheduled(fixedDelay = 2000)
- public void sendRawGlassMessage() {
- log.info("鍙戦�佷换鍔′俊鎭拰鏋跺瓙淇℃伅");
- JSONObject jsonObject = new JSONObject();
- List<RawGlassStorageDetails> rawStationDetailsList =
- rawGlassStorageStationService.listRawGlassDetails();
- List<RawGlassStorageTask> tasks = rawGlassStorageTaskService.listRawGlassTask();
- jsonObject.append("rawStationDetailsList", rawStationDetailsList);
- jsonObject.append("tasks", tasks);
-// log.info("鑾峰彇鍒扮殑宸ヤ綅璇︽儏鍙婁换鍔′俊鎭负锛歿}", jsonObject);
-
- List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("rawGlass");
- if (CollectionUtil.isNotEmpty(sendwServer)) {
- sendwServer.stream().forEach(e->{
- e.sendMessage(String.valueOf(jsonObject));
- });
+ @Scheduled(fixedDelay = 2000)
+ public void sendRawGlassMessage() {
+ log.info("鍙戦�佷换鍔′俊鎭拰鏋跺瓙淇℃伅");
+ JSONObject jsonObject = new JSONObject();
+ List<RawGlassStorageDetails> rawStationDetailsList =
+ rawGlassStorageStationService.listRawGlassDetails();
+ List<RawGlassStorageTask> tasks = rawGlassStorageTaskService.listRawGlassTask();
+ jsonObject.append("rawStationDetailsList", rawStationDetailsList);
+ jsonObject.append("tasks", tasks);
+ List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("rawGlass");
+ if (CollectionUtil.isNotEmpty(sendwServer)) {
+ sendwServer.stream().forEach(e -> {
+ e.sendMessage(String.valueOf(jsonObject));
+ });
+ }
}
- }
-
- /** todo:鍏ュ簱浠诲姟锛氬悐瑁呬綅鏈夌幓鐠冿紝鍏堝幓宸ヤ綅琛ㄦ煡璇㈢┖鏍煎瓙锛岀敓鎴愬叆搴撲换鍔′粠鍚婅浣嶅埌鐩爣鏍煎瓙 */
-// @Scheduled(fixedDelay = 1000)
-// public void sendRawGlassMessage() {
-//// List<RawGlassStorageDetails> rawGlassStorageDetailsList = rawGlassStorageDetailsService.List(new RawGlassStorageDetails())
-// Wrapper<RawGlassStorageDetails> queryWrapper = null;
-// List<RawGlassStorageDetails> detailsList = rawGlassStorageDetailsService.list(null);
-// queryWrapper.eq(RawGlassStorageDetails::getState, 100);
-// if(detailsList.size() >0){
-// //鏌ユ壘鏍煎瓙琛╠etails绌烘牸瀛�
-// List<String> slotIds = detailsList.stream()
-// .map(RawGlassStorageDetails::getSlotId)
-// .collect(Collectors.toList());
-// list(new LambdaQueryWrapper<RawGlassStorageTask>()
-// .in(CollectionUtil.isNotEmpty(request.getState()), RawGlassStorageTask::getState, request.getState())
-// .in(CollectionUtil.isNotEmpty(request.getSlotId()), RawGlassStorageTask::getSlotId, request.getSlotId())
-// .orderByDesc(RawGlassStorageTask::getCreateTime));
-// }if(slotIds.size()>0){
-// //鐢熸垚鍏ュ簱浠诲姟
-// }
-//
-// }
-
-
-
- /** todo:鍑哄簱浠诲姟锛�1銆佺偣鍑哄簱锛岀珛椹敓鎴愬嚭鐗囦换鍔� 2銆佺偣鍑哄簱淇敼宸ヤ綅璇︽儏鍐呯殑鐘舵�佷负寰呭嚭搴擄紝瀹氭椂浠诲姟鎵弿鐢熸垚鍑哄簱浠诲姟 */
-
- /** todo:鍘熺墖璋冨害锛�1銆佹煡璇㈠伐绋嬪師鐗囪〃锛屾寜鐓ч『搴忓皢鍘熺墖鏀惧叆涓婄墖1鍙蜂綅锛屽悗缁師鐗囨斁涓婄墖2鍙蜂綅锛屽嚭鐜板昂瀵告浛鎹紝鍒ゆ柇鍘熶笂鐗囦綅鏄惁鏈夌幓鐠冿紝鏈� 鍏堝嚭鍚庤繘锛屾棤 鐩存帴杩涚墖 */
}
--
Gitblit v1.8.0