From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 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 6e7d874..a06a933 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,7 +2,10 @@
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;
@@ -13,6 +16,7 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author wangfei
@@ -24,6 +28,8 @@
@Resource private RawGlassStorageStationService rawGlassStorageStationService;
@Resource private RawGlassStorageTaskService rawGlassStorageTaskService;
+
+ @Resource private RawGlassStorageDetailsService rawGlassStorageDetailsService;
@Scheduled(fixedDelay = 2000)
public void sendRawGlassMessage() {
@@ -42,11 +48,31 @@
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銆佺偣鍑哄簱淇敼宸ヤ綅璇︽儏鍐呯殑鐘舵�佷负寰呭嚭搴擄紝瀹氭椂浠诲姟鎵弿鐢熸垚鍑哄簱浠诲姟 */
--
Gitblit v1.8.0