From 24385ce9fee382e9600ce03108a814a66990981c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 05 十二月 2023 08:10:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
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 7d52f42..0f33a07 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
@@ -18,7 +18,11 @@
import com.example.springboot.component.PlcPositioning2;
import com.example.springboot.component.PlcParameter2;
import com.example.springboot.component.PlcParameter1;
-//import com.example.springboot.component.PlcServoManualone;
+import com.example.springboot.component.PlcServoManualone;
+import com.example.springboot.component.PLCAutomaticParameterSetting;
+import com.example.springboot.component.PlcManualonePosition;
+import com.example.springboot.component.PlcManualonePosition2;
+import com.example.springboot.component.PLCManualJog;
@Component
@Order(1)
@@ -31,24 +35,28 @@
//
System.out.println("鍚姩瀹屾垚");
- // new PlcHold().start();
-
- // new Plcaction().start();
+ new PlcHold().start();
+//
//
- // new Plchome().start();
- //
- // new PlcParameter().start();
- //
- // new Plcalarm().start();
- //
- // new Plcsign().start();
- //
- // new Plcstate().start();
- new PlcPositioning1().start();
- new PlcPositioning2().start();
+ new Plchome().start();
+// //
+ new PlcParameter().start();
+ //
+ // new Plcalarm().start();
+ //
+ new Plcsign().start();
+ //
+ new Plcaction().start();
+ new Plcstate().start();
+ new PlcPositioning1().start();
+ new PlcPositioning2().start();
new PlcParameter2().start();
- new PlcParameter1().start();
- new PLCAutomaticParameterSetting().start();
- // new PlcServoManualone().start();
+ new PlcParameter1().start();
+ new PLCAutomaticParameterSetting().start();
+
+ new PlcManualonePosition().start();
+ new PlcManualonePosition2().start();
+ new PlcServoManualone().start();
+ new PLCManualJog().start();
}
}
\ No newline at end of file
--
Gitblit v1.8.0