From 8e69e4edb047e384aa7b74e82fa7b33f2eb5a4e5 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 12 九月 2023 08:40:42 +0800
Subject: [PATCH] 跨域 修改
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 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 28a4104..f4daa38 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,9 +1,11 @@
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.mapper.AlarmMapper;
import cn.hutool.json.JSONArray;
@@ -24,12 +26,39 @@
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> 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);
+ //鑾峰彇鐜荤拑id
+ for(Short list1:datas1ListID)
+ spianController.selectAll(list1);
+ }
+ //System.out.println(exist);
+
+ }
+ //鑾峰彇杩涚墖id
+ // List<Short> datas1ListID=S7control.getinstance().ReadWord("DB106.26", 13);
+
+
+
+
+
// 鏌ヨ鏁版嵁搴�
// 鎺ㄩ�佸埌鍓嶇
--
Gitblit v1.8.0