project_boditech_vidas_a8000_v3
/
a8k_app
7
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

update

tags/v0
zhaohe 1 year ago
parent
be41f1a638
commit
03a00ef917
5 changed files with 52 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      src/main/java/a8k/db/AppSetting.java
  2. 10
      src/main/java/a8k/service/appsettings/AppSettingsMgr.java
  3. 2
      src/main/java/a8k/service/appsettings/base/AppSettingTab.java
  4. 2
      src/main/resources/db/migration/V100_4__create_table_AppSettingTable.sql

28
src/main/java/a8k/db/AppSetting.java
View File

@ -1,6 +1,6 @@
package a8k.db; 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.AppOptionName;
import a8k.service.appsettings.base.AppSettingType; import a8k.service.appsettings.base.AppSettingType;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
@ -14,7 +14,7 @@ public class AppSetting extends UfActiveRecord {
@UfActiveRecordField @UfActiveRecordField
public String type; //支持类型范围 AppSettingType public String type; //支持类型范围 AppSettingType
@UfActiveRecordField @UfActiveRecordField
public String group; //返回名字为英文，前端需要根据英文名字进行翻译
public String tab; //返回名字为英文，前端需要根据英文名字进行翻译
@UfActiveRecordField @UfActiveRecordField
public String name; //返回名字为英文，前端需要根据英文名字进行翻译 public String name; //返回名字为英文，前端需要根据英文名字进行翻译
@UfActiveRecordField @UfActiveRecordField
@ -59,12 +59,12 @@ public class AppSetting extends UfActiveRecord {
// //
@JsonIgnore @JsonIgnore
static AppSettingGroup currentBuildGroup;
static AppSettingTab currentBuildGroup;
@JsonIgnore @JsonIgnore
static Integer buildPriority = 0; static Integer buildPriority = 0;
static Boolean buildHidden = false; static Boolean buildHidden = false;
static public void setBuildGroup(AppSettingGroup group) {
static public void setBuildGroup(AppSettingTab group) {
currentBuildGroup = group; currentBuildGroup = group;
buildPriority = 0; buildPriority = 0;
buildHidden = false; buildHidden = false;
@ -78,7 +78,7 @@ public class AppSetting extends UfActiveRecord {
public static void addIntegerOption(AppOptionName name, Boolean checkValRange, Double minVal, Double maxVal, Integer value) { public static void addIntegerOption(AppOptionName name, Boolean checkValRange, Double minVal, Double maxVal, Integer value) {
var option = new AppSetting(); var option = new AppSetting();
option.type = AppSettingType.INTEGER.name(); option.type = AppSettingType.INTEGER.name();
option.group = currentBuildGroup.name();
option.tab = currentBuildGroup.name();
option.name = name.name(); option.name = name.name();
option.checkValRange = checkValRange ? 1 : 0; option.checkValRange = checkValRange ? 1 : 0;
option.minVal = minVal; option.minVal = minVal;
@ -95,7 +95,7 @@ public class AppSetting extends UfActiveRecord {
public static void addDoubleOption(AppOptionName name, Boolean checkValRange, Double minVal, Double maxVal, Double value) { public static void addDoubleOption(AppOptionName name, Boolean checkValRange, Double minVal, Double maxVal, Double value) {
var option = new AppSetting(); var option = new AppSetting();
option.type = AppSettingType.DOUBLE.name(); option.type = AppSettingType.DOUBLE.name();
option.group = currentBuildGroup.name();
option.tab = currentBuildGroup.name();
option.name = name.name(); option.name = name.name();
option.checkValRange = checkValRange ? 1 : 0; option.checkValRange = checkValRange ? 1 : 0;
option.minVal = minVal; option.minVal = minVal;
@ -112,7 +112,7 @@ public class AppSetting extends UfActiveRecord {
public static void addStringOption(AppOptionName name, String value) { public static void addStringOption(AppOptionName name, String value) {
var option = new AppSetting(); var option = new AppSetting();
option.type = AppSettingType.STRING.name(); option.type = AppSettingType.STRING.name();
option.group = currentBuildGroup.name();
option.tab = currentBuildGroup.name();
option.name = name.name(); option.name = name.name();
option.value = value; option.value = value;
option.priority = buildPriority++; option.priority = buildPriority++;
@ -122,7 +122,7 @@ public class AppSetting extends UfActiveRecord {
public static void addBooleanOption(AppOptionName name, Boolean value) { public static void addBooleanOption(AppOptionName name, Boolean value) {
var option = new AppSetting(); var option = new AppSetting();
option.type = AppSettingType.BOOLEAN.name(); option.type = AppSettingType.BOOLEAN.name();
option.group = currentBuildGroup.name();
option.tab = currentBuildGroup.name();
option.name = name.name(); option.name = name.name();
option.value = value ? "1" : "0"; option.value = value ? "1" : "0";
option.priority = buildPriority++; option.priority = buildPriority++;
@ -132,7 +132,7 @@ public class AppSetting extends UfActiveRecord {
public static void addDateOption(AppOptionName name, String value) { public static void addDateOption(AppOptionName name, String value) {
var option = new AppSetting(); var option = new AppSetting();
option.type = AppSettingType.DATE.name(); option.type = AppSettingType.DATE.name();
option.group = currentBuildGroup.name();
option.tab = currentBuildGroup.name();
option.name = name.name(); option.name = name.name();
option.value = value; option.value = value;
option.priority = buildPriority++; option.priority = buildPriority++;
@ -142,7 +142,7 @@ public class AppSetting extends UfActiveRecord {
public static void addTimeOption(AppOptionName name, String value) { public static void addTimeOption(AppOptionName name, String value) {
var option = new AppSetting(); var option = new AppSetting();
option.type = AppSettingType.TIME.name(); option.type = AppSettingType.TIME.name();
option.group = currentBuildGroup.name();
option.tab = currentBuildGroup.name();
option.name = name.name(); option.name = name.name();
option.value = value; option.value = value;
option.priority = buildPriority++; option.priority = buildPriority++;
@ -152,7 +152,7 @@ public class AppSetting extends UfActiveRecord {
public static void addTimezoneOption(AppOptionName name, String value) { public static void addTimezoneOption(AppOptionName name, String value) {
var option = new AppSetting(); var option = new AppSetting();
option.type = AppSettingType.TIMEZONE.name(); option.type = AppSettingType.TIMEZONE.name();
option.group = currentBuildGroup.name();
option.tab = currentBuildGroup.name();
option.name = name.name(); option.name = name.name();
option.value = value; option.value = value;
option.priority = buildPriority++; option.priority = buildPriority++;
@ -162,7 +162,7 @@ public class AppSetting extends UfActiveRecord {
public static void addIpOption(AppOptionName name, String value) { public static void addIpOption(AppOptionName name, String value) {
var option = new AppSetting(); var option = new AppSetting();
option.type = AppSettingType.IP.name(); option.type = AppSettingType.IP.name();
option.group = currentBuildGroup.name();
option.tab = currentBuildGroup.name();
option.name = name.name(); option.name = name.name();
option.value = value; option.value = value;
option.priority = buildPriority++; option.priority = buildPriority++;
@ -172,7 +172,7 @@ public class AppSetting extends UfActiveRecord {
public static void addEnumOption(AppOptionName name, String[] valueEnumRange, String value) { public static void addEnumOption(AppOptionName name, String[] valueEnumRange, String value) {
var option = new AppSetting(); var option = new AppSetting();
option.type = AppSettingType.ENUM.name(); option.type = AppSettingType.ENUM.name();
option.group = currentBuildGroup.name();
option.tab = currentBuildGroup.name();
option.name = name.name(); option.name = name.name();
option.valueEnumRange = Arrays.toString(valueEnumRange); option.valueEnumRange = Arrays.toString(valueEnumRange);
option.value = value; option.value = value;
@ -183,7 +183,7 @@ public class AppSetting extends UfActiveRecord {
public static void addFixStringOption(AppOptionName name, String value) { public static void addFixStringOption(AppOptionName name, String value) {
var option = new AppSetting(); var option = new AppSetting();
option.type = AppSettingType.FIX_STRING.name(); option.type = AppSettingType.FIX_STRING.name();
option.group = currentBuildGroup.name();
option.tab = currentBuildGroup.name();
option.name = name.name(); option.name = name.name();
option.value = value; option.value = value;
option.priority = buildPriority++; option.priority = buildPriority++;

10
src/main/java/a8k/service/appsettings/AppSettingsMgr.java
View File

@ -4,7 +4,7 @@ import a8k.appbase.appret.AppRet;
import a8k.controler.engineer.utils.EngineerPageTab; import a8k.controler.engineer.utils.EngineerPageTab;
import a8k.controler.engineer.utils.EnginnerPageAction; import a8k.controler.engineer.utils.EnginnerPageAction;
import a8k.db.AppSetting; 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.base.AppOptionName;
import a8k.service.appsettings.settingenum.AutoLogoutTime; import a8k.service.appsettings.settingenum.AutoLogoutTime;
import a8k.service.appsettings.settingenum.LISProtocol; import a8k.service.appsettings.settingenum.LISProtocol;
@ -52,7 +52,7 @@ public class AppSettingsMgr {
} }
public void initsettingdb() { public void initsettingdb() {
AppSetting.setBuildGroup(AppSettingGroup.DEVICE);
AppSetting.setBuildGroup(AppSettingTab.DEVICE);
AppSetting.addIntegerOption(AppOptionName.SETTING_PAGE_VERSION, settingPageVersion); AppSetting.addIntegerOption(AppOptionName.SETTING_PAGE_VERSION, settingPageVersion);
AppSetting.addDateOption(AppOptionName.DATE, ""); AppSetting.addDateOption(AppOptionName.DATE, "");
AppSetting.addTimeOption(AppOptionName.TIME, ""); AppSetting.addTimeOption(AppOptionName.TIME, "");
@ -61,11 +61,11 @@ public class AppSettingsMgr {
AppSetting.addBooleanOption(AppOptionName.AUTO_PRINT, false); AppSetting.addBooleanOption(AppOptionName.AUTO_PRINT, false);
AppSetting.addEnumOption(AppOptionName.AUTO_LOGOUT, AutoLogoutTime.cgetValues(), AutoLogoutTime.T03_00.name()); 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_TYPE, LISType.getValues(), LISType.SINGLE_TRACK.name());
AppSetting.addEnumOption(AppOptionName.LIS_PROTOCOL, LISProtocol.getValues(), LISProtocol.Boditech.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.DEVICE_SERIAL, "TEST-001");
AppSetting.addFixStringOption(AppOptionName.OS_VERSION, "v1.0.0"); AppSetting.addFixStringOption(AppOptionName.OS_VERSION, "v1.0.0");
AppSetting.addFixStringOption(AppOptionName.APP_VERSION, "v1.0.0"); AppSetting.addFixStringOption(AppOptionName.APP_VERSION, "v1.0.0");
@ -81,7 +81,7 @@ public class AppSettingsMgr {
@EnginnerPageAction(name = "getAppSetting") @EnginnerPageAction(name = "getAppSetting")
public AppRet<List<String>> getGroups() { public AppRet<List<String>> getGroups() {
List<String> groups = new ArrayList<>(); List<String> groups = new ArrayList<>();
for (AppSettingGroup group : AppSettingGroup.values()) {
for (AppSettingTab group : AppSettingTab.values()) {
groups.add(group.name()); groups.add(group.name());
} }
return AppRet.success(groups); return AppRet.success(groups);

2
src/main/java/a8k/service/appsettings/base/AppSettingGroup.java → src/main/java/a8k/service/appsettings/base/AppSettingTab.java
View File

@ -1,6 +1,6 @@
package a8k.service.appsettings.base; package a8k.service.appsettings.base;
public enum AppSettingGroup {
public enum AppSettingTab {
DEVICE, DEVICE,
USRMGR, USRMGR,
LIS, LIS,

2
src/main/resources/db/migration/V100_4__create_table_AppSettingTable.sql
View File

@ -2,7 +2,7 @@ CREATE TABLE "AppSettingTable"
( (
"id" text NOT NULL, "id" text NOT NULL,
"type" text, "type" text,
"group" text,
"tab" text,
"name" text, "name" text,
"display" integer, "display" integer,
"priority" integer, "priority" integer,

Write Preview
Loading…
Cancel
Save