Gaokun Wang 3 hónapja
szülő
commit
2a166ef836

+ 13 - 6
als-modules/agile-assurance/src/main/java/org/eco/als/controller/WarningController.java

@@ -2,10 +2,12 @@ package org.eco.als.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONObject;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.eco.als.domain.bo.WarningBo;
+import org.eco.als.domain.vo.DataImportVo;
 import org.eco.als.domain.vo.JudgeFaultLogicVo;
 import org.eco.als.domain.vo.WarningImportVo;
 import org.eco.als.domain.vo.WarningVo;
@@ -13,9 +15,12 @@ import org.eco.als.listener.WarningImportListener;
 import org.eco.als.service.IDataImportService;
 import org.eco.als.service.IJudgeFaultLogicService;
 import org.eco.als.service.IWarningService;
+import org.eco.als.utils.CsvUtils;
+import org.eco.common.core.constant.Constants;
 import org.eco.common.core.core.domain.CommonResult;
 import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.common.core.core.page.PageResult;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.excel.core.ExcelResult;
 import org.eco.common.excel.utils.ExcelUtil;
 import org.eco.common.log.annotation.Log;
@@ -23,6 +28,7 @@ import org.eco.common.log.enums.BusinessType;
 import org.eco.common.security.utils.LoginHelper;
 import org.eco.common.web.annotation.RepeatSubmit;
 import org.eco.common.web.core.BaseController;
+import org.eco.system.domain.vo.SysOssVo;
 import org.eco.system.service.ISysOssService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -30,6 +36,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 
 /**
  * 警告信息Controller
@@ -155,12 +162,12 @@ public class WarningController extends BaseController {
         if (ObjectUtil.isEmpty(judgeFaultLogicVo)) {
             return CommonResult.fail("判故逻辑不能为空,请配置.");
         }
-//        String columnData = judgeFaultLogicVo.getParameterColumn();
-//        DataImportVo dataImportVo = dataImportService.selectBySortieNo(sortieNo);
-//        SysOssVo ossVo = sysOssService.getById(dataImportVo.getOssId());
-//        // 数据库资源地址
-//        String path = StringUtils.substringAfter(ossVo.getFileName(), Constants.RESOURCE_PREFIX);
-//        JSONObject res = CsvUtils.getPlaybackByHeaders(path, Arrays.asList(columnData.split(",")), null);
+        String columnData = judgeFaultLogicVo.getAttribute1();
+        DataImportVo dataImportVo = dataImportService.selectBySortieNo(sortieNo);
+        SysOssVo ossVo = sysOssService.getById(dataImportVo.getOssId());
+        // 数据库资源地址
+        String path = StringUtils.substringAfter(ossVo.getFileName(), Constants.RESOURCE_PREFIX);
+        JSONObject res = CsvUtils.getPlaybackByHeaders(path, Arrays.asList(columnData.split(",")), null);
         return CommonResult.success();
     }
 }