From 865ff82a55657d93516225d724fa0261965e0df2 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 24 十月 2023 10:18:51 +0800
Subject: [PATCH] 上片弹窗提示
---
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 14 +++++++-------
springboot-vue3/pom.xml | 2 +-
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 22 +++++++++++++++-------
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 3 +++
4 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/springboot-vue3/pom.xml b/springboot-vue3/pom.xml
index 881fe13..d56f7d3 100644
--- a/springboot-vue3/pom.xml
+++ b/springboot-vue3/pom.xml
@@ -80,7 +80,7 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot-starter</artifactId>
- <version>1.8.0</version>
+ <version>1.8.0</version>
</dependency>
<!--mybatis-plus-->
<dependency>
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 c7c8b6a..cccfa0e 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
@@ -48,12 +48,20 @@
// // TODO Auto-generated catch block
// e.printStackTrace();
// }
- // spianService.selectAll((short)257);
+
//鍒ゆ柇杩涚墖璇锋眰
- List<Short> datas1List = S7control.getinstance().ReadWord("DB106.24", 1);// 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
- List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);// 鑾峰彇杩涚墖杞︾姸鎬�
- List<Short> datas1ListState2 = S7control.getinstance().ReadWord("DB105.12", 1);// 鑾峰彇杩涚墖杞︿换鍔℃槸鍚﹀惎鍔�
-
+ // List<Short> datas1List = S7control.getinstance().ReadWord("DB106.24", 1);// 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
+ // List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);// 鑾峰彇杩涚墖杞︾姸鎬�
+ // List<Short> datas1ListState2 = S7control.getinstance().ReadWord("DB105.12", 1);// 鑾峰彇杩涚墖杞︿换鍔℃槸鍚﹀惎鍔�
+ //娴嬭瘯鍚姩鑷畾涔塸rc鍊�
+ List<Short> datas1List=new ArrayList<>();
+ datas1List.add((short)1);
+ List<Short> datas1ListState=new ArrayList<>();
+ datas1List.add((short)0);
+ List<Short> datas1ListState2=new ArrayList<>();
+ datas1List.add((short)0);
+ spianMapper.insertqueue("1",1);
+
if (datas1List != null && datas1ListState != null) {
// 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
@@ -83,7 +91,7 @@
if (exist1 == true) {
//鑾峰彇宸蹭笅鍙戠殑杩涚墖id 涓巔lc璇锋眰鐨刬d浣滄瘮杈�
byte[] writedglassidbytes = S7control.getinstance().ReadByte("DB105.16", 1);
- if (writedglassidbytes != null) {
+ if (writedglassidbytes != null) { //
// 鑾峰彇鐜荤拑id
for (byte iditem : writedglassidbytes) {
writedstrId.append(iditem);
@@ -101,7 +109,7 @@
{
spianService.selectAll(strId.toString());
S7control.getinstance().WriteByte("DB105.16",datas1ListID);//娲惧彂杩涚墖id
-
+
}
//spianService.selectAll(Short.parseShort(strId.toString()));
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index 557afd9..1a90139 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -19,24 +19,24 @@
public class AppRunnerConfig implements ApplicationRunner {
- @Override
+ @Override
public void run(ApplicationArguments args) throws Exception {
// TODO Auto-generated method stub
//
System.out.println("鍚姩瀹屾垚");
new PlcHold().start();
-
+
// new Plcaction().start();
- new Plchome().start();
+ // new Plchome().start();
- new PlcParameter().start();
+ // new PlcParameter().start();
- new Plcalarm().start();
+ // new Plcalarm().start();
- new Plcsign().start();
+ // new Plcsign().start();
- new Plcstate().start();
+ // new Plcstate().start();
}
}
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
index 05b5daf..e9e4edd 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
@@ -103,5 +103,8 @@
//鏍规嵁绗煎瓙鏍煎瓙灞傛暟鑾峰彇鐜荤拑id
@Select("SELECT COUNT(*) FROM `storage_cage` where state=3;")
Integer Selectoutstate();
+ //娣诲姞浠诲姟搴忓垪
+ @Insert("INSERT INTO `canadames`.`queue`(`glassid`, `type`, `state`) VALUES (#{glassid},#{type},0);")
+ void insertqueue(String glassid,int type);
}
\ No newline at end of file
--
Gitblit v1.8.0