From 3aa3916d0574365548b2d12c225d3f5e0ec23887 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期六, 16 九月 2023 07:57:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java | 2
springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java | 2
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 117 +++++++++++++++++++--------------------
springboot-vue3/src/main/java/com/example/springboot/component/S7control.java | 7 +
springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java | 2
springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java | 2
springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java | 2
springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java | 2
8 files changed, 69 insertions(+), 67 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java b/springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java
index 2b079ae..ac38360 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java
@@ -14,6 +14,8 @@
public static void main(String[] args) {
// SpringApplication.run(AuthorityApplication.class, args);
+ // 111
+ //System.out.println("null");
SpringApplication springApplication = new SpringApplication(AuthorityApplication.class);
ConfigurableApplicationContext configurableApplicationContext = springApplication.run(args);
WebSocketServer.setApplicationContext(configurableApplicationContext);
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..131cd1b 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,87 @@
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鑾峰彇璁㈠崟鍙�
+
+ // 鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�
try {
- Glass glass=jdbcConnections.selectGlass(112);
+ Glass glass = jdbcConnections.selectGlass(112);
- //System.out.println(glass.getOrderId());
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ // 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);
+ // spianService.selectout("11");
- 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){
+ // 鍒ゆ柇杩涚墖璇锋眰
+ List<Short> datas1List = S7control.getinstance().ReadWord("DB106.24", 1);
+ List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);
+
- spianService.selectAll((short)list1);
- }
- }
- //System.out.println(exist);
- }
- }
+ 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));
+ }
- 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); // 鍑虹墖杞︾姸鎬�
+ //List<Short> outlist2 = S7control.getinstance().ReadWord("DB106.20", 1); // 鍑虹墖浠诲姟瀹屾垚
+
+
+ if (outlist != null) {
+ // 鍒ゆ柇鎸夎鍗曞嚭鐗�
+ boolean outstate = outlist.contains((short) 0);
+
+ if (outstate = true) { // 鍑虹墖杞︾姸鎬佺┖闂叉椂
+ String orderid = spianMapper.SelectOrderout();
+ if (orderid != null) {
+ spianService.selectout(orderid);
+ }
+ }
+
+ }
+
// 鏌ヨ鏁版嵁搴�
// 鎺ㄩ�佸埌鍓嶇
}
}
-
+
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
index 3113709..d1109ac 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
@@ -10,7 +10,7 @@
public void run() {
while (this != null) {
try {
- Thread.sleep(1000);
+ Thread.sleep(500);
} catch (InterruptedException e) {
e.printStackTrace();
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
index 17b9d6d..ba512ab 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
@@ -11,7 +11,7 @@
public void run() {
while (this != null) {
try {
- Thread.sleep(1000);
+ Thread.sleep(500);
} catch (InterruptedException e) {
e.printStackTrace();
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
index 0d03879..00d1d4b 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
@@ -15,7 +15,7 @@
public void run() {
while (this != null) {
try {
- Thread.sleep(10000);
+ Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
index cd0375b..ce46de1 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
@@ -11,7 +11,7 @@
public void run() {
while (this != null) {
try {
- Thread.sleep(10000);
+ Thread.sleep(500);
} catch (InterruptedException e) {
e.printStackTrace();
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
index 0e063ea..e02e09a 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
@@ -11,7 +11,7 @@
public void run() {
while (this != null) {
try {
- Thread.sleep(10000);
+ Thread.sleep(500);
} catch (InterruptedException e) {
e.printStackTrace();
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
index 9b9a66e..3ae24aa 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
@@ -206,7 +206,8 @@
} else
return null;
- for (int i = 0; i < count; i++) {
+ addresslist.add(address);
+ for (int i = 0; i < count-1; i++) {
int bitcurrent = bitindex + addedbit;
if (bitcurrent > 7) {
@@ -214,7 +215,9 @@
bitindex = 0;
} else
bitindex = bitcurrent;
- addresslist.add(stringdatas[0] + "." + dbwindex + "." + bitindex);
+
+ String endstr=stringdatas.length==3?"." + bitindex:"";
+ addresslist.add(stringdatas[0] + "." + dbwindex + endstr);
}
return addresslist;
}
--
Gitblit v1.8.0