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

添加系统配置

tags/v0
zhaohe 1 year ago
parent
7a45ee76c0
commit
d0455caac4
5 changed files with 92 additions and 64 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. 26
      src/main/java/a8k/db/AppSetting.java
  2. 59
      src/main/java/a8k/service/appsettings/AppSettingsMgr.java
  3. 2
      src/main/java/a8k/service/appsettings/base/AppOptionName.java
  4. 1
      src/main/java/a8k/service/usermgr/AppUserMgrService.java

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

@ -1,7 +1,7 @@
package a8k.db; package a8k.db;
import a8k.service.appsettings.base.AppSettingGroup; import a8k.service.appsettings.base.AppSettingGroup;
import a8k.service.appsettings.base.AppSettingName;
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;
import com.iflytop.uf.UfActiveRecord; import com.iflytop.uf.UfActiveRecord;
@ -75,7 +75,7 @@ public class AppSetting extends UfActiveRecord {
} }
public static void addIntegerOption(AppSettingName 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.group = currentBuildGroup.name();
@ -88,11 +88,11 @@ public class AppSetting extends UfActiveRecord {
option.save(); option.save();
} }
public static void addIntegerOption(AppSettingName name, Integer value) {
public static void addIntegerOption(AppOptionName name, Integer value) {
addIntegerOption(name, false, 0.0, 0.0, value); addIntegerOption(name, false, 0.0, 0.0, value);
} }
public static void addDoubleOption(AppSettingName 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.group = currentBuildGroup.name();
@ -105,11 +105,11 @@ public class AppSetting extends UfActiveRecord {
option.save(); option.save();
} }
public static void addDoubleOption(AppSettingName name, Double value) {
public static void addDoubleOption(AppOptionName name, Double value) {
addDoubleOption(name, false, 0.0, 0.0, value); addDoubleOption(name, false, 0.0, 0.0, value);
} }
public static void addStringOption(AppSettingName 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.group = currentBuildGroup.name();
@ -119,7 +119,7 @@ public class AppSetting extends UfActiveRecord {
option.save(); option.save();
} }
public static void addBooleanOption(AppSettingName 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.group = currentBuildGroup.name();
@ -129,7 +129,7 @@ public class AppSetting extends UfActiveRecord {
option.save(); option.save();
} }
public static void addDateOption(AppSettingName 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.group = currentBuildGroup.name();
@ -139,7 +139,7 @@ public class AppSetting extends UfActiveRecord {
option.save(); option.save();
} }
public static void addTimeOption(AppSettingName 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.group = currentBuildGroup.name();
@ -149,7 +149,7 @@ public class AppSetting extends UfActiveRecord {
option.save(); option.save();
} }
public static void addTimezoneOption(AppSettingName 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.group = currentBuildGroup.name();
@ -159,7 +159,7 @@ public class AppSetting extends UfActiveRecord {
option.save(); option.save();
} }
public static void addIpOption(AppSettingName 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.group = currentBuildGroup.name();
@ -169,7 +169,7 @@ public class AppSetting extends UfActiveRecord {
option.save(); option.save();
} }
public static void addEnumOption(AppSettingName 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.group = currentBuildGroup.name();
@ -180,7 +180,7 @@ public class AppSetting extends UfActiveRecord {
option.save(); option.save();
} }
public static void addFixStringOption(AppSettingName 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.group = currentBuildGroup.name();

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

@ -5,7 +5,7 @@ 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.AppSettingGroup;
import a8k.service.appsettings.base.AppSettingName;
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;
import a8k.service.appsettings.settingenum.LISType; import a8k.service.appsettings.settingenum.LISType;
@ -29,7 +29,7 @@ public class AppSettingsMgr {
return UfActiveRecord.find(AppSetting.class); return UfActiveRecord.find(AppSetting.class);
} }
AppSetting dbGetAppSetting(AppSettingName name) {
AppSetting dbGetAppSetting(AppOptionName name) {
return UfActiveRecord.findOne(AppSetting.class, Map.of("name", name.name())); return UfActiveRecord.findOne(AppSetting.class, Map.of("name", name.name()));
} }
@ -44,7 +44,7 @@ public class AppSettingsMgr {
public void init() { public void init() {
logger.info("AppSettingsMgr init"); logger.info("AppSettingsMgr init");
AppSetting spversion = dbGetAppSetting(AppSettingName.SETTING_PAGE_VERSION);
AppSetting spversion = dbGetAppSetting(AppOptionName.SETTING_PAGE_VERSION);
if (spversion == null || !Objects.equals(spversion.getIntegerValue(), settingPageVersion)) { if (spversion == null || !Objects.equals(spversion.getIntegerValue(), settingPageVersion)) {
dbClearAppSettings(); dbClearAppSettings();
initsettingdb(); initsettingdb();
@ -53,23 +53,23 @@ public class AppSettingsMgr {
public void initsettingdb() { public void initsettingdb() {
AppSetting.setBuildGroup(AppSettingGroup.DEVICE); AppSetting.setBuildGroup(AppSettingGroup.DEVICE);
AppSetting.addIntegerOption(AppSettingName.SETTING_PAGE_VERSION, settingPageVersion);
AppSetting.addDateOption(AppSettingName.DATE, "");
AppSetting.addTimeOption(AppSettingName.TIME, "");
AppSetting.addTimezoneOption(AppSettingName.TIMEZONE, "");
AppSetting.addEnumOption(AppSettingName.LANGUAGE, new String[]{"zh_CN", "en_US"}, "zh_CN");
AppSetting.addBooleanOption(AppSettingName.AUTO_PRINT, false);
AppSetting.addEnumOption(AppSettingName.AUTO_LOGOUT, AutoLogoutTime.cgetValues(), AutoLogoutTime.T03_00.name());
AppSetting.addIntegerOption(AppOptionName.SETTING_PAGE_VERSION, settingPageVersion);
AppSetting.addDateOption(AppOptionName.DATE, "");
AppSetting.addTimeOption(AppOptionName.TIME, "");
AppSetting.addTimezoneOption(AppOptionName.TIMEZONE, "");
AppSetting.addEnumOption(AppOptionName.LANGUAGE, new String[]{"zh_CN", "en_US"}, "zh_CN");
AppSetting.addBooleanOption(AppOptionName.AUTO_PRINT, false);
AppSetting.addEnumOption(AppOptionName.AUTO_LOGOUT, AutoLogoutTime.cgetValues(), AutoLogoutTime.T03_00.name());
AppSetting.setBuildGroup(AppSettingGroup.LIS); AppSetting.setBuildGroup(AppSettingGroup.LIS);
AppSetting.addEnumOption(AppSettingName.LIS_TYPE, LISType.getValues(), LISType.SINGLE_TRACK.name());
AppSetting.addEnumOption(AppSettingName.LIS_PROTOCOL, LISProtocol.getValues(), LISProtocol.Boditech.name());
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(AppSettingGroup.RELEASE);
AppSetting.addFixStringOption(AppSettingName.DEVICE_SERIAL, "TEST-001");
AppSetting.addFixStringOption(AppSettingName.OS_VERSION, "v1.0.0");
AppSetting.addFixStringOption(AppSettingName.APP_VERSION, "v1.0.0");
AppSetting.addFixStringOption(AppSettingName.MCU_VERSION, "v1.0.0");
AppSetting.addFixStringOption(AppOptionName.DEVICE_SERIAL, "TEST-001");
AppSetting.addFixStringOption(AppOptionName.OS_VERSION, "v1.0.0");
AppSetting.addFixStringOption(AppOptionName.APP_VERSION, "v1.0.0");
AppSetting.addFixStringOption(AppOptionName.MCU_VERSION, "v1.0.0");
} }
@ -86,4 +86,31 @@ public class AppSettingsMgr {
} }
return AppRet.success(groups); return AppRet.success(groups);
} }
@EnginnerPageAction(name = "setSysDate")
public void setSysDate(Integer Year, Integer Month, Integer Day) {
logger.info("setSysDate {}-{}-{}", Year, Month, Day);
}
@EnginnerPageAction(name = "setSysTime")
public void setSysTime(Integer Hour, Integer Minute, Integer Second) {
logger.info("setSysTime {}:{}:{}", Hour, Minute, Second);
}
@EnginnerPageAction(name = "setSysTimezone")
public void setSysTimezone(String timezone) {
logger.info("setSysTimezone {}", timezone);
}
@EnginnerPageAction(name = "setOptionVal")
public void setOptionVal(AppOptionName optionName,String val){
logger.info("setOptionVal {}={}", optionName, val);
AppSetting appSetting = dbGetAppSetting(optionName);
if(appSetting != null){
appSetting.value = val;
appSetting.save();
}
}
} }

2
src/main/java/a8k/service/appsettings/base/AppSettingName.java → src/main/java/a8k/service/appsettings/base/AppOptionName.java
View File

@ -1,6 +1,6 @@
package a8k.service.appsettings.base; package a8k.service.appsettings.base;
public enum AppSettingName {
public enum AppOptionName {
//DEVICE //DEVICE
SETTING_PAGE_VERSION, SETTING_PAGE_VERSION,
DATE, DATE,

1
src/main/java/a8k/service/usermgr/AppUserMgrService.java
View File

@ -11,6 +11,7 @@ import org.springframework.stereotype.Component;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@Component @Component
public class AppUserMgrService { public class AppUserMgrService {
static Logger logger = org.slf4j.LoggerFactory.getLogger(AppUserMgrService.class); static Logger logger = org.slf4j.LoggerFactory.getLogger(AppUserMgrService.class);

Write Preview
Loading…
Cancel
Save