故障诊断结果更新

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

@@ -1,29 +1,21 @@
 package org.eco.als.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.hutool.core.collection.CollUtil;
 import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.eco.als.domain.bo.FaultDiagnosisResultBo;
 import org.eco.als.domain.vo.FaultDiagnosisResultVo;
 import org.eco.als.service.IFaultDiagnosisResultService;
 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.excel.utils.ExcelUtil;
 import org.eco.common.log.annotation.Log;
 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.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -31,7 +23,7 @@ import java.util.List;
  * 故障诊断结果Controller
  *
  * @author wgk
- * @date 2024-07-23
+ * @date 2024-11-25
  */
 @Validated
 @RequiredArgsConstructor
@@ -56,14 +48,9 @@ public class FaultDiagnosisResultController extends BaseController {
     @SaCheckPermission("als:faultDiagnosisResult:export")
     @Log(title = "故障诊断结果", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public CommonResult<Void> export(FaultDiagnosisResultBo faultDiagnosisResultBo) {
-        LoginUser loginUser = LoginHelper.getLoginUser();
+    public void export(HttpServletResponse response, FaultDiagnosisResultBo faultDiagnosisResultBo) {
         List<FaultDiagnosisResultVo> list = faultDiagnosisResultService.selectList(faultDiagnosisResultBo);
-        if (CollUtil.isEmpty(list)) {
-            return CommonResult.fail("导出列表为空");
-        }
-        faultDiagnosisResultService.asyncExport(list, "故障诊断结果", loginUser);
-        return CommonResult.success();
+        ExcelUtil.exportExcel(list, "故障诊断结果", FaultDiagnosisResultVo.class, response);
     }
 
     /**

als-modules/agile-assurance/src/main/java/org/eco/als/domain/FaultDiagnosisResult.java

@@ -13,7 +13,7 @@ import java.io.Serial;
  * 故障诊断结果对象 als_fault_diagnosis_result_t
  *
  * @author wgk
- * @date 2024-07-23
+ * @date 2024-11-25
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -42,11 +42,42 @@ public class FaultDiagnosisResult extends BaseEntity {
      * 机号
      */
     private String aircraftId;
+
+    /**
+     * 模型类型
+     */
+    private String modelType;
+
+    /**
+     * 参数
+     */
+    private String param;
+
+    /**
+     * 数据列
+     */
+    private String columnData;
+
+    /**
+     * 文件Id
+     */
+    private Long ossId;
+
+    /**
+     * 结果
+     */
+    private String resultContent;
+
     /**
      * 状态（1正常）
      */
     private String status;
 
+    /**
+     * 备注
+     */
+    private String remarks;
+
     /**
      * 删除标识（1删除 0未删除）
      */

als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/FaultDiagnosisResultBo.java

@@ -1,8 +1,7 @@
 package org.eco.als.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.eco.als.domain.FaultDiagnosisResult;
@@ -12,8 +11,9 @@ import org.eco.common.orm.core.domain.BaseEntity;
  * 故障诊断结果业务对象 als_fault_diagnosis_result_t
  *
  * @author wgk
- * @date 2024-07-23
+ * @date 2024-11-25
  */
+@Builder
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = FaultDiagnosisResult.class, reverseConvertGenerate = false)
@@ -26,26 +26,52 @@ public class FaultDiagnosisResultBo extends BaseEntity {
     /**
      * 故障诊断编号
      */
-    @NotNull(message = "故障诊断编号不能为空")
     private Long diagnosisId;
 
     /**
      * 架次号
      */
-    @NotBlank(message = "架次号不能为空")
     private String sortieNo;
 
     /**
-     * 机号Id
+     * 机号
      */
-    @NotNull(message = "机号不能为空")
     private String aircraftId;
 
+    /**
+     * 模型类型
+     */
+    private String modelType;
+
+    /**
+     * 参数
+     */
+    private String param;
+
+    /**
+     * 数据列
+     */
+    private String columnData;
+
+    /**
+     * 文件Id
+     */
+    private Long ossId;
+
+    /**
+     * 结果
+     */
+    private String resultContent;
+
     /**
      * 状态（1正常）
      */
-    @NotBlank(message = "状态（1正常）不能为空")
     private String status;
 
+    /**
+     * 备注
+     */
+    private String remarks;
+
 
 }

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FaultDiagnosisResultVo.java

@@ -19,7 +19,7 @@ import java.io.Serializable;
  * 故障诊断结果视图对象 als_fault_diagnosis_result_t
  *
  * @author wgk
- * @date 2024-07-23
+ * @date 2024-11-25
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -49,24 +49,54 @@ public class FaultDiagnosisResultVo extends BaseEntity implements Serializable {
     private String sortieNo;
 
     /**
-     * 机号Id
+     * 机号
      */
+    @ExcelProperty(value = "机号")
     private String aircraftId;
 
     /**
-     * 机号
+     * 模型类型
      */
-    @ExcelProperty(value = "机号")
-    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
-    private String aircraftNo;
+    @ExcelProperty(value = "模型类型")
+    private String modelType;
+
+    /**
+     * 参数
+     */
+    @ExcelProperty(value = "参数")
+    private String param;
+
+    /**
+     * 数据列
+     */
+    @ExcelProperty(value = "数据列")
+    private String columnData;
+
+    /**
+     * 文件Id
+     */
+    @ExcelProperty(value = "文件Id")
+    private Long ossId;
+
+    /**
+     * 结果
+     */
+    @ExcelProperty(value = "结果")
+    private String resultContent;
 
     /**
      * 状态（1正常）
      */
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "common_type")
+    @ExcelDictFormat(readConverterExp = "1=正常")
     private String status;
 
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remarks;
+
     /**
      * 删除标识（1删除 0未删除）
      */

als-modules/agile-assurance/src/main/java/org/eco/als/mapper/FaultDiagnosisResultMapper.java

@@ -8,7 +8,7 @@ import org.eco.als.domain.FaultDiagnosisResult;
  * 故障诊断结果Mapper接口
  *
  * @author wgk
- * @date 2024-07-23
+ * @date 2024-11-25
  */
 @Mapper
 public interface FaultDiagnosisResultMapper extends BaseMapper<FaultDiagnosisResult> {

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

@@ -3,10 +3,8 @@ package org.eco.als.service;
 import org.eco.als.domain.FaultDiagnosisResult;
 import org.eco.als.domain.bo.FaultDiagnosisResultBo;
 import org.eco.als.domain.vo.FaultDiagnosisResultVo;
-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 java.util.List;
 
@@ -14,7 +12,7 @@ import java.util.List;
  * 故障诊断结果Service接口
  *
  * @author wgk
- * @date 2024-07-23
+ * @date 2024-11-25
  */
 public interface IFaultDiagnosisResultService extends IBaseService<FaultDiagnosisResult> {
     /**
@@ -72,15 +70,4 @@ public interface IFaultDiagnosisResultService extends IBaseService<FaultDiagnosi
      * @return 结果:true 删除成功，false 删除失败
      */
     boolean deleteByIds(Long[] ids);
-
-    /**
-     * asyncExport 异步导出
-     *
-     * @param listVo    数据列表
-     * @param sheetName 文件名称
-     * @param user      上下文
-     */
-    @Async
-    void asyncExport(List<FaultDiagnosisResultVo> listVo, String sheetName, LoginUser user);
-
 }

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

@@ -45,9 +45,6 @@ public class AlgorithmService implements IAlgorithmService {
     @Resource
     private IModelService modelService;
 
-    @Resource
-    private IDataImportService dataImportService;
-
     @Resource
     private ISysOssService ossService;
 
@@ -65,6 +62,8 @@ public class AlgorithmService implements IAlgorithmService {
 
     @Resource
     private IFaultDiagnosisService faultDiagnosisService;
+    @Resource
+    private IFaultDiagnosisResultService faultDiagnosisResultService;
 
     @Resource
     private ITaskService taskService;
@@ -232,6 +231,13 @@ public class AlgorithmService implements IAlgorithmService {
             diagnosisBo.setStatus("1");
             diagnosisBo.setResultContent(httpVo.getData());
             faultDiagnosisService.update(diagnosisBo);
+            FaultDiagnosisResultBo resultBo = FaultDiagnosisResultBo.builder()
+                .aircraftId(diagnosisBo.getAircraftId())
+                .diagnosisId(diagnosisBo.getId())
+                .resultContent(httpVo.getData())
+                .sortieNo(diagnosisBo.getSortieNo())
+                .build();
+            faultDiagnosisResultService.insert(resultBo);
         }
         return httpVo != null ? httpVo.getData() : null;
     }

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

@@ -10,14 +10,10 @@ import org.eco.als.domain.bo.FaultDiagnosisResultBo;
 import org.eco.als.domain.vo.FaultDiagnosisResultVo;
 import org.eco.als.mapper.FaultDiagnosisResultMapper;
 import org.eco.als.service.IFaultDiagnosisResultService;
-import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.common.core.core.page.PageResult;
 import org.eco.common.core.utils.MapstructUtils;
-import org.eco.common.excel.entity.ExcelResultRes;
-import org.eco.common.excel.service.IExcelService;
 import org.eco.common.orm.core.page.PageQuery;
 import org.eco.common.orm.core.service.impl.BaseServiceImpl;
-import org.eco.system.service.IImportExportService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -30,7 +26,7 @@ import static org.eco.als.domain.table.FaultDiagnosisResultTableDef.FAULT_DIAGNO
  * 故障诊断结果Service业务层处理
  *
  * @author wgk
- * @date 2024-07-23
+ * @date 2024-11-25
  */
 @Service
 @Slf4j
@@ -38,12 +34,6 @@ public class FaultDiagnosisResultServiceImpl extends BaseServiceImpl<FaultDiagno
     @Resource
     private FaultDiagnosisResultMapper faultDiagnosisResultMapper;
 
-    @Resource
-    private IExcelService excelService;
-
-    @Resource
-    private IImportExportService importExportService;
-
     @Override
     public QueryWrapper query() {
         return super.query().from(FAULT_DIAGNOSIS_RESULT);
@@ -57,8 +47,20 @@ public class FaultDiagnosisResultServiceImpl extends BaseServiceImpl<FaultDiagno
             (faultDiagnosisResultBo.getSortieNo()));
         queryWrapper.and(FAULT_DIAGNOSIS_RESULT.AIRCRAFT_ID.eq
             (faultDiagnosisResultBo.getAircraftId()));
+        queryWrapper.and(FAULT_DIAGNOSIS_RESULT.MODEL_TYPE.eq
+            (faultDiagnosisResultBo.getModelType()));
+        queryWrapper.and(FAULT_DIAGNOSIS_RESULT.PARAM.eq
+            (faultDiagnosisResultBo.getParam()));
+        queryWrapper.and(FAULT_DIAGNOSIS_RESULT.COLUMN_DATA.eq
+            (faultDiagnosisResultBo.getColumnData()));
+        queryWrapper.and(FAULT_DIAGNOSIS_RESULT.OSS_ID.eq
+            (faultDiagnosisResultBo.getOssId()));
+        queryWrapper.and(FAULT_DIAGNOSIS_RESULT.RESULT_CONTENT.eq
+            (faultDiagnosisResultBo.getResultContent()));
         queryWrapper.and(FAULT_DIAGNOSIS_RESULT.STATUS.eq
             (faultDiagnosisResultBo.getStatus()));
+        queryWrapper.and(FAULT_DIAGNOSIS_RESULT.REMARKS.eq
+            (faultDiagnosisResultBo.getRemarks()));
 
         return queryWrapper;
     }
@@ -138,20 +140,12 @@ public class FaultDiagnosisResultServiceImpl extends BaseServiceImpl<FaultDiagno
     public boolean update(FaultDiagnosisResultBo faultDiagnosisResultBo) {
         FaultDiagnosisResult faultDiagnosisResult = MapstructUtils.convert(faultDiagnosisResultBo, FaultDiagnosisResult.class);
         if (ObjectUtil.isNotNull(faultDiagnosisResult) && ObjectUtil.isNotNull(faultDiagnosisResult.getId())) {
-            return this.updateById(faultDiagnosisResult);
+            boolean updated = this.updateById(faultDiagnosisResult);
+            return updated;
         }
         return false;
     }
 
-    @Override
-    public void asyncExport(List<FaultDiagnosisResultVo> listVo, String sheetName, LoginUser loginUser) {
-        ExcelResultRes result = excelService.exportExcel(listVo, sheetName, FaultDiagnosisResultVo.class);
-        boolean flag = importExportService.saveInfo(result, loginUser, "1");
-        if (flag) {
-            log.info("异步导出日志写入成功");
-        }
-    }
-
     /**
      * 批量删除故障诊断结果
      *