Merge branch 'master' of http://101.126.133.7:9001/www/als into dev-lhp

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

@@ -47,6 +47,14 @@ public class QaHistoryController extends BaseController {
     public CommonResult<PageResult<QaHistoryVo>> list(QaHistoryBo qaHistoryBo) {
         return CommonResult.success(qaHistoryService.selectPage(qaHistoryBo));
     }
+    /**
+     * 查询问答历史记录列表
+     */
+    @SaCheckPermission("als:qaHistory:list")
+    @GetMapping("/list/all")
+    public CommonResult<List<QaHistoryVo>> listAll(QaHistoryBo qaHistoryBo) {
+        return CommonResult.success(qaHistoryService.selectList(qaHistoryBo));
+    }
 
     /**
      * 导出问答历史记录列表

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

@@ -370,7 +370,7 @@ public class AlgorithmService implements IAlgorithmService {
         String data = jsonObject.getStr("data");
         String code = jsonObject.getStr("code");
         String msg = jsonObject.getStr("msg");
-        if (StrUtil.isBlank(code)) {
+        if (!StrUtil.equals(code, "200")) {
             throw new BusinessException(msg);
         }
         JSONObject answerJson = JSONUtil.parseObj(data);
@@ -383,6 +383,7 @@ public class AlgorithmService implements IAlgorithmService {
         qaHistoryBo.setAnswer(answer);
         qaHistoryBo.setOssId(Long.valueOf(ossId));
         qaHistoryBo.setUserId(userId);
+        qaHistoryBo.setQuestion(qaBo.getQuestion());
         qaHistoryBo.setFileName(fileName);
         qaHistoryBo.setGraph(graph);
         qaHistoryService.insert(qaHistoryBo);

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

@@ -166,4 +166,4 @@ sms:
       #您的sdkAppId
       sdk-app-id: 您的sdkAppId
 kgqa:
-  ask-url: http://192.168.0.102:8000/kgqa/ask/
+  ask-url: http://192.168.0.103:8000/kgqa/ask/

als-start/src/main/resources/db/dm/V1_0_0_6__als-1213-ddl.sql

@@ -1,5 +1,5 @@
-DROP TABLE IF EXISTS "als"."als_qa_history_t";
-CREATE TABLE "als"."als_qa_history_t"(
+DROP TABLE IF EXISTS "lqbz"."als_qa_history_t";
+CREATE TABLE "lqbz"."als_qa_history_t"(
                                          id bigint NOT NULL,
                                          user_id VARCHAR2(255),
                                          question VARCHAR2(5000),
@@ -17,21 +17,21 @@ CREATE TABLE "als"."als_qa_history_t"(
                                          update_time TIMESTAMP
 );
 
-ALTER TABLE "als"."als_qa_history_t" ADD CONSTRAINT PRIMARY KEY (id);
+ALTER TABLE "lqbz"."als_qa_history_t" ADD CONSTRAINT PRIMARY KEY (id);
 
-COMMENT ON TABLE "als"."als_qa_history_t" IS '问答历史记录';
-COMMENT ON COLUMN "als"."als_qa_history_t"."id" IS '唯一ID';
-COMMENT ON COLUMN "als"."als_qa_history_t"."user_id" IS '当前用户';
-COMMENT ON COLUMN "als"."als_qa_history_t"."question" IS '问题';
-COMMENT ON COLUMN "als"."als_qa_history_t"."answer" IS '回答';
-COMMENT ON COLUMN "als"."als_qa_history_t"."graph" IS '图谱相关';
-COMMENT ON COLUMN "als"."als_qa_history_t"."oss_id" IS '文件ID';
-COMMENT ON COLUMN "als"."als_qa_history_t"."file_name" IS '文件名称';
-COMMENT ON COLUMN "als"."als_qa_history_t"."remarks" IS '备注';
-COMMENT ON COLUMN "als"."als_qa_history_t"."tenant_id" IS '租户号';
-COMMENT ON COLUMN "als"."als_qa_history_t"."del_flag" IS '删除标识（1删除 0未删除）';
-COMMENT ON COLUMN "als"."als_qa_history_t"."version" IS '乐观锁';
-COMMENT ON COLUMN "als"."als_qa_history_t"."create_by" IS '创建人';
-COMMENT ON COLUMN "als"."als_qa_history_t"."create_time" IS '创建时间';
-COMMENT ON COLUMN "als"."als_qa_history_t"."update_by" IS '更新人';
-COMMENT ON COLUMN "als"."als_qa_history_t"."update_time" IS '更新时间';
+COMMENT ON TABLE "lqbz"."als_qa_history_t" IS '问答历史记录';
+COMMENT ON COLUMN "lqbz"."als_qa_history_t"."id" IS '唯一ID';
+COMMENT ON COLUMN "lqbz"."als_qa_history_t"."user_id" IS '当前用户';
+COMMENT ON COLUMN "lqbz"."als_qa_history_t"."question" IS '问题';
+COMMENT ON COLUMN "lqbz"."als_qa_history_t"."answer" IS '回答';
+COMMENT ON COLUMN "lqbz"."als_qa_history_t"."graph" IS '图谱相关';
+COMMENT ON COLUMN "lqbz"."als_qa_history_t"."oss_id" IS '文件ID';
+COMMENT ON COLUMN "lqbz"."als_qa_history_t"."file_name" IS '文件名称';
+COMMENT ON COLUMN "lqbz"."als_qa_history_t"."remarks" IS '备注';
+COMMENT ON COLUMN "lqbz"."als_qa_history_t"."tenant_id" IS '租户号';
+COMMENT ON COLUMN "lqbz"."als_qa_history_t"."del_flag" IS '删除标识（1删除 0未删除）';
+COMMENT ON COLUMN "lqbz"."als_qa_history_t"."version" IS '乐观锁';
+COMMENT ON COLUMN "lqbz"."als_qa_history_t"."create_by" IS '创建人';
+COMMENT ON COLUMN "lqbz"."als_qa_history_t"."create_time" IS '创建时间';
+COMMENT ON COLUMN "lqbz"."als_qa_history_t"."update_by" IS '更新人';
+COMMENT ON COLUMN "lqbz"."als_qa_history_t"."update_time" IS '更新时间';

als-start/src/main/resources/db/dm/V1_0_0_5__als-ddl.sql → als-start/src/main/resources/db/dm/V1_1_0_5__als-ddl.sql

@@ -1,3 +1,4 @@
+DROP TABLE IF EXISTS "lqbz"."als_judge_fault_logic_t";
 CREATE TABLE "lqbz"."als_judge_fault_logic_t"
 (
     "id" BIGINT NOT NULL,
@@ -42,7 +43,7 @@ COMMENT ON COLUMN "lqbz"."als_judge_fault_logic_t"."create_time" IS '创建时
 COMMENT ON COLUMN "lqbz"."als_judge_fault_logic_t"."update_by" IS '更新人';
 
 COMMENT ON COLUMN "lqbz"."als_judge_fault_logic_t"."update_time" IS '更新时间';
-
+DROP TABLE IF EXISTS "lqbz"."als_fault_statistics_t";
 CREATE TABLE "lqbz"."als_fault_statistics_t"
 (
     "id" BIGINT NOT NULL,