diff --git a/src/main/java/a8k/app/controler/api/v1/app/data/ReactionResultControler.java b/src/main/java/a8k/app/controler/api/v1/app/data/ReactionResultControler.java index 341001d..3c61011 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/data/ReactionResultControler.java +++ b/src/main/java/a8k/app/controler/api/v1/app/data/ReactionResultControler.java @@ -46,6 +46,28 @@ public class ReactionResultControler { return ApiRet.success(); } + @PostMapping("/printfRecords") + public ApiRet printfRecord(List id) { + for (Integer i : id) { + reactionRecordMgrService.printfRecord(i); + } + return ApiRet.success(); + } + + @PostMapping("/exportRecordByLIS") + public ApiRet exportRecordByLIS(Integer id) { + reactionRecordMgrService.exportRecordByLIS(id); + return ApiRet.success(); + } + + @PostMapping("/exportRecordsByLIS") + public ApiRet exportRecordByLIS(List id) { + for (Integer i : id) { + reactionRecordMgrService.exportRecordByLIS(i); + } + return ApiRet.success(); + } + @PostMapping("/deleteRecord") public ApiRet deleteRecord(Integer id) { reactionRecordMgrService.deleteRecord(id); diff --git a/src/main/java/a8k/app/controler/api/v1/app/setting/AppSettingControler.java b/src/main/java/a8k/app/controler/api/v1/app/setting/AppSettingControler.java index e2ce4ec..c68bd0b 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/setting/AppSettingControler.java +++ b/src/main/java/a8k/app/controler/api/v1/app/setting/AppSettingControler.java @@ -4,6 +4,7 @@ import a8k.app.service.setting.AppSettingsMgrService; import a8k.app.dao.db.type.AppSetting; import a8k.app.dao.db.type.appsetting.settingenum.*; import a8k.app.a8ktype.ui.ApiRet; +import a8k.app.service.statemgr.GStateMgrService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; @@ -23,6 +24,9 @@ public class AppSettingControler { @Resource AppSettingsMgrService appSettingsMgrService; + @Resource + GStateMgrService gstate; + // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ // EXT FUNC // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -129,4 +133,36 @@ public class AppSettingControler { return ApiRet.success(); } + + @Operation(summary = "设置DHCP") + @PostMapping("/setDHCCP") + public ApiRet setDHCP(Boolean val) { + appSettingsMgrService.setDHCP(val); + return ApiRet.success(); + } + + @Operation(summary = "设置本地IP") + @PostMapping("/setLocalIp") + public ApiRet setLocalIp(String val) { + appSettingsMgrService.setLocalIp(val); + return ApiRet.success(); + } + + + public static class DeviceInfo { + public String appVersion; + public String mcuVersion; + public String sn; + } + + @Operation(summary = "获取设备信息") + @PostMapping("/getDeviceInfo") + public ApiRet getDeviceInfo() { + DeviceInfo info = new DeviceInfo(); + info.appVersion = gstate.getAppVersion(); + info.mcuVersion = gstate.getMcuVersion(); + info.sn = gstate.getSn(); + return ApiRet.success(info); + } + } diff --git a/src/main/java/a8k/app/dao/db/type/AppSetting.java b/src/main/java/a8k/app/dao/db/type/AppSetting.java index 6af712a..b22a44d 100644 --- a/src/main/java/a8k/app/dao/db/type/AppSetting.java +++ b/src/main/java/a8k/app/dao/db/type/AppSetting.java @@ -57,4 +57,8 @@ public class AppSetting { @Max(35) public Integer temperature = 25; + public Boolean DHCP = true; + + public String localIp = ""; + } diff --git a/src/main/java/a8k/app/service/data/ReactionRecordMgrService.java b/src/main/java/a8k/app/service/data/ReactionRecordMgrService.java index 329d958..2737082 100644 --- a/src/main/java/a8k/app/service/data/ReactionRecordMgrService.java +++ b/src/main/java/a8k/app/service/data/ReactionRecordMgrService.java @@ -88,7 +88,6 @@ public class ReactionRecordMgrService { } - public void deleteAll() { List records = reactionReportDao.getAll(); for (ReactionReport record : records) { @@ -101,6 +100,11 @@ public class ReactionRecordMgrService { logger.info("printfRecord: {}", ZJsonHelper.objToPrettyJson(record)); } + public void exportRecordByLIS(Integer id) { + ReactionReport record = reactionReportDao.findById(id); + logger.info("exportRecord: {}", ZJsonHelper.objToPrettyJson(record)); + } + public void deleteRecord(Integer id) { reactionReportDao.delete(id); } diff --git a/src/main/java/a8k/app/service/setting/AppSettingsMgrService.java b/src/main/java/a8k/app/service/setting/AppSettingsMgrService.java index 2f5c4f5..91d7546 100644 --- a/src/main/java/a8k/app/service/setting/AppSettingsMgrService.java +++ b/src/main/java/a8k/app/service/setting/AppSettingsMgrService.java @@ -112,4 +112,16 @@ public class AppSettingsMgrService { appSettingDao.update(setting); } + public void setDHCP(Boolean val) { + AppSetting setting = appSettingDao.get(); + setting.setDHCP(val); + appSettingDao.update(setting); + } + + public void setLocalIp(String val) { + AppSetting setting = appSettingDao.get(); + setting.setLocalIp(val); + appSettingDao.update(setting); + } + } diff --git a/src/main/java/a8k/extui/page/debug/P20AppSettingDebugPage.java b/src/main/java/a8k/extui/page/debug/P20AppSettingDebugPage.java index 6788238..c9efa6b 100644 --- a/src/main/java/a8k/extui/page/debug/P20AppSettingDebugPage.java +++ b/src/main/java/a8k/extui/page/debug/P20AppSettingDebugPage.java @@ -66,6 +66,14 @@ public class P20AppSettingDebugPage { appSettingsMgrService.setTemperature(val); } + public void setDHCP(Boolean val) { + appSettingsMgrService.setDHCP(val); + } + + public void setLocalIp(String val) { + appSettingsMgrService.setLocalIp(val); + } + @Resource ExtApiPageMgr extApiPageMgr; @@ -83,6 +91,8 @@ public class P20AppSettingDebugPage { page.addFunction("设置LIS网络IP", this::setLISNetIp); page.addFunction("设置LIS网络端口", this::setLISNetPort); page.addFunction("设置温度", this::setTemperature); + page.addFunction("设置DHCP", this::setDHCP); + page.addFunction("设置本地IP", this::setLocalIp); extApiPageMgr.addPage(page); } }