From 86467589b2fd4f1fb108edfa00227e793049e481 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期三, 13 九月 2023 16:43:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 64 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 10 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..65b6d28 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,38 +1,82 @@
package com.example.springboot.component;
+import java.sql.SQLException;
import java.util.List;
-import javax.websocket.Session;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.example.springboot.service.JdbcConnections;
+import com.example.springboot.service.SpianService;
+import com.example.springboot.entity.Glass;
import com.example.springboot.mapper.AlarmMapper;
-
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
public class PlcHold extends Thread {
private AlarmMapper alarmMapper;
+ @Autowired
+ private JdbcConnections jdbcConnections;
+
+ private SpianService spianService;
+
+
@Override
public void run() {
+
while (this != null) {
try {
Thread.sleep(500);
} catch (InterruptedException e) {
- // TODO Auto-generated catch block
+ //\\ 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);
- //鍒ゆ柇杩涚墖璇锋眰
- List<Short> datas1List=S7control.getinstance().ReadWord("DB106.24", 1);
+ jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
+ try {
+ Glass glass=jdbcConnections.selectGlass(112);
+ //System.out.println(glass.getOrderId());
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ //鍒ゆ柇杩涚墖璇锋眰
+ 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