allen 11 months ago
parent
commit
49b59685d6

+ 3 - 0
taais-modules/taais-biz/src/main/java/com/taais/biz/constant/BizConstant.java

@@ -58,4 +58,7 @@ public class BizConstant {
 
     public static final String TYPE_DATA_PROCESS = "dataProcess";
     public static final String TYPE_DATA_BIZ_PROCESS = "dataBizProcess";
+    public static final String R_CURVE = "R_curve.png";
+    public static final String P_CURVE = "P_curve.png";
+    public static final String F1_CURVE = "F1_curve.png";
 }

+ 6 - 0
taais-modules/taais-biz/src/main/java/com/taais/biz/controller/AlgorithmBizProcessController.java

@@ -2,6 +2,7 @@ package com.taais.biz.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.taais.biz.domain.bo.AlgorithmBizProcessBo;
+import com.taais.biz.domain.dto.task.TranResultDto;
 import com.taais.biz.domain.vo.AlgorithmBizProcessVo;
 import com.taais.biz.service.IAlgorithmBizProcessService;
 import com.taais.common.core.core.domain.CommonResult;
@@ -110,4 +111,9 @@ public class AlgorithmBizProcessController extends BaseController {
     public CommonResult<List<AlgorithmBizProcessVo>> getProcessBySubtaskId(@PathVariable Long subtaskId) {
         return CommonResult.success(algorithmBizProcessService.getProcessBySubtaskId(subtaskId));
     }
+
+    @GetMapping("/getTranResult/{subtaskId}")
+    public CommonResult<TranResultDto> getTranResult(@PathVariable Long subtaskId) {
+        return CommonResult.success(algorithmBizProcessService.getTranResult(subtaskId));
+    }
 }

+ 17 - 0
taais-modules/taais-biz/src/main/java/com/taais/biz/domain/dto/task/TranResultDto.java

@@ -0,0 +1,17 @@
+package com.taais.biz.domain.dto.task;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author allen
+ */
+@Data
+public class TranResultDto {
+    private List<String> agNameList = new ArrayList<>();
+    private List<String> rcureList = new ArrayList<>();
+    private List<String> pcureList = new ArrayList<>();
+    private List<String> f1cureList = new ArrayList<>();
+}

+ 3 - 0
taais-modules/taais-biz/src/main/java/com/taais/biz/service/IAlgorithmBizProcessService.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.taais.biz.domain.AlgorithmBizProcess;
 import com.taais.biz.domain.dto.TaskResultDTO;
+import com.taais.biz.domain.dto.task.TranResultDto;
 import com.taais.biz.domain.vo.AlgorithmBizProcessVo;
 import com.taais.biz.domain.bo.AlgorithmBizProcessBo;
 import com.taais.common.orm.core.service.IBaseService;
@@ -67,4 +68,6 @@ public interface IAlgorithmBizProcessService extends IBaseService<AlgorithmBizPr
     List<AlgorithmBizProcessVo> getProcessBySubtaskId(Long subtaskId);
 
     String taskResult(TaskResultDTO resultDTO);
+
+    TranResultDto getTranResult(Long subtaskId);
 }

+ 19 - 0
taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/AlgorithmBizProcessServiceImpl.java

@@ -8,7 +8,10 @@ import cn.hutool.core.util.ObjectUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.taais.biz.constant.BizConstant;
+import com.taais.biz.domain.AlgorithmConfig;
 import com.taais.biz.domain.dto.TaskResultDTO;
+import com.taais.biz.domain.dto.task.TranResultDto;
+import com.taais.biz.service.IAlgorithmConfigService;
 import com.taais.common.core.utils.DateUtils;
 import com.taais.common.core.utils.MapstructUtils;
 import com.taais.common.orm.core.page.PageQuery;
@@ -37,6 +40,8 @@ public class AlgorithmBizProcessServiceImpl extends BaseServiceImpl<AlgorithmBiz
     private static final Logger log = LoggerFactory.getLogger(AlgorithmBizProcessServiceImpl.class);
     @Resource
     private AlgorithmBizProcessMapper algorithmBizProcessMapper;
+    @Resource
+    private IAlgorithmConfigService algorithmConfigService;
 
     @Override
     public QueryWrapper query() {
@@ -170,4 +175,18 @@ public class AlgorithmBizProcessServiceImpl extends BaseServiceImpl<AlgorithmBiz
         return null;
     }
 
+    @Override
+    public TranResultDto getTranResult(Long subtaskId) {
+        List<AlgorithmBizProcessVo> bizProcessVoList = getProcessBySubtaskId(subtaskId);
+        TranResultDto tranResultDto = new TranResultDto();
+        for (AlgorithmBizProcessVo bizProcessVo : bizProcessVoList) {
+            AlgorithmConfig algorithmConfig = algorithmConfigService.getById(bizProcessVo.getAlgorithmId());
+            tranResultDto.getAgNameList().add(algorithmConfig.getAlgorithmName());
+            tranResultDto.getRcureList().add(bizProcessVo.getResultPath()+BizConstant.R_CURVE);
+            tranResultDto.getPcureList().add(bizProcessVo.getResultPath()+BizConstant.P_CURVE);
+            tranResultDto.getF1cureList().add(bizProcessVo.getResultPath()+BizConstant.F1_CURVE);
+        }
+        return tranResultDto;
+    }
+
 }

+ 1 - 2
taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/AlgorithmTaskServiceImpl.java

@@ -599,8 +599,6 @@ public class AlgorithmTaskServiceImpl extends BaseServiceImpl<AlgorithmTaskMappe
             returnList.add(resultPath);
             index++;
         }
-
-
         return returnList;
     }
 
@@ -608,6 +606,7 @@ public class AlgorithmTaskServiceImpl extends BaseServiceImpl<AlgorithmTaskMappe
         AlgorithmSubtaskBo algorithmSubtask = new AlgorithmSubtaskBo();
         algorithmSubtask.setTaskId(algorithmTask.getId());
         algorithmSubtask.setIndex(Long.valueOf(step));
+        algorithmSubtask.setParameters("null");
         // todo allen
         switch (step) {
             case BizConstant.STEP5_TRAIN -> {