获取警告信息对应的参数详细信息, 更新判故逻辑

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

@@ -6,10 +6,12 @@ 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;
 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;
@@ -53,6 +55,8 @@ public class WarningController extends BaseController {
 
     @Resource
     private ISysOssService sysOssService;
+    @Resource
+    private IJudgeFaultLogicService judgeFaultLogicService;
 
     /**
      * 查询警告信息列表
@@ -152,11 +156,12 @@ public class WarningController extends BaseController {
      */
     @GetMapping(value = "/{code}/{sortieNo}")
     public CommonResult<String> getInfoByHmc(@PathVariable String code, @PathVariable String sortieNo) {
-        String columnData = "时间,发动机排气温度";
+        JudgeFaultLogicVo judgeFaultLogicVo = judgeFaultLogicService.selectByHmc(code);
+        String columnData = judgeFaultLogicVo.getParameterColumn();
         DataImportVo dataImportVo = dataImportService.selectBySortieNo(sortieNo);
         SysOssVo ossVo = sysOssService.getById(dataImportVo.getOssId());
         // 数据库资源地址
         String path = StringUtils.substringAfter(ossVo.getFileName(), Constants.RESOURCE_PREFIX);
-        return CommonResult.success(String.valueOf(CsvUtils.getPlaybackByHeaders(path, Arrays.asList(columnData.split(",")), null)),"");
+        return CommonResult.success(String.valueOf(CsvUtils.getPlaybackByHeaders(path, Arrays.asList(columnData.split(",")), null)), "");
     }
 }

als-modules/agile-assurance/src/main/java/org/eco/als/service/IJudgeFaultLogicService.java

@@ -1,14 +1,15 @@
 package org.eco.als.service;
 
-import java.util.List;
-import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.als.domain.JudgeFaultLogic;
-import org.eco.als.domain.vo.JudgeFaultLogicVo;
 import org.eco.als.domain.bo.JudgeFaultLogicBo;
+import org.eco.als.domain.vo.JudgeFaultLogicVo;
+import org.eco.common.core.core.domain.model.LoginUser;
+import org.eco.common.core.core.page.PageResult;
 import org.eco.common.orm.core.service.IBaseService;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.multipart.MultipartFile;
-import org.eco.common.core.core.page.PageResult;
+
+import java.util.List;
 
 /**
  * 判故逻辑Service接口
@@ -23,7 +24,16 @@ public interface IJudgeFaultLogicService extends IBaseService<JudgeFaultLogic> {
      * @param id 判故逻辑主键
      * @return 判故逻辑
      */
-        JudgeFaultLogicVo selectById(Long id);
+    JudgeFaultLogicVo selectById(Long id);
+
+    /**
+     * 查询判故逻辑
+     *
+     * @param code 判故逻辑主键
+     * @return 判故逻辑
+     */
+    JudgeFaultLogicVo selectByHmc(String code);
+
     /**
      * 查询判故逻辑列表
      *

als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/JudgeFaultLogicServiceImpl.java

@@ -22,7 +22,9 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.IOException;
+
 import org.eco.als.mapper.JudgeFaultLogicMapper;
 import org.eco.als.domain.JudgeFaultLogic;
 import org.eco.als.domain.bo.JudgeFaultLogicBo;
@@ -30,6 +32,7 @@ import org.eco.als.domain.vo.JudgeFaultLogicVo;
 import org.eco.als.domain.vo.JudgeFaultLogicImportVo;
 import org.eco.als.listener.JudgeFaultLogicImportListener;
 import org.eco.als.service.IJudgeFaultLogicService;
+
 import static org.eco.als.domain.table.JudgeFaultLogicTableDef.JUDGE_FAULT_LOGIC;
 
 /**
@@ -58,9 +61,9 @@ public class JudgeFaultLogicServiceImpl extends BaseServiceImpl<JudgeFaultLogicM
     private QueryWrapper buildQueryWrapper(JudgeFaultLogicBo judgeFaultLogicBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.or(JUDGE_FAULT_LOGIC.MODEL.like
-        (judgeFaultLogicBo.getKeyWord()));
+            (judgeFaultLogicBo.getKeyWord()));
         queryWrapper.or(JUDGE_FAULT_LOGIC.HMC_CODE.like
-        (judgeFaultLogicBo.getKeyWord()));
+            (judgeFaultLogicBo.getKeyWord()));
 
         return queryWrapper;
     }
@@ -73,7 +76,19 @@ public class JudgeFaultLogicServiceImpl extends BaseServiceImpl<JudgeFaultLogicM
      */
     @Override
     public JudgeFaultLogicVo selectById(Long id) {
-            return this.getOneAs(query().where(JUDGE_FAULT_LOGIC.ID.eq(id)), JudgeFaultLogicVo.class);
+        return this.getOneAs(query().where(JUDGE_FAULT_LOGIC.ID.eq(id)), JudgeFaultLogicVo.class);
+
+    }
+
+    /**
+     * 查询判故逻辑
+     *
+     * @param code hmc码
+     * @return 判故逻辑
+     */
+    @Override
+    public JudgeFaultLogicVo selectByHmc(String code) {
+        return this.getOneAs(query().where(JUDGE_FAULT_LOGIC.HMC_CODE.eq(code)), JudgeFaultLogicVo.class);
 
     }
 
@@ -87,7 +102,7 @@ public class JudgeFaultLogicServiceImpl extends BaseServiceImpl<JudgeFaultLogicM
     @Override
     public List<JudgeFaultLogicVo> selectList(JudgeFaultLogicBo judgeFaultLogicBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(judgeFaultLogicBo);
-            return this.listAs(queryWrapper, JudgeFaultLogicVo.class);
+        return this.listAs(queryWrapper, JudgeFaultLogicVo.class);
     }
 
     /**
@@ -99,7 +114,7 @@ public class JudgeFaultLogicServiceImpl extends BaseServiceImpl<JudgeFaultLogicM
     @Override
     public PageResult<JudgeFaultLogicVo> selectPage(JudgeFaultLogicBo judgeFaultLogicBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(judgeFaultLogicBo);
-            Page<JudgeFaultLogicVo> page = this.pageAs(PageQuery.build(), queryWrapper, JudgeFaultLogicVo.class);
+        Page<JudgeFaultLogicVo> page = this.pageAs(PageQuery.build(), queryWrapper, JudgeFaultLogicVo.class);
         return PageResult.build(page);
     }
 
@@ -111,7 +126,7 @@ public class JudgeFaultLogicServiceImpl extends BaseServiceImpl<JudgeFaultLogicM
      */
     @Override
     public boolean insert(JudgeFaultLogicBo judgeFaultLogicBo) {
-    JudgeFaultLogic judgeFaultLogic =MapstructUtils.convert(judgeFaultLogicBo, JudgeFaultLogic. class);
+        JudgeFaultLogic judgeFaultLogic = MapstructUtils.convert(judgeFaultLogicBo, JudgeFaultLogic.class);
 
         return this.save(judgeFaultLogic);//使用全局配置的雪花算法主键生成器生成ID值
     }
@@ -123,12 +138,11 @@ public class JudgeFaultLogicServiceImpl extends BaseServiceImpl<JudgeFaultLogicM
      * @return 结果:true 操作成功，false 操作失败
      */
     @Override
-    public boolean insertWithPk(JudgeFaultLogicBo judgeFaultLogicBo)
-    {
+    public boolean insertWithPk(JudgeFaultLogicBo judgeFaultLogicBo) {
         JudgeFaultLogic judgeFaultLogic = MapstructUtils.convert(judgeFaultLogicBo, JudgeFaultLogic.class);
 
 
-            return judgeFaultLogicMapper.insertWithPk(judgeFaultLogic) > 0;//前台传来主键值
+        return judgeFaultLogicMapper.insertWithPk(judgeFaultLogic) > 0;//前台传来主键值
     }
 
     /**
@@ -139,10 +153,10 @@ public class JudgeFaultLogicServiceImpl extends BaseServiceImpl<JudgeFaultLogicM
      */
     @Override
     public boolean update(JudgeFaultLogicBo judgeFaultLogicBo) {
-        JudgeFaultLogic judgeFaultLogic =MapstructUtils.convert(judgeFaultLogicBo, JudgeFaultLogic. class);
-        if (ObjectUtil.isNotNull(judgeFaultLogic) && ObjectUtil.isNotNull(judgeFaultLogic.getId())){
+        JudgeFaultLogic judgeFaultLogic = MapstructUtils.convert(judgeFaultLogicBo, JudgeFaultLogic.class);
+        if (ObjectUtil.isNotNull(judgeFaultLogic) && ObjectUtil.isNotNull(judgeFaultLogic.getId())) {
             boolean updated = this.updateById(judgeFaultLogic);
-                return updated;
+            return updated;
         }
         return false;
     }