Browse Source

update

tags/v0
zhaohe 7 months ago
parent
commit
764a22f20d
  1. 22
      src/main/java/a8k/app/controler/api/v1/app/data/ReactionResultControler.java
  2. 36
      src/main/java/a8k/app/controler/api/v1/app/setting/AppSettingControler.java
  3. 4
      src/main/java/a8k/app/dao/db/type/AppSetting.java
  4. 6
      src/main/java/a8k/app/service/data/ReactionRecordMgrService.java
  5. 12
      src/main/java/a8k/app/service/setting/AppSettingsMgrService.java
  6. 10
      src/main/java/a8k/extui/page/debug/P20AppSettingDebugPage.java

22
src/main/java/a8k/app/controler/api/v1/app/data/ReactionResultControler.java

@ -46,6 +46,28 @@ public class ReactionResultControler {
return ApiRet.success(); return ApiRet.success();
} }
@PostMapping("/printfRecords")
public ApiRet<Void> printfRecord(List<Integer> id) {
for (Integer i : id) {
reactionRecordMgrService.printfRecord(i);
}
return ApiRet.success();
}
@PostMapping("/exportRecordByLIS")
public ApiRet<Void> exportRecordByLIS(Integer id) {
reactionRecordMgrService.exportRecordByLIS(id);
return ApiRet.success();
}
@PostMapping("/exportRecordsByLIS")
public ApiRet<Void> exportRecordByLIS(List<Integer> id) {
for (Integer i : id) {
reactionRecordMgrService.exportRecordByLIS(i);
}
return ApiRet.success();
}
@PostMapping("/deleteRecord") @PostMapping("/deleteRecord")
public ApiRet<Void> deleteRecord(Integer id) { public ApiRet<Void> deleteRecord(Integer id) {
reactionRecordMgrService.deleteRecord(id); reactionRecordMgrService.deleteRecord(id);

36
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;
import a8k.app.dao.db.type.appsetting.settingenum.*; import a8k.app.dao.db.type.appsetting.settingenum.*;
import a8k.app.a8ktype.ui.ApiRet; 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.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
@ -23,6 +24,9 @@ public class AppSettingControler {
@Resource @Resource
AppSettingsMgrService appSettingsMgrService; AppSettingsMgrService appSettingsMgrService;
@Resource
GStateMgrService gstate;
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// EXT FUNC // EXT FUNC
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@ -129,4 +133,36 @@ public class AppSettingControler {
return ApiRet.success(); return ApiRet.success();
} }
@Operation(summary = "设置DHCP")
@PostMapping("/setDHCCP")
public ApiRet<Void> setDHCP(Boolean val) {
appSettingsMgrService.setDHCP(val);
return ApiRet.success();
}
@Operation(summary = "设置本地IP")
@PostMapping("/setLocalIp")
public ApiRet<Void> 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<DeviceInfo> getDeviceInfo() {
DeviceInfo info = new DeviceInfo();
info.appVersion = gstate.getAppVersion();
info.mcuVersion = gstate.getMcuVersion();
info.sn = gstate.getSn();
return ApiRet.success(info);
}
} }

4
src/main/java/a8k/app/dao/db/type/AppSetting.java

@ -57,4 +57,8 @@ public class AppSetting {
@Max(35) @Max(35)
public Integer temperature = 25; public Integer temperature = 25;
public Boolean DHCP = true;
public String localIp = "";
} }

6
src/main/java/a8k/app/service/data/ReactionRecordMgrService.java

@ -88,7 +88,6 @@ public class ReactionRecordMgrService {
} }
public void deleteAll() { public void deleteAll() {
List<ReactionReport> records = reactionReportDao.getAll(); List<ReactionReport> records = reactionReportDao.getAll();
for (ReactionReport record : records) { for (ReactionReport record : records) {
@ -101,6 +100,11 @@ public class ReactionRecordMgrService {
logger.info("printfRecord: {}", ZJsonHelper.objToPrettyJson(record)); 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) { public void deleteRecord(Integer id) {
reactionReportDao.delete(id); reactionReportDao.delete(id);
} }

12
src/main/java/a8k/app/service/setting/AppSettingsMgrService.java

@ -112,4 +112,16 @@ public class AppSettingsMgrService {
appSettingDao.update(setting); 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);
}
} }

10
src/main/java/a8k/extui/page/debug/P20AppSettingDebugPage.java

@ -66,6 +66,14 @@ public class P20AppSettingDebugPage {
appSettingsMgrService.setTemperature(val); appSettingsMgrService.setTemperature(val);
} }
public void setDHCP(Boolean val) {
appSettingsMgrService.setDHCP(val);
}
public void setLocalIp(String val) {
appSettingsMgrService.setLocalIp(val);
}
@Resource @Resource
ExtApiPageMgr extApiPageMgr; ExtApiPageMgr extApiPageMgr;
@ -83,6 +91,8 @@ public class P20AppSettingDebugPage {
page.addFunction("设置LIS网络IP", this::setLISNetIp); page.addFunction("设置LIS网络IP", this::setLISNetIp);
page.addFunction("设置LIS网络端口", this::setLISNetPort); page.addFunction("设置LIS网络端口", this::setLISNetPort);
page.addFunction("设置温度", this::setTemperature); page.addFunction("设置温度", this::setTemperature);
page.addFunction("设置DHCP", this::setDHCP);
page.addFunction("设置本地IP", this::setLocalIp);
extApiPageMgr.addPage(page); extApiPageMgr.addPage(page);
} }
} }
Loading…
Cancel
Save