From 9d04f3dcad6e56f4fad4d6a9d9acc7e4d5f460eb Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Wed, 7 Aug 2024 10:36:25 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=BB=93=E6=9E=84=EF=BC=8C=E5=8E=BB=E9=99=A4=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E6=B5=8B=E8=AF=95=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExampleChatController.java | 10 +- .../domain/ModelMetric.java | 53 +++++-- .../domain/ModelMetricExample.java | 3 +- .../domain/NoteCheckRecord.java | 3 +- .../dto/QARecordNodeDTO.java | 2 +- .../mapper/ModelMetricExampleMapper.java | 4 +- .../demo/mapper/ModelMetricMapper.java | 18 +++ .../service/ModelMetricExampleService.java | 4 +- .../demo/service/ModelMetricService.java | 13 ++ .../impl/ModelMetricExampleServiceImpl.java | 8 +- .../service/impl/ModelMetricServiceImpl.java | 22 +++ .../police/mapper/NoteCheckRecordMapper.java | 2 +- .../service/NoteCheckRecordService.java | 6 +- .../service/RecordSplitTypeService.java | 1 - .../impl/NoteCheckRecordServiceImpl.java | 5 +- .../impl/NoteRecordSplitServiceImpl.java | 8 +- .../impl/RecordSplitTypeServiceImpl.java | 7 - .../service/impl/PromptTestServiceImpl.java | 12 +- .../controller/SimilarityController.java | 146 ------------------ .../SimilarityQuestionController.java | 44 ------ .../controller/VPTestController.java | 83 ---------- .../VirtualPatientTestController.java | 90 ----------- .../domain/VpAskTemplateQuestionLibrary.java | 81 ---------- .../springaidemo/domain/VpCommonDic.java | 86 ----------- .../springaidemo/dto/AnswerDTO.java | 11 -- .../springaidemo/dto/GlobalResult.java | 45 ------ .../springaidemo/dto/MetricResultDTO.java | 13 -- .../dto/paddlespeech/req/AsrReqDTO.java | 21 --- .../dto/paddlespeech/req/TtsReqDTO.java | 23 --- .../dto/paddlespeech/res/AsrResultDTO.java | 10 -- .../paddlespeech/res/PaddleSpeechResDTO.java | 15 -- .../dto/paddlespeech/res/TtsResultDTO.java | 23 --- .../mapper/ModelMetricMapper.java | 18 --- .../VpAskTemplateQuestionLibraryMapper.java | 18 --- .../mapper/VpCommonDicMapper.java | 18 --- .../service/ModelMetricService.java | 13 -- .../VpAskTemplateQuestionLibraryService.java | 13 -- .../service/VpCommonDicService.java | 13 -- .../service/impl/ModelMetricServiceImpl.java | 22 --- ...AskTemplateQuestionLibraryServiceImpl.java | 22 --- .../service/impl/VpCommonDicServiceImpl.java | 22 --- .../springaidemo/util/TtsUtil.java | 33 ---- .../thread/RecordSplitTypeThread.java | 5 - .../util => utils}/RecordRegexUtil.java | 4 +- .../util => utils}/WordReadUtil.java | 2 +- .../mapper/ModelMetricExampleMapper.xml | 4 +- .../resources/mapper/ModelMetricMapper.xml | 23 ++- .../mapper/NoteCheckRecordMapper.xml | 2 +- .../resources/mapper/VpCommonDicMapper.xml | 30 ---- .../DruidTableExtractor.java | 2 +- .../FuHsiApplicationTests.java | 4 +- .../ModelIndexTest.java | 2 +- .../SQLTableExtractor.java | 7 +- .../WordRenderTest.java | 2 +- 54 files changed, 152 insertions(+), 999 deletions(-) rename src/main/java/com/supervision/{springaidemo => demo}/controller/ExampleChatController.java (98%) rename src/main/java/com/supervision/{springaidemo => demo}/domain/ModelMetric.java (67%) rename src/main/java/com/supervision/{springaidemo => demo}/domain/ModelMetricExample.java (87%) rename src/main/java/com/supervision/{springaidemo => demo}/domain/NoteCheckRecord.java (92%) rename src/main/java/com/supervision/{springaidemo => demo}/dto/QARecordNodeDTO.java (90%) rename src/main/java/com/supervision/{springaidemo => demo}/mapper/ModelMetricExampleMapper.java (77%) create mode 100644 src/main/java/com/supervision/demo/mapper/ModelMetricMapper.java rename src/main/java/com/supervision/{springaidemo => demo}/service/ModelMetricExampleService.java (73%) create mode 100644 src/main/java/com/supervision/demo/service/ModelMetricService.java rename src/main/java/com/supervision/{springaidemo => demo}/service/impl/ModelMetricExampleServiceImpl.java (63%) create mode 100644 src/main/java/com/supervision/demo/service/impl/ModelMetricServiceImpl.java delete mode 100644 src/main/java/com/supervision/springaidemo/controller/SimilarityController.java delete mode 100644 src/main/java/com/supervision/springaidemo/controller/SimilarityQuestionController.java delete mode 100644 src/main/java/com/supervision/springaidemo/controller/VPTestController.java delete mode 100644 src/main/java/com/supervision/springaidemo/controller/VirtualPatientTestController.java delete mode 100644 src/main/java/com/supervision/springaidemo/domain/VpAskTemplateQuestionLibrary.java delete mode 100644 src/main/java/com/supervision/springaidemo/domain/VpCommonDic.java delete mode 100644 src/main/java/com/supervision/springaidemo/dto/AnswerDTO.java delete mode 100644 src/main/java/com/supervision/springaidemo/dto/GlobalResult.java delete mode 100644 src/main/java/com/supervision/springaidemo/dto/MetricResultDTO.java delete mode 100644 src/main/java/com/supervision/springaidemo/dto/paddlespeech/req/AsrReqDTO.java delete mode 100644 src/main/java/com/supervision/springaidemo/dto/paddlespeech/req/TtsReqDTO.java delete mode 100644 src/main/java/com/supervision/springaidemo/dto/paddlespeech/res/AsrResultDTO.java delete mode 100644 src/main/java/com/supervision/springaidemo/dto/paddlespeech/res/PaddleSpeechResDTO.java delete mode 100644 src/main/java/com/supervision/springaidemo/dto/paddlespeech/res/TtsResultDTO.java delete mode 100644 src/main/java/com/supervision/springaidemo/mapper/ModelMetricMapper.java delete mode 100644 src/main/java/com/supervision/springaidemo/mapper/VpAskTemplateQuestionLibraryMapper.java delete mode 100644 src/main/java/com/supervision/springaidemo/mapper/VpCommonDicMapper.java delete mode 100644 src/main/java/com/supervision/springaidemo/service/ModelMetricService.java delete mode 100644 src/main/java/com/supervision/springaidemo/service/VpAskTemplateQuestionLibraryService.java delete mode 100644 src/main/java/com/supervision/springaidemo/service/VpCommonDicService.java delete mode 100644 src/main/java/com/supervision/springaidemo/service/impl/ModelMetricServiceImpl.java delete mode 100644 src/main/java/com/supervision/springaidemo/service/impl/VpAskTemplateQuestionLibraryServiceImpl.java delete mode 100644 src/main/java/com/supervision/springaidemo/service/impl/VpCommonDicServiceImpl.java delete mode 100644 src/main/java/com/supervision/springaidemo/util/TtsUtil.java rename src/main/java/com/supervision/{springaidemo/util => utils}/RecordRegexUtil.java (93%) rename src/main/java/com/supervision/{springaidemo/util => utils}/WordReadUtil.java (98%) delete mode 100644 src/main/resources/mapper/VpCommonDicMapper.xml rename src/test/java/com/supervision/{springaidemo => demo}/DruidTableExtractor.java (98%) rename src/test/java/com/supervision/{springaidemo => demo}/FuHsiApplicationTests.java (95%) rename src/test/java/com/supervision/{springaidemo => demo}/ModelIndexTest.java (99%) rename src/test/java/com/supervision/{springaidemo => demo}/SQLTableExtractor.java (77%) rename src/test/java/com/supervision/{springaidemo => demo}/WordRenderTest.java (98%) diff --git a/src/main/java/com/supervision/springaidemo/controller/ExampleChatController.java b/src/main/java/com/supervision/demo/controller/ExampleChatController.java similarity index 98% rename from src/main/java/com/supervision/springaidemo/controller/ExampleChatController.java rename to src/main/java/com/supervision/demo/controller/ExampleChatController.java index b4a5eea..4ebdf12 100644 --- a/src/main/java/com/supervision/springaidemo/controller/ExampleChatController.java +++ b/src/main/java/com/supervision/demo/controller/ExampleChatController.java @@ -1,17 +1,17 @@ -package com.supervision.springaidemo.controller; +package com.supervision.demo.controller; import cn.hutool.core.io.FileUtil; +import com.supervision.demo.service.ModelMetricService; import com.supervision.police.domain.ModelRecordType; import com.supervision.police.domain.NoteRecordSplit; -import com.supervision.springaidemo.dto.QARecordNodeDTO; +import com.supervision.demo.dto.QARecordNodeDTO; import com.supervision.police.mapper.ModelRecordTypeMapper; import com.supervision.police.mapper.NoteRecordSplitMapper; import com.supervision.police.service.ModelRecordTypeService; -import com.supervision.springaidemo.service.ModelMetricService; import com.supervision.police.service.NoteRecordSplitService; import com.supervision.police.service.NoteCheckRecordService; -import com.supervision.springaidemo.util.RecordRegexUtil; -import com.supervision.springaidemo.util.WordReadUtil; +import com.supervision.utils.RecordRegexUtil; +import com.supervision.utils.WordReadUtil; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.annotations.Param; import org.json.JSONObject; diff --git a/src/main/java/com/supervision/springaidemo/domain/ModelMetric.java b/src/main/java/com/supervision/demo/domain/ModelMetric.java similarity index 67% rename from src/main/java/com/supervision/springaidemo/domain/ModelMetric.java rename to src/main/java/com/supervision/demo/domain/ModelMetric.java index e3e8de8..48a971c 100644 --- a/src/main/java/com/supervision/springaidemo/domain/ModelMetric.java +++ b/src/main/java/com/supervision/demo/domain/ModelMetric.java @@ -1,18 +1,18 @@ -package com.supervision.springaidemo.domain; +package com.supervision.demo.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import java.io.Serializable; - +import java.time.LocalDateTime; import lombok.Data; /** + * 所有指标0 * @TableName model_metric */ -@TableName(value = "model_metric") +@TableName(value ="model_metric") @Data public class ModelMetric implements Serializable { /** @@ -31,30 +31,45 @@ public class ModelMetric implements Serializable { */ private Integer metricId; + /** + * 分数 + */ + private Integer score; + /** * 指标名称 */ private String metricName; + /** + * 判定符合的描述 + */ + private String metricTrueDesc; + + /** + * 判定为不符合的原因 + */ + private String metricFalseDesc; + /** * 模型详情模板,一个新的尝试 */ private String metricDetailTemplate; /** - * 通过例子来做,钱院长的建议,可以尝试一下 + * 例子(具体的例子) */ private String example; /** - * 判定符合的描述 + * 跑出来的结果 */ - private String metricTrueDesc; + private String result; /** - * 判定为不符合的原因 + * 新的结果 */ - private String metricFalseDesc; + private String newResult; /** * 指标详细描述 @@ -71,6 +86,26 @@ public class ModelMetric implements Serializable { */ private String promptTemplate; + /** + * 创建人ID + */ + private String createUserId; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 更新人 + */ + private String updateUserId; + + /** + * 更新时间 + */ + private LocalDateTime updateTime; + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/src/main/java/com/supervision/springaidemo/domain/ModelMetricExample.java b/src/main/java/com/supervision/demo/domain/ModelMetricExample.java similarity index 87% rename from src/main/java/com/supervision/springaidemo/domain/ModelMetricExample.java rename to src/main/java/com/supervision/demo/domain/ModelMetricExample.java index 0e0442b..db4c214 100644 --- a/src/main/java/com/supervision/springaidemo/domain/ModelMetricExample.java +++ b/src/main/java/com/supervision/demo/domain/ModelMetricExample.java @@ -1,6 +1,5 @@ -package com.supervision.springaidemo.domain; +package com.supervision.demo.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/com/supervision/springaidemo/domain/NoteCheckRecord.java b/src/main/java/com/supervision/demo/domain/NoteCheckRecord.java similarity index 92% rename from src/main/java/com/supervision/springaidemo/domain/NoteCheckRecord.java rename to src/main/java/com/supervision/demo/domain/NoteCheckRecord.java index b8fce5b..fbfcc02 100644 --- a/src/main/java/com/supervision/springaidemo/domain/NoteCheckRecord.java +++ b/src/main/java/com/supervision/demo/domain/NoteCheckRecord.java @@ -1,6 +1,5 @@ -package com.supervision.springaidemo.domain; +package com.supervision.demo.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/com/supervision/springaidemo/dto/QARecordNodeDTO.java b/src/main/java/com/supervision/demo/dto/QARecordNodeDTO.java similarity index 90% rename from src/main/java/com/supervision/springaidemo/dto/QARecordNodeDTO.java rename to src/main/java/com/supervision/demo/dto/QARecordNodeDTO.java index f35175b..3ec106d 100644 --- a/src/main/java/com/supervision/springaidemo/dto/QARecordNodeDTO.java +++ b/src/main/java/com/supervision/demo/dto/QARecordNodeDTO.java @@ -1,4 +1,4 @@ -package com.supervision.springaidemo.dto; +package com.supervision.demo.dto; import lombok.Data; diff --git a/src/main/java/com/supervision/springaidemo/mapper/ModelMetricExampleMapper.java b/src/main/java/com/supervision/demo/mapper/ModelMetricExampleMapper.java similarity index 77% rename from src/main/java/com/supervision/springaidemo/mapper/ModelMetricExampleMapper.java rename to src/main/java/com/supervision/demo/mapper/ModelMetricExampleMapper.java index 21fec21..eced802 100644 --- a/src/main/java/com/supervision/springaidemo/mapper/ModelMetricExampleMapper.java +++ b/src/main/java/com/supervision/demo/mapper/ModelMetricExampleMapper.java @@ -1,6 +1,6 @@ -package com.supervision.springaidemo.mapper; +package com.supervision.demo.mapper; -import com.supervision.springaidemo.domain.ModelMetricExample; +import com.supervision.demo.domain.ModelMetricExample; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/com/supervision/demo/mapper/ModelMetricMapper.java b/src/main/java/com/supervision/demo/mapper/ModelMetricMapper.java new file mode 100644 index 0000000..c4361a4 --- /dev/null +++ b/src/main/java/com/supervision/demo/mapper/ModelMetricMapper.java @@ -0,0 +1,18 @@ +package com.supervision.demo.mapper; + +import com.supervision.demo.domain.ModelMetric; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author Administrator +* @description 针对表【model_metric(所有指标0)】的数据库操作Mapper +* @createDate 2024-08-07 10:28:54 +* @Entity com.supervision.demo.domain.ModelMetric +*/ +public interface ModelMetricMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/supervision/springaidemo/service/ModelMetricExampleService.java b/src/main/java/com/supervision/demo/service/ModelMetricExampleService.java similarity index 73% rename from src/main/java/com/supervision/springaidemo/service/ModelMetricExampleService.java rename to src/main/java/com/supervision/demo/service/ModelMetricExampleService.java index 25287bc..4f9cdf6 100644 --- a/src/main/java/com/supervision/springaidemo/service/ModelMetricExampleService.java +++ b/src/main/java/com/supervision/demo/service/ModelMetricExampleService.java @@ -1,6 +1,6 @@ -package com.supervision.springaidemo.service; +package com.supervision.demo.service; -import com.supervision.springaidemo.domain.ModelMetricExample; +import com.supervision.demo.domain.ModelMetricExample; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/src/main/java/com/supervision/demo/service/ModelMetricService.java b/src/main/java/com/supervision/demo/service/ModelMetricService.java new file mode 100644 index 0000000..b42ee79 --- /dev/null +++ b/src/main/java/com/supervision/demo/service/ModelMetricService.java @@ -0,0 +1,13 @@ +package com.supervision.demo.service; + +import com.supervision.demo.domain.ModelMetric; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author Administrator +* @description 针对表【model_metric(所有指标0)】的数据库操作Service +* @createDate 2024-08-07 10:28:54 +*/ +public interface ModelMetricService extends IService { + +} diff --git a/src/main/java/com/supervision/springaidemo/service/impl/ModelMetricExampleServiceImpl.java b/src/main/java/com/supervision/demo/service/impl/ModelMetricExampleServiceImpl.java similarity index 63% rename from src/main/java/com/supervision/springaidemo/service/impl/ModelMetricExampleServiceImpl.java rename to src/main/java/com/supervision/demo/service/impl/ModelMetricExampleServiceImpl.java index 2dfa87f..0a94d37 100644 --- a/src/main/java/com/supervision/springaidemo/service/impl/ModelMetricExampleServiceImpl.java +++ b/src/main/java/com/supervision/demo/service/impl/ModelMetricExampleServiceImpl.java @@ -1,9 +1,9 @@ -package com.supervision.springaidemo.service.impl; +package com.supervision.demo.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.supervision.springaidemo.domain.ModelMetricExample; -import com.supervision.springaidemo.service.ModelMetricExampleService; -import com.supervision.springaidemo.mapper.ModelMetricExampleMapper; +import com.supervision.demo.domain.ModelMetricExample; +import com.supervision.demo.service.ModelMetricExampleService; +import com.supervision.demo.mapper.ModelMetricExampleMapper; import org.springframework.stereotype.Service; /** diff --git a/src/main/java/com/supervision/demo/service/impl/ModelMetricServiceImpl.java b/src/main/java/com/supervision/demo/service/impl/ModelMetricServiceImpl.java new file mode 100644 index 0000000..7a13e24 --- /dev/null +++ b/src/main/java/com/supervision/demo/service/impl/ModelMetricServiceImpl.java @@ -0,0 +1,22 @@ +package com.supervision.demo.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.supervision.demo.domain.ModelMetric; +import com.supervision.demo.service.ModelMetricService; +import com.supervision.demo.mapper.ModelMetricMapper; +import org.springframework.stereotype.Service; + +/** +* @author Administrator +* @description 针对表【model_metric(所有指标0)】的数据库操作Service实现 +* @createDate 2024-08-07 10:28:54 +*/ +@Service +public class ModelMetricServiceImpl extends ServiceImpl + implements ModelMetricService{ + +} + + + + diff --git a/src/main/java/com/supervision/police/mapper/NoteCheckRecordMapper.java b/src/main/java/com/supervision/police/mapper/NoteCheckRecordMapper.java index c663cbe..ece1f5c 100644 --- a/src/main/java/com/supervision/police/mapper/NoteCheckRecordMapper.java +++ b/src/main/java/com/supervision/police/mapper/NoteCheckRecordMapper.java @@ -1,6 +1,6 @@ package com.supervision.police.mapper; -import com.supervision.springaidemo.domain.NoteCheckRecord; +import com.supervision.demo.domain.NoteCheckRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/com/supervision/police/service/NoteCheckRecordService.java b/src/main/java/com/supervision/police/service/NoteCheckRecordService.java index 9a3c099..bfd1e97 100644 --- a/src/main/java/com/supervision/police/service/NoteCheckRecordService.java +++ b/src/main/java/com/supervision/police/service/NoteCheckRecordService.java @@ -1,11 +1,7 @@ package com.supervision.police.service; -import com.supervision.police.domain.NoteRecordSplit; -import com.supervision.springaidemo.domain.NoteCheckRecord; +import com.supervision.demo.domain.NoteCheckRecord; import com.baomidou.mybatisplus.extension.service.IService; -import org.apache.ibatis.annotations.Param; - -import java.util.List; /** * @author flevance diff --git a/src/main/java/com/supervision/police/service/RecordSplitTypeService.java b/src/main/java/com/supervision/police/service/RecordSplitTypeService.java index 186261f..897ce90 100644 --- a/src/main/java/com/supervision/police/service/RecordSplitTypeService.java +++ b/src/main/java/com/supervision/police/service/RecordSplitTypeService.java @@ -2,7 +2,6 @@ package com.supervision.police.service; import com.supervision.police.domain.ModelRecordType; import com.supervision.police.domain.NoteRecordSplit; -import com.supervision.springaidemo.dto.QARecordNodeDTO; import java.util.List; diff --git a/src/main/java/com/supervision/police/service/impl/NoteCheckRecordServiceImpl.java b/src/main/java/com/supervision/police/service/impl/NoteCheckRecordServiceImpl.java index e358880..71d0c4d 100644 --- a/src/main/java/com/supervision/police/service/impl/NoteCheckRecordServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/NoteCheckRecordServiceImpl.java @@ -1,14 +1,11 @@ package com.supervision.police.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.supervision.police.domain.NoteRecordSplit; -import com.supervision.springaidemo.domain.NoteCheckRecord; +import com.supervision.demo.domain.NoteCheckRecord; import com.supervision.police.service.NoteCheckRecordService; import com.supervision.police.mapper.NoteCheckRecordMapper; import org.springframework.stereotype.Service; -import java.util.List; - /** * @author flevance * @description 针对表【note_check_record(案件执行验证结果)】的数据库操作Service实现 diff --git a/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java b/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java index 3c84241..6e34dfe 100644 --- a/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java @@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.supervision.common.utils.IPages; import com.supervision.common.utils.ListUtils; import com.supervision.common.utils.StringUtils; -import com.supervision.config.BusinessException; import com.supervision.minio.domain.MinioFile; import com.supervision.minio.mapper.MinioFileMapper; import com.supervision.minio.service.MinioService; @@ -17,13 +16,12 @@ import com.supervision.neo4j.service.Neo4jService; import com.supervision.police.domain.*; import com.supervision.police.dto.NoteRecordDTO; import com.supervision.police.dto.NoteRecordDetailDTO; -import com.supervision.police.mapper.ModelCaseMapper; import com.supervision.police.mapper.NoteRecordSplitMapper; import com.supervision.police.mapper.NoteRecordMapper; import com.supervision.police.service.*; -import com.supervision.springaidemo.dto.QARecordNodeDTO; -import com.supervision.springaidemo.util.RecordRegexUtil; -import com.supervision.springaidemo.util.WordReadUtil; +import com.supervision.demo.dto.QARecordNodeDTO; +import com.supervision.utils.RecordRegexUtil; +import com.supervision.utils.WordReadUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/supervision/police/service/impl/RecordSplitTypeServiceImpl.java b/src/main/java/com/supervision/police/service/impl/RecordSplitTypeServiceImpl.java index 6b97e29..ec92b5c 100644 --- a/src/main/java/com/supervision/police/service/impl/RecordSplitTypeServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/RecordSplitTypeServiceImpl.java @@ -1,16 +1,13 @@ package com.supervision.police.service.impl; -import cn.hutool.core.collection.ConcurrentHashSet; import cn.hutool.core.util.StrUtil; import com.supervision.police.domain.CaseTaskRecord; import com.supervision.police.domain.ModelRecordType; import com.supervision.police.domain.NoteRecordSplit; -import com.supervision.police.domain.TripleInfo; import com.supervision.police.service.CaseTaskRecordService; import com.supervision.police.service.ExtractTripleInfoService; import com.supervision.police.service.NoteRecordSplitService; import com.supervision.police.service.RecordSplitTypeService; -import com.supervision.springaidemo.dto.QARecordNodeDTO; import com.supervision.thread.RecordSplitTypeThread; import com.supervision.thread.RecordSplitTypeThreadPool; import lombok.RequiredArgsConstructor; @@ -21,12 +18,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; @Service @Slf4j diff --git a/src/main/java/com/supervision/prompt/service/impl/PromptTestServiceImpl.java b/src/main/java/com/supervision/prompt/service/impl/PromptTestServiceImpl.java index 3789b86..04b9c09 100644 --- a/src/main/java/com/supervision/prompt/service/impl/PromptTestServiceImpl.java +++ b/src/main/java/com/supervision/prompt/service/impl/PromptTestServiceImpl.java @@ -5,8 +5,6 @@ import cn.hutool.core.collection.ConcurrentHashSet; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONObjectIter; -import cn.hutool.json.JSONUtil; import com.supervision.config.BusinessException; import com.supervision.minio.domain.MinioFile; import com.supervision.minio.service.MinioService; @@ -16,20 +14,16 @@ import com.supervision.prompt.vo.ParamTestDTO; import com.supervision.prompt.vo.PromptRequestVO; import com.supervision.prompt.vo.ExecResultDTO; import com.supervision.prompt.vo.ResultResVO; -import com.supervision.springaidemo.dto.QARecordNodeDTO; -import com.supervision.springaidemo.util.RecordRegexUtil; -import com.supervision.springaidemo.util.WordReadUtil; -import lombok.Data; +import com.supervision.demo.dto.QARecordNodeDTO; +import com.supervision.utils.RecordRegexUtil; +import com.supervision.utils.WordReadUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.Rank; import org.springframework.ai.ollama.OllamaChatClient; import org.springframework.stereotype.Service; import java.io.IOException; import java.io.InputStream; -import java.lang.reflect.Field; -import java.math.BigDecimal; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/com/supervision/springaidemo/controller/SimilarityController.java b/src/main/java/com/supervision/springaidemo/controller/SimilarityController.java deleted file mode 100644 index bceaece..0000000 --- a/src/main/java/com/supervision/springaidemo/controller/SimilarityController.java +++ /dev/null @@ -1,146 +0,0 @@ -package com.supervision.springaidemo.controller; - -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.io.FileUtil; -import cn.hutool.core.map.MapUtil; -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.springaidemo.domain.VpAskTemplateQuestionLibrary; -import com.supervision.springaidemo.domain.VpCommonDic; -import com.supervision.springaidemo.service.VpAskTemplateQuestionLibraryService; -import com.supervision.springaidemo.service.VpCommonDicService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.ai.document.Document; -import org.springframework.ai.embedding.EmbeddingClient; -import org.springframework.ai.ollama.OllamaChatClient; -import org.springframework.ai.ollama.OllamaEmbeddingClient; -import org.springframework.ai.ollama.api.OllamaOptions; -import org.springframework.ai.vectorstore.SimpleVectorStore; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.io.File; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -@Slf4j -@RequestMapping("similarity") -@RestController -public class SimilarityController { - - private final SimpleVectorStore store; - - - private final OllamaChatClient chatClient; - - @Autowired - private VpCommonDicService vpCommonDicService; - - @Autowired - private VpAskTemplateQuestionLibraryService libraryService; - - @Autowired - public SimilarityController(OllamaEmbeddingClient ollamaEmbeddingClient, OllamaChatClient chatClient) { - store = new SimpleVectorStore(ollamaEmbeddingClient.withDefaultOptions(OllamaOptions.create().withModel("llama3-chinese:8b"))); - this.chatClient = chatClient; -// File file = FileUtil.file("/Users/flevance/Java/spring-ai-demo/spring-ai-demo/data/storeData.json"); -// if (FileUtil.isNotEmpty(file)) { -// store.load(file); -// } - } - - @GetMapping("init") - public void init() { - // 从数据库中加载向量数据 - List list = libraryService.lambdaQuery().list(); - for (VpAskTemplateQuestionLibrary vpAskTemplateQuestionLibrary : list) { - String questionJsonStr = vpAskTemplateQuestionLibrary.getQuestion(); - List questionList = JSONUtil.toList(questionJsonStr, String.class); - questionList.add(vpAskTemplateQuestionLibrary.getDescription()); - for (String question : questionList) { - Map meta = MapUtil.of("dictId", vpAskTemplateQuestionLibrary.getDictId()); - meta.put("id", vpAskTemplateQuestionLibrary.getId()); - Document document = new Document(question, meta); - store.add(ListUtil.of(document)); - log.info("{}已添加到向量数据库", question); - } - } - log.info("向量化完成"); - // 加载完成之后,保存到本地 - store.save(FileUtil.newFile("/Users/flevance/Java/spring-ai-demo/spring-ai-demo/data/storeData.json")); - log.info("保存完成"); - } - - @GetMapping("similarity") - public void similarity(String userQuestion) { - List documents = store.similaritySearch(userQuestion); - for (Document document : documents) { - log.info("{}", document.getContent()); - } - } - - @GetMapping("itemCheck") - public void itemCheck() { - File file = FileUtil.file("/Users/flevance/Desktop/虚拟病人/副本副本医生临床问诊问题收集v1.xlsx"); - ExcelReader reader = ExcelUtil.getReader(file, 1); - ExcelWriter writer = ExcelUtil.getWriter(file, "match"); - List list = vpCommonDicService.lambdaQuery().like(VpCommonDic::getNameZhPath, "/").eq(VpCommonDic::getGroupCode, "AQT").list(); - Set databaseExistSet = new HashSet<>(); - for (VpCommonDic vpCommonDic : list) { - databaseExistSet.add(vpCommonDic.getNameZhPath()); - } - List> objects = reader.read(1); - for (int i = 0; i < objects.size(); i++) { - List list1 = objects.get(i); - String s = (String) list1.get(0); - String s1 = (String) list1.get(1); - // 如果不存在,则记录 - if (!databaseExistSet.contains(s + "/" + s1)) { - writer.writeCellValue(1, i + 1, "不存在"); - } else { - writer.writeCellValue(1, i + 1, "存在"); - } - } - writer.flush(); - - } - - @GetMapping("similarityBatch") - public void similarityBatch() { - init(); - Map dicMap = vpCommonDicService.list().stream().collect(Collectors.toMap(VpCommonDic::getId, Function.identity())); - // 从Excel中获取数据 - File file = FileUtil.file("/Users/flevance/Desktop/虚拟病人/副本副本医生临床问诊问题收集v1.xlsx"); - ExcelReader reader = ExcelUtil.getReader(file, 2); - ExcelWriter writer = ExcelUtil.getWriter(file, "result"); - - List objects = reader.readColumn(2, 1); - for (int i = 0; i < objects.size(); i++) { - int rowIndex = i + 1; - String question = objects.get(i).toString(); - try { - List documents = store.similaritySearch(question); - Optional first = documents.stream().findFirst(); - if (first.isPresent()) { - Map meta = first.get().getMetadata(); - String dictId = meta.get("dictId").toString(); - VpCommonDic vpCommonDic = dicMap.get(Long.parseLong(dictId)); - writer.writeCellValue(8, rowIndex, question); - writer.writeCellValue(9, rowIndex, ""); - writer.writeCellValue(10, rowIndex, vpCommonDic.getNameZhPath()); - writer.writeCellValue(11, rowIndex, dictId); - } - } catch (Exception e) { - log.error("出现错误", e); - } - log.info("{}匹配完成.", question); - } - writer.flush(); - - } -} diff --git a/src/main/java/com/supervision/springaidemo/controller/SimilarityQuestionController.java b/src/main/java/com/supervision/springaidemo/controller/SimilarityQuestionController.java deleted file mode 100644 index c176a14..0000000 --- a/src/main/java/com/supervision/springaidemo/controller/SimilarityQuestionController.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.supervision.springaidemo.controller; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.ai.chat.ChatResponse; -import org.springframework.ai.chat.Generation; -import org.springframework.ai.chat.messages.UserMessage; -import org.springframework.ai.chat.prompt.Prompt; -import org.springframework.ai.ollama.OllamaChatClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@RestController -@Slf4j -@RequestMapping("question") -public class SimilarityQuestionController { - - private static final String template = """ - 假设你现在是一个医生,现在假设你在问诊,如果你想问用户:你什么时候发现问题的？ - 请你给出这种问句10种相似的问法以扩充语料,要求扩充语料和源问题相似度很高以满足向量匹配的需求,且符合真实场景医生的询问方式 - """; - - - private final OllamaChatClient chatClient; - - @Autowired - public SimilarityQuestionController(OllamaChatClient chatClient) { - this.chatClient = chatClient; - } - - @GetMapping("test") - public void test() { - Prompt prompt = new Prompt(List.of(new UserMessage(template))); - ChatResponse call = chatClient.call(prompt); - Generation result = call.getResult(); - - String content = result.getOutput().getContent(); - log.info("结果是:{}", content); - } - -} diff --git a/src/main/java/com/supervision/springaidemo/controller/VPTestController.java b/src/main/java/com/supervision/springaidemo/controller/VPTestController.java deleted file mode 100644 index 2ec2e04..0000000 --- a/src/main/java/com/supervision/springaidemo/controller/VPTestController.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.supervision.springaidemo.controller; - -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; -import com.supervision.springaidemo.dto.AnswerDTO; -import com.supervision.springaidemo.dto.GlobalResult; -import com.supervision.springaidemo.util.TtsUtil; -import org.springframework.ai.chat.ChatResponse; -import org.springframework.ai.chat.Generation; -import org.springframework.ai.chat.messages.AssistantMessage; -import org.springframework.ai.chat.messages.Message; -import org.springframework.ai.chat.messages.SystemMessage; -import org.springframework.ai.chat.messages.UserMessage; -import org.springframework.ai.chat.prompt.Prompt; -import org.springframework.ai.ollama.OllamaChatClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -/** - * 测试如何避免出现答非所问 - */ -@RequestMapping("vp-test") -@RestController -public class VPTestController { - - private final OllamaChatClient chatClient; - - - // 使用多线程进行提交 - - - @Autowired - public VPTestController(OllamaChatClient chatClient) { - this.chatClient = chatClient; - } - - public static final String userPromptTemplate = """ - 现在希望你从预设的问题中,找到与给定问题的意图最匹配的项,以避免出现答非所问 - --- - 给定问题:{userQuestion} - --- - 预设问题1:{dataBaseQuestion1},问题ID:1761963909201268731 - 预设问题2:{dataBaseQuestion2},问题ID:1761963909201268732 - 预设问题3:{dataBaseQuestion3},问题ID:1761963909201268733 - 预设问题4:{dataBaseQuestion4},问题ID:1761963909201268734 - 预设问题5:{dataBaseQuestion5},问题ID:1761963909201268735 - --- - 回复格式为json:{"id":"对应的问题ID","question":"匹配到的预设问题"} - """; - - - -// private static final String systemPrompt = """ -// 你现在扮演一个医生,以医生的角度从预设问题列表中找到与给定问题最匹配的一项 -// """; - - @GetMapping("test") - public String test(String userQuestion) { - List messageHistoryList = new ArrayList<>(); -// messageHistoryList.add(new SystemMessage(systemPrompt)); - HashMap map = new HashMap<>(); - map.put("userQuestion", userQuestion); - map.put("dataBaseQuestion1", "您有什么症状？"); - map.put("dataBaseQuestion2", "您有什么不舒服的？"); - map.put("dataBaseQuestion3", "您是否有腹痛？"); - map.put("dataBaseQuestion4", "您还有什么不舒服的？"); - map.put("dataBaseQuestion5", "您还有其他什么症状吗？"); - StrUtil.format(userPromptTemplate, map); - messageHistoryList.add(new UserMessage(StrUtil.format(userPromptTemplate, map))); - Prompt prompt = new Prompt(messageHistoryList); - ChatResponse call = chatClient.call(prompt); - Generation result = call.getResult(); - return result.getOutput().getContent(); - } - -} diff --git a/src/main/java/com/supervision/springaidemo/controller/VirtualPatientTestController.java b/src/main/java/com/supervision/springaidemo/controller/VirtualPatientTestController.java deleted file mode 100644 index 0538042..0000000 --- a/src/main/java/com/supervision/springaidemo/controller/VirtualPatientTestController.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.supervision.springaidemo.controller; - -import cn.hutool.json.JSONUtil; -import com.supervision.springaidemo.dto.AnswerDTO; -import com.supervision.springaidemo.dto.GlobalResult; -import com.supervision.springaidemo.util.TtsUtil; -import org.springframework.ai.chat.ChatResponse; -import org.springframework.ai.chat.Generation; -import org.springframework.ai.chat.messages.AssistantMessage; -import org.springframework.ai.chat.messages.Message; -import org.springframework.ai.chat.messages.SystemMessage; -import org.springframework.ai.chat.messages.UserMessage; -import org.springframework.ai.chat.prompt.Prompt; -import org.springframework.ai.ollama.OllamaChatClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.ArrayList; -import java.util.List; - -@RequestMapping("virtual-patient") -@RestController -public class VirtualPatientTestController { - - private final OllamaChatClient chatClient; - - - // 使用多线程进行提交 - - - @Autowired - public VirtualPatientTestController(OllamaChatClient chatClient) { - this.chatClient = chatClient; - } - - public static final String userPromptTemplate = """ - 预设病例的基本情况如下： - --- - 名字:xxx - 年龄:xxx - 性别:女 - 主诉:头疼，发烧。 - 居住地:山东。 - 职业:学生 - 饮食:情况良好，胃口很大，总是感到饥饿，其他方面正常。 - 大小便:小便正常，但每天有大约3次稀便。 - 伴随症状:包括手抖、怕热、容易出汗，虽然胃口很好，吃很多却总是觉得饿，同时感到紧张、容易发脾气，经常拉肚子，体重有所下降。 - --- - 回复格式为json:{"answer":"根据病例情况回复的内容"} - """; - - private static final String systemPrompt = """ - 我们现在来进行一个角色扮演连续对话场景。 - 你现在扮演一个病人的角色(小樊)，我来扮演医生,我们进行模拟问诊。 - 我会给你设定病人的基本情况,你根据给定病人的基本信息进行回复我。 - 如果参考信息中不能回答医生的问题，则回复'我不知道/没注意/不清楚'",所有问话都必须给回复! - 如果医生说'你好'等礼貌用语,你就回复'你好,医生'!!! - """; - - private static final List messageHistoryList = new ArrayList<>(); - - static { - messageHistoryList.add(new SystemMessage(systemPrompt)); - messageHistoryList.add(new UserMessage(userPromptTemplate)); - messageHistoryList.add(new AssistantMessage("好的,已了解我要扮演病人的基本情况。已准备好对话了。")); - } - - @GetMapping("talk") - public String talk(String question) { - messageHistoryList.add(new UserMessage(question)); - Prompt prompt = new Prompt(messageHistoryList); - ChatResponse call = chatClient.call(prompt); - Generation result = call.getResult(); - String content = result.getOutput().getContent(); - messageHistoryList.add(new AssistantMessage(content)); - return content; - } - - @GetMapping("chatVoice") - public GlobalResult chatVoice(String question){ - String talk = talk(question); - AnswerDTO answer = JSONUtil.toBean(talk, AnswerDTO.class); - String answerBase64 = TtsUtil.ttsTransform(answer.getAnswer()); - answer.setAnswerBase64(answerBase64); - return GlobalResult.ok(answer); - } - -} diff --git a/src/main/java/com/supervision/springaidemo/domain/VpAskTemplateQuestionLibrary.java b/src/main/java/com/supervision/springaidemo/domain/VpAskTemplateQuestionLibrary.java deleted file mode 100644 index 62562cc..0000000 --- a/src/main/java/com/supervision/springaidemo/domain/VpAskTemplateQuestionLibrary.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.supervision.springaidemo.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - -/** - * 诊断问询意图问题库 - * @TableName vp_ask_template_question_library - */ -@TableName(value ="vp_ask_template_question_library") -@Data -public class VpAskTemplateQuestionLibrary implements Serializable { - /** - * 主键 - */ - @TableId - private String id; - - /** - * 字典值ID(关联common_dict表ID) - */ - private Long dictId; - - /** - * 编码 - */ - private String code; - - /** - * 中文注释 用户设置的问题 - */ - private String description; - - /** - * 问题列表 由用户传入的问题生成的问题列表 - */ - private String question; - - /** - * 默认回答编码 - */ - private String defaultAnswerCode; - - /** - * 默认问题的回答 - */ - private String defaultAnswer; - - /** - * 默认回答资源id - */ - private String defaultAnswerResourceId; - - /** - * 创建人ID - */ - private String createUserId; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 更新人 - */ - private String updateUserId; - - /** - * 更新时间 - */ - private Date updateTime; - - @TableField(exist = false) - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/src/main/java/com/supervision/springaidemo/domain/VpCommonDic.java b/src/main/java/com/supervision/springaidemo/domain/VpCommonDic.java deleted file mode 100644 index f11b6ec..0000000 --- a/src/main/java/com/supervision/springaidemo/domain/VpCommonDic.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.supervision.springaidemo.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - -/** - * 通用字典表 - * @TableName vp_common_dic - */ -@TableName(value ="vp_common_dic") -@Data -public class VpCommonDic implements Serializable { - /** - * - */ - @TableId(type = IdType.AUTO) - private Long id; - - /** - * 字段码值 - */ - private String code; - - /** - * 中文名 - */ - private String nameZh; - - /** - * 英文名 - */ - private String nameEn; - - /** - * 分组code - */ - private String groupCode; - - /** - * 父级id - */ - private Long parentId; - - /** - * 优先级,用来做排序等操作 - */ - private Integer priority; - - /** - * 中文路径 - */ - private String nameZhPath; - - /** - * 说明 - */ - private String description; - - /** - * - */ - private String createUserId; - - /** - * - */ - private Date createTime; - - /** - * - */ - private String updateUserId; - - /** - * - */ - private Date updateTime; - - @TableField(exist = false) - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/src/main/java/com/supervision/springaidemo/dto/AnswerDTO.java b/src/main/java/com/supervision/springaidemo/dto/AnswerDTO.java deleted file mode 100644 index 9e45c9a..0000000 --- a/src/main/java/com/supervision/springaidemo/dto/AnswerDTO.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.supervision.springaidemo.dto; - -import lombok.Data; - -@Data -public class AnswerDTO { - - private String answer; - - private String answerBase64; -} diff --git a/src/main/java/com/supervision/springaidemo/dto/GlobalResult.java b/src/main/java/com/supervision/springaidemo/dto/GlobalResult.java deleted file mode 100644 index 643fe6a..0000000 --- a/src/main/java/com/supervision/springaidemo/dto/GlobalResult.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.supervision.springaidemo.dto; - -import lombok.Data; -import org.springframework.http.HttpStatus; - -@Data -public class GlobalResult { - - private int code = 200; - - private String msg = "success"; - - private T data; - - - public static GlobalResult ok() { - return ok(null); - } - - public static GlobalResult ok(T data) { - GlobalResult globalResult = new GlobalResult<>(); - globalResult.setData(data); - return globalResult; - } - - public static GlobalResult ok(T data, String message) { - GlobalResult globalResult = new GlobalResult<>(); - globalResult.setMsg(message); - globalResult.setData(data); - return globalResult; - } - - public static GlobalResult error(String msg) { - return error(HttpStatus.INTERNAL_SERVER_ERROR.value(), null, msg); - } - - - public static GlobalResult error(int code, T data, String msg) { - GlobalResult globalResult = new GlobalResult<>(); - globalResult.setCode(code); - globalResult.setData(data); - globalResult.setMsg(msg); - return globalResult; - } -} diff --git a/src/main/java/com/supervision/springaidemo/dto/MetricResultDTO.java b/src/main/java/com/supervision/springaidemo/dto/MetricResultDTO.java deleted file mode 100644 index 11f6644..0000000 --- a/src/main/java/com/supervision/springaidemo/dto/MetricResultDTO.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.supervision.springaidemo.dto; - -import lombok.Data; - -@Data -public class MetricResultDTO { - - private String result; - - private String originalContext; - - private String reason; -} diff --git a/src/main/java/com/supervision/springaidemo/dto/paddlespeech/req/AsrReqDTO.java b/src/main/java/com/supervision/springaidemo/dto/paddlespeech/req/AsrReqDTO.java deleted file mode 100644 index eceff42..0000000 --- a/src/main/java/com/supervision/springaidemo/dto/paddlespeech/req/AsrReqDTO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.supervision.springaidemo.dto.paddlespeech.req; - -import lombok.Data; - -@Data -public class AsrReqDTO { - - private final String audio; - - private final String audio_format = "wav"; - - private final Integer sample_rate = 16000; - - private final String lang = "zh_cn"; - - private final Integer punc = 0; - - public AsrReqDTO(String audio) { - this.audio = audio; - } -} diff --git a/src/main/java/com/supervision/springaidemo/dto/paddlespeech/req/TtsReqDTO.java b/src/main/java/com/supervision/springaidemo/dto/paddlespeech/req/TtsReqDTO.java deleted file mode 100644 index 834b1e5..0000000 --- a/src/main/java/com/supervision/springaidemo/dto/paddlespeech/req/TtsReqDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.supervision.springaidemo.dto.paddlespeech.req; - -import lombok.Data; - -@Data -public class TtsReqDTO { - - private final String text; - - private final Integer spk_id = 0; - - private final Double speed = 1.0; - - private final Double volume = 1.0; - - private final Integer sample_rate = 16000; - - private final String save_path = "./tts.wav"; - - public TtsReqDTO(String text) { - this.text = text; - } -} diff --git a/src/main/java/com/supervision/springaidemo/dto/paddlespeech/res/AsrResultDTO.java b/src/main/java/com/supervision/springaidemo/dto/paddlespeech/res/AsrResultDTO.java deleted file mode 100644 index 317f917..0000000 --- a/src/main/java/com/supervision/springaidemo/dto/paddlespeech/res/AsrResultDTO.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.supervision.springaidemo.dto.paddlespeech.res; - -import lombok.Data; - -@Data -public class AsrResultDTO { - - private String transcription; - -} diff --git a/src/main/java/com/supervision/springaidemo/dto/paddlespeech/res/PaddleSpeechResDTO.java b/src/main/java/com/supervision/springaidemo/dto/paddlespeech/res/PaddleSpeechResDTO.java deleted file mode 100644 index a242ec0..0000000 --- a/src/main/java/com/supervision/springaidemo/dto/paddlespeech/res/PaddleSpeechResDTO.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.supervision.springaidemo.dto.paddlespeech.res; - -import lombok.Data; - -@Data -public class PaddleSpeechResDTO { - - private Boolean success; - - private Integer code; - - private Object message; - - private T result; -} diff --git a/src/main/java/com/supervision/springaidemo/dto/paddlespeech/res/TtsResultDTO.java b/src/main/java/com/supervision/springaidemo/dto/paddlespeech/res/TtsResultDTO.java deleted file mode 100644 index 8012d25..0000000 --- a/src/main/java/com/supervision/springaidemo/dto/paddlespeech/res/TtsResultDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.supervision.springaidemo.dto.paddlespeech.res; - -import lombok.Data; - -@Data -public class TtsResultDTO { - - private String lang; - - private String spk_id; - - private String speed; - - private String volume; - - private String sample_rate; - - private String duration; - - private String save_path; - - private String audio; -} diff --git a/src/main/java/com/supervision/springaidemo/mapper/ModelMetricMapper.java b/src/main/java/com/supervision/springaidemo/mapper/ModelMetricMapper.java deleted file mode 100644 index 8efa7a7..0000000 --- a/src/main/java/com/supervision/springaidemo/mapper/ModelMetricMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.supervision.springaidemo.mapper; - -import com.supervision.springaidemo.domain.ModelMetric; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author flevance -* @description 针对表【model_metric】的数据库操作Mapper -* @createDate 2024-05-10 16:40:18 -* @Entity com.supervision.domain.ModelMetric -*/ -public interface ModelMetricMapper extends BaseMapper { - -} - - - - diff --git a/src/main/java/com/supervision/springaidemo/mapper/VpAskTemplateQuestionLibraryMapper.java b/src/main/java/com/supervision/springaidemo/mapper/VpAskTemplateQuestionLibraryMapper.java deleted file mode 100644 index ca65ddc..0000000 --- a/src/main/java/com/supervision/springaidemo/mapper/VpAskTemplateQuestionLibraryMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.supervision.springaidemo.mapper; - -import com.supervision.springaidemo.domain.VpAskTemplateQuestionLibrary; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author flevance -* @description 针对表【vp_ask_template_question_library(诊断问询意图问题库)】的数据库操作Mapper -* @createDate 2024-05-22 17:40:02 -* @Entity com.supervision.springaidemo.domain.VpAskTemplateQuestionLibrary -*/ -public interface VpAskTemplateQuestionLibraryMapper extends BaseMapper { - -} - - - - diff --git a/src/main/java/com/supervision/springaidemo/mapper/VpCommonDicMapper.java b/src/main/java/com/supervision/springaidemo/mapper/VpCommonDicMapper.java deleted file mode 100644 index 265b40c..0000000 --- a/src/main/java/com/supervision/springaidemo/mapper/VpCommonDicMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.supervision.springaidemo.mapper; - -import com.supervision.springaidemo.domain.VpCommonDic; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author flevance -* @description 针对表【vp_common_dic(通用字典表)】的数据库操作Mapper -* @createDate 2024-05-23 10:24:49 -* @Entity com.supervision.springaidemo.domain.VpCommonDic -*/ -public interface VpCommonDicMapper extends BaseMapper { - -} - - - - diff --git a/src/main/java/com/supervision/springaidemo/service/ModelMetricService.java b/src/main/java/com/supervision/springaidemo/service/ModelMetricService.java deleted file mode 100644 index 7ea6ea2..0000000 --- a/src/main/java/com/supervision/springaidemo/service/ModelMetricService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.supervision.springaidemo.service; - -import com.supervision.springaidemo.domain.ModelMetric; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author flevance -* @description 针对表【model_metric】的数据库操作Service -* @createDate 2024-05-10 16:40:18 -*/ -public interface ModelMetricService extends IService { - -} diff --git a/src/main/java/com/supervision/springaidemo/service/VpAskTemplateQuestionLibraryService.java b/src/main/java/com/supervision/springaidemo/service/VpAskTemplateQuestionLibraryService.java deleted file mode 100644 index 5d4062e..0000000 --- a/src/main/java/com/supervision/springaidemo/service/VpAskTemplateQuestionLibraryService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.supervision.springaidemo.service; - -import com.supervision.springaidemo.domain.VpAskTemplateQuestionLibrary; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author flevance -* @description 针对表【vp_ask_template_question_library(诊断问询意图问题库)】的数据库操作Service -* @createDate 2024-05-22 17:40:02 -*/ -public interface VpAskTemplateQuestionLibraryService extends IService { - -} diff --git a/src/main/java/com/supervision/springaidemo/service/VpCommonDicService.java b/src/main/java/com/supervision/springaidemo/service/VpCommonDicService.java deleted file mode 100644 index e07acf9..0000000 --- a/src/main/java/com/supervision/springaidemo/service/VpCommonDicService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.supervision.springaidemo.service; - -import com.supervision.springaidemo.domain.VpCommonDic; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author flevance -* @description 针对表【vp_common_dic(通用字典表)】的数据库操作Service -* @createDate 2024-05-23 10:24:49 -*/ -public interface VpCommonDicService extends IService { - -} diff --git a/src/main/java/com/supervision/springaidemo/service/impl/ModelMetricServiceImpl.java b/src/main/java/com/supervision/springaidemo/service/impl/ModelMetricServiceImpl.java deleted file mode 100644 index 106a624..0000000 --- a/src/main/java/com/supervision/springaidemo/service/impl/ModelMetricServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.supervision.springaidemo.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.supervision.springaidemo.domain.ModelMetric; -import com.supervision.springaidemo.service.ModelMetricService; -import com.supervision.springaidemo.mapper.ModelMetricMapper; -import org.springframework.stereotype.Service; - -/** -* @author flevance -* @description 针对表【model_metric】的数据库操作Service实现 -* @createDate 2024-05-10 16:40:18 -*/ -@Service -public class ModelMetricServiceImpl extends ServiceImpl - implements ModelMetricService{ - -} - - - - diff --git a/src/main/java/com/supervision/springaidemo/service/impl/VpAskTemplateQuestionLibraryServiceImpl.java b/src/main/java/com/supervision/springaidemo/service/impl/VpAskTemplateQuestionLibraryServiceImpl.java deleted file mode 100644 index 17f54f1..0000000 --- a/src/main/java/com/supervision/springaidemo/service/impl/VpAskTemplateQuestionLibraryServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.supervision.springaidemo.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.supervision.springaidemo.domain.VpAskTemplateQuestionLibrary; -import com.supervision.springaidemo.service.VpAskTemplateQuestionLibraryService; -import com.supervision.springaidemo.mapper.VpAskTemplateQuestionLibraryMapper; -import org.springframework.stereotype.Service; - -/** -* @author flevance -* @description 针对表【vp_ask_template_question_library(诊断问询意图问题库)】的数据库操作Service实现 -* @createDate 2024-05-22 17:40:02 -*/ -@Service -public class VpAskTemplateQuestionLibraryServiceImpl extends ServiceImpl - implements VpAskTemplateQuestionLibraryService{ - -} - - - - diff --git a/src/main/java/com/supervision/springaidemo/service/impl/VpCommonDicServiceImpl.java b/src/main/java/com/supervision/springaidemo/service/impl/VpCommonDicServiceImpl.java deleted file mode 100644 index 38e90fc..0000000 --- a/src/main/java/com/supervision/springaidemo/service/impl/VpCommonDicServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.supervision.springaidemo.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.supervision.springaidemo.domain.VpCommonDic; -import com.supervision.springaidemo.service.VpCommonDicService; -import com.supervision.springaidemo.mapper.VpCommonDicMapper; -import org.springframework.stereotype.Service; - -/** -* @author flevance -* @description 针对表【vp_common_dic(通用字典表)】的数据库操作Service实现 -* @createDate 2024-05-23 10:24:49 -*/ -@Service -public class VpCommonDicServiceImpl extends ServiceImpl - implements VpCommonDicService{ - -} - - - - diff --git a/src/main/java/com/supervision/springaidemo/util/TtsUtil.java b/src/main/java/com/supervision/springaidemo/util/TtsUtil.java deleted file mode 100644 index 3015755..0000000 --- a/src/main/java/com/supervision/springaidemo/util/TtsUtil.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.supervision.springaidemo.util; - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.http.HttpUtil; -import cn.hutool.json.JSONUtil; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.supervision.springaidemo.dto.paddlespeech.req.TtsReqDTO; -import com.supervision.springaidemo.dto.paddlespeech.res.PaddleSpeechResDTO; -import com.supervision.springaidemo.dto.paddlespeech.res.TtsResultDTO; - -public class TtsUtil { - - private static final String TTS_URL = "http://192.168.10.137:8090/paddlespeech/tts"; - - private static final ObjectMapper objectMapper = new ObjectMapper(); - - public static String ttsTransform(String str) { - // 构建 - String post = HttpUtil.post(TTS_URL, JSONUtil.toJsonStr(new TtsReqDTO(str))); - try { - PaddleSpeechResDTO response = objectMapper.readValue(post, new TypeReference>() { - }); - if (!response.getSuccess() || ObjectUtil.isEmpty(response.getResult())) { - throw new RuntimeException("文字转换语音失败"); - } - return response.getResult().getAudio(); - } catch (Exception e) { - throw new RuntimeException("语音转换文字失败", e); - } - - } -} diff --git a/src/main/java/com/supervision/thread/RecordSplitTypeThread.java b/src/main/java/com/supervision/thread/RecordSplitTypeThread.java index d489461..7400d72 100644 --- a/src/main/java/com/supervision/thread/RecordSplitTypeThread.java +++ b/src/main/java/com/supervision/thread/RecordSplitTypeThread.java @@ -1,17 +1,13 @@ package com.supervision.thread; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.supervision.police.domain.ModelRecordType; import com.supervision.police.domain.NoteRecordSplit; -import com.supervision.police.service.CaseTaskRecordService; import com.supervision.police.service.NoteRecordSplitService; -import com.supervision.springaidemo.dto.QARecordNodeDTO; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.json.JSONObject; import org.springframework.ai.chat.ChatResponse; import org.springframework.ai.chat.messages.UserMessage; import org.springframework.ai.chat.prompt.Prompt; @@ -23,7 +19,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; import java.util.stream.Collectors; /** diff --git a/src/main/java/com/supervision/springaidemo/util/RecordRegexUtil.java b/src/main/java/com/supervision/utils/RecordRegexUtil.java similarity index 93% rename from src/main/java/com/supervision/springaidemo/util/RecordRegexUtil.java rename to src/main/java/com/supervision/utils/RecordRegexUtil.java index 10cd374..3777325 100644 --- a/src/main/java/com/supervision/springaidemo/util/RecordRegexUtil.java +++ b/src/main/java/com/supervision/utils/RecordRegexUtil.java @@ -1,8 +1,8 @@ -package com.supervision.springaidemo.util; +package com.supervision.utils; import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.StrUtil; -import com.supervision.springaidemo.dto.QARecordNodeDTO; +import com.supervision.demo.dto.QARecordNodeDTO; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/supervision/springaidemo/util/WordReadUtil.java b/src/main/java/com/supervision/utils/WordReadUtil.java similarity index 98% rename from src/main/java/com/supervision/springaidemo/util/WordReadUtil.java rename to src/main/java/com/supervision/utils/WordReadUtil.java index 2668c3e..8178a99 100644 --- a/src/main/java/com/supervision/springaidemo/util/WordReadUtil.java +++ b/src/main/java/com/supervision/utils/WordReadUtil.java @@ -1,4 +1,4 @@ -package com.supervision.springaidemo.util; +package com.supervision.utils; import lombok.extern.slf4j.Slf4j; import org.apache.poi.xwpf.usermodel.XWPFDocument; diff --git a/src/main/resources/mapper/ModelMetricExampleMapper.xml b/src/main/resources/mapper/ModelMetricExampleMapper.xml index fe7c87d..95c9c89 100644 --- a/src/main/resources/mapper/ModelMetricExampleMapper.xml +++ b/src/main/resources/mapper/ModelMetricExampleMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/src/main/resources/mapper/ModelMetricMapper.xml b/src/main/resources/mapper/ModelMetricMapper.xml index 614bdae..af93546 100644 --- a/src/main/resources/mapper/ModelMetricMapper.xml +++ b/src/main/resources/mapper/ModelMetricMapper.xml @@ -2,22 +2,35 @@ - + - + + + + + + + + + + + - id,metric_code,metric_name, - metric_true_desc,metric_false_desc, - metric_desc,metric_type,prompt_template + id,metric_code,metric_id, + score,metric_name,metric_true_desc, + metric_false_desc,metric_detail_template,example, + result,new_result,metric_desc, + metric_type,prompt_template,create_user_id, + create_time,update_user_id,update_time diff --git a/src/main/resources/mapper/NoteCheckRecordMapper.xml b/src/main/resources/mapper/NoteCheckRecordMapper.xml index c8ffdd9..84347e9 100644 --- a/src/main/resources/mapper/NoteCheckRecordMapper.xml +++ b/src/main/resources/mapper/NoteCheckRecordMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/src/main/resources/mapper/VpCommonDicMapper.xml b/src/main/resources/mapper/VpCommonDicMapper.xml deleted file mode 100644 index 3b7cf8d..0000000 --- a/src/main/resources/mapper/VpCommonDicMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - id,code,name_zh, - name_en,group_code,parent_id, - priority,name_zh_path,description, - create_user_id,create_time,update_user_id, - update_time - - diff --git a/src/test/java/com/supervision/springaidemo/DruidTableExtractor.java b/src/test/java/com/supervision/demo/DruidTableExtractor.java similarity index 98% rename from src/test/java/com/supervision/springaidemo/DruidTableExtractor.java rename to src/test/java/com/supervision/demo/DruidTableExtractor.java index a09f7fc..48ffa79 100644 --- a/src/test/java/com/supervision/springaidemo/DruidTableExtractor.java +++ b/src/test/java/com/supervision/demo/DruidTableExtractor.java @@ -1,4 +1,4 @@ -package com.supervision.springaidemo; +package com.supervision.demo; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.*; diff --git a/src/test/java/com/supervision/springaidemo/FuHsiApplicationTests.java b/src/test/java/com/supervision/demo/FuHsiApplicationTests.java similarity index 95% rename from src/test/java/com/supervision/springaidemo/FuHsiApplicationTests.java rename to src/test/java/com/supervision/demo/FuHsiApplicationTests.java index 5c3e26e..dc99ac1 100644 --- a/src/test/java/com/supervision/springaidemo/FuHsiApplicationTests.java +++ b/src/test/java/com/supervision/demo/FuHsiApplicationTests.java @@ -1,9 +1,9 @@ -package com.supervision.springaidemo; +package com.supervision.demo; import com.supervision.common.domain.R; import com.supervision.neo4j.controller.Neo4jController; import com.supervision.neo4j.domain.CaseNode; -import com.supervision.springaidemo.controller.ExampleChatController; +import com.supervision.demo.controller.ExampleChatController; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.ai.chat.ChatResponse; diff --git a/src/test/java/com/supervision/springaidemo/ModelIndexTest.java b/src/test/java/com/supervision/demo/ModelIndexTest.java similarity index 99% rename from src/test/java/com/supervision/springaidemo/ModelIndexTest.java rename to src/test/java/com/supervision/demo/ModelIndexTest.java index 308daca..d8e91d9 100644 --- a/src/test/java/com/supervision/springaidemo/ModelIndexTest.java +++ b/src/test/java/com/supervision/demo/ModelIndexTest.java @@ -1,4 +1,4 @@ -package com.supervision.springaidemo; +package com.supervision.demo; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.UUID; diff --git a/src/test/java/com/supervision/springaidemo/SQLTableExtractor.java b/src/test/java/com/supervision/demo/SQLTableExtractor.java similarity index 77% rename from src/test/java/com/supervision/springaidemo/SQLTableExtractor.java rename to src/test/java/com/supervision/demo/SQLTableExtractor.java index 73e0377..c860af4 100644 --- a/src/test/java/com/supervision/springaidemo/SQLTableExtractor.java +++ b/src/test/java/com/supervision/demo/SQLTableExtractor.java @@ -1,12 +1,7 @@ -package com.supervision.springaidemo; +package com.supervision.demo; import net.sf.jsqlparser.parser.CCJSqlParserUtil; import net.sf.jsqlparser.statement.Statement; -import net.sf.jsqlparser.statement.select.PlainSelect; -import net.sf.jsqlparser.statement.select.Select; -import net.sf.jsqlparser.statement.select.SelectBody; -import net.sf.jsqlparser.statement.select.SubSelect; -import net.sf.jsqlparser.schema.Table; import net.sf.jsqlparser.util.TablesNamesFinder; import net.sf.jsqlparser.JSQLParserException; diff --git a/src/test/java/com/supervision/springaidemo/WordRenderTest.java b/src/test/java/com/supervision/demo/WordRenderTest.java similarity index 98% rename from src/test/java/com/supervision/springaidemo/WordRenderTest.java rename to src/test/java/com/supervision/demo/WordRenderTest.java index aad7142..5499961 100644 --- a/src/test/java/com/supervision/springaidemo/WordRenderTest.java +++ b/src/test/java/com/supervision/demo/WordRenderTest.java @@ -1,4 +1,4 @@ -package com.supervision.springaidemo; +package com.supervision.demo; import com.deepoove.poi.XWPFTemplate; import com.supervision.police.dto.caseScore.CaseScoreDetailDTO;