算法+结果返回

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

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import org.eco.als.domain.bo.AlgorithmBo;
+import org.eco.als.domain.bo.QaBo;
 import org.eco.als.domain.bo.TaskBo;
 import org.eco.als.service.IAlgorithmService;
 import org.eco.common.core.core.domain.CommonResult;
@@ -52,7 +53,7 @@ public class AlgorithmController {
     @Log(title = "执行虚警抑制算法", businessType = BusinessType.EXECUTE)
     @PostMapping("/execute/falseAlarm")
     public CommonResult<String> executeFalseAlarm(@Validated @RequestBody AlgorithmBo algorithmBo) {
-        return StrUtil.isBlank(algorithmService.executeFalseAlarm(algorithmBo)) ? CommonResult.fail() : CommonResult.success();
+        return CommonResult.success(algorithmService.executeFalseAlarm(algorithmBo));
     }
 
     /**
@@ -80,6 +81,7 @@ public class AlgorithmController {
     public CommonResult<String> batchExecute(@Validated @RequestBody TaskBo taskBo) {
         return StrUtil.isBlank(algorithmService.batchExecute(taskBo)) ? CommonResult.fail() : CommonResult.success();
     }
+
     /**
      * 获取数据参数名称
      *
@@ -91,6 +93,7 @@ public class AlgorithmController {
     public CommonResult<List<String>> getDataHeader(@PathVariable Long ossId) {
         return CommonResult.success(algorithmService.getDataHeader(ossId));
     }
+
     /**
      * 获取数据根据OssId
      *
@@ -102,6 +105,7 @@ public class AlgorithmController {
     public CommonResult<String> getDataByOssId(@PathVariable Long ossId) {
         return CommonResult.success(algorithmService.getDataByOssId(ossId), "");
     }
+
     /**
      * 获取曲线数据根据OssId
      *
@@ -113,4 +117,15 @@ public class AlgorithmController {
     public CommonResult<String> getPlaybackDataByOssId(@PathVariable Long ossId) {
         return CommonResult.success(algorithmService.getDataByOssId(ossId), "");
     }
+
+    /**
+     * 问答
+     *
+     * @param QaBo 入参
+     * @return org.eco.common.core.core.domain.CommonResult<java.lang.String> 结果
+     **/
+    @PostMapping("/execute/qa")
+    public CommonResult<String> executeQa(@Validated @RequestBody QaBo QaBo) {
+        return CommonResult.success(algorithmService.executeQa(QaBo), "");
+    }
 }

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

@@ -0,0 +1,13 @@
+package org.eco.als.domain.bo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 问答
+ */
+@Data
+public class QaBo {
+    private String userId;
+    private String question;
+}

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

@@ -1,6 +1,7 @@
 package org.eco.als.service;
 
 import org.eco.als.domain.bo.AlgorithmBo;
+import org.eco.als.domain.bo.QaBo;
 import org.eco.als.domain.bo.TaskBo;
 
 import java.util.List;
@@ -21,4 +22,5 @@ public interface IAlgorithmService {
 
     List<String> getDataHeader(Long ossId);
     String getDataByOssId(Long ossId);
+    String executeQa(QaBo qaBo);
 }

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

@@ -1,5 +1,6 @@
 package org.eco.als.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -9,12 +10,7 @@ import cn.hutool.json.JSONUtil;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.eco.als.domain.Warning;
-import org.eco.als.domain.bo.AlgorithmBo;
-import org.eco.als.domain.bo.FalseAlarmBo;
-import org.eco.als.domain.bo.FalseAlarmResultBo;
-import org.eco.als.domain.bo.FaultDiagnosisBo;
-import org.eco.als.domain.bo.PreProcessingBo;
-import org.eco.als.domain.bo.TaskBo;
+import org.eco.als.domain.bo.*;
 import org.eco.als.domain.vo.ModelHttpVo;
 import org.eco.als.domain.vo.ModelVo;
 import org.eco.als.service.IAlgorithmService;
@@ -296,4 +292,14 @@ public class AlgorithmService implements IAlgorithmService {
         String path = StringUtils.substringAfter(ossVo.getFileName(), Constants.RESOURCE_PREFIX);
         return CsvUtils.fileCsvToJson(path).toString();
     }
+
+    @Override
+    public String executeQa(QaBo qaBo) {
+        String url = "http://192.168.0.102:8000/ask/";
+        Map<String, Object> map = new HashMap<>();
+        map.put("user_id", qaBo.getUserId());
+        map.put("question", qaBo.getQuestion());
+        String result = HttpUtils.postJson(url, map);
+        return result;
+    }
 }