|
@@ -16,13 +16,9 @@ import api.common.pojo.po.model.ConfigSensorPO;
|
|
import api.common.pojo.po.model.VehiclePO;
|
|
import api.common.pojo.po.model.VehiclePO;
|
|
import api.common.pojo.po.project.*;
|
|
import api.common.pojo.po.project.*;
|
|
import api.common.pojo.po.scene.ScenePackagePO;
|
|
import api.common.pojo.po.scene.ScenePackagePO;
|
|
-import api.common.pojo.vo.algorithm.AlgorithmVO;
|
|
|
|
import api.common.pojo.vo.project.*;
|
|
import api.common.pojo.vo.project.*;
|
|
import api.common.pojo.vo.scene.RunProjectVO;
|
|
import api.common.pojo.vo.scene.RunProjectVO;
|
|
-import api.common.util.JsonUtil;
|
|
|
|
-import api.common.util.ObjectUtil;
|
|
|
|
-import api.common.util.StringUtil;
|
|
|
|
-import api.common.util.TimeUtil;
|
|
|
|
|
|
+import api.common.util.*;
|
|
import com.css.simulation.resource.common.utils.AuthUtil;
|
|
import com.css.simulation.resource.common.utils.AuthUtil;
|
|
import com.css.simulation.resource.common.utils.PageUtil;
|
|
import com.css.simulation.resource.common.utils.PageUtil;
|
|
import com.css.simulation.resource.feign.AlgoPlatformService;
|
|
import com.css.simulation.resource.feign.AlgoPlatformService;
|
|
@@ -713,6 +709,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
|
|
InputStream fileInputStream = null;
|
|
InputStream fileInputStream = null;
|
|
InputStreamReader inputStreamReader = null;
|
|
InputStreamReader inputStreamReader = null;
|
|
BufferedReader bufferedReader = null;
|
|
BufferedReader bufferedReader = null;
|
|
|
|
+ File file = null;
|
|
try {
|
|
try {
|
|
//2.解析仿真文件
|
|
//2.解析仿真文件
|
|
//time
|
|
//time
|
|
@@ -742,12 +739,15 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
|
|
inputStreamReader = new InputStreamReader(fileInputStream,"utf-8");*/
|
|
inputStreamReader = new InputStreamReader(fileInputStream,"utf-8");*/
|
|
|
|
|
|
MinioParameter minioParameter = new MinioParameter();
|
|
MinioParameter minioParameter = new MinioParameter();
|
|
-// minioParameter.setObjectName(po.getRunResultFilePath()+"/ego.csv");
|
|
|
|
- minioParameter.setObjectName("test/ego.csv");
|
|
|
|
|
|
+ minioParameter.setObjectName(po.getRunResultFilePath()+"/ego.csv");
|
|
|
|
+ //minioParameter.setObjectName("test/ego.csv");
|
|
Response download = fileDownService.download(minioParameter);
|
|
Response download = fileDownService.download(minioParameter);
|
|
Response.Body body = download.body();
|
|
Response.Body body = download.body();
|
|
- fileInputStream = body.asInputStream();
|
|
|
|
-
|
|
|
|
|
|
+ //fileInputStream = body.asInputStream();
|
|
|
|
+ String path = ClassLoader.getSystemResource("").getPath() + StringUtil.getRandomCode() + "temp";
|
|
|
|
+ FileUtil.writeInputStreamToLocalFile(body.asInputStream(),path);
|
|
|
|
+ file = new File(path);
|
|
|
|
+ fileInputStream = new FileInputStream(file);
|
|
inputStreamReader = new InputStreamReader(fileInputStream,"utf-8");
|
|
inputStreamReader = new InputStreamReader(fileInputStream,"utf-8");
|
|
|
|
|
|
bufferedReader = new BufferedReader(inputStreamReader);
|
|
bufferedReader = new BufferedReader(inputStreamReader);
|
|
@@ -910,6 +910,9 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
|
|
if(bufferedReader != null){
|
|
if(bufferedReader != null){
|
|
bufferedReader.close();
|
|
bufferedReader.close();
|
|
}
|
|
}
|
|
|
|
+ if(file != null ){
|
|
|
|
+ file.delete();
|
|
|
|
+ }
|
|
}catch (IOException e){
|
|
}catch (IOException e){
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
|
|
|