Gaokun Wang 5 сар өмнө
parent
commit
27cfc4b71a

+ 8 - 0
als-modules/agile-assurance/src/main/java/org/eco/als/controller/FaultStatisticsController.java

@@ -155,5 +155,13 @@ public class FaultStatisticsController extends BaseController {
             return CommonResult.fail("删除故障统计记录失败!");
             return CommonResult.fail("删除故障统计记录失败!");
         }
         }
         return CommonResult.success();
         return CommonResult.success();
+}
+
+    /**
+     * 查询故障统计数量
+     */
+    @GetMapping("/extra/statistics")
+    public CommonResult<List<FaultStatisticsVo>> getExtraStatistics() {
+        return CommonResult.success(faultStatisticsService.getExtraStatistics());
     }
     }
 }
 }

+ 2 - 0
als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/FaultStatisticsBo.java

@@ -1,5 +1,6 @@
 package org.eco.als.domain.bo;
 package org.eco.als.domain.bo;
 
 
+import lombok.experimental.Accessors;
 import org.eco.als.domain.FaultStatistics;
 import org.eco.als.domain.FaultStatistics;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.Data;
@@ -18,6 +19,7 @@ import org.eco.common.orm.core.domain.BaseEntity;
 @Data
 @Data
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = FaultStatistics.class, reverseConvertGenerate = false)
 @AutoMapper(target = FaultStatistics.class, reverseConvertGenerate = false)
+@Accessors(chain = true)
 public class FaultStatisticsBo extends BaseEntity{
 public class FaultStatisticsBo extends BaseEntity{
     /**
     /**
      * 编号
      * 编号

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

@@ -12,6 +12,11 @@ public class ExtraKGraphTaskVo {
      */
      */
     private Long taskId;
     private Long taskId;
 
 
+    /**
+     * 文件Id
+     */
+    private Long ossId;
+
     /**
     /**
      * 任务类型
      * 任务类型
      */
      */

+ 13 - 0
als-modules/agile-assurance/src/main/java/org/eco/als/service/IFaultStatisticsService.java

@@ -41,6 +41,12 @@ public interface IFaultStatisticsService extends IBaseService<FaultStatistics> {
      * @return 故障统计集合
      * @return 故障统计集合
      */
      */
     public List<FaultStatisticsVo> Statistics(FaultStatisticsBo faultStatisticsBo);
     public List<FaultStatisticsVo> Statistics(FaultStatisticsBo faultStatisticsBo);
+    /**
+     * 查询故障统计数量
+     *
+     * @return 故障统计集合
+     */
+    public List<FaultStatisticsVo> getExtraStatistics();
 
 
     /**
     /**
      * 外部查询故障统计列表
      * 外部查询故障统计列表
@@ -65,6 +71,13 @@ public interface IFaultStatisticsService extends IBaseService<FaultStatistics> {
      * @return 结果:true 操作成功,false 操作失败
      * @return 结果:true 操作成功,false 操作失败
      */
      */
     boolean insert(FaultStatisticsBo faultStatisticsBo);
     boolean insert(FaultStatisticsBo faultStatisticsBo);
+    /**
+     * 批量新增故障统计
+     *
+     * @param faultStatisticsBos 故障统计Bo
+     * @return 结果:true 操作成功,false 操作失败
+     */
+    boolean saveBatch(List<FaultStatisticsBo> faultStatisticsBos);
 
 
     /**
     /**
      * 新增故障统计,前台提供主键值,一般用于导入的场合
      * 新增故障统计,前台提供主键值,一般用于导入的场合

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 65 - 31
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultStatisticsServiceImpl.java


+ 5 - 1
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/KGraphTaskServiceImpl.java

@@ -135,14 +135,18 @@ public class KGraphTaskServiceImpl extends BaseServiceImpl<KGraphTaskMapper, KGr
 
 
     @Override
     @Override
     public boolean proTask(KGraphTaskBo kGraphTaskBo) {
     public boolean proTask(KGraphTaskBo kGraphTaskBo) {
+        log.info("进入处理:{}", kGraphTaskBo.getTaskType());
         KGraphTaskVo kGraphTaskVo = this.selectById(kGraphTaskBo.getId());
         KGraphTaskVo kGraphTaskVo = this.selectById(kGraphTaskBo.getId());
+        Long ossId = kGraphTaskVo.getOssId();
+        if(ObjectUtil.isEmpty(kGraphTaskVo)) {
+            throw new BusinessException("任务为空,请核实任务ID");
+        }
         String result;
         String result;
         JSONObject jsonObject;
         JSONObject jsonObject;
         ExtraKGraphTaskVo extraKGraphTaskVo = new ExtraKGraphTaskVo();
         ExtraKGraphTaskVo extraKGraphTaskVo = new ExtraKGraphTaskVo();
         switch (kGraphTaskBo.getTaskType()) {
         switch (kGraphTaskBo.getTaskType()) {
             case "0":
             case "0":
                 updateStatus(kGraphTaskBo, kGraphTaskVo.getVersion(), GraphStatus.STATUS_1.getCode());
                 updateStatus(kGraphTaskBo, kGraphTaskVo.getVersion(), GraphStatus.STATUS_1.getCode());
-                Long ossId = kGraphTaskVo.getOssId();
                 // 知识图谱执行分句
                 // 知识图谱执行分句
                 Map<String, Object> map = new HashMap<>();
                 Map<String, Object> map = new HashMap<>();
                 map.put("ossId", ossId);
                 map.put("ossId", ossId);

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно