From 044c32c15ee9ccac6f3b60eb6745025e2f4480f2 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 11 十二月 2024 16:59:54 +0800
Subject: [PATCH] 报工回传+库位显示
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCManualReporting.java | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCManualReporting.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCManualReporting.java
index 680b369..536d353 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCManualReporting.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCManualReporting.java
@@ -1,10 +1,15 @@
package com.mes.job;
import cn.hutool.json.JSONObject;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.common.S7object;
import com.mes.device.PlcParameterObject;
+import com.mes.md.entity.LineConfiguration;
+import com.mes.md.entity.Machine;
import com.mes.md.entity.PrimitiveTask;
+import com.mes.md.entity.Tasking;
import com.mes.md.mapper.MachineMapper;
+import com.mes.md.mapper.TaskingMapper;
import com.mes.md.service.PrimitiveTaskService;
import com.mes.md.service.TaskingService;
import com.mes.tools.WebSocketServer;
@@ -27,26 +32,42 @@
@Autowired
TaskingService taskingService;
@Autowired
+ TaskingMapper taskingMapper;
+ @Autowired
MachineMapper machineMapper;
@Autowired
PrimitiveTaskService primitiveTaskService;
- //@Scheduled(fixedDelay = 500)
- //@Scheduled(fixedDelay = 1000)
+ @Scheduled(fixedDelay = 500)
public void manualReporting() {
-
JSONObject jsonObject = new JSONObject();
- List<PrimitiveTask> taskingList = primitiveTaskService.selectPrimitiveTask(new PrimitiveTask());
+ Machine machine=machineMapper.selectById(24L);
+ List<Tasking> taskingList=taskingMapper.selectJoinList(Tasking.class,new MPJLambdaWrapper<Tasking>()
+ .selectAll(Tasking.class)
+ .innerJoin(LineConfiguration.class,LineConfiguration::getId,Tasking::getLineConfigurationId)
+ .innerJoin(Machine.class,Machine::getId,LineConfiguration::getMachineId)
+ .eq(LineConfiguration::getMachineId,machine.getId())
+ .eq(Tasking::getGlassState,"姝ｅ父")
+ .eq(Tasking::getState,"绾夸笂")
+ .ne(Tasking::getWorkState,"瀹屽伐")
+ .orderByDesc(Tasking::getOperationRecordTime));
+
+ //List<PrimitiveTask> taskingList = primitiveTaskService.selectPrimitiveTask(new PrimitiveTask());
jsonObject.append("taskingList", taskingList);
+ jsonObject.append("machine", machine);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("manualReporting");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
- List<String> messages = webserver.getMessages();
- if (!messages.isEmpty()) {
- // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- webserver.clearMessages();
+ try {
+ webserver.sendMessage(jsonObject.toString());
+ List<String> messages = webserver.getMessages();
+ if (!messages.isEmpty()) {
+ // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+ webserver.clearMessages();
+ }
+ }catch (Exception e) {
+
}
} else {
log.info("Home is closed");
--
Gitblit v1.8.0