diff --git a/src/main/java/a8k/db/AppSetting.java b/src/main/java/a8k/db/AppSetting.java index 3bea319..5362b66 100644 --- a/src/main/java/a8k/db/AppSetting.java +++ b/src/main/java/a8k/db/AppSetting.java @@ -1,6 +1,6 @@ package a8k.db; -import a8k.service.appsettings.base.AppSettingGroup; +import a8k.service.appsettings.base.AppSettingTab; import a8k.service.appsettings.base.AppOptionName; import a8k.service.appsettings.base.AppSettingType; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,11 +12,11 @@ import java.util.Arrays; public class AppSetting extends UfActiveRecord { @UfActiveRecordField - public String type; //支持类型范围 AppSettingType + public String type; //支持类型范围 AppSettingType @UfActiveRecordField - public String group; //返回名字为英文，前端需要根据英文名字进行翻译 + public String tab; //返回名字为英文，前端需要根据英文名字进行翻译 @UfActiveRecordField - public String name; //返回名字为英文，前端需要根据英文名字进行翻译 + public String name; //返回名字为英文，前端需要根据英文名字进行翻译 @UfActiveRecordField public Integer display = 1;// 是否显示 @UfActiveRecordField @@ -59,12 +59,12 @@ public class AppSetting extends UfActiveRecord { // @JsonIgnore - static AppSettingGroup currentBuildGroup; + static AppSettingTab currentBuildGroup; @JsonIgnore - static Integer buildPriority = 0; + static Integer buildPriority = 0; static Boolean buildHidden = false; - static public void setBuildGroup(AppSettingGroup group) { + static public void setBuildGroup(AppSettingTab group) { currentBuildGroup = group; buildPriority = 0; buildHidden = false; @@ -77,9 +77,9 @@ public class AppSetting extends UfActiveRecord { public static void addIntegerOption(AppOptionName name, Boolean checkValRange, Double minVal, Double maxVal, Integer value) { var option = new AppSetting(); - option.type = AppSettingType.INTEGER.name(); - option.group = currentBuildGroup.name(); - option.name = name.name(); + option.type = AppSettingType.INTEGER.name(); + option.tab = currentBuildGroup.name(); + option.name = name.name(); option.checkValRange = checkValRange ? 1 : 0; option.minVal = minVal; option.maxVal = maxVal; @@ -94,9 +94,9 @@ public class AppSetting extends UfActiveRecord { public static void addDoubleOption(AppOptionName name, Boolean checkValRange, Double minVal, Double maxVal, Double value) { var option = new AppSetting(); - option.type = AppSettingType.DOUBLE.name(); - option.group = currentBuildGroup.name(); - option.name = name.name(); + option.type = AppSettingType.DOUBLE.name(); + option.tab = currentBuildGroup.name(); + option.name = name.name(); option.checkValRange = checkValRange ? 1 : 0; option.minVal = minVal; option.maxVal = maxVal; @@ -111,9 +111,9 @@ public class AppSetting extends UfActiveRecord { public static void addStringOption(AppOptionName name, String value) { var option = new AppSetting(); - option.type = AppSettingType.STRING.name(); - option.group = currentBuildGroup.name(); - option.name = name.name(); + option.type = AppSettingType.STRING.name(); + option.tab = currentBuildGroup.name(); + option.name = name.name(); option.value = value; option.priority = buildPriority++; option.save(); @@ -121,9 +121,9 @@ public class AppSetting extends UfActiveRecord { public static void addBooleanOption(AppOptionName name, Boolean value) { var option = new AppSetting(); - option.type = AppSettingType.BOOLEAN.name(); - option.group = currentBuildGroup.name(); - option.name = name.name(); + option.type = AppSettingType.BOOLEAN.name(); + option.tab = currentBuildGroup.name(); + option.name = name.name(); option.value = value ? "1" : "0"; option.priority = buildPriority++; option.save(); @@ -131,9 +131,9 @@ public class AppSetting extends UfActiveRecord { public static void addDateOption(AppOptionName name, String value) { var option = new AppSetting(); - option.type = AppSettingType.DATE.name(); - option.group = currentBuildGroup.name(); - option.name = name.name(); + option.type = AppSettingType.DATE.name(); + option.tab = currentBuildGroup.name(); + option.name = name.name(); option.value = value; option.priority = buildPriority++; option.save(); @@ -141,9 +141,9 @@ public class AppSetting extends UfActiveRecord { public static void addTimeOption(AppOptionName name, String value) { var option = new AppSetting(); - option.type = AppSettingType.TIME.name(); - option.group = currentBuildGroup.name(); - option.name = name.name(); + option.type = AppSettingType.TIME.name(); + option.tab = currentBuildGroup.name(); + option.name = name.name(); option.value = value; option.priority = buildPriority++; option.save(); @@ -151,9 +151,9 @@ public class AppSetting extends UfActiveRecord { public static void addTimezoneOption(AppOptionName name, String value) { var option = new AppSetting(); - option.type = AppSettingType.TIMEZONE.name(); - option.group = currentBuildGroup.name(); - option.name = name.name(); + option.type = AppSettingType.TIMEZONE.name(); + option.tab = currentBuildGroup.name(); + option.name = name.name(); option.value = value; option.priority = buildPriority++; option.save(); @@ -161,9 +161,9 @@ public class AppSetting extends UfActiveRecord { public static void addIpOption(AppOptionName name, String value) { var option = new AppSetting(); - option.type = AppSettingType.IP.name(); - option.group = currentBuildGroup.name(); - option.name = name.name(); + option.type = AppSettingType.IP.name(); + option.tab = currentBuildGroup.name(); + option.name = name.name(); option.value = value; option.priority = buildPriority++; option.save(); @@ -171,9 +171,9 @@ public class AppSetting extends UfActiveRecord { public static void addEnumOption(AppOptionName name, String[] valueEnumRange, String value) { var option = new AppSetting(); - option.type = AppSettingType.ENUM.name(); - option.group = currentBuildGroup.name(); - option.name = name.name(); + option.type = AppSettingType.ENUM.name(); + option.tab = currentBuildGroup.name(); + option.name = name.name(); option.valueEnumRange = Arrays.toString(valueEnumRange); option.value = value; option.priority = buildPriority++; @@ -182,9 +182,9 @@ public class AppSetting extends UfActiveRecord { public static void addFixStringOption(AppOptionName name, String value) { var option = new AppSetting(); - option.type = AppSettingType.FIX_STRING.name(); - option.group = currentBuildGroup.name(); - option.name = name.name(); + option.type = AppSettingType.FIX_STRING.name(); + option.tab = currentBuildGroup.name(); + option.name = name.name(); option.value = value; option.priority = buildPriority++; option.save(); diff --git a/src/main/java/a8k/service/appsettings/AppSettingsMgr.java b/src/main/java/a8k/service/appsettings/AppSettingsMgr.java index 02bdb31..81b9d65 100644 --- a/src/main/java/a8k/service/appsettings/AppSettingsMgr.java +++ b/src/main/java/a8k/service/appsettings/AppSettingsMgr.java @@ -4,7 +4,7 @@ import a8k.appbase.appret.AppRet; import a8k.controler.engineer.utils.EngineerPageTab; import a8k.controler.engineer.utils.EnginnerPageAction; import a8k.db.AppSetting; -import a8k.service.appsettings.base.AppSettingGroup; +import a8k.service.appsettings.base.AppSettingTab; import a8k.service.appsettings.base.AppOptionName; import a8k.service.appsettings.settingenum.AutoLogoutTime; import a8k.service.appsettings.settingenum.LISProtocol; @@ -52,7 +52,7 @@ public class AppSettingsMgr { } public void initsettingdb() { - AppSetting.setBuildGroup(AppSettingGroup.DEVICE); + AppSetting.setBuildGroup(AppSettingTab.DEVICE); AppSetting.addIntegerOption(AppOptionName.SETTING_PAGE_VERSION, settingPageVersion); AppSetting.addDateOption(AppOptionName.DATE, ""); AppSetting.addTimeOption(AppOptionName.TIME, ""); @@ -61,11 +61,11 @@ public class AppSettingsMgr { AppSetting.addBooleanOption(AppOptionName.AUTO_PRINT, false); AppSetting.addEnumOption(AppOptionName.AUTO_LOGOUT, AutoLogoutTime.cgetValues(), AutoLogoutTime.T03_00.name()); - AppSetting.setBuildGroup(AppSettingGroup.LIS); + AppSetting.setBuildGroup(AppSettingTab.LIS); AppSetting.addEnumOption(AppOptionName.LIS_TYPE, LISType.getValues(), LISType.SINGLE_TRACK.name()); AppSetting.addEnumOption(AppOptionName.LIS_PROTOCOL, LISProtocol.getValues(), LISProtocol.Boditech.name()); - AppSetting.setBuildGroup(AppSettingGroup.RELEASE); + AppSetting.setBuildGroup(AppSettingTab.RELEASE); AppSetting.addFixStringOption(AppOptionName.DEVICE_SERIAL, "TEST-001"); AppSetting.addFixStringOption(AppOptionName.OS_VERSION, "v1.0.0"); AppSetting.addFixStringOption(AppOptionName.APP_VERSION, "v1.0.0"); @@ -81,7 +81,7 @@ public class AppSettingsMgr { @EnginnerPageAction(name = "getAppSetting") public AppRet> getGroups() { List groups = new ArrayList<>(); - for (AppSettingGroup group : AppSettingGroup.values()) { + for (AppSettingTab group : AppSettingTab.values()) { groups.add(group.name()); } return AppRet.success(groups); diff --git a/src/main/java/a8k/service/appsettings/base/AppSettingGroup.java b/src/main/java/a8k/service/appsettings/base/AppSettingTab.java similarity index 73% rename from src/main/java/a8k/service/appsettings/base/AppSettingGroup.java rename to src/main/java/a8k/service/appsettings/base/AppSettingTab.java index 3ce8818..81e1759 100644 --- a/src/main/java/a8k/service/appsettings/base/AppSettingGroup.java +++ b/src/main/java/a8k/service/appsettings/base/AppSettingTab.java @@ -1,6 +1,6 @@ package a8k.service.appsettings.base; -public enum AppSettingGroup { +public enum AppSettingTab { DEVICE, USRMGR, LIS, diff --git a/src/main/resources/db/migration/V100_4__create_table_AppSettingTable.sql b/src/main/resources/db/migration/V100_4__create_table_AppSettingTable.sql index a24443b..8da4dec 100644 --- a/src/main/resources/db/migration/V100_4__create_table_AppSettingTable.sql +++ b/src/main/resources/db/migration/V100_4__create_table_AppSettingTable.sql @@ -2,7 +2,7 @@ CREATE TABLE "AppSettingTable" ( "id" text NOT NULL, "type" text, - "group" text, + "tab" text, "name" text, "display" integer, "priority" integer,