故障案例,导入

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

@@ -85,8 +85,7 @@ public class FaultCaseController extends BaseController {
     @SaCheckPermission("als:faultCase:import")
     @PostMapping("/importData")
     public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) throws IOException {
-        LoginUser loginUser = LoginHelper.getLoginUser();
-        ExcelResult<FaultCaseImportVo> result = ExcelUtil.importExcel(file.getInputStream(), FaultCaseImportVo.class, new FaultCaseImportListener(updateSupport, loginUser));
+        ExcelResult<FaultCaseImportVo> result = ExcelUtil.importExcel(file.getInputStream(), FaultCaseImportVo.class, new FaultCaseImportListener(updateSupport, null));
         return CommonResult.success(result.getAnalysis().getLogInfo());
     }
 

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

@@ -2,12 +2,11 @@ package org.eco.als.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.eco.common.excel.annotation.ExcelDictFormat;
-import org.eco.common.excel.convert.ExcelDictConvert;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.io.Serial;
 import java.io.Serializable;
-import lombok.NoArgsConstructor;
 
 /**
  * 故障案例导入视图对象 als_fault_case_t
@@ -26,7 +25,6 @@ public class FaultCaseImportVo implements Serializable {
 
 
                 /** 飞机编号 */
-                    @ExcelProperty(value = "飞机编号")
                 private String aircraftTypeId;
 
                 /** 机型 */
@@ -34,7 +32,6 @@ public class FaultCaseImportVo implements Serializable {
                 private String aircraftTypeName;
 
                 /** 系统编号 */
-                    @ExcelProperty(value = "系统编号")
                 private String aircraftSystemId;
 
                 /** 系统 */
@@ -42,7 +39,6 @@ public class FaultCaseImportVo implements Serializable {
                 private String aircraftSystemName;
 
                 /** 分系统编号 */
-                    @ExcelProperty(value = "分系统编号")
                 private String aircraftSubsystemId;
 
                 /** 分系统 */
@@ -50,7 +46,6 @@ public class FaultCaseImportVo implements Serializable {
                 private String aircraftSubsystemName;
 
                 /** 作者 */
-                    @ExcelProperty(value = "作者")
                 private String author;
 
                 /** 故障现象 */
@@ -62,15 +57,12 @@ public class FaultCaseImportVo implements Serializable {
                 private String faultCause;
 
                 /** 故障树 */
-                    @ExcelProperty(value = "故障树")
                 private String faultTreePath;
 
                 /** 故障图 */
-                    @ExcelProperty(value = "故障图")
                 private String faultPicturePath;
 
                 /** 排故方法 */
-                    @ExcelProperty(value = "排故方法")
                 private String troubleshootingMethodPath;
 
                 /** 查看次数 */
@@ -78,11 +70,9 @@ public class FaultCaseImportVo implements Serializable {
                 private String viewCount;
 
                 /** 排序 */
-                    @ExcelProperty(value = "排序")
                 private String orderBy;
 
                 /** 删除标识（1删除 0未删除） */
-                    @ExcelProperty(value = "删除标识（1删除 0未删除）")
                     private Integer delFlag;
 
 

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

@@ -1,5 +1,6 @@
 package org.eco.als.domain.vo;
 
+import com.mybatisflex.annotation.RelationOneToOne;
 import org.eco.als.domain.FaultCase;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -34,15 +35,23 @@ private static final long serialVersionUID = 1L;
     private Long id;
 
     /** 飞机编号 */
-    @ExcelProperty(value = "飞机编号")
+//    @ExcelProperty(value = "飞机编号")
     private String aircraftTypeId;
 
     /** 机型 */
-    @ExcelProperty(value = "机型")
+
     private String aircraftTypeName;
 
+    @RelationOneToOne(
+        selfField = "aircraftTypeName",
+        targetTable = "T_AIRCAFT_MODEL",
+        targetField = "aircaftModelId",
+        valueField = "aircaftModelName"
+    )
+    @ExcelProperty(value = "机型")
+    private String airModel;
+
     /** 系统编号 */
-    @ExcelProperty(value = "系统编号")
     private String aircraftSystemId;
 
     /** 系统 */
@@ -50,7 +59,6 @@ private static final long serialVersionUID = 1L;
     private String aircraftSystemName;
 
     /** 分系统编号 */
-    @ExcelProperty(value = "分系统编号")
     private String aircraftSubsystemId;
 
     /** 分系统 */
@@ -58,7 +66,7 @@ private static final long serialVersionUID = 1L;
     private String aircraftSubsystemName;
 
     /** 作者 */
-    @ExcelProperty(value = "作者")
+//    @ExcelProperty(value = "作者")
     private String author;
 
     /** 故障现象 */
@@ -70,15 +78,15 @@ private static final long serialVersionUID = 1L;
     private String faultCause;
 
     /** 故障树 */
-    @ExcelProperty(value = "故障树")
+//    @ExcelProperty(value = "故障树")
     private String faultTreePath;
 
     /** 故障图 */
-    @ExcelProperty(value = "故障图")
+//    @ExcelProperty(value = "故障图")
     private String faultPicturePath;
 
     /** 排故方法 */
-    @ExcelProperty(value = "排故方法")
+//    @ExcelProperty(value = "排故方法")
     private String troubleshootingMethodPath;
 
     /** 查看次数 */
@@ -86,14 +94,12 @@ private static final long serialVersionUID = 1L;
     private String viewCount;
 
     /** 排序 */
-    @ExcelProperty(value = "排序")
+//    @ExcelProperty(value = "排序")
     private String orderBy;
 
     /** 删除标识（1删除 0未删除） */
-    @ExcelProperty(value = "删除标识（1删除 0未删除）")
     private Integer delFlag;
 
-
     /**
      * 创建人名称
      */

als-modules/agile-assurance/src/main/java/org/eco/als/listener/FaultCaseImportListener.java

@@ -4,18 +4,17 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
-import org.eco.common.core.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+import org.eco.als.domain.bo.FaultCaseBo;
+import org.eco.als.domain.vo.FaultCaseImportVo;
+import org.eco.als.domain.vo.FaultCaseVo;
+import org.eco.als.service.IFaultCaseService;
+import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.common.core.utils.SpringUtils;
 import org.eco.common.core.utils.ValidatorUtils;
 import org.eco.common.excel.core.ExcelListener;
 import org.eco.common.excel.core.ExcelResult;
 import org.eco.common.excel.entity.ExcelResultRes;
-import org.eco.common.core.core.domain.model.LoginUser;
-import org.eco.als.domain.bo.FaultCaseBo;
-import org.eco.als.domain.vo.FaultCaseImportVo;
-import org.eco.als.domain.vo.FaultCaseVo;
-import org.eco.als.service.IFaultCaseService;
-import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
 
@@ -86,9 +85,15 @@ public class FaultCaseImportListener extends AnalysisEventListener<FaultCaseImpo
     }
     private void setBo(FaultCaseBo faultCaseBo) {
         faultCaseBo.setVersion(0);
-        faultCaseBo.setCreateBy(loginUser.getUserId());
-        faultCaseBo.setUpdateBy(loginUser.getUserId());
-        faultCaseBo.setTenantId(loginUser.getTenantId());
+        if (ObjectUtil.isNull(loginUser)) {
+            faultCaseBo.setCreateBy(1L);
+            faultCaseBo.setUpdateBy(1L);
+            faultCaseBo.setTenantId(0L);
+        } else {
+            faultCaseBo.setCreateBy(loginUser.getUserId());
+            faultCaseBo.setUpdateBy(loginUser.getUserId());
+            faultCaseBo.setTenantId(loginUser.getTenantId());
+        }
     }
 
     @Override

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

@@ -115,7 +115,7 @@ public class FaultCaseServiceImpl extends BaseServiceImpl<FaultCaseMapper, Fault
     @Override
     public List<FaultCaseVo> selectList(FaultCaseBo faultCaseBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(faultCaseBo);
-        return this.listAs(queryWrapper, FaultCaseVo.class);
+        return faultCaseMapper.selectListWithRelationsByQueryAs(queryWrapper, FaultCaseVo.class);
     }
 
     /**

als-start/src/main/resources/application-local.yml

@@ -166,7 +166,7 @@ sms:
 scheduling:
     enabled: false
 easy-es:
-  address: 127.0.0.1:9007
+  address: 127.0.0.1:9200
   banner: false # 默认为true 打印banner 若您不期望打印banner,可配置为false
   username: #es用户名,若无则删去此行配置
   password: #es密码,若无则删去此行配置