From 9973bb6887f668cd91f1c4a0b8a7d05f9bd229ad Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期六, 12 十月 2024 14:57:21 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/JiuMuMES
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCManualReporting.java | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCTurn.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCManualReporting.java
similarity index 62%
copy from JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCTurn.java
copy to JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCManualReporting.java
index d633948..e83d7c1 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCTurn.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCManualReporting.java
@@ -3,7 +3,9 @@
import cn.hutool.json.JSONObject;
import com.mes.common.S7object;
import com.mes.device.PlcParameterObject;
-import com.mes.md.entity.Tasking;
+import com.mes.md.entity.PrimitiveTask;
+import com.mes.md.mapper.MachineMapper;
+import com.mes.md.service.PrimitiveTaskService;
import com.mes.md.service.TaskingService;
import com.mes.tools.WebSocketServer;
import lombok.extern.slf4j.Slf4j;
@@ -13,38 +15,30 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.Objects;
/**
* @author SNG-010
*/
@Component
@Slf4j
-public class PLCTurn {
+public class PLCManualReporting {
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
@Autowired
TaskingService taskingService;
- //@Scheduled(fixedDelay = 500)
- public void plcTurn() {
- //娓呮礂鏈洪�熷害
- String rinseSpeed = plcParameterObject.getPlcParameter("rinseSpeed").getValue();
- if(!Objects.equals(rinseSpeed, "")){
- //缁欑炕鐗囧彴鍙戦�佺（杈规満閫熷害
- S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("turnSpeed").getAddress(), Integer.parseInt(rinseSpeed));
- }
+ @Autowired
+ MachineMapper machineMapper;
+ @Autowired
+ PrimitiveTaskService primitiveTaskService;
- }
- //@Scheduled(fixedDelay = 1000)
- public void turnWeb() {
- //鑾峰彇鎶ヨ鐘舵��
- String warning = plcParameterObject.getPlcParameter("turnWarning").getValue();
+ //@Scheduled(fixedDelay = 500)
+ @Scheduled(fixedDelay = 1000)
+ public void manualReporting() {
+
JSONObject jsonObject = new JSONObject();
- if (!Objects.equals(warning, "0")) {
- //log.info("鎶ヨ淇℃伅锛�"+warning);
- jsonObject.append("turnWarning", warning);
- }
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("turn");
+ List<PrimitiveTask> taskingList = primitiveTaskService.selectPrimitiveTask(new PrimitiveTask());
+ jsonObject.append("taskingList", taskingList);
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("manualReporting");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
--
Gitblit v1.8.0