diff --git a/app.db b/app.db index 1dcd768..e238d82 100644 Binary files a/app.db and b/app.db differ diff --git a/src/main/java/a8k/controler/extapi/pagecontrol/ExtApiTabConfig.java b/src/main/java/a8k/controler/extapi/pagecontrol/ExtApiTabConfig.java index 0998b2a..5132aba 100644 --- a/src/main/java/a8k/controler/extapi/pagecontrol/ExtApiTabConfig.java +++ b/src/main/java/a8k/controler/extapi/pagecontrol/ExtApiTabConfig.java @@ -3,13 +3,13 @@ package a8k.controler.extapi.pagecontrol; public enum ExtApiTabConfig { AppFrontEndEventRouter("基础组件.前端事件路由", true), - AppUserMgrService("应用.用户管理", true), //ok - AppSettingsMgr("应用.设备配置管理", true), - AppCtrlService("应用.设备控制", true), + AppUserMgrService("应用.用户管理", true), //Ok + AppSettingsMgr("应用.设备配置管理", true), //OK AppConsumablesMgrService("应用.耗材", true), AppProjectItemMgrService("应用.ID卡管理", true), AppStateMgrService("应用.设备状态管理", true), SampleFormulaMgrService("应用.配方管理", true), + AppCtrlService("应用.设备控制", true), //底层硬件 A8kPipetteCtrlModule("A8kPipetteCtrlModule", true), diff --git a/src/main/java/a8k/dbservice/AppSettingDBService.java b/src/main/java/a8k/dbservice/AppSettingDBService.java index ed12571..521ae5e 100644 --- a/src/main/java/a8k/dbservice/AppSettingDBService.java +++ b/src/main/java/a8k/dbservice/AppSettingDBService.java @@ -36,9 +36,9 @@ public class AppSettingDBService { private AppSetting rowMapper(ResultSet rs, int rowNum) throws SQLException { AppSetting obj = new AppSetting(); obj.id = rs.getInt("id"); - obj.type = AppSettingType.valueOf(rs.getString("type")); - obj.tab = AppSettingTab.valueOf(rs.getString("tab")); - obj.name = AppSettingName.valueOf(rs.getString("name")); + obj.type = rs.getString("type") != null ? AppSettingType.valueOf(rs.getString("type")) : null; + obj.tab = rs.getString("tab") != null ? AppSettingTab.valueOf(rs.getString("tab")) : null; + obj.name = rs.getString("name") != null ? AppSettingName.valueOf(rs.getString("name")) : null; obj.display = rs.getBoolean("display"); obj.minVal = rs.getDouble("minVal"); @@ -208,9 +208,9 @@ public class AppSettingDBService { public void addSettingVersion(Integer version) { AppSetting setting = new AppSetting(); - setting.type = AppSettingType.INTEGER; - setting.name = AppSettingName.SETTING_PAGE_VERSION; - setting.value = version.toString(); + setting.type = AppSettingType.INTEGER; + setting.name = AppSettingName.SETTING_PAGE_VERSION; + setting.value = version.toString(); setting.display = false; addSetting(setting); } diff --git a/src/main/java/a8k/dbservice/type/appsetting/AppSettingName.java b/src/main/java/a8k/dbservice/type/appsetting/AppSettingName.java index 42d0e88..c927438 100644 --- a/src/main/java/a8k/dbservice/type/appsetting/AppSettingName.java +++ b/src/main/java/a8k/dbservice/type/appsetting/AppSettingName.java @@ -3,21 +3,12 @@ package a8k.dbservice.type.appsetting; public enum AppSettingName { SETTING_PAGE_VERSION,// 用来更新配置项目 //DEVICE - DATE,//日期 - TIME,//时间 - TIMEZONE,//时区 LANGUAGE,//语言 AUTO_PRINT,//是否自动打印 AUTO_LOGOUT,//自动登出 //USR_MGR - //RELEASE - DEVICE_SERIAL, - OS_VERSION, - APP_VERSION, - MCU_VERSION, - //LIS LIS_TYPE, LIS_PROTOCOL, @@ -27,9 +18,5 @@ public enum AppSettingName { LIS_NET_IP, LIS_NET_PORT, - //NET - NET_IP, - NET_PORT, - } diff --git a/src/main/java/a8k/dbservice/type/appsetting/AppSettingTab.java b/src/main/java/a8k/dbservice/type/appsetting/AppSettingTab.java index b9309bf..20cc065 100644 --- a/src/main/java/a8k/dbservice/type/appsetting/AppSettingTab.java +++ b/src/main/java/a8k/dbservice/type/appsetting/AppSettingTab.java @@ -5,8 +5,5 @@ package a8k.dbservice.type.appsetting; */ public enum AppSettingTab { DEVICE, //设备配置页面 - USRMGR, //用户管理页面 LIS, //LIS配置页面 - NETWORK,//网络管理页面 - RELEASE,//版本信息页面 } diff --git a/src/main/java/a8k/service/app/AppSettingsMgr.java b/src/main/java/a8k/service/app/AppSettingsMgr.java index 0d23e7a..99aa0dd 100644 --- a/src/main/java/a8k/service/app/AppSettingsMgr.java +++ b/src/main/java/a8k/service/app/AppSettingsMgr.java @@ -26,16 +26,15 @@ public class AppSettingsMgr { static class ORDER { static final int getAppSettings = 1; - static final int getAppSetting = 2; + static final int getAppSettingByName = 2; + static final int getAppSettingByTab = 2; static final int getTabs = 3; static final int getAppSettingTypesRange = 4; static final int getAppSettingNamesRange = 5; static final int setOptionVal = 6; - static final int setSysDate = 7; - static final int setSysTime = 8; } - static Integer settingPageVersion = 4;// 如果配置项发生改变，修改这个数字，可以重置数据库 + static Integer settingPageVersion = 1;// 如果配置项发生改变，修改这个数字，可以重置数据库 @Resource AppSettingDBService appSettingDBService; @@ -52,15 +51,11 @@ public class AppSettingsMgr { public void initsettingdb() { appSettingDBService.addSettingVersion(settingPageVersion); - //AppSettingTab.DEVICE - appSettingDBService.addStringSetting(AppSettingTab.DEVICE, AppSettingName.DATE, ""); - appSettingDBService.addStringSetting(AppSettingTab.DEVICE, AppSettingName.TIME, ""); appSettingDBService.addEnumSetting(AppSettingTab.DEVICE, AppSettingName.LANGUAGE, LanguageType.class, LanguageType.zh_CN); appSettingDBService.addBooleanSetting(AppSettingTab.DEVICE, AppSettingName.AUTO_PRINT, false); appSettingDBService.addEnumSetting(AppSettingTab.DEVICE, AppSettingName.AUTO_LOGOUT, AutoLogoutOption.class, AutoLogoutOption.T00_10); - // AppSettingTab.LIS appSettingDBService.addEnumSetting(AppSettingTab.LIS, AppSettingName.LIS_TYPE, LISTypeEnum.class, LISTypeEnum.SINGLE_TRACK); appSettingDBService.addEnumSetting(AppSettingTab.LIS, AppSettingName.LIS_PROTOCOL, LISProtocolEnum.class, LISProtocolEnum.Boditech); @@ -68,12 +63,6 @@ public class AppSettingsMgr { appSettingDBService.addEnumSetting(AppSettingTab.LIS, AppSettingName.LIS_SERIAL_BAUDRATE, LISSerialBaudrate.class, LISSerialBaudrate.B9600); appSettingDBService.addIpSetting(AppSettingTab.LIS, AppSettingName.LIS_NET_IP, "127.0.0.1"); appSettingDBService.addPortSetting(AppSettingTab.LIS, AppSettingName.LIS_NET_PORT, 8080); - - //RELEASE - appSettingDBService.addFixStringSetting(AppSettingTab.RELEASE, AppSettingName.DEVICE_SERIAL, "TEST-001"); - appSettingDBService.addFixStringSetting(AppSettingTab.RELEASE, AppSettingName.OS_VERSION, "v1.0.0"); - appSettingDBService.addFixStringSetting(AppSettingTab.RELEASE, AppSettingName.APP_VERSION, "v1.0.0"); - appSettingDBService.addFixStringSetting(AppSettingTab.RELEASE, AppSettingName.MCU_VERSION, "v1.0.0"); } Boolean isOptionLegal(AppSettingName name, String val) { @@ -90,11 +79,17 @@ public class AppSettingsMgr { return AppRet.success(appSettingDBService.getAllSettings()); } - @ExtApiFn(name = "getAppSetting", order = ORDER.getAppSetting) - public AppRet getAppSetting(AppSettingName name) { + @ExtApiFn(name = "getAppSettingByName", order = ORDER.getAppSettingByName) + public AppRet getAppSettingByName(AppSettingName name) { return AppRet.success(appSettingDBService.getSettingByName(name)); } + @ExtApiFn(name = "getAppSettingByTab", order = ORDER.getAppSettingByTab) + public AppRet> getAppSettingByTab(AppSettingTab tab) { + return AppRet.success(appSettingDBService.getSettingsByTab(tab)); + } + + @ExtApiFn(name = "getTabs", order = ORDER.getTabs) public AppRet getTabs() { return AppRet.success(AppSettingTab.values()); @@ -117,22 +112,12 @@ public class AppSettingsMgr { return AppRet.fail(A8kEcode.AppOptionIsInvalid); } appSettingDBService.updateSetting(optionName, val); - return getAppSetting(optionName); - } - - // - // DATA API - // - - @ExtApiFn(name = "setSysDate", order = ORDER.setSysDate) - public void setSysDate(Integer Year, Integer Month, Integer Day) { - // TODO 完成它 - logger.info("setSysDate {}-{}-{}", Year, Month, Day); + return getAppSettingByName(optionName); } - @ExtApiFn(name = "setSysTime", order = ORDER.setSysTime) - public void setSysTime(Integer Hour, Integer Minute, Integer Second) { - // TODO 完成它 - logger.info("setSysTime {}:{}:{}", Hour, Minute, Second); + @ExtApiFn(name = "factoryReset") + public void factoryReset() { + appSettingDBService.clearAllSettings(); + initsettingdb(); } }