From f0fdce5ebc51df67875197fd44493374b3a411d0 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 12 Nov 2024 18:15:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=89=E5=AD=A6=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../a8k/controler/filemgr/FileMgrController.java | 2 +- .../a8k/service/app/appdata/FileMgrService.java | 8 +++--- src/main/java/a8k/service/test/A8kOptTest.java | 33 +++++++++++++--------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/main/java/a8k/controler/filemgr/FileMgrController.java b/src/main/java/a8k/controler/filemgr/FileMgrController.java index d856e0b..c58a3aa 100644 --- a/src/main/java/a8k/controler/filemgr/FileMgrController.java +++ b/src/main/java/a8k/controler/filemgr/FileMgrController.java @@ -108,7 +108,7 @@ public class FileMgrController { } - @GetMapping("/index") + @GetMapping("") public String fileDownloadPage(Model model) { // Mock data for file groups and files List fileGroups = List.of( diff --git a/src/main/java/a8k/service/app/appdata/FileMgrService.java b/src/main/java/a8k/service/app/appdata/FileMgrService.java index a2fe2b2..49249d2 100644 --- a/src/main/java/a8k/service/app/appdata/FileMgrService.java +++ b/src/main/java/a8k/service/app/appdata/FileMgrService.java @@ -49,11 +49,11 @@ public class FileMgrService { return String.format("%s/%s", FilePathConstant.FILE_OPT_REPORT_PATH, fileName); } - public String storageOptReport(String projName, Integer projId, OptScanResult optScanResult) throws IOException { + public String storageOptReport(String projName, Integer projId, Integer subProjIndex, OptScanResult optScanResult) throws IOException { File dir = new File(FilePathConstant.FILE_OPT_REPORT_PATH); dir.mkdir(); //FileName - String fileName = String.format("%s-%s-%s.txt", projName, optScanResult.rawData.optType, ZDateUtils.toID(optScanResult.rawData.scanDate)); + String fileName = String.format("%s(%s-%s)-%s-%s.txt", projName, projId, subProjIndex, optScanResult.rawData.optType, ZDateUtils.toID(optScanResult.rawData.scanDate)); String filePath = String.format("%s/%s", FilePathConstant.FILE_OPT_REPORT_PATH, fileName); File file = new File(filePath); @@ -62,7 +62,7 @@ public class FileMgrService { String content = createOptReportContent(projName, projId, optScanResult); writer.write(content); writer.close(); - return file.getAbsolutePath(); + return fileName; } // @@ -215,7 +215,7 @@ public class FileMgrService { optScanResult.rawData = data; optScanResult.analysResult = optAlgoAnalysResult; - String path = storageOptReport("Fake( xxxx)", 1, optScanResult); + String path = storageOptReport("Fake( xxxx)", 1, 0, optScanResult); log.info("createFakeOptReport success {}", path); } diff --git a/src/main/java/a8k/service/test/A8kOptTest.java b/src/main/java/a8k/service/test/A8kOptTest.java index 3477e4f..0febdae 100644 --- a/src/main/java/a8k/service/test/A8kOptTest.java +++ b/src/main/java/a8k/service/test/A8kOptTest.java @@ -53,8 +53,8 @@ public class A8kOptTest { @Resource ProjInfoMgrService projInfoMgrService; - @Autowired - private FileMgrService fileMgrService; + @Resource + FileMgrService fileMgrService; @ExtApiFn(name = "归零", group = "测试工具", order = 11) public void deviceReset() throws AppException { @@ -110,31 +110,32 @@ public class A8kOptTest { static class OptScanReport { public A8kScanCurve optScanCurve; - public String reportURL; + public String optReportFileName; } - List optScanReports = new ArrayList<>(); - public void generateOptReport(OptScanResult optScanResult) { + public void generateOptReport(ProjBuildinInfo info, Integer subProjIndex, OptScanResult optScanResult) throws IOException { OptScanReport report = new OptScanReport(); - report.optScanCurve = createScanCurve1200Point(optScanResult.rawData.rawData); + report.optScanCurve = createScanCurve1200Point(optScanResult.rawData.rawData); + report.optReportFileName = fileMgrService.storageOptReport(info.projBaseInfo.projName, info.projBaseInfo.projId, subProjIndex, optScanResult); optScanReports.add(report); } - public List doOptScan(Integer projId) throws AppException { + @ExtApiFn(name = "光学扫描", group = "光学测试", order = 200) + public String doOptScan(Integer projId) throws AppException, IOException { + fileMgrService.clearOptReport(); optScanReports.clear(); - ProjBuildinInfo info = projInfoMgrService.getProjBuildInInfo(projId); - List analysResults = new ArrayList<>(); + ProjBuildinInfo info = projInfoMgrService.getProjBuildInInfo(projId); for (int i = 0; i < info.projOptInfos.size(); i++) { OptScanResult scanResult = optScanModuleCtrlService.optScan(info.projBaseInfo, info.projOptInfos.get(i), i); - generateOptReport(scanResult); - analysResults.add(scanResult.analysResult); + generateOptReport(info, i, scanResult); } - return analysResults; + return "扫描完成"; } + @ExtApiFn(name = "获取光学扫描曲线", group = "光学测试", order = 201) public A8kScanCurve getScanCurve(Integer subProjIndex) { if (subProjIndex < optScanReports.size()) { return optScanReports.get(subProjIndex).optScanCurve; @@ -142,11 +143,15 @@ public class A8kOptTest { return null; } + @ExtApiFn(name = "获取光学报告", group = "光学测试", order = 202) + public String getOptReport(Integer subProjIndex) { + return "http://127.0.0.1/filemgr/index.html"; + } + + @ExtApiFn(name = "读取项目信息", group = "光学测试", order = 203) public ProjBuildinInfo getProjInfo(Integer projId) throws AppException { return projInfoMgrService.getProjBuildInInfo(projId); } - - }