Ver Fonte

删除冗余代码

Gaokun Wang há 4 meses atrás
pai
commit
092741ec26

+ 7 - 18
als-modules/agile-assurance/src/main/java/org/eco/als/controller/WarningController.java

@@ -2,13 +2,10 @@ package org.eco.als.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-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;
@@ -16,12 +13,9 @@ 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;
@@ -29,7 +23,6 @@ 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.*;
@@ -37,7 +30,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 
 /**
  * 警告信息Controller
@@ -163,15 +155,12 @@ public class WarningController extends BaseController {
         if (ObjectUtil.isEmpty(judgeFaultLogicVo)) {
             return CommonResult.fail("判故逻辑不能为空,请配置.");
         }
-        if (StrUtil.isBlank(judgeFaultLogicVo.getParameterColumn())) {
-            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);
-        return CommonResult.success(ObjectUtil.isEmpty(res) ? null : String.valueOf(res), "");
+//        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);
+        return CommonResult.success();
     }
 }

+ 0 - 5
als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/JudgeFaultLogicVo.java

@@ -42,10 +42,6 @@ private static final long serialVersionUID = 1L;
     @ExcelProperty(value = "HMC码")
     private String hmcCode;
 
-    /** 参数列 */
-    @ExcelProperty(value = "参数列", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_device_type")
-    private String parameterColumn;
 
     /** 模型 */
     @ExcelProperty(value = "模型")
@@ -107,7 +103,6 @@ private static final long serialVersionUID = 1L;
      */
     private String attribute5;
 
-
     /**
      * 创建人名称
      */