From 963185f963fd5ec1a7454e3b6930d65e08cbaf01 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sat, 18 Jan 2025 15:09:16 +0800 Subject: [PATCH] update --- .../api/v1/app/setting/AppSettingControler.java | 168 --------------------- .../api/v1/app/setting/DeviceInfoControler.java | 52 +++++++ .../api/v1/app/setting/DeviceSettingControler.java | 114 ++++++++++++++ .../api/v1/app/setting/LISSettingControler.java | 123 +++++++++++++++ src/main/java/a8k/app/dao/db/AppSettingDao.java | 1 + 5 files changed, 290 insertions(+), 168 deletions(-) delete mode 100644 src/main/java/a8k/app/controler/api/v1/app/setting/AppSettingControler.java create mode 100644 src/main/java/a8k/app/controler/api/v1/app/setting/DeviceInfoControler.java create mode 100644 src/main/java/a8k/app/controler/api/v1/app/setting/DeviceSettingControler.java create mode 100644 src/main/java/a8k/app/controler/api/v1/app/setting/LISSettingControler.java 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 deleted file mode 100644 index c68bd0b..0000000 --- a/src/main/java/a8k/app/controler/api/v1/app/setting/AppSettingControler.java +++ /dev/null @@ -1,168 +0,0 @@ -package a8k.app.controler.api.v1.app.setting; - -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; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - - -@Tag(name = "系统设置", description = "") -@Slf4j -@Controller -@RequestMapping(value = "/api/v1/app/AppSetting/") -@ResponseBody -public class AppSettingControler { - @Resource - AppSettingsMgrService appSettingsMgrService; - - @Resource - GStateMgrService gstate; - - // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - // EXT FUNC - // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - - @Operation(summary = "获取系统设置") - @PostMapping("/getAppSettings") - public ApiRet getAppSettings() { - return ApiRet.success(appSettingsMgrService.getAppSettings()); - } - - - @Operation(summary = "设置语言") - @PostMapping("/setLanguage") - public ApiRet setLanguage(LanguageType val) { - appSettingsMgrService.setLanguage(val); - return ApiRet.success(); - } - - - @Operation(summary = "设置自动打印报告") - @PostMapping("/setAutoPrint") - public ApiRet setAutoPrint(Boolean val) { - appSettingsMgrService.setAutoPrint(val); - return ApiRet.success(); - } - - - @Operation(summary = "设置自动登出") - @PostMapping("/setAutoLogout") - public ApiRet setAutoLogout(Boolean val) { - appSettingsMgrService.setAutoLogout(val); - return ApiRet.success(); - } - - - @Operation(summary = "设置LIS类型") - @PostMapping("/setLISType") - public ApiRet setLISType(LISTypeEnum val) { - appSettingsMgrService.setLISType(val); - return ApiRet.success(); - - } - - - @Operation(summary = "设置LIS协议") - @PostMapping("/setLISProtocol") - public ApiRet setLISProtocol(LISProtocolEnum val) { - appSettingsMgrService.setLISProtocol(val); - return ApiRet.success(); - - } - - - @Operation(summary = "设置LIS接口") - @PostMapping("/setLIFIf") - public ApiRet setLIFIf(LISIFType val) { - appSettingsMgrService.setLIFIf(val); - return ApiRet.success(); - - } - - - @Operation(summary = "设置LIS是否自动上报报告") - @PostMapping("/setLISAutoExport") - public ApiRet setLISAutoExport(Boolean val) { - appSettingsMgrService.setLISAutoExport(val); - return ApiRet.success(); - - } - - - @Operation(summary = "设置LIS串口波特率") - @PostMapping("/setLISSerialBaudrate") - public ApiRet setLISSerialBaudrate(LISSerialBaudrateType val) { - appSettingsMgrService.setLISSerialBaudrate(val); - return ApiRet.success(); - - } - - - @Operation(summary = "设置LISIP") - @PostMapping("/setLISNetIp") - public ApiRet setLISNetIp(String val) { - appSettingsMgrService.setLISNetIp(val); - return ApiRet.success(); - - } - - - @Operation(summary = "设置LIS端口") - @PostMapping("/setLISNetPort") - public ApiRet setLISNetPort(Integer val) { - appSettingsMgrService.setLISNetPort(val); - return ApiRet.success(); - - } - - - @Operation(summary = "设置设备温度") - @PostMapping("/setTemperature") - public ApiRet setTemperature(Integer val) { - log.info("setTemperature:{}", val); - appSettingsMgrService.setTemperature(val); - 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/controler/api/v1/app/setting/DeviceInfoControler.java b/src/main/java/a8k/app/controler/api/v1/app/setting/DeviceInfoControler.java new file mode 100644 index 0000000..d984159 --- /dev/null +++ b/src/main/java/a8k/app/controler/api/v1/app/setting/DeviceInfoControler.java @@ -0,0 +1,52 @@ +package a8k.app.controler.api.v1.app.setting; + +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; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + + +@Tag(name = "设备信息", description = "") +@Slf4j +@Controller +@RequestMapping(value = "/api/v1/app/DeviceInfo/") +@ResponseBody +public class DeviceInfoControler { + @Resource + GStateMgrService gstate; + + 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); + } + + @Operation(summary = "更新MCU版本") + @PostMapping("/updateMcuVersion") + public void updateMcuVersion() { + + } + + @Operation(summary = "更新APP代码") + @PostMapping("/updateAppVersion") + public void updateAppVersion() { + + } + +} diff --git a/src/main/java/a8k/app/controler/api/v1/app/setting/DeviceSettingControler.java b/src/main/java/a8k/app/controler/api/v1/app/setting/DeviceSettingControler.java new file mode 100644 index 0000000..6566bf0 --- /dev/null +++ b/src/main/java/a8k/app/controler/api/v1/app/setting/DeviceSettingControler.java @@ -0,0 +1,114 @@ +package a8k.app.controler.api.v1.app.setting; + +import a8k.app.a8ktype.ui.ApiRet; +import a8k.app.dao.db.type.AppSetting; +import a8k.app.dao.db.type.appsetting.settingenum.*; +import a8k.app.service.setting.AppSettingsMgrService; +import a8k.app.service.statemgr.GStateMgrService; +import a8k.app.utils.ZList; +import a8k.extui.type.ret.AppRetV1; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + + +@Tag(name = "设备设置", description = "") +@Slf4j +@Controller +@RequestMapping(value = "/api/v1/app/DeviceSetting/") +@ResponseBody +public class DeviceSettingControler { + @Resource + AppSettingsMgrService appSettingsMgrService; + + @Resource + GStateMgrService gstate; + + // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + // EXT FUNC + // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + + public static class DeviceSetting { + public LanguageType language; + public Boolean autoPrint; + public Boolean autoLogout; + public Integer temperature; + public Boolean DHCP; + public String localIp; + } + + @Operation(summary = "获取系统设置") + @PostMapping("/getSetting") + public ApiRet getAppSettings() { + DeviceSetting setting = new DeviceSetting(); + AppSetting appSetting = appSettingsMgrService.getAppSettings(); + setting.language = appSetting.language; + setting.autoPrint = appSetting.autoPrint; + setting.autoLogout = appSetting.autoLogout; + setting.temperature = appSetting.temperature; + setting.DHCP = appSetting.DHCP; + setting.localIp = appSetting.localIp; + return ApiRet.success(setting); + } + + + @Operation(summary = "设置语言") + @PostMapping("/setLanguage") + public ApiRet setLanguage(LanguageType val) { + appSettingsMgrService.setLanguage(val); + return ApiRet.success(); + } + + + @Operation(summary = "设置自动打印报告") + @PostMapping("/setAutoPrint") + public ApiRet setAutoPrint(Boolean val) { + appSettingsMgrService.setAutoPrint(val); + return ApiRet.success(); + } + + + @Operation(summary = "设置自动登出") + @PostMapping("/setAutoLogout") + public ApiRet setAutoLogout(Boolean val) { + appSettingsMgrService.setAutoLogout(val); + return ApiRet.success(); + } + + @Operation(summary = "设置设备温度") + @PostMapping("/setTemperature") + public ApiRet setTemperature(Integer val) { + log.info("setTemperature:{}", val); + appSettingsMgrService.setTemperature(val); + 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(); + } + + @Operation(summary = "获取温度范围") + @PostMapping("/getTemperatureAvailableRange") + public ApiRet> getTemperatureAvailableRange() { + return ApiRet.success(ZList.of(25, 35)); + } + +} diff --git a/src/main/java/a8k/app/controler/api/v1/app/setting/LISSettingControler.java b/src/main/java/a8k/app/controler/api/v1/app/setting/LISSettingControler.java new file mode 100644 index 0000000..94d4fc8 --- /dev/null +++ b/src/main/java/a8k/app/controler/api/v1/app/setting/LISSettingControler.java @@ -0,0 +1,123 @@ +package a8k.app.controler.api.v1.app.setting; + +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; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + + +@Tag(name = "LIS配置", description = "") +@Slf4j +@Controller +@RequestMapping(value = "/api/v1/app/LISSetting/") +@ResponseBody +public class LISSettingControler { + @Resource + AppSettingsMgrService appSettingsMgrService; + + @Resource + GStateMgrService gstate; + + // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + // EXT FUNC + // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + + public static class LISSetting { + public LISTypeEnum LISType = LISTypeEnum.SINGLE_TRACK; + public LISProtocolEnum LISProtocol = LISProtocolEnum.Boditech; + public LISIFType LIFIf = LISIFType.NETWORK; + public Boolean LISAutoExport = true; + public LISSerialBaudrateType LISSerialBaudrate = LISSerialBaudrateType.B9600; + public String LISNetIp = "127.0.0.1"; + public Integer LISNetPort = 9973; + } + + ; + + @Operation(summary = "获取系统设置") + @PostMapping("/getSetting") + public ApiRet getAppSettings() { + LISSetting setting = new LISSetting(); + AppSetting appSetting = appSettingsMgrService.getAppSettings(); + setting.LISType = appSetting.LISType; + setting.LISProtocol = appSetting.LISProtocol; + setting.LIFIf = appSetting.LIFIf; + setting.LISAutoExport = appSetting.LISAutoExport; + setting.LISSerialBaudrate = appSetting.LISSerialBaudrate; + setting.LISNetIp = appSetting.LISNetIp; + setting.LISNetPort = appSetting.LISNetPort; + return ApiRet.success(setting); + } + + + @Operation(summary = "设置LIS类型") + @PostMapping("/setLISType") + public ApiRet setLISType(LISTypeEnum val) { + appSettingsMgrService.setLISType(val); + return ApiRet.success(); + + } + + + @Operation(summary = "设置LIS协议") + @PostMapping("/setLISProtocol") + public ApiRet setLISProtocol(LISProtocolEnum val) { + appSettingsMgrService.setLISProtocol(val); + return ApiRet.success(); + + } + + + @Operation(summary = "设置LIS接口") + @PostMapping("/setLIFIf") + public ApiRet setLIFIf(LISIFType val) { + appSettingsMgrService.setLIFIf(val); + return ApiRet.success(); + + } + + + @Operation(summary = "设置LIS是否自动上报报告") + @PostMapping("/setLISAutoExport") + public ApiRet setLISAutoExport(Boolean val) { + appSettingsMgrService.setLISAutoExport(val); + return ApiRet.success(); + + } + + + @Operation(summary = "设置LIS串口波特率") + @PostMapping("/setLISSerialBaudrate") + public ApiRet setLISSerialBaudrate(LISSerialBaudrateType val) { + appSettingsMgrService.setLISSerialBaudrate(val); + return ApiRet.success(); + + } + + + @Operation(summary = "设置LISIP") + @PostMapping("/setLISNetIp") + public ApiRet setLISNetIp(String val) { + appSettingsMgrService.setLISNetIp(val); + return ApiRet.success(); + + } + + + @Operation(summary = "设置LIS端口") + @PostMapping("/setLISNetPort") + public ApiRet setLISNetPort(Integer val) { + appSettingsMgrService.setLISNetPort(val); + return ApiRet.success(); + + } +} diff --git a/src/main/java/a8k/app/dao/db/AppSettingDao.java b/src/main/java/a8k/app/dao/db/AppSettingDao.java index 43e71d5..0c49573 100644 --- a/src/main/java/a8k/app/dao/db/AppSettingDao.java +++ b/src/main/java/a8k/app/dao/db/AppSettingDao.java @@ -37,6 +37,7 @@ public class AppSettingDao { @PostConstruct void init() { if (!ZSqliteJdbcHelper.isTableExist(jdbcTemplate, tableName)) { +// ZSqliteJdbcHelper.deleteTable(jdbcTemplate, tableName); ZSqliteJdbcHelper.createTable(jdbcTemplate, tableName, tClass); ZSqliteJdbcHelper.addObj(jdbcTemplate, tableName, AppSetting.class, new AppSetting()); }