From f978d4ecdf83cbf7c8b778f1362b86be5aa510bd Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 10 二月 2023 17:04:26 +0800
Subject: [PATCH] 充放电数据解析和内阻数据解析
---
src/main/java/com/whyc/controller/TestController.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/controller/TestController.java b/src/main/java/com/whyc/controller/TestController.java
index 17028bd..5b0e1eb 100644
--- a/src/main/java/com/whyc/controller/TestController.java
+++ b/src/main/java/com/whyc/controller/TestController.java
@@ -4,9 +4,13 @@
import com.whyc.fbo.FboDataHeadStart;
import com.whyc.fbo.FboDataHeadStop;
import com.whyc.fbo.FboDataInf;
+import com.whyc.mcp.TestDataInfo;
import com.whyc.pojo.Response;
+import com.whyc.res.RESDataInfo;
import com.whyc.service.ExcelExportService;
import com.whyc.service.FboDataInfService;
+import com.whyc.service.RESDataInfoService;
+import com.whyc.service.TestDataInfoService;
import com.whyc.util.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -37,6 +41,12 @@
@Autowired
private ExcelExportService exportService;
+ @Autowired
+ private RESDataInfoService resService;
+
+ @Autowired
+ private TestDataInfoService testDataInfoService;
+
@GetMapping("/hello")
public Response hello(){
return new Response().set(1,"hello");
@@ -48,17 +58,23 @@
String suffix=filePath.substring(filePath.lastIndexOf(".")+1).toLowerCase(Locale.ROOT);
Response response=new Response();
switch (suffix){
- case "fbx":FboDataInf fboDataInf = fboService.readFboFile(filePath);
+ case "fbx":
+ FboDataInf fboDataInf = fboService.readFboFile(filePath);
response.set(1,fboDataInf,filePath);
break;
- case "bres":response.set(1,filePath);
+ case "bres":
+ RESDataInfo resDataInfo =resService.readFileData(filePath);
+ response.set(1,resDataInfo,filePath);
break;
case "alm":response.set(1,filePath);
break;
- case "mcp":response.set(1,filePath);
+ case "mcp":
+ TestDataInfo testDataInfoMcp=testDataInfoService.readFileData(filePath);
+ response.set(1,testDataInfoMcp,filePath);
break;
- case "mch":response.set(1,filePath);
- break;
+ case "mch":TestDataInfo testDataInfoMch=testDataInfoService.readFileData(filePath);
+ response.set(1,testDataInfoMch,filePath);
+ break;
default:response.set(1,false,filePath);
}
--
Gitblit v1.9.1