From 2f78ef164653d5d30732d6e2e3f822a68de63010 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 30 十一月 2023 09:41:39 +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 | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 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 6782509..4661acd 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
@@ -7,10 +7,7 @@
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;
@@ -22,6 +19,10 @@
import com.example.springboot.component.PlcParameter2;
import com.example.springboot.component.PlcParameter1;
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)
@@ -34,27 +35,28 @@
//
System.out.println("鍚姩瀹屾垚");
- // new PlcHold().start();
+ new PlcHold().start();
new Plcaction().start();
//
new Plchome().start();
//
- new PlcParameter().start();
+ new PlcParameter().start();
//
- // new Plcalarm().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();
+ new Plcstate().start();
+ new PlcPositioning1().start();
+ new PlcPositioning2().start();
+ new PlcParameter2().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