From d0455caac41732bc3256d4dbaad24bfc6421d79f Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 30 Jul 2024 16:10:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B3=BB=E7=BB=9F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/a8k/db/AppSetting.java | 26 +++++----- .../a8k/service/appsettings/AppSettingsMgr.java | 59 ++++++++++++++++------ .../service/appsettings/base/AppOptionName.java | 35 +++++++++++++ .../service/appsettings/base/AppSettingName.java | 35 ------------- .../a8k/service/usermgr/AppUserMgrService.java | 1 + 5 files changed, 92 insertions(+), 64 deletions(-) create mode 100644 src/main/java/a8k/service/appsettings/base/AppOptionName.java delete mode 100644 src/main/java/a8k/service/appsettings/base/AppSettingName.java diff --git a/src/main/java/a8k/db/AppSetting.java b/src/main/java/a8k/db/AppSetting.java index 4610348..3bea319 100644 --- a/src/main/java/a8k/db/AppSetting.java +++ b/src/main/java/a8k/db/AppSetting.java @@ -1,7 +1,7 @@ package a8k.db; 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 com.fasterxml.jackson.annotation.JsonIgnore; 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(); option.type = AppSettingType.INTEGER.name(); option.group = currentBuildGroup.name(); @@ -88,11 +88,11 @@ public class AppSetting extends UfActiveRecord { 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); } - 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(); option.type = AppSettingType.DOUBLE.name(); option.group = currentBuildGroup.name(); @@ -105,11 +105,11 @@ public class AppSetting extends UfActiveRecord { 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); } - public static void addStringOption(AppSettingName name, String value) { + public static void addStringOption(AppOptionName name, String value) { var option = new AppSetting(); option.type = AppSettingType.STRING.name(); option.group = currentBuildGroup.name(); @@ -119,7 +119,7 @@ public class AppSetting extends UfActiveRecord { option.save(); } - public static void addBooleanOption(AppSettingName name, Boolean value) { + public static void addBooleanOption(AppOptionName name, Boolean value) { var option = new AppSetting(); option.type = AppSettingType.BOOLEAN.name(); option.group = currentBuildGroup.name(); @@ -129,7 +129,7 @@ public class AppSetting extends UfActiveRecord { option.save(); } - public static void addDateOption(AppSettingName name, String value) { + public static void addDateOption(AppOptionName name, String value) { var option = new AppSetting(); option.type = AppSettingType.DATE.name(); option.group = currentBuildGroup.name(); @@ -139,7 +139,7 @@ public class AppSetting extends UfActiveRecord { option.save(); } - public static void addTimeOption(AppSettingName name, String value) { + public static void addTimeOption(AppOptionName name, String value) { var option = new AppSetting(); option.type = AppSettingType.TIME.name(); option.group = currentBuildGroup.name(); @@ -149,7 +149,7 @@ public class AppSetting extends UfActiveRecord { option.save(); } - public static void addTimezoneOption(AppSettingName name, String value) { + public static void addTimezoneOption(AppOptionName name, String value) { var option = new AppSetting(); option.type = AppSettingType.TIMEZONE.name(); option.group = currentBuildGroup.name(); @@ -159,7 +159,7 @@ public class AppSetting extends UfActiveRecord { option.save(); } - public static void addIpOption(AppSettingName name, String value) { + public static void addIpOption(AppOptionName name, String value) { var option = new AppSetting(); option.type = AppSettingType.IP.name(); option.group = currentBuildGroup.name(); @@ -169,7 +169,7 @@ public class AppSetting extends UfActiveRecord { 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(); option.type = AppSettingType.ENUM.name(); option.group = currentBuildGroup.name(); @@ -180,7 +180,7 @@ public class AppSetting extends UfActiveRecord { option.save(); } - public static void addFixStringOption(AppSettingName name, String value) { + public static void addFixStringOption(AppOptionName name, String value) { var option = new AppSetting(); option.type = AppSettingType.FIX_STRING.name(); option.group = currentBuildGroup.name(); diff --git a/src/main/java/a8k/service/appsettings/AppSettingsMgr.java b/src/main/java/a8k/service/appsettings/AppSettingsMgr.java index 96aa9c3..02bdb31 100644 --- a/src/main/java/a8k/service/appsettings/AppSettingsMgr.java +++ b/src/main/java/a8k/service/appsettings/AppSettingsMgr.java @@ -5,7 +5,7 @@ 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.AppSettingName; +import a8k.service.appsettings.base.AppOptionName; import a8k.service.appsettings.settingenum.AutoLogoutTime; import a8k.service.appsettings.settingenum.LISProtocol; import a8k.service.appsettings.settingenum.LISType; @@ -29,7 +29,7 @@ public class AppSettingsMgr { return UfActiveRecord.find(AppSetting.class); } - AppSetting dbGetAppSetting(AppSettingName name) { + AppSetting dbGetAppSetting(AppOptionName name) { return UfActiveRecord.findOne(AppSetting.class, Map.of("name", name.name())); } @@ -44,7 +44,7 @@ public class AppSettingsMgr { public void 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)) { dbClearAppSettings(); initsettingdb(); @@ -53,23 +53,23 @@ public class AppSettingsMgr { public void initsettingdb() { 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.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.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); } + + @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(); + } + } + + } diff --git a/src/main/java/a8k/service/appsettings/base/AppOptionName.java b/src/main/java/a8k/service/appsettings/base/AppOptionName.java new file mode 100644 index 0000000..b28978f --- /dev/null +++ b/src/main/java/a8k/service/appsettings/base/AppOptionName.java @@ -0,0 +1,35 @@ +package a8k.service.appsettings.base; + +public enum AppOptionName { + //DEVICE + SETTING_PAGE_VERSION, + DATE, + TIME, + TIMEZONE, + LANGUAGE, + AUTO_PRINT, + AUTO_LOGOUT, + + //USR_MGR + + //RELEASE + DEVICE_SERIAL, + OS_VERSION, + APP_VERSION, + MCU_VERSION, + + //LIS + LIS_TYPE, + LIS_PROTOCOL, + LIS_IF, + LIS_AUTO_EXPORT, + LIS_SERIAL_BAUDRATE, + LIS_NET_IP, + LIS_NET_PORT, + + //NET + NET_IP, + NET_PORT, + +} + diff --git a/src/main/java/a8k/service/appsettings/base/AppSettingName.java b/src/main/java/a8k/service/appsettings/base/AppSettingName.java deleted file mode 100644 index f14f526..0000000 --- a/src/main/java/a8k/service/appsettings/base/AppSettingName.java +++ /dev/null @@ -1,35 +0,0 @@ -package a8k.service.appsettings.base; - -public enum AppSettingName { - //DEVICE - SETTING_PAGE_VERSION, - DATE, - TIME, - TIMEZONE, - LANGUAGE, - AUTO_PRINT, - AUTO_LOGOUT, - - //USR_MGR - - //RELEASE - DEVICE_SERIAL, - OS_VERSION, - APP_VERSION, - MCU_VERSION, - - //LIS - LIS_TYPE, - LIS_PROTOCOL, - LIS_IF, - LIS_AUTO_EXPORT, - LIS_SERIAL_BAUDRATE, - LIS_NET_IP, - LIS_NET_PORT, - - //NET - NET_IP, - NET_PORT, - -} - diff --git a/src/main/java/a8k/service/usermgr/AppUserMgrService.java b/src/main/java/a8k/service/usermgr/AppUserMgrService.java index b77fb31..06d9a1a 100644 --- a/src/main/java/a8k/service/usermgr/AppUserMgrService.java +++ b/src/main/java/a8k/service/usermgr/AppUserMgrService.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; + @Component public class AppUserMgrService { static Logger logger = org.slf4j.LoggerFactory.getLogger(AppUserMgrService.class);