diff --git a/src/main/java/iflytop/app/extui/zextui/ExtUIPageMenuRegister.java b/src/main/java/iflytop/app/extui/zextui/ExtUIPageMenuRegister.java new file mode 100644 index 0000000..b516172 --- /dev/null +++ b/src/main/java/iflytop/app/extui/zextui/ExtUIPageMenuRegister.java @@ -0,0 +1,28 @@ +package iflytop.app.extui.zextui; + +import iflytop.app.extui.zextui.page.SubDeviceDriverTestPage; +import iflytop.app.utils.ZList; +import iflytop.zextui.mgr.ExtApiPageGroupCfgMgr.*; +import iflytop.zextui.mgr.ExtApiPageGroupCfgMgr; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Component; + +@Component +public class ExtUIPageMenuRegister { + @Resource + ExtApiPageGroupCfgMgr groupCfgMgr; + + + public void pushMenu(Menu label) { + groupCfgMgr.pushMenu(label); + } + + @PostConstruct + void init() { + pushMenu(new Menu("硬件测试", ZList.of( + new Menu(SubDeviceDriverTestPage.class, "串口通道测试") + ))); + + } +} diff --git a/src/main/java/iflytop/app/extui/zextui/page/SubDeviceDriverTestPage.java b/src/main/java/iflytop/app/extui/zextui/page/SubDeviceDriverTestPage.java new file mode 100644 index 0000000..ab90456 --- /dev/null +++ b/src/main/java/iflytop/app/extui/zextui/page/SubDeviceDriverTestPage.java @@ -0,0 +1,25 @@ +package iflytop.app.extui.zextui.page; + +import iflytop.zextui.mgr.ExtApiPageMgr; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Component; + +@Component +public class SubDeviceDriverTestPage { + @Resource + ExtApiPageMgr extApiPageMgr; + + public void start() { + + } + + @PostConstruct + public void init() { + var page = extApiPageMgr.newPage(this); + page.newGroup("设备控制"); + page.addFunction("开始", this::start); + extApiPageMgr.addPage(page); + } + +} diff --git a/src/main/java/iflytop/app/service/backgroud/SensorReportPreAnalysis.java b/src/main/java/iflytop/app/service/backgroud/SensorReportPreAnalysis.java index af823c7..7e8ad2a 100644 --- a/src/main/java/iflytop/app/service/backgroud/SensorReportPreAnalysis.java +++ b/src/main/java/iflytop/app/service/backgroud/SensorReportPreAnalysis.java @@ -1,9 +1,11 @@ package iflytop.app.service.backgroud; +import iflytop.app.config.AppConstantConfig; import iflytop.app.driver.SubDeviceDriver; import iflytop.app.type.XYPoint; import iflytop.app.type.protocol.TPMIPacket; import iflytop.app.type.protocol.TPMISensorValReport; +import iflytop.app.utils.CoordinateCalculator; import iflytop.app.utils.ZList; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; @@ -34,9 +36,18 @@ public class SensorReportPreAnalysis { if (report == null) return; - log.info("report: {}", report); + Integer arm0Angle = report.getArm0Angle(); + Integer arm1Angle = report.getArm1Angle(); + + Double arm0rad = arm0Angle * 1.0 / AppConstantConfig.ENCODER_ACCURACY * 2 * Math.PI; + Double arm1rad = arm1Angle * 1.0 / AppConstantConfig.ENCODER_ACCURACY * 2 * Math.PI; + + + var xypoint = CoordinateCalculator.calculator(AppConstantConfig.SENSOR_ARM0_LENGTH_MM, arm0rad, AppConstantConfig.SENSOR_ARM1_LENGTH_MM, arm1rad); + + // xyPoints.add(new XYPoint(report.x, report.y)); } diff --git a/src/main/java/iflytop/app/utils/CoordinateCalculator.java b/src/main/java/iflytop/app/utils/CoordinateCalculator.java index c589e5f..aee75fa 100644 --- a/src/main/java/iflytop/app/utils/CoordinateCalculator.java +++ b/src/main/java/iflytop/app/utils/CoordinateCalculator.java @@ -1,6 +1,8 @@ package iflytop.app.utils; +import iflytop.app.config.AppConstantConfig; import iflytop.app.type.XYPoint; +import iflytop.app.type.protocol.TPMISensorValReport; import lombok.extern.slf4j.Slf4j; import org.springframework.util.Assert; @@ -10,6 +12,24 @@ import static java.lang.Math.abs; @Slf4j public class CoordinateCalculator { + + static public XYPoint calculator(Double arm0Length, Double arm0Rad, Double arm1Length, Double arm1Rad) { + XYPoint xyPoint = new XYPoint(); double lval = calculateThirdSide(arm0Length, arm1Length, Math.PI - arm1Rad); if (lval < 0.000001) { + xyPoint.x = 0.0; xyPoint.y = 0.0; + } else { + double rad0 = calculateAngle(arm0Length, lval, arm1Length); double lrad = 0.0; if (arm1Rad > 0) { + lrad = arm0Rad + rad0; + } else { + lrad = arm0Rad - rad0; + } xyPoint.x = lval * Math.sin(lrad); xyPoint.y = lval * Math.cos(lrad); + } return xyPoint; + } + + + // + // PRIVATE + // + public static double calculateThirdSide(double a, double b, double angleInRadians) { // 计算第三条边的平方 double cSquared = a * a + b * b - 2 * a * b * Math.cos(angleInRadians); @@ -38,18 +58,9 @@ public class CoordinateCalculator { } return ret; } - - static public XYPoint calculator(Double arm0Length, Double arm0Rad, Double arm1Length, Double arm1Rad) { - XYPoint xyPoint = new XYPoint(); double lval = calculateThirdSide(arm0Length, arm1Length, Math.PI - arm1Rad); if (lval < 0.000001) { - xyPoint.x = 0.0; xyPoint.y = 0.0; - } else { - double rad0 = calculateAngle(arm0Length, lval, arm1Length); double lrad = 0.0; if (arm1Rad > 0) { - lrad = arm0Rad + rad0; - } else { - lrad = arm0Rad - rad0; - } xyPoint.x = lval * Math.sin(lrad); xyPoint.y = lval * Math.cos(lrad); - } return xyPoint; - } + // + // TEST + // static void testCalculateThirdSide(double a, double b, double angleInRadians, double expected) { double c = calculateThirdSide(a, b, angleInRadians); @@ -62,7 +73,6 @@ public class CoordinateCalculator { String.format("testcalculateAngle: side1=%+.4f,side2=%+.4f,oppositeSide=%+.4f --> angle=%+.4f(%+.4f)", side1, side2, oppositeSide, angle, Math.toDegrees(angle))); } - static void testCalculator(double arm0Length, double arm0Rad, double arm1Length, double arm1Rad, double expectedX, double expectedY) { XYPoint xyPoint = calculator(arm0Length, arm0Rad, arm1Length, arm1Rad); Assert.isTrue(abs(xyPoint.x - expectedX) < 0.0001 && abs(xyPoint.y - expectedY) < 0.0001, @@ -70,7 +80,7 @@ public class CoordinateCalculator { } public static void main(String[] args) { - CoordinateCalculator.testCalculateThirdSide(1, 1, 0,0.0); + CoordinateCalculator.testCalculateThirdSide(1, 1, 0, 0.0); CoordinateCalculator.testCalculateThirdSide(1, 1, Math.PI / 4, 0.7654); CoordinateCalculator.testCalculateThirdSide(1, 1, Math.PI / 2, 1.4142); CoordinateCalculator.testCalculateThirdSide(1, 1, Math.PI * 3 / 4, 1.8478); diff --git a/src/main/java/iflytoplib/amiseui/controler/EngineerRootPageControler.java b/src/main/java/iflytop/zeui/controler/EngineerRootPageControler.java similarity index 86% rename from src/main/java/iflytoplib/amiseui/controler/EngineerRootPageControler.java rename to src/main/java/iflytop/zeui/controler/EngineerRootPageControler.java index 248fcfe..75f2efe 100644 --- a/src/main/java/iflytoplib/amiseui/controler/EngineerRootPageControler.java +++ b/src/main/java/iflytop/zeui/controler/EngineerRootPageControler.java @@ -1,8 +1,7 @@ -package iflytoplib.amiseui.controler; +package iflytop.zeui.controler; import iflytop.app.type.exception.AppException; -import iflytoplib.amiseui.service.RootMgrService; -import iflytoplib.amiseui.service.RootMgrService; +import iflytop.zeui.service.RootMgrService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; diff --git a/src/main/java/iflytoplib/amiseui/service/RootMgrService.java b/src/main/java/iflytop/zeui/service/RootMgrService.java similarity index 78% rename from src/main/java/iflytoplib/amiseui/service/RootMgrService.java rename to src/main/java/iflytop/zeui/service/RootMgrService.java index 7358922..2f8b815 100644 --- a/src/main/java/iflytoplib/amiseui/service/RootMgrService.java +++ b/src/main/java/iflytop/zeui/service/RootMgrService.java @@ -1,8 +1,8 @@ -package iflytoplib.amiseui.service; +package iflytop.zeui.service; -import iflytoplib.amiseui.type.EngineerPage; -import iflytoplib.amiseui.type.features.Nav; -import iflytoplib.amiseui.type.layout.Page; +import iflytop.zeui.type.EngineerPage; +import iflytop.zeui.type.features.Nav; +import iflytop.zeui.type.layout.Page; import org.springframework.stereotype.Component; import java.util.ArrayList; diff --git a/src/main/java/iflytoplib/amiseui/type/EngineerPage.java b/src/main/java/iflytop/zeui/type/EngineerPage.java similarity index 71% rename from src/main/java/iflytoplib/amiseui/type/EngineerPage.java rename to src/main/java/iflytop/zeui/type/EngineerPage.java index da16d49..fb59022 100644 --- a/src/main/java/iflytoplib/amiseui/type/EngineerPage.java +++ b/src/main/java/iflytop/zeui/type/EngineerPage.java @@ -1,4 +1,4 @@ -package iflytoplib.amiseui.type; +package iflytop.zeui.type; public class EngineerPage { public String groupName; diff --git a/src/main/java/iflytoplib/amiseui/type/display/Icon.java b/src/main/java/iflytop/zeui/type/display/Icon.java similarity index 93% rename from src/main/java/iflytoplib/amiseui/type/display/Icon.java rename to src/main/java/iflytop/zeui/type/display/Icon.java index 0eb3cfa..f09af2c 100644 --- a/src/main/java/iflytoplib/amiseui/type/display/Icon.java +++ b/src/main/java/iflytop/zeui/type/display/Icon.java @@ -1,4 +1,4 @@ -package iflytoplib.amiseui.type.display; +package iflytop.zeui.type.display; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/iflytoplib/amiseui/type/display/Remark.java b/src/main/java/iflytop/zeui/type/display/Remark.java similarity index 64% rename from src/main/java/iflytoplib/amiseui/type/display/Remark.java rename to src/main/java/iflytop/zeui/type/display/Remark.java index 269d904..cc24b36 100644 --- a/src/main/java/iflytoplib/amiseui/type/display/Remark.java +++ b/src/main/java/iflytop/zeui/type/display/Remark.java @@ -1,12 +1,9 @@ -package iflytoplib.amiseui.type.display; +package iflytop.zeui.type.display; import com.fasterxml.jackson.annotation.JsonInclude; -import iflytoplib.amiseui.type.options.Position; -import iflytoplib.amiseui.type.options.Shape; -import iflytoplib.amiseui.type.options.Trigger; -import iflytoplib.amiseui.type.options.Position; -import iflytoplib.amiseui.type.options.Shape; -import iflytoplib.amiseui.type.options.Trigger; +import iflytop.zeui.type.options.Position; +import iflytop.zeui.type.options.Shape; +import iflytop.zeui.type.options.Trigger; @JsonInclude(JsonInclude.Include.NON_NULL) public class Remark { diff --git a/src/main/java/iflytoplib/amiseui/type/features/ActionButton.java b/src/main/java/iflytop/zeui/type/features/ActionButton.java similarity index 98% rename from src/main/java/iflytoplib/amiseui/type/features/ActionButton.java rename to src/main/java/iflytop/zeui/type/features/ActionButton.java index 7ec8808..a10b6ee 100644 --- a/src/main/java/iflytoplib/amiseui/type/features/ActionButton.java +++ b/src/main/java/iflytop/zeui/type/features/ActionButton.java @@ -1,4 +1,4 @@ -package iflytoplib.amiseui.type.features; +package iflytop.zeui.type.features; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/iflytoplib/amiseui/type/features/DropDownButton.java b/src/main/java/iflytop/zeui/type/features/DropDownButton.java similarity index 93% rename from src/main/java/iflytoplib/amiseui/type/features/DropDownButton.java rename to src/main/java/iflytop/zeui/type/features/DropDownButton.java index c5a7319..c7ecc34 100644 --- a/src/main/java/iflytoplib/amiseui/type/features/DropDownButton.java +++ b/src/main/java/iflytop/zeui/type/features/DropDownButton.java @@ -1,7 +1,7 @@ -package iflytoplib.amiseui.type.features; +package iflytop.zeui.type.features; import com.fasterxml.jackson.annotation.JsonInclude; -import iflytoplib.amiseui.type.options.Trigger; +import iflytop.zeui.type.options.Trigger; import java.util.List; diff --git a/src/main/java/iflytoplib/amiseui/type/features/Nav.java b/src/main/java/iflytop/zeui/type/features/Nav.java similarity index 98% rename from src/main/java/iflytoplib/amiseui/type/features/Nav.java rename to src/main/java/iflytop/zeui/type/features/Nav.java index b645938..aedc6da 100644 --- a/src/main/java/iflytoplib/amiseui/type/features/Nav.java +++ b/src/main/java/iflytop/zeui/type/features/Nav.java @@ -1,4 +1,4 @@ -package iflytoplib.amiseui.type.features; +package iflytop.zeui.type.features; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/iflytoplib/amiseui/type/features/ServiceContainer.java b/src/main/java/iflytop/zeui/type/features/ServiceContainer.java similarity index 97% rename from src/main/java/iflytoplib/amiseui/type/features/ServiceContainer.java rename to src/main/java/iflytop/zeui/type/features/ServiceContainer.java index efa1f70..7f8f122 100644 --- a/src/main/java/iflytoplib/amiseui/type/features/ServiceContainer.java +++ b/src/main/java/iflytop/zeui/type/features/ServiceContainer.java @@ -1,4 +1,4 @@ -package iflytoplib.amiseui.type.features; +package iflytop.zeui.type.features; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/iflytoplib/amiseui/type/form/Form.java b/src/main/java/iflytop/zeui/type/form/Form.java similarity index 98% rename from src/main/java/iflytoplib/amiseui/type/form/Form.java rename to src/main/java/iflytop/zeui/type/form/Form.java index f1ea2d8..722cee0 100644 --- a/src/main/java/iflytoplib/amiseui/type/form/Form.java +++ b/src/main/java/iflytop/zeui/type/form/Form.java @@ -1,7 +1,7 @@ -package iflytoplib.amiseui.type.form; +package iflytop.zeui.type.form; import com.fasterxml.jackson.annotation.JsonInclude; -import iflytoplib.amiseui.type.options.Align; +import iflytop.zeui.type.options.Align; @JsonInclude(JsonInclude.Include.NON_NULL) public class Form { diff --git a/src/main/java/iflytoplib/amiseui/type/form/FormItem.java b/src/main/java/iflytop/zeui/type/form/FormItem.java similarity index 97% rename from src/main/java/iflytoplib/amiseui/type/form/FormItem.java rename to src/main/java/iflytop/zeui/type/form/FormItem.java index 1d4479d..8c9048b 100644 --- a/src/main/java/iflytoplib/amiseui/type/form/FormItem.java +++ b/src/main/java/iflytop/zeui/type/form/FormItem.java @@ -1,7 +1,7 @@ -package iflytoplib.amiseui.type.form; +package iflytop.zeui.type.form; import com.fasterxml.jackson.annotation.JsonInclude; -import iflytoplib.amiseui.type.options.Align; +import iflytop.zeui.type.options.Align; import java.util.List; diff --git a/src/main/java/iflytoplib/amiseui/type/form/InputNumber.java b/src/main/java/iflytop/zeui/type/form/InputNumber.java similarity index 83% rename from src/main/java/iflytoplib/amiseui/type/form/InputNumber.java rename to src/main/java/iflytop/zeui/type/form/InputNumber.java index 9be5f7d..293b7a0 100644 --- a/src/main/java/iflytoplib/amiseui/type/form/InputNumber.java +++ b/src/main/java/iflytop/zeui/type/form/InputNumber.java @@ -1,4 +1,4 @@ -package iflytoplib.amiseui.type.form; +package iflytop.zeui.type.form; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/iflytoplib/amiseui/type/form/InputText.java b/src/main/java/iflytop/zeui/type/form/InputText.java similarity index 83% rename from src/main/java/iflytoplib/amiseui/type/form/InputText.java rename to src/main/java/iflytop/zeui/type/form/InputText.java index da3552b..0cb8dba 100644 --- a/src/main/java/iflytoplib/amiseui/type/form/InputText.java +++ b/src/main/java/iflytop/zeui/type/form/InputText.java @@ -1,4 +1,4 @@ -package iflytoplib.amiseui.type.form; +package iflytop.zeui.type.form; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/iflytoplib/amiseui/type/form/Select.java b/src/main/java/iflytop/zeui/type/form/Select.java similarity index 88% rename from src/main/java/iflytoplib/amiseui/type/form/Select.java rename to src/main/java/iflytop/zeui/type/form/Select.java index 3c8c4a0..f9c415b 100644 --- a/src/main/java/iflytoplib/amiseui/type/form/Select.java +++ b/src/main/java/iflytop/zeui/type/form/Select.java @@ -1,4 +1,4 @@ -package iflytoplib.amiseui.type.form; +package iflytop.zeui.type.form; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/iflytoplib/amiseui/type/layout/Flex.java b/src/main/java/iflytop/zeui/type/layout/Flex.java similarity index 95% rename from src/main/java/iflytoplib/amiseui/type/layout/Flex.java rename to src/main/java/iflytop/zeui/type/layout/Flex.java index 8239d35..9c0652b 100644 --- a/src/main/java/iflytoplib/amiseui/type/layout/Flex.java +++ b/src/main/java/iflytop/zeui/type/layout/Flex.java @@ -1,4 +1,4 @@ -package iflytoplib.amiseui.type.layout; +package iflytop.zeui.type.layout; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/iflytoplib/amiseui/type/layout/Page.java b/src/main/java/iflytop/zeui/type/layout/Page.java similarity index 90% rename from src/main/java/iflytoplib/amiseui/type/layout/Page.java rename to src/main/java/iflytop/zeui/type/layout/Page.java index 388638d..e79accb 100644 --- a/src/main/java/iflytoplib/amiseui/type/layout/Page.java +++ b/src/main/java/iflytop/zeui/type/layout/Page.java @@ -1,10 +1,8 @@ -package iflytoplib.amiseui.type.layout; +package iflytop.zeui.type.layout; import com.fasterxml.jackson.annotation.JsonInclude; -import iflytoplib.amiseui.type.display.Remark; -import iflytoplib.amiseui.type.options.Position; -import iflytoplib.amiseui.type.display.Remark; -import iflytoplib.amiseui.type.options.Position; +import iflytop.zeui.type.display.Remark; +import iflytop.zeui.type.options.Position; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/src/main/java/iflytoplib/amiseui/type/layout/Tabs.java b/src/main/java/iflytop/zeui/type/layout/Tabs.java similarity index 93% rename from src/main/java/iflytoplib/amiseui/type/layout/Tabs.java rename to src/main/java/iflytop/zeui/type/layout/Tabs.java index b7e7c1a..5d9e3bd 100644 --- a/src/main/java/iflytoplib/amiseui/type/layout/Tabs.java +++ b/src/main/java/iflytop/zeui/type/layout/Tabs.java @@ -1,10 +1,8 @@ -package iflytoplib.amiseui.type.layout; +package iflytop.zeui.type.layout; import com.fasterxml.jackson.annotation.JsonInclude; -import iflytoplib.amiseui.type.display.Icon; -import iflytoplib.amiseui.type.options.Position; -import iflytoplib.amiseui.type.display.Icon; -import iflytoplib.amiseui.type.options.Position; +import iflytop.zeui.type.display.Icon; +import iflytop.zeui.type.options.Position; import java.util.List; diff --git a/src/main/java/iflytop/zeui/type/options/Align.java b/src/main/java/iflytop/zeui/type/options/Align.java new file mode 100644 index 0000000..2a4f085 --- /dev/null +++ b/src/main/java/iflytop/zeui/type/options/Align.java @@ -0,0 +1,5 @@ +package iflytop.zeui.type.options; + +public enum Align { + left, right +} diff --git a/src/main/java/iflytoplib/amiseui/type/options/Position.java b/src/main/java/iflytop/zeui/type/options/Position.java similarity index 55% rename from src/main/java/iflytoplib/amiseui/type/options/Position.java rename to src/main/java/iflytop/zeui/type/options/Position.java index 003c1a8..c27dd37 100644 --- a/src/main/java/iflytoplib/amiseui/type/options/Position.java +++ b/src/main/java/iflytop/zeui/type/options/Position.java @@ -1,4 +1,4 @@ -package iflytoplib.amiseui.type.options; +package iflytop.zeui.type.options; public enum Position { left, right, top, bottom diff --git a/src/main/java/iflytop/zeui/type/options/Shape.java b/src/main/java/iflytop/zeui/type/options/Shape.java new file mode 100644 index 0000000..5681037 --- /dev/null +++ b/src/main/java/iflytop/zeui/type/options/Shape.java @@ -0,0 +1,5 @@ +package iflytop.zeui.type.options; + +public enum Shape { + circle, square +} diff --git a/src/main/java/iflytop/zeui/type/options/Size.java b/src/main/java/iflytop/zeui/type/options/Size.java new file mode 100644 index 0000000..1a09369 --- /dev/null +++ b/src/main/java/iflytop/zeui/type/options/Size.java @@ -0,0 +1,5 @@ +package iflytop.zeui.type.options; + +public enum Size { + xs,sm,md,lg +} diff --git a/src/main/java/iflytop/zeui/type/options/Trigger.java b/src/main/java/iflytop/zeui/type/options/Trigger.java new file mode 100644 index 0000000..6596bc0 --- /dev/null +++ b/src/main/java/iflytop/zeui/type/options/Trigger.java @@ -0,0 +1,5 @@ +package iflytop.zeui.type.options; + +public enum Trigger { + hover, focus +} diff --git a/src/main/java/iflytoplib/zextui/controler/ExtApiControler.java b/src/main/java/iflytop/zextui/controler/ExtApiControler.java similarity index 90% rename from src/main/java/iflytoplib/zextui/controler/ExtApiControler.java rename to src/main/java/iflytop/zextui/controler/ExtApiControler.java index 3a1310a..142ca0f 100644 --- a/src/main/java/iflytoplib/zextui/controler/ExtApiControler.java +++ b/src/main/java/iflytop/zextui/controler/ExtApiControler.java @@ -1,14 +1,14 @@ -package iflytoplib.zextui.controler; +package iflytop.zextui.controler; import iflytop.app.utils.SpringBootBeanUtil; -import iflytoplib.zextui.mgr.ExtApiPageGroupCfgMgr; -import iflytoplib.zextui.mgr.ExtApiPageMgr; -import iflytoplib.zextui.type.ExUIParam; -import iflytoplib.zextui.type.ExtApiStatu; -import iflytoplib.zextui.type.ExtUIPageCfg; -import iflytoplib.zextui.type.param.ExtUIFile; -import iflytoplib.zextui.type.ret.EngineerUIRet; +import iflytop.zextui.mgr.ExtApiPageGroupCfgMgr; +import iflytop.zextui.mgr.ExtApiPageMgr; +import iflytop.zextui.type.ExUIParam; +import iflytop.zextui.type.ExtApiStatu; +import iflytop.zextui.type.ExtUIPageCfg; +import iflytop.zextui.type.param.ExtUIFile; +import iflytop.zextui.type.ret.EngineerUIRet; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; @@ -16,7 +16,7 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.ResponseBody; -import iflytoplib.zextui.type.ExUIFunction; +import iflytop.zextui.type.ExUIFunction; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -42,23 +42,6 @@ public class ExtApiControler { @PostMapping("/api/service-config/service-list") @ResponseBody public EngineerUIRet services() { -// List> services = new ArrayList<>(); -// var classes = SpringBootBeanUtil.getBeans(); -// for (var clazz : classes) { -// var cfg = extApiPageGroupCfgMgr.getCfg(clazz); -// if (cfg == null) { -// continue; -// } -// if (!cfg.display) { -// continue; -// } -// Map service = new HashMap<>(); -// service.put("key", clazz.getSimpleName()); -// service.put("name", cfg.getChName()); -// service.put("order", cfg.getIndex()); -// services.add(service); -// } - // log.info("services:{}", services); return EngineerUIRet.success(extApiPageGroupCfgMgr.getMenuList()); } diff --git a/src/main/java/iflytoplib/zextui/controler/ExtApiControllerAdvice.java b/src/main/java/iflytop/zextui/controler/ExtApiControllerAdvice.java similarity index 66% rename from src/main/java/iflytoplib/zextui/controler/ExtApiControllerAdvice.java rename to src/main/java/iflytop/zextui/controler/ExtApiControllerAdvice.java index 0c634c3..0db2b4f 100644 --- a/src/main/java/iflytoplib/zextui/controler/ExtApiControllerAdvice.java +++ b/src/main/java/iflytop/zextui/controler/ExtApiControllerAdvice.java @@ -1,21 +1,21 @@ -package iflytoplib.zextui.controler; +package iflytop.zextui.controler; -import a8k.extui.type.ret.AppRetV1; +import iflytop.zextui.type.ret.EngineerUIRet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; -@ControllerAdvice(value = "a8k.extui.controler") +@ControllerAdvice(value = "iflytop.zextui.controler") public class ExtApiControllerAdvice { Logger logger = LoggerFactory.getLogger(ExtApiControllerAdvice.class); @ResponseBody @ExceptionHandler(value = Exception.class) - public AppRetV1 controllerExceptionHandler(Exception e) { + public EngineerUIRet controllerExceptionHandler(Exception e) { logger.info("捕获到异常 : ", e); - return AppRetV1.fail(e); + return EngineerUIRet.fail(e); } } diff --git a/src/main/java/iflytoplib/zextui/mgr/ExtApiPageGroupCfgMgr.java b/src/main/java/iflytop/zextui/mgr/ExtApiPageGroupCfgMgr.java similarity index 94% rename from src/main/java/iflytoplib/zextui/mgr/ExtApiPageGroupCfgMgr.java rename to src/main/java/iflytop/zextui/mgr/ExtApiPageGroupCfgMgr.java index 80ac668..904914c 100644 --- a/src/main/java/iflytoplib/zextui/mgr/ExtApiPageGroupCfgMgr.java +++ b/src/main/java/iflytop/zextui/mgr/ExtApiPageGroupCfgMgr.java @@ -1,4 +1,4 @@ -package iflytoplib.zextui.mgr; +package iflytop.zextui.mgr; import jakarta.annotation.PostConstruct; import org.springframework.stereotype.Component; @@ -51,17 +51,13 @@ public class ExtApiPageGroupCfgMgr { List menuList = new ArrayList<>(); - void pushMenu(Menu label) { + public void pushMenu(Menu label) { menuList.add(label); } @PostConstruct void init() { - - - - //////////////////////////////////////////////////////////////////////////////////////////// } diff --git a/src/main/java/iflytoplib/zextui/mgr/ExtApiPageMgr.java b/src/main/java/iflytop/zextui/mgr/ExtApiPageMgr.java similarity index 86% rename from src/main/java/iflytoplib/zextui/mgr/ExtApiPageMgr.java rename to src/main/java/iflytop/zextui/mgr/ExtApiPageMgr.java index 9e92cd4..9d11884 100644 --- a/src/main/java/iflytoplib/zextui/mgr/ExtApiPageMgr.java +++ b/src/main/java/iflytop/zextui/mgr/ExtApiPageMgr.java @@ -1,6 +1,6 @@ -package iflytoplib.zextui.mgr; +package iflytop.zextui.mgr; -import iflytoplib.zextui.type.ExtUIPageCfg; +import iflytop.zextui.type.ExtUIPageCfg; import org.springframework.stereotype.Component; import java.util.ArrayList; diff --git a/src/main/java/iflytoplib/zextui/type/ExApiPage.java b/src/main/java/iflytop/zextui/type/ExApiPage.java similarity index 57% rename from src/main/java/iflytoplib/zextui/type/ExApiPage.java rename to src/main/java/iflytop/zextui/type/ExApiPage.java index 0022a5c..ced950e 100644 --- a/src/main/java/iflytoplib/zextui/type/ExApiPage.java +++ b/src/main/java/iflytop/zextui/type/ExApiPage.java @@ -1,4 +1,4 @@ -package iflytoplib.zextui.type; +package iflytop.zextui.type; public class ExApiPage { String chName; diff --git a/src/main/java/iflytoplib/zextui/type/ExUIFunction.java b/src/main/java/iflytop/zextui/type/ExUIFunction.java similarity index 98% rename from src/main/java/iflytoplib/zextui/type/ExUIFunction.java rename to src/main/java/iflytop/zextui/type/ExUIFunction.java index be4f388..6b63e7e 100644 --- a/src/main/java/iflytoplib/zextui/type/ExUIFunction.java +++ b/src/main/java/iflytop/zextui/type/ExUIFunction.java @@ -1,4 +1,4 @@ -package iflytoplib.zextui.type; +package iflytop.zextui.type; import com.fasterxml.jackson.annotation.JsonIgnore; import org.springframework.util.Assert; diff --git a/src/main/java/iflytoplib/zextui/type/ExUIParam.java b/src/main/java/iflytop/zextui/type/ExUIParam.java similarity index 89% rename from src/main/java/iflytoplib/zextui/type/ExUIParam.java rename to src/main/java/iflytop/zextui/type/ExUIParam.java index 65ffa50..c7fba6f 100644 --- a/src/main/java/iflytoplib/zextui/type/ExUIParam.java +++ b/src/main/java/iflytop/zextui/type/ExUIParam.java @@ -1,4 +1,4 @@ -package iflytoplib.zextui.type; +package iflytop.zextui.type; public class ExUIParam { public String keyName; diff --git a/src/main/java/iflytoplib/zextui/type/ExUIParamGetInitValFnType1.java b/src/main/java/iflytop/zextui/type/ExUIParamGetInitValFnType1.java similarity index 75% rename from src/main/java/iflytoplib/zextui/type/ExUIParamGetInitValFnType1.java rename to src/main/java/iflytop/zextui/type/ExUIParamGetInitValFnType1.java index e4bf028..a21e1d8 100644 --- a/src/main/java/iflytoplib/zextui/type/ExUIParamGetInitValFnType1.java +++ b/src/main/java/iflytop/zextui/type/ExUIParamGetInitValFnType1.java @@ -1,4 +1,4 @@ -package iflytoplib.zextui.type; +package iflytop.zextui.type; @FunctionalInterface public interface ExUIParamGetInitValFnType1 { diff --git a/src/main/java/iflytoplib/zextui/type/ExUIParamGetInitValFnType2.java b/src/main/java/iflytop/zextui/type/ExUIParamGetInitValFnType2.java similarity index 80% rename from src/main/java/iflytoplib/zextui/type/ExUIParamGetInitValFnType2.java rename to src/main/java/iflytop/zextui/type/ExUIParamGetInitValFnType2.java index 0564652..838632d 100644 --- a/src/main/java/iflytoplib/zextui/type/ExUIParamGetInitValFnType2.java +++ b/src/main/java/iflytop/zextui/type/ExUIParamGetInitValFnType2.java @@ -1,4 +1,4 @@ -package iflytoplib.zextui.type; +package iflytop.zextui.type; @FunctionalInterface public interface ExUIParamGetInitValFnType2 { diff --git a/src/main/java/iflytoplib/zextui/type/ExtApiFn.java b/src/main/java/iflytop/zextui/type/ExtApiFn.java similarity index 93% rename from src/main/java/iflytoplib/zextui/type/ExtApiFn.java rename to src/main/java/iflytop/zextui/type/ExtApiFn.java index 7d496cf..5efebea 100644 --- a/src/main/java/iflytoplib/zextui/type/ExtApiFn.java +++ b/src/main/java/iflytop/zextui/type/ExtApiFn.java @@ -1,4 +1,4 @@ -package iflytoplib.zextui.type; +package iflytop.zextui.type; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/iflytoplib/zextui/type/ExtApiStatu.java b/src/main/java/iflytop/zextui/type/ExtApiStatu.java similarity index 92% rename from src/main/java/iflytoplib/zextui/type/ExtApiStatu.java rename to src/main/java/iflytop/zextui/type/ExtApiStatu.java index 4a87b55..ab3bcf9 100644 --- a/src/main/java/iflytoplib/zextui/type/ExtApiStatu.java +++ b/src/main/java/iflytop/zextui/type/ExtApiStatu.java @@ -1,4 +1,4 @@ -package iflytoplib.zextui.type; +package iflytop.zextui.type; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/iflytoplib/zextui/type/ExtUIPageCfg.java b/src/main/java/iflytop/zextui/type/ExtUIPageCfg.java similarity index 98% rename from src/main/java/iflytoplib/zextui/type/ExtUIPageCfg.java rename to src/main/java/iflytop/zextui/type/ExtUIPageCfg.java index 4be30bd..35c8a54 100644 --- a/src/main/java/iflytoplib/zextui/type/ExtUIPageCfg.java +++ b/src/main/java/iflytop/zextui/type/ExtUIPageCfg.java @@ -1,7 +1,7 @@ -package iflytoplib.zextui.type; +package iflytop.zextui.type; -import a8k.extui.utils.FieldUtils; import com.fasterxml.jackson.annotation.JsonIgnore; +import iflytop.zextui.utils.FieldUtils; import org.springframework.util.Assert; import java.io.Serializable; diff --git a/src/main/java/iflytoplib/zextui/type/ExtUITab.java b/src/main/java/iflytop/zextui/type/ExtUITab.java similarity index 83% rename from src/main/java/iflytoplib/zextui/type/ExtUITab.java rename to src/main/java/iflytop/zextui/type/ExtUITab.java index 63b56a7..db08fff 100644 --- a/src/main/java/iflytoplib/zextui/type/ExtUITab.java +++ b/src/main/java/iflytop/zextui/type/ExtUITab.java @@ -1,4 +1,4 @@ -package iflytoplib.zextui.type; +package iflytop.zextui.type; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/iflytoplib/zextui/type/ExtUiTable.java b/src/main/java/iflytop/zextui/type/ExtUiTable.java similarity index 98% rename from src/main/java/iflytoplib/zextui/type/ExtUiTable.java rename to src/main/java/iflytop/zextui/type/ExtUiTable.java index 6ef980c..365f9d1 100644 --- a/src/main/java/iflytoplib/zextui/type/ExtUiTable.java +++ b/src/main/java/iflytop/zextui/type/ExtUiTable.java @@ -1,4 +1,4 @@ -package iflytoplib.zextui.type; +package iflytop.zextui.type; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/iflytoplib/zextui/type/TabCfg.java b/src/main/java/iflytop/zextui/type/TabCfg.java similarity index 90% rename from src/main/java/iflytoplib/zextui/type/TabCfg.java rename to src/main/java/iflytop/zextui/type/TabCfg.java index 220c8e5..3a1f91e 100644 --- a/src/main/java/iflytoplib/zextui/type/TabCfg.java +++ b/src/main/java/iflytop/zextui/type/TabCfg.java @@ -1,4 +1,4 @@ -package iflytoplib.zextui.type; +package iflytop.zextui.type; import lombok.Data; diff --git a/src/main/java/iflytoplib/zextui/type/param/ExtUIFile.java b/src/main/java/iflytop/zextui/type/param/ExtUIFile.java similarity index 87% rename from src/main/java/iflytoplib/zextui/type/param/ExtUIFile.java rename to src/main/java/iflytop/zextui/type/param/ExtUIFile.java index ec736c5..28d866b 100644 --- a/src/main/java/iflytoplib/zextui/type/param/ExtUIFile.java +++ b/src/main/java/iflytop/zextui/type/param/ExtUIFile.java @@ -1,4 +1,4 @@ -package iflytoplib.zextui.type.param; +package iflytop.zextui.type.param; import java.util.Base64; public class ExtUIFile { public byte[] bytes; diff --git a/src/main/java/iflytoplib/zextui/type/ret/EngineerUIRet.java b/src/main/java/iflytop/zextui/type/ret/EngineerUIRet.java similarity index 95% rename from src/main/java/iflytoplib/zextui/type/ret/EngineerUIRet.java rename to src/main/java/iflytop/zextui/type/ret/EngineerUIRet.java index b17bb4b..3b891f6 100644 --- a/src/main/java/iflytoplib/zextui/type/ret/EngineerUIRet.java +++ b/src/main/java/iflytop/zextui/type/ret/EngineerUIRet.java @@ -1,4 +1,4 @@ -package iflytoplib.zextui.type.ret; +package iflytop.zextui.type.ret; import lombok.Getter; public class EngineerUIRet { // 错误信息 diff --git a/src/main/java/iflytoplib/zextui/type/ret/ExtApiCurve.java b/src/main/java/iflytop/zextui/type/ret/ExtApiCurve.java similarity index 89% rename from src/main/java/iflytoplib/zextui/type/ret/ExtApiCurve.java rename to src/main/java/iflytop/zextui/type/ret/ExtApiCurve.java index 0edf3b1..3c8a41d 100644 --- a/src/main/java/iflytoplib/zextui/type/ret/ExtApiCurve.java +++ b/src/main/java/iflytop/zextui/type/ret/ExtApiCurve.java @@ -1,4 +1,4 @@ -package iflytoplib.zextui.type.ret; +package iflytop.zextui.type.ret; import java.util.List; diff --git a/src/main/java/iflytoplib/zextui/type/ret/ExtUIDownloadTasks.java b/src/main/java/iflytop/zextui/type/ret/ExtUIDownloadTasks.java similarity index 79% rename from src/main/java/iflytoplib/zextui/type/ret/ExtUIDownloadTasks.java rename to src/main/java/iflytop/zextui/type/ret/ExtUIDownloadTasks.java index 5b3c6a6..4a63e48 100644 --- a/src/main/java/iflytoplib/zextui/type/ret/ExtUIDownloadTasks.java +++ b/src/main/java/iflytop/zextui/type/ret/ExtUIDownloadTasks.java @@ -1,4 +1,4 @@ -package iflytoplib.zextui.type.ret; +package iflytop.zextui.type.ret; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/iflytoplib/zextui/type/ret/FileToBeDownload.java b/src/main/java/iflytop/zextui/type/ret/FileToBeDownload.java similarity index 76% rename from src/main/java/iflytoplib/zextui/type/ret/FileToBeDownload.java rename to src/main/java/iflytop/zextui/type/ret/FileToBeDownload.java index 5cb2070..1bb7ae2 100644 --- a/src/main/java/iflytoplib/zextui/type/ret/FileToBeDownload.java +++ b/src/main/java/iflytop/zextui/type/ret/FileToBeDownload.java @@ -1,4 +1,4 @@ -package iflytoplib.zextui.type.ret; +package iflytop.zextui.type.ret; public class FileToBeDownload { public String url; diff --git a/src/main/java/iflytoplib/zextui/utils/FieldUtils.java b/src/main/java/iflytop/zextui/utils/FieldUtils.java similarity index 98% rename from src/main/java/iflytoplib/zextui/utils/FieldUtils.java rename to src/main/java/iflytop/zextui/utils/FieldUtils.java index 6557916..76cdcf2 100644 --- a/src/main/java/iflytoplib/zextui/utils/FieldUtils.java +++ b/src/main/java/iflytop/zextui/utils/FieldUtils.java @@ -1,4 +1,4 @@ -package iflytoplib.zextui.utils; +package iflytop.zextui.utils; import java.lang.invoke.SerializedLambda; import java.lang.reflect.Field; diff --git a/src/main/java/iflytoplib/amiseui/type/options/Align.java b/src/main/java/iflytoplib/amiseui/type/options/Align.java deleted file mode 100644 index 6f4118c..0000000 --- a/src/main/java/iflytoplib/amiseui/type/options/Align.java +++ /dev/null @@ -1,5 +0,0 @@ -package iflytoplib.amiseui.type.options; - -public enum Align { - left, right -} diff --git a/src/main/java/iflytoplib/amiseui/type/options/Shape.java b/src/main/java/iflytoplib/amiseui/type/options/Shape.java deleted file mode 100644 index 4bab8a6..0000000 --- a/src/main/java/iflytoplib/amiseui/type/options/Shape.java +++ /dev/null @@ -1,5 +0,0 @@ -package iflytoplib.amiseui.type.options; - -public enum Shape { - circle, square -} diff --git a/src/main/java/iflytoplib/amiseui/type/options/Size.java b/src/main/java/iflytoplib/amiseui/type/options/Size.java deleted file mode 100644 index a87f231..0000000 --- a/src/main/java/iflytoplib/amiseui/type/options/Size.java +++ /dev/null @@ -1,5 +0,0 @@ -package iflytoplib.amiseui.type.options; - -public enum Size { - xs,sm,md,lg -} diff --git a/src/main/java/iflytoplib/amiseui/type/options/Trigger.java b/src/main/java/iflytoplib/amiseui/type/options/Trigger.java deleted file mode 100644 index 0ac454e..0000000 --- a/src/main/java/iflytoplib/amiseui/type/options/Trigger.java +++ /dev/null @@ -1,5 +0,0 @@ -package iflytoplib.amiseui.type.options; - -public enum Trigger { - hover, focus -} diff --git a/ui/zextui/src/App.vue b/ui/zextui/src/App.vue index aab843e..ed746e7 100644 --- a/ui/zextui/src/App.vue +++ b/ui/zextui/src/App.vue @@ -70,8 +70,6 @@ async function mounted() { menuItems.value = services; activeServiceKey.value = null; - setupEventWebSocket(); - setupStateUpdateWebSocket(); } // handle menu item click @@ -82,75 +80,7 @@ function actionMenuItemClick(event) { } -// handle open change -function handleOpenChange(keys) { - openKeys.value = keys.length ? [keys[keys.length - 1]] : []; -} - -function setupEventWebSocket() { - let ws = createWebSocket('event'); - ws.onmessage = (event) => { - let report = JSON.parse(event.data); - console.info(report); - if (report.data.typeName === "AppPromptEvent") { - Modal.info({ - title: 'PROMPT', - content: h(VueJsonPretty, { data: report.data.prompt, deep: 2 }), - width: 600, - }); - } else { - Modal.info({ - title: 'WebSocket Event', - content: h(VueJsonPretty, { data: report, deep: 2 }), - width: 600, - }); - } - }; - - // ws.onclose = () => { - // setTimeout(() => { - // ws.connect(); - // }, 1000); - // }; -} -function setupStateUpdateWebSocket() { - let ws = createWebSocket('state'); - - ws.onmessage = (event) => { - const data = JSON.parse(event.data); - if (data.messageType === 'Report' && data.dataType === 'MessageBoxState') { - const time = new Date(data.data.topMessage.time).toLocaleString(); - message.value = `${time} - ${data.data.topMessage.message}`; - messageBoxList.value = data.data.messageBoxList; - switch (data.data.topMessage.messageLevel) { - case 'Info': - messageColor.value = 'blue'; - break; - case 'Warn': - messageColor.value = 'orange'; - break; - case 'Error': - messageColor.value = 'red'; - break; - default: - messageColor.value = 'black'; - } - } - }; - - // ws.onclose = () => { - // setTimeout(() => { - // ws = createWebSocket('state'); - // }, 1000); - // }; -} - -function createWebSocket(type) { - const url = process.env.NODE_ENV === 'production' ? `ws://${window.location.host}:80/api/v1/app/ws/${type}` - : `ws://localhost:80/api/v1/app/ws/${type}`; - return new WebSocket(url); -} function showMessageBoxList() { const listItems = messageBoxList.value.map(item => {