1

1 year ago · 44f01b04ee
10 changed files with 66 additions and 10 deletions
--- a/src/main/java/a8k/hardware/controler/Controler.java
+++ b/src/main/java/a8k/hardware/controler/Controler.java
@ -110,6 +110,14 @@ public class Controler {
 		return AppRet.success();
 	}

+	@PostMapping("/api/service-config/service-params-reset")
+	@ResponseBody
+	public AppRet<Object> serviceParamsReset( @RequestBody Map<String, Object> params ) throws Exception {
+		String serviceKey = (String)params.get("serviceKey");
+		HardwareServiceSetting.deleteAllByServiceName(serviceKey);
+		return AppRet.success();
+	}
+
 	@PostMapping("/api/service-config/service-status-list")
 	@ResponseBody
 	public AppRet<Object> serviceStatus( @RequestBody Map<String, Object> params ) throws InvocationTargetException, IllegalAccessException {
@ -177,8 +185,8 @@ public class Controler {
 			action.put("key", method.getName());
 			action.put("name", actionAnnotation.name());
 			action.put("group", actionAnnotation.group());
-//			action.put("order", actionAnnotation.order());
-//			action.put("newline", actionAnnotation.newline());
+			action.put("order", actionAnnotation.order());
+			action.put("newline", actionAnnotation.newline());

 			var actionParams = new ArrayList<Map<String,Object>>();
 			var actionParamList = method.getParameters();
--- a/src/main/java/a8k/service/db/entity/HardwareServiceSetting.java
+++ b/src/main/java/a8k/service/db/entity/HardwareServiceSetting.java
@ -3,10 +3,7 @@ package a8k.service.db.entity;
 import com.iflytop.uf.UfActiveRecord;
 import com.iflytop.uf.UfActiveRecordField;
 import com.iflytop.uf.util.UfJsonHelper;
-
-import java.util.HashMap;
 import java.util.Map;
-
 public class HardwareServiceSetting extends UfActiveRecord {
 	@UfActiveRecordField
 	public String key;
@ -17,6 +14,17 @@ public class HardwareServiceSetting extends UfActiveRecord {
 	@UfActiveRecordField
 	public String val;

+	public static String getTableName() {
+		return "HardwareServiceSetting" + "Table";
+	}
+
+	public static void deleteAllByServiceName(String serviceName) {
+		var items = UfActiveRecord.find(HardwareServiceSetting.class, Map.of("ServiceName", serviceName));
+		for (var item : items) {
+			item.delete();
+		}
+	}
+
 	public void setValue( Object value ) throws Exception {
 		if ( value instanceof String ) {
 			this.val = (String) value;
@ -29,9 +37,7 @@ public class HardwareServiceSetting extends UfActiveRecord {
 		}
 	}

-	public static String getTableName() {
-		return "HardwareServiceSetting" + "Table";
-	}
+

 	public static void setOption( String service, String key, Object value ) throws Exception {
 		var options = getOption(service, key);
--- a/src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java
+++ b/src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java
@ -467,7 +467,7 @@ public class SamplesPreProcessModuleCtrlService implements HardwareCtrlModule {
 	/**
 	 * 气溶胶风扇控制
 	 */
-	@HardwareServiceAction(name = "气溶胶风扇控制")
+	@HardwareServiceAction(name = "气溶胶风扇控制", order = 1)
 	public void setAeroslFanPower(Boolean enable) throws HardwareException, InterruptedException {
 		if (enable) {
 			canBus.fanControlerSetSpeed(MId.WbTubeFanMod, 99);
--- a/src/main/java/a8k/utils/HardwareServiceAction.java
+++ b/src/main/java/a8k/utils/HardwareServiceAction.java
@ -8,4 +8,6 @@ import java.lang.annotation.Target;
 public @interface HardwareServiceAction {
 	String name();
 	String group() default "";
+	int order() default 0;
+	boolean newline() default false;
 }
--- a/src/main/resources/static/test/css/app.cf2036ed.css
+++ b/src/main/resources/static/test/css/app.cf2036ed.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.d235939b.js"></script><script defer="defer" src="js/app.629c5fd5.js"></script><link href="css/app.0f7de753.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.32cf27ec.js"></script><script defer="defer" src="js/app.18de7c67.js"></script><link href="css/app.cf2036ed.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.18de7c67.js
+++ b/src/main/resources/static/test/js/app.18de7c67.js
--- a/src/main/resources/static/test/js/app.18de7c67.js.map
+++ b/src/main/resources/static/test/js/app.18de7c67.js.map
--- a/src/main/resources/static/test/js/chunk-vendors.32cf27ec.js
+++ b/src/main/resources/static/test/js/chunk-vendors.32cf27ec.js
--- a/src/main/resources/static/test/js/chunk-vendors.32cf27ec.js.map
+++ b/src/main/resources/static/test/js/chunk-vendors.32cf27ec.js.map