From 77dba770ab6ab03d25106d143b6443d4c77a4af7 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 17 十月 2024 12:23:24 +0800
Subject: [PATCH] 修改解析
---
src/main/java/com/whyc/service/AnaysiService.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/whyc/service/AnaysiService.java b/src/main/java/com/whyc/service/AnaysiService.java
index 6cc10f2..f68bffa 100644
--- a/src/main/java/com/whyc/service/AnaysiService.java
+++ b/src/main/java/com/whyc/service/AnaysiService.java
@@ -5,6 +5,8 @@
import com.whyc.pojo.AnaylsisId;
import com.whyc.pojo.AnaysisData;
import com.whyc.pojo.BatttestdataId;
+import com.whyc.pojo.UserInf;
+import com.whyc.util.ActionUtil;
import com.whyc.util.AnalysisUtil;
import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -30,16 +32,16 @@
//棰勪及鏁版嵁
public String createAnaysisXls(int battGroupId, int testRecordCount) {
+ UserInf uinf= ActionUtil.getUser();
+ String uid=String.valueOf(uinf.getUId());
//1.鏌ュ嚭闇�瑕侀浼扮殑鏁版嵁
- List<AnaysisData> list=subService.getAnaysisData(battGroupId,testRecordCount);
- String excelName="娴嬭瘯鏁版嵁.xlsx";
- //String root = FileDirPath.getFileDirName();
- //String excelOutPutPath=root+ File.separator+"outPath";
+ List<AnaysisData> list=subService.getAnaysisData(battGroupId,testRecordCount);
+ String excelName="娴嬭瘯鏁版嵁"+"_"+battGroupId+"_"+testRecordCount+".xlsx";
//2.鐢熸垚瑙ｆ瀽鐨剎ls
- String root=exportDataToXls(excelName,list);
+ String root=exportDataToXls(uid,excelName,list);
String voltagePredictExePath=root+ File.separator+"10灏忔椂鐜囩數鍘嬮浼癨\voltage_predict_process\\main.exe";
- String excelOutPutPath=root+ File.separator+"outPath";
- String excelSourcePath=root+ File.separator+"娴嬭瘯鏁版嵁.xlsx";
+ String excelOutPutPath=root+ File.separator+"analysis"+File.separator+uid+ File.separator+"outPath"+File.separator+battGroupId+File.separator+testRecordCount;
+ String excelSourcePath=root+ File.separator+"analysis"+File.separator+uid+File.separator+excelName;
//4銆傚皢棰勪及鐨勬暟鎹瓨鍏ユ暟鎹簱
if(list!=null){
int recordNum=list.size()+1;
@@ -192,7 +194,7 @@
}
//鐢熸垚瑙ｆ瀽鐨剎ls
- private String exportDataToXls( String excelName,List<AnaysisData> list) {
+ private String exportDataToXls(String uid, String excelName,List<AnaysisData> list) {
String fileDirName = FileDirPath.getFileDirName();
String rootFace="";
String[] titleNames=new String[]{"鏃堕棿(HMS)","鎬荤數鍘�(V)","鎬荤數娴�(A)","瀹归噺(AH)"};
@@ -222,10 +224,15 @@
cell.setCellValue(j+1+"#");
}
}
- rootFace=fileDirName;
+ rootFace=fileDirName+File.separator+"analysis";
File destfile = new File(rootFace);
if(!destfile.exists()) {
destfile.mkdir();
+ }
+ rootFace=fileDirName+File.separator+"analysis"+File.separator+uid;
+ File destfile1 = new File(rootFace);
+ if(!destfile1.exists()) {
+ destfile1.mkdir();
}
//灏嗛�変腑鐨勬枃浠跺瓨鍏ユ寚瀹氱洰褰曚笅鎵撳寘涓嬭浇
if(list!=null&&list.size()>0){
@@ -262,7 +269,7 @@
}
}
}
- return rootFace;
+ return fileDirName;
}
//鏌ヨ棰勪及鏁版嵁
--
Gitblit v1.9.1