Merge branch 'master' of http://47.92.195.73:8081/project_boditech_vidas_a8000_v3/a8k_app

1 year ago · 75f6de88eb
33 changed files with 135 additions and 2 deletions
--- a/src/main/java/a8k/hardware/HardwareServiceOrder.java
+++ b/src/main/java/a8k/hardware/HardwareServiceOrder.java
@ -0,0 +1,6 @@
+package a8k.hardware;
+public enum HardwareServiceOrder {
+	SamplesPreProcessModuleCtrlService,
+	ReactionPlatesTransmitCtrlService,
+	Max;
+}
--- a/src/main/java/a8k/hardware/controler/Controler.java
+++ b/src/main/java/a8k/hardware/controler/Controler.java
@ -30,6 +30,7 @@ public class Controler {
 			Map<String,Object> service = new HashMap<>();
 			service.put("key", clazz.getSimpleName());
 			service.put("name", hardwareServiceAnnotation.name());
+			service.put("order", hardwareServiceAnnotation.order().ordinal());
 			services.add(service);
 		}
 		return AppRet.success(services);
--- a/src/main/java/a8k/service/hardware/ReactionPlatesTransmitCtrlService.java
+++ b/src/main/java/a8k/service/hardware/ReactionPlatesTransmitCtrlService.java
@ -7,6 +7,7 @@ import a8k.canbus.protocol.MId;
 import a8k.appbean.ecode.AppRet;
 import a8k.canbus.A8kCanBusService;
 import a8k.canbus.protocol.RegIndex;
+import a8k.hardware.HardwareServiceOrder;
 import a8k.opt_algo.A8kOptAlgo;
 import a8k.utils.*;
 import jakarta.annotation.Resource;
@ -18,7 +19,7 @@ import java.util.ArrayList;
 import java.util.List;

@Component
-@HardwareService(name = "反应板条搬移服务")
+@HardwareService(name = "反应板条搬移服务", order= HardwareServiceOrder.ReactionPlatesTransmitCtrlService)
@HardwareServiceParams(service = ReactionPlatesTransmitCtrlService.class)
 public class ReactionPlatesTransmitCtrlService implements HardwareCtrlModule {
 	static Logger logger = LoggerFactory.getLogger(ReactionPlatesTransmitCtrlService.class);
--- a/src/main/java/a8k/utils/HardwareService.java
+++ b/src/main/java/a8k/utils/HardwareService.java
@ -1,4 +1,5 @@
 package a8k.utils;
+import a8k.hardware.HardwareServiceOrder;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@ -7,4 +8,5 @@ import java.lang.annotation.Target;
@Target({ElementType.TYPE})
 public @interface HardwareService {
 	String name();
+	HardwareServiceOrder order() default HardwareServiceOrder.Max;
 }
--- a/src/main/resources/static/test/css/app.181a1d0d.css
+++ b/src/main/resources/static/test/css/app.181a1d0d.css
--- a/src/main/resources/static/test/css/app.2bbbd28f.css
+++ b/src/main/resources/static/test/css/app.2bbbd28f.css
--- a/src/main/resources/static/test/css/app.6e635385.css
+++ b/src/main/resources/static/test/css/app.6e635385.css
--- a/src/main/resources/static/test/css/app.778b6d80.css
+++ b/src/main/resources/static/test/css/app.778b6d80.css
--- a/src/main/resources/static/test/css/app.ec2f6772.css
+++ b/src/main/resources/static/test/css/app.ec2f6772.css
--- a/src/main/resources/static/test/css/app.ee03d7a1.css
+++ b/src/main/resources/static/test/css/app.ee03d7a1.css
--- a/src/main/resources/static/test/index.html
+++ b/src/main/resources/static/test/index.html
@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>a8k_webui</title><script defer="defer" src="js/chunk-vendors.0bbc0a44.js"></script><script defer="defer" src="js/app.a316097c.js"></script><link href="css/app.e804b054.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but a8k_webui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>a8k_webui</title><script defer="defer" src="js/chunk-vendors.ce3623b2.js"></script><script defer="defer" src="js/app.2843a9ca.js"></script><link href="css/app.6e635385.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but a8k_webui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
--- a/src/main/resources/static/test/js/app.13f1e6c3.js
+++ b/src/main/resources/static/test/js/app.13f1e6c3.js
--- a/src/main/resources/static/test/js/app.13f1e6c3.js.map
+++ b/src/main/resources/static/test/js/app.13f1e6c3.js.map
--- a/src/main/resources/static/test/js/app.17c316dc.js
+++ b/src/main/resources/static/test/js/app.17c316dc.js
--- a/src/main/resources/static/test/js/app.17c316dc.js.map
+++ b/src/main/resources/static/test/js/app.17c316dc.js.map
--- a/src/main/resources/static/test/js/app.1a4c0fdd.js
+++ b/src/main/resources/static/test/js/app.1a4c0fdd.js
--- a/src/main/resources/static/test/js/app.1a4c0fdd.js.map
+++ b/src/main/resources/static/test/js/app.1a4c0fdd.js.map
--- a/src/main/resources/static/test/js/app.1cf068f9.js
+++ b/src/main/resources/static/test/js/app.1cf068f9.js
--- a/src/main/resources/static/test/js/app.1cf068f9.js.map
+++ b/src/main/resources/static/test/js/app.1cf068f9.js.map
--- a/src/main/resources/static/test/js/app.2843a9ca.js
+++ b/src/main/resources/static/test/js/app.2843a9ca.js
--- a/src/main/resources/static/test/js/app.2843a9ca.js.map
+++ b/src/main/resources/static/test/js/app.2843a9ca.js.map
--- a/src/main/resources/static/test/js/app.4ed4a80b.js
+++ b/src/main/resources/static/test/js/app.4ed4a80b.js
--- a/src/main/resources/static/test/js/app.4ed4a80b.js.map
+++ b/src/main/resources/static/test/js/app.4ed4a80b.js.map
--- a/src/main/resources/static/test/js/app.758f1cd3.js
+++ b/src/main/resources/static/test/js/app.758f1cd3.js
--- a/src/main/resources/static/test/js/app.758f1cd3.js.map
+++ b/src/main/resources/static/test/js/app.758f1cd3.js.map
--- a/src/main/resources/static/test/js/app.c39cfc0d.js
+++ b/src/main/resources/static/test/js/app.c39cfc0d.js
--- a/src/main/resources/static/test/js/app.c39cfc0d.js.map
+++ b/src/main/resources/static/test/js/app.c39cfc0d.js.map
--- a/src/main/resources/static/test/js/app.c566e359.js
+++ b/src/main/resources/static/test/js/app.c566e359.js
--- a/src/main/resources/static/test/js/app.c566e359.js.map
+++ b/src/main/resources/static/test/js/app.c566e359.js.map
--- a/src/main/resources/static/test/js/chunk-vendors.a6d91d2d.js
+++ b/src/main/resources/static/test/js/chunk-vendors.a6d91d2d.js
--- a/src/main/resources/static/test/js/chunk-vendors.a6d91d2d.js.map
+++ b/src/main/resources/static/test/js/chunk-vendors.a6d91d2d.js.map
--- a/src/main/resources/static/test/js/chunk-vendors.ce3623b2.js
+++ b/src/main/resources/static/test/js/chunk-vendors.ce3623b2.js
--- a/src/main/resources/static/test/js/chunk-vendors.ce3623b2.js.map
+++ b/src/main/resources/static/test/js/chunk-vendors.ce3623b2.js.map