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 | 123 +++++++++++++++++++++--------------------
1 files changed, 63 insertions(+), 60 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 542e0df..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
@@ -21,90 +21,93 @@
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();
}
spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
+
+ // 鏍规嵁鐜荤拑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);
+
- //鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�
- try {
- Glass glass=jdbcConnections.selectGlass(112);
+ 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(glass.getOrderId());
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
-
- //spianService.selectout("11");
- //鍒ゆ柇杩涚墖璇锋眰
- 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);
- }
- }
-
- List<Short> outlist=S7control.getinstance().ReadWord("DB106.20", 1); //鍑虹墖杞︾姸鎬�
- List<Short> outlist2=S7control.getinstance().ReadWord("DB106.20", 1); //鍑虹墖浠诲姟瀹屾垚
-
-
- List<Short>ceshi1=new ArrayList<Short>();//鍑虹墖杞︾姸鎬�
- List<Short>ceshi2=new ArrayList<Short>();//鍑虹墖浠诲姟瀹屾垚
- ceshi1.add((short)0);
- ceshi2.add((short)1);
- if(outlist!=null && outlist2!=null){
- //鍒ゆ柇鎸夎鍗曞嚭鐗�
- boolean outstate = outlist.contains((short)0);
- boolean outstate2 = outlist2.contains((short)1);
- if(outstate=true){ //鍑虹墖杞︾姸鎬佺┖闂叉椂
- if(outstate2=true){ //鍑虹墖杞︿换鍔″畬鎴愭椂
- String orderid=spianMapper.SelectOrderout();
- if(orderid!=null){
- spianService.selectout(orderid);
- }
-
+ }
+ // 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