commit

api-common/src/main/java/api/common/pojo/param/demo/TestPageParam.java

@@ -2,7 +2,9 @@ package api.common.pojo.param.demo;
 
 import api.common.pojo.common.PageVO;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class TestPageParam extends PageVO {
 

api-common/src/main/java/api/common/pojo/param/log/LogPageParam.java

@@ -2,7 +2,9 @@ package api.common.pojo.param.log;
 
 import api.common.pojo.common.PageVO;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class LogPageParam extends PageVO {
 

api-common/src/main/java/api/common/pojo/param/model/ConfigPageParam.java

@@ -2,9 +2,11 @@ package api.common.pojo.param.model;
 
 import api.common.pojo.common.PageVO;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class ConfigPageParam extends PageVO {
 

api-common/src/main/java/api/common/pojo/param/model/VehiclePageParam.java

@@ -2,7 +2,9 @@ package api.common.pojo.param.model;
 
 import api.common.pojo.common.PageVO;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class VehiclePageParam extends PageVO {
 

api-common/src/main/java/api/common/pojo/param/scene/SceneAccidentParam.java

@@ -9,9 +9,8 @@ import java.util.List;
 /**
  * 交通事故场景
  */
-@EqualsAndHashCode()
+@EqualsAndHashCode(callSuper = false)
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class SceneAccidentParam extends PageVO implements Serializable {

api-common/src/main/java/api/common/pojo/param/scene/SceneGeneralTemplateParam.java

@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * 泛化模板
  */
-@EqualsAndHashCode()
+@EqualsAndHashCode(callSuper = false)
 @Data
 @Builder
 @NoArgsConstructor

api-common/src/main/java/api/common/pojo/param/scene/SceneNaturalParam.java

@@ -9,9 +9,8 @@ import java.util.List;
 /**
  * 自然驾驶场景
  */
-@EqualsAndHashCode()
+@EqualsAndHashCode(callSuper = false)
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class SceneNaturalParam extends PageVO implements Serializable {

api-common/src/main/java/api/common/pojo/param/scene/ScenePackageNewParam.java

@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * 测试场景包
  */
-@EqualsAndHashCode()
+@EqualsAndHashCode(callSuper = false)
 @Data
 @Builder
 @NoArgsConstructor

api-common/src/main/java/api/common/pojo/param/scene/ScoringRulesParam.java

@@ -8,7 +8,7 @@ import java.io.Serializable;
 /**
  * 打分规则
  */
-@EqualsAndHashCode()
+@EqualsAndHashCode(callSuper = false)
 @Data
 @Builder
 @NoArgsConstructor

api-common/src/main/java/api/common/pojo/param/scene/StandardsRegulationsParam.java

@@ -9,9 +9,8 @@ import java.util.List;
 /**
  * 标准法规场景
  */
-@EqualsAndHashCode()
+@EqualsAndHashCode(callSuper = false)
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class StandardsRegulationsParam extends PageVO implements Serializable {

api-common/src/main/java/api/common/pojo/param/system/ClusterParam.java

@@ -2,7 +2,9 @@ package api.common.pojo.param.system;
 
 import api.common.pojo.common.PageVO;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class ClusterParam extends PageVO {
 

api-common/src/main/java/api/common/pojo/param/system/ParameterParam.java

@@ -2,7 +2,9 @@ package api.common.pojo.param.system;
 
 import api.common.pojo.common.PageVO;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class ParameterParam extends PageVO {
 

api-common/src/main/java/api/common/pojo/param/system/RoleParam.java

@@ -2,7 +2,9 @@ package api.common.pojo.param.system;
 
 import api.common.pojo.common.PageVO;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class RoleParam extends PageVO {
 

api-common/src/main/java/api/common/pojo/param/system/SceneImportPageParam.java

@@ -3,9 +3,11 @@ package api.common.pojo.param.system;
 import api.common.pojo.common.PageVO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.sql.Timestamp;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class SceneImportPageParam extends PageVO {
 

api-common/src/main/java/api/common/pojo/param/system/UserParam.java

@@ -2,7 +2,9 @@ package api.common.pojo.param.system;
 
 import api.common.pojo.common.PageVO;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class UserParam extends PageVO {
 

api-common/src/main/java/api/common/pojo/po/model/GpsPO.java

@@ -2,9 +2,11 @@ package api.common.pojo.po.model;
 
 import api.common.pojo.common.CommonPO;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class GpsPO extends CommonPO {
 

api-common/src/main/java/api/common/pojo/po/model/LidarPO.java

@@ -2,9 +2,11 @@ package api.common.pojo.po.model;
 
 import api.common.pojo.common.CommonPO;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class LidarPO extends CommonPO {
 

api-common/src/main/java/api/common/pojo/po/model/OgtPO.java

@@ -2,9 +2,11 @@ package api.common.pojo.po.model;
 
 import api.common.pojo.common.CommonPO;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class OgtPO extends CommonPO {
 

api-common/src/main/java/api/common/pojo/po/model/VehicleTempPO.java

@@ -3,9 +3,11 @@ package api.common.pojo.po.model;
 
 import api.common.pojo.common.CommonPO;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class VehicleTempPO extends CommonPO {
 

api-common/src/main/java/api/common/pojo/po/scene/VehicleTypePO.java

@@ -10,14 +10,13 @@ import java.math.BigDecimal;
  */
 @EqualsAndHashCode()
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class VehicleTypePO implements Serializable {
     private String vehicleCategory;//车辆类型
     private String model3d;//车辆颜色渲染地址
     private BigDecimal centerX;
-    private double centerY=0;
+    private double centerY = 0;
     private BigDecimal centerZ;
     private BigDecimal dimensionsWidth;
     private BigDecimal dimensionsLength;
@@ -25,7 +24,7 @@ public class VehicleTypePO implements Serializable {
 
     private BigDecimal performanceMaxSpeed;
     private BigDecimal performanceMaxDeceleration;
-    private String performanceMaxAcceleration="2.5";
+    private String performanceMaxAcceleration = "2.5";
 
     private BigDecimal FrontAxleMaxSteering;
     private BigDecimal FrontAxleWheelDiameter;
@@ -33,13 +32,11 @@ public class VehicleTypePO implements Serializable {
     private BigDecimal FrontAxlePositionX;
     private BigDecimal FrontAxlePositionZ;
 
-    private String RearAxleMaxSteering="0";
+    private String RearAxleMaxSteering = "0";
     private BigDecimal RearAxleWheelDiameter;
     private BigDecimal RearAxleTrackWidth;
     private BigDecimal RearAxlePositionX;
     private BigDecimal RearAxlePositionZ;
 
 
-
-
 }

api-common/src/main/java/api/common/pojo/po/system/ClusterPO.java

@@ -3,9 +3,11 @@ package api.common.pojo.po.system;
 import api.common.pojo.common.CommonPO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class ClusterPO extends CommonPO {
 

api-common/src/main/java/api/common/pojo/po/system/DictPO.java

@@ -2,7 +2,9 @@ package api.common.pojo.po.system;
 
 import api.common.pojo.common.CommonPO;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class DictPO extends CommonPO {
 

api-common/src/main/java/api/common/pojo/po/system/ParameterPO.java

@@ -2,7 +2,9 @@ package api.common.pojo.po.system;
 
 import api.common.pojo.common.CommonPO;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class ParameterPO extends CommonPO {
 

api-common/src/main/java/api/common/pojo/po/system/RoleMenuPO.java

@@ -2,7 +2,9 @@ package api.common.pojo.po.system;
 
 import api.common.pojo.common.CommonPO;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class RoleMenuPO extends CommonPO {
 

api-common/src/main/java/api/common/pojo/po/system/RolePO.java

@@ -2,7 +2,9 @@ package api.common.pojo.po.system;
 
 import api.common.pojo.common.CommonPO;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class RolePO extends CommonPO {
 

api-common/src/main/java/api/common/pojo/po/system/UserPO.java

@@ -2,7 +2,9 @@ package api.common.pojo.po.system;
 
 import api.common.pojo.common.CommonPO;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class UserPO extends CommonPO {
 

api-common/src/main/java/api/common/pojo/vo/algorithm/AlgorithmVO.java

@@ -8,7 +8,6 @@ import lombok.*;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@Builder
 public class AlgorithmVO {
     private String id;  //算法ID
     private String algorithmCode;   //算法名称

api-common/src/main/java/api/common/pojo/vo/model/VehicleVO.java

@@ -8,9 +8,9 @@ import lombok.NoArgsConstructor;
 import java.math.BigDecimal;
 import java.util.List;
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@Builder
 public class VehicleVO {
     private String saveOrShare = "0";   // 0 保存 1 分享
     private String id;  //主键id

api-common/src/main/java/api/common/pojo/vo/scene/SceneAccidentVO.java

@@ -8,7 +8,7 @@ import java.io.Serializable;
 /**
  * 交通事故场景
  */
-@EqualsAndHashCode()
+@EqualsAndHashCode(callSuper = false)
 @Data
 @Builder
 @NoArgsConstructor

api-common/src/main/java/api/common/pojo/vo/scene/SceneNaturalVO.java

@@ -8,7 +8,7 @@ import java.io.Serializable;
 /**
  * 自然驾驶场景
  */
-@EqualsAndHashCode()
+@EqualsAndHashCode(callSuper = false)
 @Data
 @Builder
 @NoArgsConstructor

api-common/src/main/java/api/common/pojo/vo/scene/ScenePackageSublistVO.java

@@ -10,7 +10,6 @@ import java.util.List;
  */
 @EqualsAndHashCode()
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class ScenePackageSublistVO implements Serializable {

api-common/src/main/java/api/common/pojo/vo/scene/ScenePackageVO.java

@@ -9,7 +9,7 @@ import java.sql.Timestamp;
 /**
  * 测试场景包
  */
-@EqualsAndHashCode()
+@EqualsAndHashCode(callSuper = false)
 @Data
 @Builder
 @NoArgsConstructor

api-common/src/main/java/api/common/pojo/vo/scene/ScoringRulesVO.java

@@ -9,7 +9,7 @@ import java.sql.Timestamp;
 /**
  * 打分规则
  */
-@EqualsAndHashCode()
+@EqualsAndHashCode(callSuper = false)
 @Data
 @Builder
 @NoArgsConstructor

api-common/src/main/java/api/common/pojo/vo/scene/StandardsRegulationsVO.java

@@ -8,7 +8,7 @@ import java.io.Serializable;
 /**
  * 标准法规场景
  */
-@EqualsAndHashCode()
+@EqualsAndHashCode(callSuper = false)
 @Data
 @Builder
 @NoArgsConstructor

api-common/src/main/java/api/common/util/ParamUtil.java

@@ -1,6 +1,8 @@
 package api.common.util;
 
 
+import lombok.extern.slf4j.Slf4j;
+
 import java.lang.reflect.Method;
 import java.util.LinkedList;
 import java.util.List;
@@ -8,31 +10,30 @@ import java.util.List;
 /**
  * 参数转换工具类
  */
+@Slf4j
 public class ParamUtil {
 
     /**
      * 将多级下拉二维数组中的数据，赋值到对应对象的属性中
      */
-    @SuppressWarnings("unchecked")
-    public static void arrConvertObj(String[][] arr,Object object) {
+    public static void arrConvertObj(String[][] arr, Object object) {
         try {
-            if(arr == null || arr.length == 0){
-                return ;
+            if (arr == null || arr.length == 0) {
+                return;
             }
-            for (int i = 0; i < arr.length; i++) {
-                String[] selector = arr[i];
+            for (String[] selector : arr) {
                 //至少包含两级
-                if(selector != null && selector.length >= 2){
+                if (selector != null && selector.length >= 2) {
                     //截取type和value
-                    String type = selector[selector.length-2];
-                    String value = selector[selector.length-1];
-                    String filedName = type.substring(0,1).toUpperCase() + type.substring(1);
+                    String type = selector[selector.length - 2];
+                    String value = selector[selector.length - 1];
+                    String filedName = type.substring(0, 1).toUpperCase() + type.substring(1);
                     //get方法
-                    String getMethodName = "get" + filedName ;
-                    Method getMethod = object.getClass().getMethod(getMethodName,null);
+                    String getMethodName = "get" + filedName;
+                    Method getMethod = object.getClass().getMethod(getMethodName, (Class<?>) null);
 
                     List<String> getValue = (List<String>) getMethod.invoke(object);
-                    if(getValue == null || getValue.size() == 0){
+                    if (getValue == null || getValue.isEmpty()) {
                         getValue = new LinkedList<>();
                     }
                     getValue.add(value);
@@ -43,7 +44,7 @@ public class ParamUtil {
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage());
         }
     }
 }

simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/acl/entity/AlgorithmExpandAclEntity.java

@@ -9,7 +9,6 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@Builder
 public class AlgorithmExpandAclEntity {
     @JsonAlias({"id"})
     private String id = "";

simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/mysql/entity/AlgorithmEntity.java

@@ -8,7 +8,6 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@Builder
 public class AlgorithmEntity {
     private String minioPath = "";
 }

simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/mysql/entity/AlgorithmExpandEntity.java

@@ -8,7 +8,6 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@Builder
 public class AlgorithmExpandEntity {
     private String id = "";
     private String algorithmId = "";

simulation-resource-monitor/src/main/java/com/css/simulation/resource/monitor/acl/entity/AlgorithmExpandAclEntity.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonAlias;
 
 
 @lombok.Data
-@lombok.Builder
 @lombok.NoArgsConstructor
 @lombok.AllArgsConstructor
 public class AlgorithmExpandAclEntity {

simulation-resource-monitor/src/main/java/com/css/simulation/resource/monitor/app/service/impl/AlgorithmExpandApplicationServiceImpl.java

@@ -7,6 +7,7 @@ import com.css.simulation.resource.monitor.app.service.AlgorithmExpandApplicatio
 import com.css.simulation.resource.monitor.infra.mysql.entity.AlgorithmExpandEntity;
 import com.css.simulation.resource.monitor.infra.mysql.mapper.AlgorithmExpandMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -30,11 +31,13 @@ public class AlgorithmExpandApplicationServiceImpl implements AlgorithmExpandApp
             //1 获取算法平台查询到的所有算法ID
             final List<String> aclAlgorithmIds = algorithmExpandAclEntities.stream().map(AlgorithmExpandAclEntity::getAlgorithmId).collect(Collectors.toList());
             log.info("算法平台的算法ID列表为：{}", aclAlgorithmIds);
-            List<String> infrastructureAlgorithmIds = algorithmExpandMapper.selectAlgorithmIds(AlgorithmExpandEntity.builder().build());
+            List<String> infrastructureAlgorithmIds = algorithmExpandMapper.selectAlgorithmIds(new AlgorithmExpandEntity());
             //2 仿真云存在而算法平台不存在，则将仿真云的数据删除
             for (String infrastructureAlgorithmId : infrastructureAlgorithmIds) {
                 if (!aclAlgorithmIds.contains(infrastructureAlgorithmId)) {
-                    algorithmExpandMapper.delete(AlgorithmExpandEntity.builder().algorithmId(infrastructureAlgorithmId).build());
+                    AlgorithmExpandEntity algorithmExpandEntity = new AlgorithmExpandEntity();
+                    algorithmExpandEntity.setAlgorithmId(infrastructureAlgorithmId);
+                    algorithmExpandMapper.delete(algorithmExpandEntity);
                 }
             }
         }

simulation-resource-monitor/src/main/java/com/css/simulation/resource/monitor/infra/mysql/entity/AlgorithmExpandEntity.java

@@ -10,7 +10,6 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@Builder
 public class AlgorithmExpandEntity {
     private String id = "";
     private String algorithmId = "";

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/impl/SimulationProjectServiceImpl.java

@@ -4477,7 +4477,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             simulationManualProjectTaskMapper.updateTaksResult(manualProjectTaskPo);
 
         } catch (Exception e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
         } finally {
             try {
                 if (fileInputStream != null) {
@@ -4495,15 +4495,17 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                  * }
                  */
             } catch (IOException e) {
-                e.printStackTrace();
-
+                log.error(e.getMessage());
             }
         }
 
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
 
     }
 
+    /**
+     * 标准化测试 - 下载 - 任务文件
+     */
     @Override
     public void exportProjectTaskFileById(SimulationManualProjectParam param) {
         String id = param.getId();
@@ -4521,40 +4523,39 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         sp.setId(id);
         SimulationManualProjectPO spo = simulationManualProjectMapper.selectProjectBaseById(sp);
         String rootPath = spo.getProjectName();
-        // FileUtil.createDirectory(rootPath);
 
         int len;
         byte[] buffer = new byte[1024];
-        // BufferedInputStream in = null;
         ZipOutputStream zos = null;
-        // InputStream inputStream = null;
         File pdfFile = null;
         try {
             HttpServletResponse response = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
             response.setContentType("multipart/form-data");
             response.setHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode("运行任务包.zip", "UTF-8"));
             zos = new ZipOutputStream(response.getOutputStream());
+            // 下载所有任务的数据文件
+            log.info("项目 {} 共有 {} 个任务。", id, manualProjectTaskVos.size());
             int i = 1;
-            // ArrayList<String> fileList = CollectionUtil.createArrayList("Ego.csv",
-            // "evaluation.csv");
             for (ManualProjectTaskVo task : manualProjectTaskVos) {
+                log.info("当前下载进度为 {}/{}。", i++, manualProjectTaskVos.size());
                 String taskId = task.getId();
                 String runResultFilePath = task.getRunResultFilePath();
                 if (!isEmpty(runResultFilePath)) {
-
                     // 获取场景名
                     SceneBaseInfoVo sceneBaseInfoVo = getSceneNameAndOther(task.getSceneId(), task.getSceneType());
                     String sceneName = sceneBaseInfoVo.getCommonSceneName();
-
                     // 任务包路径
-                    // String taskPagePath = rootPath + File.separator + sceneName + "(" + i + ")";
                     String taskPagePath = rootPath + File.separator + sceneName + "- " + taskId.substring(0, 8);
-
                     // 视频文件路径
                     MinioParameter minioParameter1 = new MinioParameter();
                     minioParameter1.setObjectName(runResultFilePath);
                     ResponseBodyVO<List<String>> list = fileDownService.list(minioParameter1);
                     List<String> info = list.getInfo();
+                    // 防止下载两次，因为结果目录里有测试用的同名文件
+                    boolean mp4_done = false;
+                    boolean Ego_csv_done = false;
+                    boolean evaluation_csv_done = false;
+
                     for (String s : info) {
                         String fileName;
                         String zipPath;
@@ -4568,6 +4569,9 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                         // 文件后缀
                         String substring = s.substring(s.lastIndexOf(".") + 1);
                         if ("mp4".equals(substring)) {
+                            if (mp4_done) {
+                                continue;
+                            }
                             // mp4视频文件导出
                             MinioParameter minioParameter2 = new MinioParameter();
                             minioParameter2.setObjectName(s);
@@ -4580,8 +4584,36 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                                 zos.write(buffer, 0, len);
                             }
                             in.close();
-                        } else if ("Ego.csv".equals(fileName) || "evaluation.csv".equals(fileName)) {
+                            mp4_done = true;
+                        } else if ("Ego.csv".equals(fileName)) {
+                            if (Ego_csv_done) {
+                                continue;
+                            }
+                            MinioParameter minioParameter = new MinioParameter();
+                            if (s.contains("/")) {
+                                minioParameter.setObjectName(runResultFilePath + "/" + fileName);
+                            } else {
+                                minioParameter.setObjectName(runResultFilePath + "\\" + fileName);
+                            }
+
+                            Response download = fileDownService.download(minioParameter);
+                            Response.Body body = download.body();
+
+                            // 任务文件路径
+                            String taskFilePath = taskPagePath + File.separator + fileName;
 
+                            ZipEntry entry = new ZipEntry(taskFilePath);
+                            zos.putNextEntry(entry);
+                            BufferedInputStream in = new BufferedInputStream(body.asInputStream());
+                            while ((len = in.read(buffer)) != -1) {
+                                zos.write(buffer, 0, len);
+                            }
+                            in.close();
+                            Ego_csv_done = true;
+                        } else if ("evaluation.csv".equals(fileName)) {
+                            if (evaluation_csv_done) {
+                                continue;
+                            }
                             MinioParameter minioParameter = new MinioParameter();
                             if (s.contains("/")) {
                                 minioParameter.setObjectName(runResultFilePath + "/" + fileName);
@@ -4602,9 +4634,9 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                                 zos.write(buffer, 0, len);
                             }
                             in.close();
+                            evaluation_csv_done = true;
                         }
                     }
-                    i++;
                 }
             }