From 2673998a8f4bbe4713bf7b9d9be196497da19fe0 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Thu, 6 Jun 2024 17:05:54 +0800 Subject: [PATCH] =?UTF-8?q?1:=20=E5=88=A0=E9=99=A4vp=5Fask=5Ftemplate=5Fqu?= =?UTF-8?q?estion=5Flibrary=E4=B8=AD=E7=9A=84=E5=A4=9A=E4=BD=99=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AskQuestionLibraryManageServiceImpl.java | 15 --------- .../model/AskTemplateQuestionLibrary.java | 8 ----- .../AskTemplateQuestionLibraryService.java | 2 -- ...AskTemplateQuestionLibraryServiceImpl.java | 11 ------- .../AskTemplateQuestionLibraryMapper.xml | 5 +-- .../java/com/supervision/RedisVecTest.java | 33 +++++++++++++++++++ .../java/com/supervision/VideoUpdateTest.java | 8 ++--- 7 files changed, 37 insertions(+), 45 deletions(-) diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java index 2730f108..ca419662 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java @@ -99,13 +99,9 @@ public class AskQuestionLibraryManageServiceImpl implements AskQuestionLibraryMa List 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); } // 对问题库进行更新操作 diff --git a/virtual-patient-model/src/main/java/com/supervision/model/AskTemplateQuestionLibrary.java b/virtual-patient-model/src/main/java/com/supervision/model/AskTemplateQuestionLibrary.java index c49a5fbd..7f79a4b3 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/AskTemplateQuestionLibrary.java +++ b/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 question; - /** - * 默认问题的回答 - */ - private String defaultAnswer; - - private String defaultAnswerCode; - - private String defaultAnswerResourceId; /** * 创建人ID diff --git a/virtual-patient-model/src/main/java/com/supervision/service/AskTemplateQuestionLibraryService.java b/virtual-patient-model/src/main/java/com/supervision/service/AskTemplateQuestionLibraryService.java index ff23d8a9..a1be87fe 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/AskTemplateQuestionLibraryService.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/AskTemplateQuestionLibraryService.java @@ -23,8 +23,6 @@ public interface AskTemplateQuestionLibraryService extends IService() - .select("max(default_answer_code) as default_answer_code")); - if (Objects.isNull(askTemplateQuestionLibrary)) { - return null; - } - return askTemplateQuestionLibrary.getDefaultAnswerCode(); - } - @Override public List queryQaKnowledge() { // 查询所有的问题,忽略错误和静默视频 diff --git a/virtual-patient-model/src/main/resources/mapper/AskTemplateQuestionLibraryMapper.xml b/virtual-patient-model/src/main/resources/mapper/AskTemplateQuestionLibraryMapper.xml index 14d68918..ca0e5ef5 100644 --- a/virtual-patient-model/src/main/resources/mapper/AskTemplateQuestionLibraryMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/AskTemplateQuestionLibraryMapper.xml @@ -11,9 +11,6 @@ - - - @@ -23,7 +20,7 @@ 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 diff --git a/virtual-patient-web/src/test/java/com/supervision/RedisVecTest.java b/virtual-patient-web/src/test/java/com/supervision/RedisVecTest.java index d0155073..70fd3e75 100644 --- a/virtual-patient-web/src/test/java/com/supervision/RedisVecTest.java +++ b/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 dicIds = CollUtil.newArrayList(180L, 181L, 182L, 183L, 1114L); + + List questionLibraryList = askTemplateQuestionLibraryService.lambdaQuery().notIn(AskTemplateQuestionLibrary::getDictId, dicIds).list(); + + for (AskTemplateQuestionLibrary library : questionLibraryList) { + List questionList = library.getQuestion(); + for (String question : questionList) { + AskTemplateQuestionSimilarity similarity = new AskTemplateQuestionSimilarity(); + similarity.setLibraryId(library.getId()); + similarity.setSimilarityQuestion(question); + askTemplateQuestionSimilarityService.save(similarity); + } + } + + + } } diff --git a/virtual-patient-web/src/test/java/com/supervision/VideoUpdateTest.java b/virtual-patient-web/src/test/java/com/supervision/VideoUpdateTest.java index 60b4ef18..07b375c8 100644 --- a/virtual-patient-web/src/test/java/com/supervision/VideoUpdateTest.java +++ b/virtual-patient-web/src/test/java/com/supervision/VideoUpdateTest.java @@ -43,8 +43,8 @@ public class VideoUpdateTest { public void saveDefaultAnswerVideo() throws Exception { List 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); }