From 946b26f26e54d40e85be9feb28cb5373384f03ea Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期六, 02 十二月 2023 09:07:10 +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, 27 insertions(+), 17 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 8978f12..0bc6e31 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,6 +6,7 @@
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
+import com.example.springboot.component.PLCAutomaticParameterSetting;
import com.example.springboot.component.PlcHold;
import com.example.springboot.component.PlcParameter;
import com.example.springboot.component.Plcaction;
@@ -18,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)
@@ -30,23 +35,28 @@
//
System.out.println("鍚姩瀹屾垚");
- // new PlcHold().start();
+ 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 PlcPositioning2().start();
- new PlcParameter2().start();
- new PlcParameter1().start();
- new PlcServoManualone().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 PlcManualonePosition().start();
+ // new PlcManualonePosition2().start();
+ // new PlcServoManualone().start();
+ // new PLCManualJog().start();
}
}
\ No newline at end of file
--
Gitblit v1.8.0