1: 删除vp_ask_template_question_library中的多余字段

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java

@@ -99,13 +99,9 @@ public class AskQuestionLibraryManageServiceImpl implements AskQuestionLibraryMa
             List<String> question = one.getQuestion();
             if (CollUtil.isEmpty(question)){
                 question = CollUtil.newArrayList(askTemplateQuestionLibrary.getDescription());
-                one.setDefaultAnswer(askTemplateQuestionLibrary.getDefaultAnswer());
             } else if (!question.contains(askTemplateQuestionLibrary.getDescription())) {
                 question.add(0, askTemplateQuestionLibrary.getDescription());
             }
-            if (StrUtil.isNotEmpty(askTemplateQuestionLibrary.getDefaultAnswer())) {
-                one.setDefaultAnswer(askTemplateQuestionLibrary.getDefaultAnswer());
-            }
             one.setQuestion(question);
             askTemplateQuestionLibraryService.updateById(one);
 
@@ -127,17 +123,7 @@ public class AskQuestionLibraryManageServiceImpl implements AskQuestionLibraryMa
                 return null;
             });
 
-            // 获取nextDefaultAnswerCode
-            String nextDefaultCode = RedisSequenceUtil.getQuestionLibraryDefaultAnswerCode(() -> {
-                String code = askTemplateQuestionLibraryService.getMaxDefaultAnswerCode();
-                if (StrUtil.isNotEmpty(code)) {
-                    return Long.parseLong(StrUtil.removePrefix(code, "A"));
-                }
-                return null;
-            });
             askTemplateQuestionLibrary.setCode(nextCode);
-            askTemplateQuestionLibrary.setDefaultAnswerCode(nextDefaultCode);
-
             askTemplateQuestionLibraryService.save(askTemplateQuestionLibrary);
             return askTemplateQuestionLibrary.getId();
         }
@@ -206,7 +192,6 @@ public class AskQuestionLibraryManageServiceImpl implements AskQuestionLibraryMa
                     questionLibrary.setDictId(Long.parseLong(currentDTO.getDictId()));
                 }
                 questionLibrary.setDescription(currentDTO.getQuestion());
-                questionLibrary.setDefaultAnswer(currentDTO.getAnswer());
                 this.saveQuestionLibrary(questionLibrary,false);
             }
             // 对问题库进行更新操作

virtual-patient-model/src/main/java/com/supervision/model/AskTemplateQuestionLibrary.java

@@ -45,14 +45,6 @@ public class AskTemplateQuestionLibrary implements Serializable {
     @TableField(typeHandler = StringListTypeHandler.class)
     private List<String> question;
 
-    /**
-     * 默认问题的回答
-     */
-    private String defaultAnswer;
-
-    private String defaultAnswerCode;
-
-    private String defaultAnswerResourceId;
 
     /**
      * 创建人ID

virtual-patient-model/src/main/java/com/supervision/service/AskTemplateQuestionLibraryService.java

@@ -23,8 +23,6 @@ public interface AskTemplateQuestionLibraryService extends IService<AskTemplateQ
 
     String getMaxCode();
 
-    String getMaxDefaultAnswerCode();
-
     /**
      * 获取所有问题库数据,以及ID,方便刷新向量库使用
      *

virtual-patient-model/src/main/java/com/supervision/service/impl/AskTemplateQuestionLibraryServiceImpl.java

@@ -60,17 +60,6 @@ public class AskTemplateQuestionLibraryServiceImpl extends ServiceImpl<AskTempla
         return askTemplateQuestionLibrary.getCode();
     }
 
-    @Override
-    public String getMaxDefaultAnswerCode() {
-        AskTemplateQuestionLibrary askTemplateQuestionLibrary = super.getBaseMapper()
-                .selectOne(new QueryWrapper<AskTemplateQuestionLibrary>()
-                        .select("max(default_answer_code) as default_answer_code"));
-        if (Objects.isNull(askTemplateQuestionLibrary)) {
-            return null;
-        }
-        return askTemplateQuestionLibrary.getDefaultAnswerCode();
-    }
-
     @Override
     public List<QaKnowledgeDTO> queryQaKnowledge() {
         // 查询所有的问题,忽略错误和静默视频

virtual-patient-model/src/main/resources/mapper/AskTemplateQuestionLibraryMapper.xml

@@ -11,9 +11,6 @@
         <result property="description" column="description" jdbcType="VARCHAR"/>
         <result property="question" column="question" jdbcType="ARRAY"
                 typeHandler="com.supervision.handler.StringListTypeHandler"/>
-        <result property="defaultAnswer" column="default_answer" jdbcType="VARCHAR"/>
-        <result property="defaultAnswerCode" column="default_answer_code" jdbcType="VARCHAR"/>
-        <result property="defaultAnswerResourceId" column="default_answer_resources_id" jdbcType="VARCHAR"/>
         <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
@@ -23,7 +20,7 @@
     <sql id="Base_Column_List">
         id
         ,dict_id,code,description,
-        question,default_answer,default_answer_code,default_answer_resources_id,create_user_id,
+        question,create_user_id,
         create_time,update_user_id,update_time
     </sql>
 

virtual-patient-web/src/test/java/com/supervision/RedisVecTest.java

@@ -2,16 +2,20 @@ package com.supervision;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.json.JSONUtil;
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.supervision.domain.QaSimilarityQuestionAnswer;
+import com.supervision.model.AskPatientAnswer;
 import com.supervision.model.AskTemplateQuestionLibrary;
+import com.supervision.model.AskTemplateQuestionSimilarity;
 import com.supervision.model.CommonDic;
 import com.supervision.service.AskPatientAnswerService;
 import com.supervision.service.AskTemplateQuestionLibraryService;
+import com.supervision.service.AskTemplateQuestionSimilarityService;
 import com.supervision.service.CommonDicService;
 import com.supervision.util.SimilarityUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -21,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -88,4 +93,32 @@ public class RedisVecTest {
         writer.write(maps, true);
         writer.close();
     }
+
+
+    @Autowired
+    private AskTemplateQuestionSimilarityService askTemplateQuestionSimilarityService;
+
+    /**
+     * 迁移相似问
+     *
+     */
+    @Test
+    public void similarityQuestionMigrateTest() {
+
+        ArrayList<Long> dicIds = CollUtil.newArrayList(180L, 181L, 182L, 183L, 1114L);
+
+        List<AskTemplateQuestionLibrary> questionLibraryList = askTemplateQuestionLibraryService.lambdaQuery().notIn(AskTemplateQuestionLibrary::getDictId, dicIds).list();
+
+        for (AskTemplateQuestionLibrary library : questionLibraryList) {
+            List<String> questionList = library.getQuestion();
+            for (String question : questionList) {
+                AskTemplateQuestionSimilarity similarity = new AskTemplateQuestionSimilarity();
+                similarity.setLibraryId(library.getId());
+                similarity.setSimilarityQuestion(question);
+                askTemplateQuestionSimilarityService.save(similarity);
+            }
+        }
+
+
+    }
 }

virtual-patient-web/src/test/java/com/supervision/VideoUpdateTest.java

@@ -43,8 +43,8 @@ public class VideoUpdateTest {
     public void saveDefaultAnswerVideo() throws Exception {
         List<AskTemplateQuestionLibrary> list = askTemplateQuestionLibraryService.list();
         for (AskTemplateQuestionLibrary library : list) {
-            String defaultAnswerCode = library.getDefaultAnswerCode();
-            File file = FileUtil.file(filePath + defaultAnswerCode + ".mp4");
+          /*  String defaultAnswerCode = library.getDefaultAnswerCode();*/
+            File file = FileUtil.file(filePath + /*defaultAnswerCode +*/ ".mp4");
             if (FileUtil.exist(file)) {
                 FileResource fileResource = new FileResource();
 
@@ -57,10 +57,8 @@ public class VideoUpdateTest {
                 fileResource.setMinioId(minioId);
                 fileResource.insert();
                 askTemplateQuestionLibraryService.lambdaUpdate()
-                        .set(AskTemplateQuestionLibrary::getDefaultAnswerResourceId, fileResource.getId())
+                       /* .set(AskTemplateQuestionLibrary::getDefaultAnswerResourceId, fileResource.getId())*/
                         .eq(AskTemplateQuestionLibrary::getId, library.getId()).update();
-            } else {
-                log.info("视频不存在:{}", defaultAnswerCode);
             }