From 490df5d4d92877171076756af73a96dee1fc053f Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 25 十二月 2024 16:03:25 +0800
Subject: [PATCH] 数据回传日志记录功能修改
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQrCodesReport.java | 78 +++++++++++++++++++++++++++++++++++++++
1 files changed, 78 insertions(+), 0 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQrCodesReport.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQrCodesReport.java
new file mode 100644
index 0000000..d82f4a8
--- /dev/null
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQrCodesReport.java
@@ -0,0 +1,78 @@
+package com.mes.job;
+import cn.hutool.json.JSONObject;
+import com.mes.common.S7object;
+import com.mes.md.entity.Machine;
+import com.mes.md.entity.Tasking;
+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;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import com.mes.device.PlcParameterObject;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author SNG-010
+ */
+@Component
+@Slf4j
+public class PLCScanQrCodesReport {
+
+ PlcParameterObject plcParameterObject =null;
+ @Autowired
+ TaskingService taskingService;
+ @Autowired
+ MachineMapper machineMapper;
+ @Autowired
+ PrimitiveTaskService primitiveTaskService;
+ //@Scheduled(fixedDelay = 500)
+ public void pLCScanQR() {
+ //鑾峰彇褰撳墠浠诲姟琛ㄦ渶鏂扮殑涓�鍧椾换鍔＄姸鎬�
+ //鎵爜绾跨▼
+ String scanId = plcParameterObject.getPlcParameter("scanId").getValue();
+ if(!Objects.equals(scanId, "")){
+ boolean result = primitiveTaskService.updateReportCount(scanId);
+ if (result){
+ //娣诲姞鎴愬姛鏃跺彂閫佽繃鐗囦俊鍙�
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("scan").getAddress(), Integer.parseInt("1"));
+ }
+ log.info("鎵弿瀹氬埗浜岀淮鐮侊細"+scanId);
+ }else {
+ log.info("鏍囧噯妯″紡鎵弿浜岀淮鐮侊細鏃�");
+ }
+
+ }
+ //@Scheduled(fixedDelay = 1000)
+ public void scanQrCode() {
+ //鑾峰彇褰撳墠浠诲姟琛ㄦ渶鏂扮殑涓�鍧椾换鍔＄姸鎬�
+ JSONObject jsonObject = new JSONObject();
+ //鑾峰彇鎶ヨ鐘舵��
+ Machine machine=machineMapper.selectById(23L);
+ List<Tasking> taskingList=taskingService.findMachineTask(machine);
+ jsonObject.append("taskingList", taskingList);
+ jsonObject.append("machine", machine);
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("scanQrCodesReport");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ if (webserver != null) {
+ webserver.sendMessage(jsonObject.toString());
+ List<String> messages = webserver.getMessages();
+ if (!messages.isEmpty()) {
+ // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+ webserver.clearMessages();
+ }
+ } else {
+ log.info("Home is closed");
+ }
+ }
+
+ }
+ }
+
+}
\ No newline at end of file
--
Gitblit v1.8.0