From 40ca2f37e5bd41a1551c4b51344c0652873cbd1a Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期日, 17 九月 2023 15:08:44 +0800
Subject: [PATCH] 将Plcsign界面读取plc数据根据地址分成两个集合读取，最后合并成同一个使用
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 95 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 85 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..5573950 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,113 @@
package com.example.springboot.component;
+import java.sql.SQLException;
+import java.util.ArrayList;
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;
+import com.example.springboot.mapper.SpianMapper;
public class PlcHold extends Thread {
private AlarmMapper alarmMapper;
+ @Autowired
+ private JdbcConnections jdbcConnections;
+ private SpianMapper spianMapper;
+ 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);
+ spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
+ spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
+ jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
- List<Short> paramlist = S7control.getinstance().ReadWord("DB100.6", 1);
+ // 鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�,鍗曠嫭鏁版嵁婧�
+ // 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);
+
- //鍒ゆ柇杩涚墖璇锋眰
- List<Short> datas1List=S7control.getinstance().ReadWord("DB106.24", 1);
-
+ if (datas1List != null && datas1ListState != null) {
+ // 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
+ boolean exist = datas1List.contains((short) 1);
+ // 鑾峰彇杩涚墖杞︾姸鎬�
+ boolean exist1 = datas1ListState.contains((short) 0);
+ String glassid="";
+ // 杩涚墖璇锋眰涓�1鏃�
+ if (exist == true) {
+ // 褰撹繘鐗囪溅绌洪棽鏃�
+ if (exist1 == true) {
+ // 鑾峰彇杩涚墖id
+ List<Short> datas1ListID = S7control.getinstance().ReadWord("DB106.26", 13);
+ if (datas1ListID != null) {
+ // 鑾峰彇鐜荤拑id
+ for (Short list1 : datas1ListID) {
+ glassid=glassid.concat(list1.toString());
+
+ }
+ spianService.selectAll(Short.parseShort(glassid));
+ }
+
+ }
+ // System.out.println(exist);
+ }
+ }
+
+ //spianService.selectAll((short) 111);
+
+ List<Short> outlist = S7control.getinstance().ReadWord("DB106.20", 1); // 鍑虹墖杞︾姸鎬�
+ boolean outstate=false;//鍑虹墖杞︾┖闂插垽鏂�
+ if (outlist != null) {
+ // 鍒ゆ柇鎸夎鍗曞嚭鐗�
+ outstate = outlist.contains((short) 0);
+ }
+ Glass glass=spianMapper.SelectDBOut();//鍒ゆ柇鏄惁鏈夎皟鎷ㄥ悗鐨勫嚭鐗囦换鍔℃湭瀹屾垚
+
+ if(outstate== true ){
+ if(glass.getId()==2){
+ spianService.selectout2(glass.getGlassId().toString());
+ }
+ }
+
+
+
+ if (outstate == true) { // 鍑虹墖杞︾姸鎬佺┖闂叉椂
+ String orderid = spianMapper.SelectOrderout();
+ if (orderid != null) {
+ spianService.selectout(orderid);
+ }
+ }
+
+
+
// 鏌ヨ鏁版嵁搴�
// 鎺ㄩ�佸埌鍓嶇
}
}
+
}
--
Gitblit v1.8.0