From f10f1843fc64c6561920a667f6fec77ac044b36d Mon Sep 17 00:00:00 2001 From: liu Date: Wed, 17 Jul 2024 09:12:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B1=BB=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../police/controller/RecordController.java | 12 ++- .../police/domain/ModelRecordType.java | 2 +- .../supervision/police/domain/NoteRecord.java | 84 ++++++++++++------- ...{NoteRecords.java => NoteRecordSplit.java} | 84 +++++++------------ .../police/mapper/NoteRecordMapper.java | 16 ++-- .../police/mapper/NoteRecordSplitMapper.java | 17 ++++ .../police/mapper/NoteRecordsMapper.java | 15 ---- .../police/service/RecordService.java | 9 +- .../impl/ModelRecordTypeServiceImpl.java | 17 ++-- .../service/impl/RecordServiceImpl.java | 62 ++++++-------- .../controller/ExampleChatController.java | 16 ++-- .../resources/mapper/NoteRecordMapper.xml | 19 +---- .../mapper/NoteRecordSplitMapper.xml | 20 +++++ .../resources/mapper/NoteRecordsMapper.xml | 5 -- 14 files changed, 181 insertions(+), 197 deletions(-) rename src/main/java/com/supervision/police/domain/{NoteRecords.java => NoteRecordSplit.java} (55%) create mode 100644 src/main/java/com/supervision/police/mapper/NoteRecordSplitMapper.java delete mode 100644 src/main/java/com/supervision/police/mapper/NoteRecordsMapper.java create mode 100644 src/main/resources/mapper/NoteRecordSplitMapper.xml delete mode 100644 src/main/resources/mapper/NoteRecordsMapper.xml diff --git a/src/main/java/com/supervision/police/controller/RecordController.java b/src/main/java/com/supervision/police/controller/RecordController.java index 55f2ae9..ad4d6b5 100644 --- a/src/main/java/com/supervision/police/controller/RecordController.java +++ b/src/main/java/com/supervision/police/controller/RecordController.java @@ -3,16 +3,14 @@ package com.supervision.police.controller; import com.supervision.common.domain.R; import com.supervision.police.domain.ModelRecordType; import com.supervision.police.domain.NotePrompt; -import com.supervision.police.domain.NoteRecords; +import com.supervision.police.domain.NoteRecord; import com.supervision.police.domain.TripleInfo; import com.supervision.police.dto.ListDTO; import com.supervision.police.service.ModelRecordTypeService; import com.supervision.police.service.RecordService; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -102,7 +100,7 @@ public class RecordController { * @return */ @PostMapping("/addOrUpdRecords") - public R uploadRecords(NoteRecords records, + public R uploadRecords(NoteRecord records, @RequestPart("file") List fileList) throws IOException { return R.ok(recordService.uploadRecords(records, fileList)); } @@ -110,16 +108,16 @@ public class RecordController { /** * 查询笔录，按姓名为父目录 * - * @param noteRecords + * @param noteRecord * @param page * @param size * @return */ @PostMapping("/queryRecords") - public R> queryRecords(@RequestBody NoteRecords noteRecords, + public R> queryRecords(@RequestBody NoteRecord noteRecord, @RequestParam(required = false, defaultValue = "1") Integer page, @RequestParam(required = false, defaultValue = "20") Integer size) { - return R.ok(recordService.queryRecords(noteRecords, page, size)); + return R.ok(recordService.queryRecords(noteRecord, page, size)); } /** diff --git a/src/main/java/com/supervision/police/domain/ModelRecordType.java b/src/main/java/com/supervision/police/domain/ModelRecordType.java index 8644990..5701c40 100644 --- a/src/main/java/com/supervision/police/domain/ModelRecordType.java +++ b/src/main/java/com/supervision/police/domain/ModelRecordType.java @@ -37,7 +37,7 @@ public class ModelRecordType implements Serializable { * 笔录示例 */ @TableField(exist = false) - private List records; + private List records; /** * 创建人ID diff --git a/src/main/java/com/supervision/police/domain/NoteRecord.java b/src/main/java/com/supervision/police/domain/NoteRecord.java index 87c9595..c1be745 100644 --- a/src/main/java/com/supervision/police/domain/NoteRecord.java +++ b/src/main/java/com/supervision/police/domain/NoteRecord.java @@ -1,5 +1,7 @@ package com.supervision.police.domain; +import java.time.LocalDateTime; + import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -8,59 +10,81 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.Date; - -@TableName(value = "note_record") +import java.util.List; + +/** + * 完整笔录表(NoteRecord)表实体类 + * + * @author qmy + * @since 2024-07-05 08:53:20 + */ @Data +@TableName("note_records") public class NoteRecord implements Serializable { - /** - * 主键ID - */ @TableId private String id; - + /** * 案件id */ private String caseId; - + /** - * 人员名称 + * 笔录名称 */ - private String personName; - + private String recordName; + /** - * 笔录名称 + * 笔录文件id */ - private String noteName; - + private String fileIds; + /** - * 问题 + * 姓名 */ - private String question; - + private String name; + /** - * 回答 + * 角色 */ - private String answer; - + private String role; + /** - * 笔录类型(总结) + * 供述材料 */ - private String recordType; - + private Integer confessionMaterial; + /** - * 笔录类型id + * 询问人 */ - @TableField(exist = false) - private String recordTypeId; + private String lawAsker; + + /** + * 供述开始时间 + */ +// @JsonFormat(pattern="yyyy-MM-dd HH:mm",timezone = "GMT+8") + private String confessionStartTime; + + /** + * 供述结束时间 + */ +// @JsonFormat(pattern="yyyy-MM-dd HH:mm",timezone = "GMT+8") + private String confessionEndTime; + + /** + * 排序序号 + */ + private Integer indexNum; + /** - * 完整笔录id + * 数据状态 */ - private String noteRecordsId; + private String dataStatus; + + @TableField(exist = false) + private List children; /** * 创建人ID @@ -89,4 +113,6 @@ public class NoteRecord implements Serializable { @TableField(exist = false) private static final long serialVersionUID = 1L; + } + diff --git a/src/main/java/com/supervision/police/domain/NoteRecords.java b/src/main/java/com/supervision/police/domain/NoteRecordSplit.java similarity index 55% rename from src/main/java/com/supervision/police/domain/NoteRecords.java rename to src/main/java/com/supervision/police/domain/NoteRecordSplit.java index af9e21d..27461f1 100644 --- a/src/main/java/com/supervision/police/domain/NoteRecords.java +++ b/src/main/java/com/supervision/police/domain/NoteRecordSplit.java @@ -1,92 +1,68 @@ package com.supervision.police.domain; -import java.time.LocalDateTime; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import org.springframework.web.multipart.MultipartFile; import java.io.Serializable; -import java.util.List; +import java.time.LocalDateTime; /** - * 完整笔录表(NoteRecords)表实体类 - * - * @author qmy - * @since 2024-07-05 08:53:20 + * 拆分后的笔录表 */ +@TableName(value = "note_record_split") @Data -@TableName("note_records") -public class NoteRecords implements Serializable { +public class NoteRecordSplit implements Serializable { + /** + * 主键ID + */ @TableId private String id; - + /** * 案件id */ private String caseId; - - /** - * 笔录名称 - */ - private String recordName; - - /** - * 笔录文件id - */ - private String fileIds; - - /** - * 姓名 - */ - private String name; - + /** - * 角色 + * 人员名称 */ - private String role; - + private String personName; + /** - * 供述材料 + * 笔录名称 */ - private Integer confessionMaterial; - + private String noteName; + /** - * 询问人 + * 问题 */ - private String lawAsker; - + private String question; + /** - * 供述开始时间 + * 回答 */ -// @JsonFormat(pattern="yyyy-MM-dd HH:mm",timezone = "GMT+8") - private String confessionStartTime; - + private String answer; + /** - * 供述结束时间 + * 笔录类型(总结) */ -// @JsonFormat(pattern="yyyy-MM-dd HH:mm",timezone = "GMT+8") - private String confessionEndTime; - + private String recordType; + /** - * 排序序号 + * 笔录类型id */ - private Integer indexNum; - + @TableField(exist = false) + private String recordTypeId; /** - * 数据状态 + * 完整笔录id */ - private String dataStatus; - - @TableField(exist = false) - private List children; + private String noteRecordsId; /** * 创建人ID @@ -115,6 +91,4 @@ public class NoteRecords implements Serializable { @TableField(exist = false) private static final long serialVersionUID = 1L; - } - diff --git a/src/main/java/com/supervision/police/mapper/NoteRecordMapper.java b/src/main/java/com/supervision/police/mapper/NoteRecordMapper.java index fefb372..0dfbb74 100644 --- a/src/main/java/com/supervision/police/mapper/NoteRecordMapper.java +++ b/src/main/java/com/supervision/police/mapper/NoteRecordMapper.java @@ -2,16 +2,14 @@ package com.supervision.police.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.supervision.police.domain.NoteRecord; -import org.apache.ibatis.annotations.Param; - -import java.util.List; +/** + * 完整笔录表(NoteRecord)表数据库访问层 + * + * @author qmy + * @since 2024-07-05 08:53:20 + */ public interface NoteRecordMapper extends BaseMapper { - List selectByRecordType(@Param("recordType") String recordType); - - List selectRecord(@Param("caseId") String caseId, - @Param("name") String name, - @Param("recordId") String recordId); - } + diff --git a/src/main/java/com/supervision/police/mapper/NoteRecordSplitMapper.java b/src/main/java/com/supervision/police/mapper/NoteRecordSplitMapper.java new file mode 100644 index 0000000..ccf0a22 --- /dev/null +++ b/src/main/java/com/supervision/police/mapper/NoteRecordSplitMapper.java @@ -0,0 +1,17 @@ +package com.supervision.police.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.supervision.police.domain.NoteRecordSplit; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface NoteRecordSplitMapper extends BaseMapper { + + List selectByRecordType(@Param("recordType") String recordType); + + List selectRecord(@Param("caseId") String caseId, + @Param("name") String name, + @Param("recordId") String recordId); + +} diff --git a/src/main/java/com/supervision/police/mapper/NoteRecordsMapper.java b/src/main/java/com/supervision/police/mapper/NoteRecordsMapper.java deleted file mode 100644 index 01234d7..0000000 --- a/src/main/java/com/supervision/police/mapper/NoteRecordsMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.supervision.police.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.supervision.police.domain.NoteRecords; - -/** - * 完整笔录表(NoteRecords)表数据库访问层 - * - * @author qmy - * @since 2024-07-05 08:53:20 - */ -public interface NoteRecordsMapper extends BaseMapper { - -} - diff --git a/src/main/java/com/supervision/police/service/RecordService.java b/src/main/java/com/supervision/police/service/RecordService.java index d7e5afd..67e1724 100644 --- a/src/main/java/com/supervision/police/service/RecordService.java +++ b/src/main/java/com/supervision/police/service/RecordService.java @@ -1,20 +1,19 @@ package com.supervision.police.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.supervision.common.domain.R; import com.supervision.police.domain.NoteRecord; -import com.supervision.police.domain.NoteRecords; +import com.supervision.police.domain.NoteRecordSplit; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; import java.util.List; import java.util.Map; -public interface RecordService extends IService { +public interface RecordService extends IService { - String uploadRecords(NoteRecords records, List fileList) throws IOException; + String uploadRecords(NoteRecord records, List fileList) throws IOException; - Map queryRecords(NoteRecords noteRecords, Integer page, Integer size); + Map queryRecords(NoteRecord noteRecord, Integer page, Integer size); void delRecords(String id); diff --git a/src/main/java/com/supervision/police/service/impl/ModelRecordTypeServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ModelRecordTypeServiceImpl.java index 4f7b17f..e6ef5c8 100644 --- a/src/main/java/com/supervision/police/service/impl/ModelRecordTypeServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ModelRecordTypeServiceImpl.java @@ -10,11 +10,11 @@ import com.supervision.neo4j.domain.CaseNode; import com.supervision.neo4j.domain.Rel; import com.supervision.neo4j.service.Neo4jService; import com.supervision.police.domain.ModelRecordType; -import com.supervision.police.domain.NoteRecord; +import com.supervision.police.domain.NoteRecordSplit; import com.supervision.police.domain.NotePrompt; import com.supervision.police.domain.TripleInfo; import com.supervision.police.mapper.ModelRecordTypeMapper; -import com.supervision.police.mapper.NoteRecordMapper; +import com.supervision.police.mapper.NoteRecordSplitMapper; import com.supervision.police.mapper.NotePromptMapper; import com.supervision.police.mapper.TripleInfoMapper; import com.supervision.police.service.ModelRecordTypeService; @@ -23,19 +23,14 @@ import lombok.extern.slf4j.Slf4j; import org.json.JSONArray; import org.json.JSONObject; import org.springframework.ai.chat.ChatResponse; -import org.springframework.ai.chat.Generation; -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.stereotype.Service; import org.springframework.util.StopWatch; import java.time.LocalDateTime; import java.util.ArrayList; -import java.util.Date; import java.util.List; @Slf4j @@ -45,7 +40,7 @@ public class ModelRecordTypeServiceImpl extends ServiceImpl noteRecords = noteRecordMapper.selectByRecordType(modelRecordType.getRecordType()); + List noteRecords = noteRecordSplitMapper.selectByRecordType(modelRecordType.getRecordType()); modelRecordType.setRecords(noteRecords); //提示词 List prompts = notePromptMapper.queryPrompt(modelRecordType.getId()); @@ -124,9 +119,9 @@ public class ModelRecordTypeServiceImpl extends ServiceImpl extractTripleInfo(String caseId, String name, String recordId) { - List records = noteRecordMapper.selectRecord(caseId, name, recordId); + List records = noteRecordSplitMapper.selectRecord(caseId, name, recordId); List tripleInfos = new ArrayList<>(); - for (NoteRecord record : records) { + for (NoteRecordSplit record : records) { List prompts = notePromptMapper.queryPrompt(record.getRecordTypeId()); for (NotePrompt prompt : prompts) { if (StringUtils.isEmpty(prompt.getPrompt())) { diff --git a/src/main/java/com/supervision/police/service/impl/RecordServiceImpl.java b/src/main/java/com/supervision/police/service/impl/RecordServiceImpl.java index 5eb56bd..f22de15 100644 --- a/src/main/java/com/supervision/police/service/impl/RecordServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/RecordServiceImpl.java @@ -2,10 +2,8 @@ package com.supervision.police.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.supervision.common.domain.R; import com.supervision.common.utils.IPages; import com.supervision.common.utils.ListUtils; import com.supervision.common.utils.StringUtils; @@ -13,13 +11,12 @@ import com.supervision.minio.domain.MinioFile; import com.supervision.minio.mapper.MinioFileMapper; import com.supervision.minio.service.MinioService; import com.supervision.police.domain.ModelCase; -import com.supervision.police.domain.ModelRecordType; +import com.supervision.police.domain.NoteRecordSplit; import com.supervision.police.domain.NoteRecord; -import com.supervision.police.domain.NoteRecords; import com.supervision.police.mapper.ModelCaseMapper; import com.supervision.police.mapper.ModelRecordTypeMapper; +import com.supervision.police.mapper.NoteRecordSplitMapper; import com.supervision.police.mapper.NoteRecordMapper; -import com.supervision.police.mapper.NoteRecordsMapper; import com.supervision.police.service.RecordService; import com.supervision.springaidemo.dto.QARecordNodeDTO; import com.supervision.springaidemo.util.RecordRegexUtil; @@ -28,15 +25,10 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.json.JSONObject; import org.springframework.ai.chat.ChatResponse; -import org.springframework.ai.chat.Generation; -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.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StopWatch; import org.springframework.web.multipart.MultipartFile; @@ -48,11 +40,11 @@ import java.util.stream.Collectors; @Slf4j @Service @RequiredArgsConstructor -public class RecordServiceImpl extends ServiceImpl implements RecordService { +public class RecordServiceImpl extends ServiceImpl implements RecordService { - private final NoteRecordMapper noteRecordMapper; + private final NoteRecordSplitMapper noteRecordSplitMapper; - private final NoteRecordsMapper noteRecordsMapper; + private final NoteRecordMapper noteRecordMapper; private final MinioService minioService; @@ -65,7 +57,7 @@ public class RecordServiceImpl extends ServiceImpl @Override // @Transactional(rollbackFor = Exception.class) - public String uploadRecords(NoteRecords records, List fileList) throws IOException { + public String uploadRecords(NoteRecord records, List fileList) throws IOException { //上传文件，获取文件ids List fileIds = new ArrayList<>(); for (MultipartFile file : fileList) { @@ -98,9 +90,9 @@ public class RecordServiceImpl extends ServiceImpl } int i = 0; if (StringUtils.isEmpty(records.getId())) { - i = noteRecordsMapper.insert(records); + i = noteRecordMapper.insert(records); } else { - i = noteRecordsMapper.updateById(records); + i = noteRecordMapper.updateById(records); } //所有对话类型 List allTypes = modelRecordTypeMapper.getAllType(); @@ -112,7 +104,7 @@ public class RecordServiceImpl extends ServiceImpl List qaList = RecordRegexUtil.recordRegex(context, records.getName()); for (QARecordNodeDTO qa : qaList) { try { - NoteRecord noteRecord = new NoteRecord(); + NoteRecordSplit noteRecord = new NoteRecordSplit(); noteRecord.setCaseId(records.getCaseId()); noteRecord.setNoteRecordsId(records.getId()); noteRecord.setNoteName(file.getName()); @@ -159,7 +151,7 @@ public class RecordServiceImpl extends ServiceImpl }*/ //保存笔录 noteRecord.setRecordType(type); - noteRecordMapper.insert(noteRecord); + noteRecordSplitMapper.insert(noteRecord); } catch (Exception e) { e.printStackTrace(); } @@ -178,25 +170,25 @@ public class RecordServiceImpl extends ServiceImpl } @Override - public Map queryRecords(NoteRecords noteRecords, Integer page, Integer size) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - wrapper.like(StringUtils.isNotEmpty(noteRecords.getName()), NoteRecords::getName, noteRecords.getName()) - .eq(NoteRecords::getCaseId, noteRecords.getCaseId()) - .eq(NoteRecords::getDataStatus, "1"); - List list = noteRecordsMapper.selectList(wrapper); + public Map queryRecords(NoteRecord noteRecords, Integer page, Integer size) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.like(StringUtils.isNotEmpty(noteRecords.getName()), NoteRecord::getName, noteRecords.getName()) + .eq(NoteRecord::getCaseId, noteRecords.getCaseId()) + .eq(NoteRecord::getDataStatus, "1"); + List list = noteRecordMapper.selectList(wrapper); // LinkedHashMap 保障顺序 - Map> nameMap = list.stream().filter(item -> StringUtils.isNotBlank(item.getName())) - .collect(Collectors.groupingBy(NoteRecords::getName, LinkedHashMap::new, Collectors.toList())); - List res = new ArrayList<>(); + Map> nameMap = list.stream().filter(item -> StringUtils.isNotBlank(item.getName())) + .collect(Collectors.groupingBy(NoteRecord::getName, LinkedHashMap::new, Collectors.toList())); + List res = new ArrayList<>(); for (String name : nameMap.keySet()) { - NoteRecords noteRecord = new NoteRecords(); + NoteRecord noteRecord = new NoteRecord(); noteRecord.setName(name); noteRecord.setChildren(nameMap.get(name)); res.add(noteRecord); } - List pager = ListUtils.Pager(size, page, res); - for (NoteRecords person : pager) { - for (NoteRecords noteRecord : person.getChildren()) { + List pager = ListUtils.Pager(size, page, res); + for (NoteRecord person : pager) { + for (NoteRecord noteRecord : person.getChildren()) { String fileIds = noteRecord.getFileIds(); if (StringUtils.isNotEmpty(fileIds)) { noteRecord.setConfessionMaterial(fileIds.split(",").length); @@ -208,10 +200,10 @@ public class RecordServiceImpl extends ServiceImpl @Override public void delRecords(String id) { - NoteRecords noteRecords = noteRecordsMapper.selectById(id); - noteRecords.setDataStatus(StringUtils.getUUID()); - noteRecordsMapper.updateById(noteRecords); - String fileIds = noteRecords.getFileIds(); + NoteRecord noteRecord = noteRecordMapper.selectById(id); + noteRecord.setDataStatus(StringUtils.getUUID()); + noteRecordMapper.updateById(noteRecord); + String fileIds = noteRecord.getFileIds(); if (StringUtils.isNotEmpty(fileIds)) { //删除文件 for (String fileId : fileIds.split(",")) { diff --git a/src/main/java/com/supervision/springaidemo/controller/ExampleChatController.java b/src/main/java/com/supervision/springaidemo/controller/ExampleChatController.java index 86cf9dc..c0c1f97 100644 --- a/src/main/java/com/supervision/springaidemo/controller/ExampleChatController.java +++ b/src/main/java/com/supervision/springaidemo/controller/ExampleChatController.java @@ -2,10 +2,10 @@ package com.supervision.springaidemo.controller; import cn.hutool.core.io.FileUtil; import com.supervision.police.domain.ModelRecordType; -import com.supervision.police.domain.NoteRecord; +import com.supervision.police.domain.NoteRecordSplit; import com.supervision.springaidemo.dto.QARecordNodeDTO; import com.supervision.police.mapper.ModelRecordTypeMapper; -import com.supervision.police.mapper.NoteRecordMapper; +import com.supervision.police.mapper.NoteRecordSplitMapper; import com.supervision.police.service.ModelRecordTypeService; import com.supervision.springaidemo.service.ModelMetricService; import com.supervision.police.service.RecordService; @@ -50,7 +50,7 @@ public class ExampleChatController { @Autowired private ModelRecordTypeMapper modelRecordTypeMapper; @Autowired - private NoteRecordMapper noteRecordMapper; + private NoteRecordSplitMapper noteRecordSplitMapper; @Autowired public ExampleChatController(OllamaChatClient chatClient) { @@ -97,7 +97,7 @@ public class ExampleChatController { String context = WordReadUtil.readWord(file.getPath()); List qaList = RecordRegexUtil.recordRegex(context, "裴金禄"); for (QARecordNodeDTO qa : qaList) { - NoteRecord noteRecord = new NoteRecord(); + NoteRecordSplit noteRecord = new NoteRecordSplit(); noteRecord.setNoteName(file.getName()); noteRecord.setPersonName("裴金禄"); noteRecord.setQuestion(qa.getQuestion()); @@ -200,11 +200,11 @@ public class ExampleChatController { } @GetMapping("queryRecordType") - public List queryRecordType() { + public List queryRecordType() { List types = modelRecordTypeMapper.selectList(null); String allType = types.stream().map(ModelRecordType::getRecordType).collect(Collectors.joining(".")); - List list = noteRecordMapper.selectList(null); - for (NoteRecord record : list) { + List list = noteRecordSplitMapper.selectList(null); + for (NoteRecordSplit record : list) { record.setRecordType(""); String test = "你是一个善于总结问讯内容的大模型，请判断以下对话属于【" + allType + "】哪个分类?对话内容为："; @@ -231,7 +231,7 @@ public class ExampleChatController { @GetMapping("test1") public void test2(@Param("id") String id) { - NoteRecord noteRecord = recordService.getById(id); + NoteRecordSplit noteRecord = recordService.getById(id); String question = noteRecord.getQuestion(); String answer = noteRecord.getAnswer(); String test = "请从以下对话中提取所有关于" + noteRecord.getRecordType() + "的所有三元组"; diff --git a/src/main/resources/mapper/NoteRecordMapper.xml b/src/main/resources/mapper/NoteRecordMapper.xml index d208796..ca9ed34 100644 --- a/src/main/resources/mapper/NoteRecordMapper.xml +++ b/src/main/resources/mapper/NoteRecordMapper.xml @@ -1,20 +1,5 @@ - + - - - + \ No newline at end of file diff --git a/src/main/resources/mapper/NoteRecordSplitMapper.xml b/src/main/resources/mapper/NoteRecordSplitMapper.xml new file mode 100644 index 0000000..d10a4d3 --- /dev/null +++ b/src/main/resources/mapper/NoteRecordSplitMapper.xml @@ -0,0 +1,20 @@ + + + + + + + diff --git a/src/main/resources/mapper/NoteRecordsMapper.xml b/src/main/resources/mapper/NoteRecordsMapper.xml deleted file mode 100644 index c5c7d19..0000000 --- a/src/main/resources/mapper/NoteRecordsMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file