From 707d28bd18f8832ac3824af4ae6f50dc1a30ee41 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期三, 29 十一月 2023 11:02:50 +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 | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 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 e3d6628..adeedbe 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
@@ -6,7 +6,11 @@
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
+import com.example.springboot.component.PLCAutomaticParameterSetting;
+import com.example.springboot.component.PLCManualJog;
import com.example.springboot.component.PlcHold;
+import com.example.springboot.component.PlcManualonePosition;
+import com.example.springboot.component.PlcManualonePosition2;
import com.example.springboot.component.PlcParameter;
import com.example.springboot.component.Plcaction;
import com.example.springboot.component.Plchome;
@@ -14,6 +18,10 @@
import com.example.springboot.component.Plcsign;
import com.example.springboot.component.Plcstate;
import com.example.springboot.component.PlcPositioning1;
+import com.example.springboot.component.PlcPositioning2;
+import com.example.springboot.component.PlcParameter2;
+import com.example.springboot.component.PlcParameter1;
+import com.example.springboot.component.PlcServoManualone;
@Component
@Order(1)
@@ -28,17 +36,25 @@
// new PlcHold().start();
-// new Plcaction().start();
-//
-// new Plchome().start();
-//
-// new PlcParameter().start();
-//
-// new Plcalarm().start();
-//
-// new Plcsign().start();
-//
-// new Plcstate().start();
- new PlcPositioning1().start();
+ new Plcaction().start();
+ //
+ // new Plchome().start();
+ //
+ new PlcParameter().start();
+ //
+ // new Plcalarm().start();
+ //
+ new Plcsign().start();
+ //
+ // new Plcstate().start();
+ // new PlcPositioning1().start();
+ // new PlcPositioning2().start();
+ // new PlcParameter2().start();
+ // new PlcParameter1().start();
+ // new PLCAutomaticParameterSetting().start();
+ // new PlcServoManualone().start();
+ // new PLCManualJog().start();
+ // new PlcManualonePosition().start();
+ new PlcManualonePosition2().start();
}
}
\ No newline at end of file
--
Gitblit v1.8.0