From 3c89dbf9bd3d064787f34d52e8ef29a803945e85 Mon Sep 17 00:00:00 2001
From: admin <52323@qq.com>
Date: 星期五, 15 九月 2023 11:37:26 +0800
Subject: [PATCH] 测试加密
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 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..68fc478 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,20 +1,19 @@
package com.example.springboot.component;
import java.util.List;
-
-import javax.websocket.Session;
-
+import com.example.springboot.service.SpianService;
import com.example.springboot.mapper.AlarmMapper;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
public class PlcHold extends Thread {
private AlarmMapper alarmMapper;
+ private SpianService spianService;
+
@Override
public void run() {
+
while (this != null) {
try {
@@ -23,13 +22,39 @@
// 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);
-
+ spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
+ //spianService.selectout("112");
+
//鍒ゆ柇杩涚墖璇锋眰
- 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);
+ if(datas1List!=null &&datas1ListState!=null){
+ //鑾峰彇prc杩涚墖璇锋眰鏁版嵁
+ boolean exist = datas1List.contains((short)1);
+ //鑾峰彇杩涚墖杞︾姸鎬�
+ boolean exist1 = datas1ListState.contains((short)0);
+ //杩涚墖璇锋眰涓�1鏃�
+ if(exist=true){
+ //褰撹繘鐗囪溅绌洪棽鏃�
+ if(exist1=true){
+ //鑾峰彇杩涚墖id
+ List<Short> datas1ListID=S7control.getinstance().ReadWord("DB106.26", 13);
+ //鑾峰彇鐜荤拑id
+ for(Short list1:datas1ListID){
+ spianService.selectAll((short)list1);
+ }
+ }
+
+
+
+
+ //System.out.println(exist);
+ }
+ }
+
+
+
+
// 鏌ヨ鏁版嵁搴�
// 鎺ㄩ�佸埌鍓嶇
--
Gitblit v1.8.0