From e08b557c1e39eefd3822df52d2acc58435b21e16 Mon Sep 17 00:00:00 2001
From: zhangyong <517047165@qq.com>
Date: 星期五, 15 九月 2023 08:31:58 +0800
Subject: [PATCH] 修复string.split(".")不能分割的bug
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 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 45da9c3..542e0df 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,6 +1,7 @@
package com.example.springboot.component;
import java.sql.SQLException;
+import java.util.ArrayList;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +10,7 @@
import com.example.springboot.service.SpianService;
import com.example.springboot.entity.Glass;
import com.example.springboot.mapper.AlarmMapper;
+import com.example.springboot.mapper.SpianMapper;
public class PlcHold extends Thread {
@@ -16,7 +18,7 @@
@Autowired
private JdbcConnections jdbcConnections;
-
+ private SpianMapper spianMapper;
private SpianService spianService;
@@ -32,20 +34,25 @@
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();
}
-
+
+ //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);
@@ -61,16 +68,36 @@
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);
- }
- }
-
--
Gitblit v1.8.0