From 184ae3b061765e8fbe54bcef06b67c6b4f2e024c Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 11 九月 2023 09:52:40 +0800
Subject: [PATCH] 拉取新版本
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
index 5e776f9..f007033 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
@@ -1,10 +1,14 @@
package com.example.springboot.component;
+import java.util.ArrayList;
import java.util.List;
import javax.websocket.Session;
+import com.example.springboot.controller.SpianController;
+import com.example.springboot.service.SpianService;
import com.example.springboot.mapper.AlarmMapper;
+import com.example.springboot.mapper.HomeMapper;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
@@ -13,20 +17,53 @@
private AlarmMapper alarmMapper;
+ private SpianService spianService;
+
@Override
public void run() {
+
while (this != null) {
try {
- Thread.sleep(10000);
+ Thread.sleep(500);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
List<Boolean> bitlist = S7control.getinstance().ReadBits("DB2.0.0", 100);
-
List<Short> paramlist = S7control.getinstance().ReadWord("DB100.6", 1);
+
+ //鍒ゆ柇杩涚墖璇锋眰
+ // List<Short> datas1List=S7control.getinstance().ReadWord("DB106.24", 1);
+ // List<Short> datas1ListState=S7control.getinstance().ReadWord("DB106.8", 1);
+ SpianController spianController=new SpianController();
+ List<Short> datas1List1=new ArrayList<>();
+ List<Short> datas1List2=new ArrayList<>();
+ datas1List1.add((short)1);
+ datas1List2.add((short)0);
+ //鑾峰彇prc杩涚墖璇锋眰鏁版嵁
+ boolean exist = datas1List1.contains((short)1);
+ boolean exist1 = datas1List2.contains((short)0);
+ //杩涚墖璇锋眰涓�1鏃�
+ if(exist=true){
+ //褰撹繘鐗囪溅绌洪棽鏃�
+ if(exist=true){
+ //List<Short> datas1ListID=S7control.getinstance().ReadWord("DB106.26", 13);
+ List<Short> datas1ListID=new ArrayList<>();
+ datas1ListID.add((short)001);
+ spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
+ //鑾峰彇鐜荤拑id
+ for(Short list1:datas1ListID){
+ spianService.selectAll(list1);
+ }
+ //System.out.println(exist);
+ }
+ }
+ //鑾峰彇杩涚墖id
+ // List<Short> datas1ListID=S7control.getinstance().ReadWord("DB106.26", 13);
+
+
// 鏌ヨ鏁版嵁搴�
// 鎺ㄩ�佸埌鍓嶇
--
Gitblit v1.8.0