Yaxin
/
fu-hsi-service
27
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修复，功能优化等

Browse Source
jinan_dev
yaxin 7 months ago
parent e26a95b504
commit 4393f59212
14 changed files with 175 additions and 64 deletions
Show Stats Download Patch File Download Diff File

5
README.md
Unescape Escape View File

@ -6,6 +6,11 @@
# Release Notes
# 发布时间 2024-12-03
# 变更
- 案件图谱优化，支持多种节点颜色样式，引力布局调整，交互体验优化
# 发布时间 2024-11-21
# 变更

8
docker/docker-compose/sql/20241126/migration_2.1.sql
Unescape Escape View File

@ -1,9 +1,6 @@
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for conversation
-- ----------------------------
DROP TABLE IF EXISTS `conversation`;
CREATE TABLE `conversation` (
`id` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
@ -25,6 +22,8 @@ CREATE TABLE `conversation_qa` (
`complete_question` text CHARACTER SET utf8 COLLATE utf8_bin NULL,
`question_time` datetime NOT NULL,
`answer` text CHARACTER SET utf8 COLLATE utf8_bin NULL,
`answer_map` text CHARACTER SET utf8 COLLATE utf8_bin NULL,
`segment_list` text CHARACTER SET utf8 COLLATE utf8_bin NULL COMMENT 'RAG片段',
`complete_answer` text CHARACTER SET utf8 COLLATE utf8_bin NULL,
`answer_time` datetime NULL DEFAULT NULL,
`time_interval` int(11) NULL DEFAULT NULL,
@ -38,3 +37,6 @@ CREATE TABLE `conversation_qa` (
alter table model_case
add knowledge_base_id varchar(64) null comment '知识库id' after id;
ALTER TABLE `nx_llm`.`note_record_split`
ADD COLUMN `note_file_id` varchar(64) NULL COMMENT '笔录文件ID' AFTER `person_name`;

3
src/main/java/com/supervision/police/controller/ChatController.java
Unescape Escape View File

@ -26,8 +26,7 @@ public class ChatController {
@PostMapping("/chat")
public R<ChatResVO> chat(@RequestBody ChatReqVO chatReqVO) {
ChatResVO chatResVO = chatService.chatNew(chatReqVO);
return R.ok(chatResVO);
return chatService.chatNew(chatReqVO);
}
/**

14
src/main/java/com/supervision/police/domain/ConversationQa.java
Unescape Escape View File

@ -3,14 +3,18 @@ package com.supervision.police.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.supervision.police.handler.KnowledgeBaseSegmentVOTypeHandler;
import com.supervision.police.vo.dify.KnowledgeBaseSegmentVO;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import java.util.List;
/**
* 会话问答表
*/
@TableName(value ="conversation_qa")
@TableName(value = "conversation_qa", autoResultMap = true)
@Data
public class ConversationQa implements Serializable {
/**
@ -54,6 +58,12 @@ public class ConversationQa implements Serializable {
*/
private String answerMap;
/**
*
*/
@TableField(typeHandler = KnowledgeBaseSegmentVOTypeHandler.class)
private List<KnowledgeBaseSegmentVO> segmentList;
/**
*
*/

5
src/main/java/com/supervision/police/domain/NoteRecordSplit.java
Unescape Escape View File

@ -33,6 +33,11 @@ public class NoteRecordSplit implements Serializable {
*/
private String personName;
/**
* 笔录ID
*/
private String noteFileId;
/**
* 笔录名称
*/

32
src/main/java/com/supervision/police/handler/KnowledgeBaseSegmentVOTypeHandler.java
Unescape Escape View File

@ -0,0 +1,32 @@
package com.supervision.police.handler;
import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.supervision.police.dto.NotePromptExtractAttributesDto;
import com.supervision.police.vo.dify.KnowledgeBaseSegmentVO;
import java.util.List;
public class KnowledgeBaseSegmentVOTypeHandler extends AbstractJsonTypeHandler<List<KnowledgeBaseSegmentVO>> {
private static final ObjectMapper objectMapper = new ObjectMapper();
@Override
protected List<KnowledgeBaseSegmentVO> parse(String json) {
try {
return objectMapper.readValue(json, new TypeReference<List<KnowledgeBaseSegmentVO>>() {
});
} catch (Exception e) {
throw new RuntimeException("Failed to parse JSON to List<KnowledgeBaseSegmentVO>", e);
}
}
@Override
protected String toJson(List<KnowledgeBaseSegmentVO> obj) {
try {
return objectMapper.writeValueAsString(obj);
} catch (Exception e) {
throw new RuntimeException("Failed to convert List<KnowledgeBaseSegmentVO> to JSON", e);
}
}
}

3
src/main/java/com/supervision/police/service/ChatService.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.supervision.police.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.supervision.common.domain.R;
import com.supervision.police.vo.ChatReqVO;
import com.supervision.police.vo.ChatResVO;
import com.supervision.police.vo.ConversationResVo;
@ -9,7 +10,7 @@ import java.util.List;
public interface ChatService {
ChatResVO chat(ChatReqVO chatReqVO);
ChatResVO chatNew(ChatReqVO chatReqVO);
R<ChatResVO> chatNew(ChatReqVO chatReqVO);
IPage<ChatResVO> queryConversationInfoList(String conversationId, int page, int size);

2
src/main/java/com/supervision/police/service/NoteRecordSplitService.java
Unescape Escape View File

@ -26,7 +26,7 @@ public interface NoteRecordSplitService extends IService<NoteRecordSplit> {
void delRecords(String id);
NoteRecordSplit saveRecordSplit(NoteRecord record, String fileName, String question, String answer);
NoteRecordSplit saveRecordSplit(NoteRecord record, String fileId, String fileName, String question, String answer);
List<NoteRecordSplit> batchSaveRecordSplit(NoteRecord record, String fileId);
Map<String, Object> queryRecordList(NoteRecordReqVO noteRecord, Integer page, Integer size);

29
src/main/java/com/supervision/police/service/impl/ChatServiceImpl.java
Unescape Escape View File

@ -12,6 +12,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.supervision.chat.client.LangChainChatService;
import com.supervision.chat.client.dto.chat.ChatReqDTO;
import com.supervision.chat.client.dto.chat.ChatResDTO;
import com.supervision.common.domain.R;
import com.supervision.constant.CaseAnalysisStatusEnum;
import com.supervision.police.domain.Conversation;
import com.supervision.police.domain.ConversationQa;
import com.supervision.police.domain.ModelCase;
@ -90,7 +92,7 @@ public class ChatServiceImpl implements ChatService {
@Transactional(transactionManager = "dataSourceTransactionManager", rollbackFor = Exception.class)
@Override
public ChatResVO chatNew(ChatReqVO chatReqVO) {
public R<ChatResVO> chatNew(ChatReqVO chatReqVO) {
ChatResVO chatResVO = new ChatResVO();
Map<String, Object> answerMap = new HashMap<>();
String query = chatReqVO.getQuery();
@ -145,11 +147,11 @@ public class ChatServiceImpl implements ChatService {
difyChatReqVO.setUser(userId);
difyChatReqVO.setConversationId(chatReqVO.getConversationId());
difyChatReqVO.setQuery(query);
difyChatReqVO.setInputs(Map.of("dataset_id", modelCase.getKnowledgeBaseId()));
difyChatReqVO.setInputs(Map.of("dataset_id", modelCase.getKnowledgeBaseId(), "participator", modelCase.getLawActor()));
DifyChatResVO chat = difyApiUtil.chat(difyChatReqVO);
JSONObject json = JSON.parseObject(chat.getAnswer());
chatResVO.setAnswer(json.getString("answerText"));
chatResVO.setSegmentVOList(JSONArray.parseArray(json.getString("quote"), KnowledgeBaseSegmentVO.class));
chatResVO.setSegmentList(JSONArray.parseArray(json.getString("quote"), KnowledgeBaseSegmentVO.class));
}
break;
case QA_TYPE_NX_LLM:
@ -184,6 +186,10 @@ public class ChatServiceImpl implements ChatService {
default:
break;
}
if (StringUtils.isEmpty(chatResVO.getAnswer()) && "{}".equals(JSON.toJSONString(answerMap))) {
log.error("chatNew: 未找到答案，query:【{}】", query);
return R.fail("未找到答案");
}
long end = System.currentTimeMillis();
ConversationQa qa = new ConversationQa();
qa.setId(UUID.randomUUID().toString());
@ -191,6 +197,7 @@ public class ChatServiceImpl implements ChatService {
qa.setQuestionTime(new Date(startTime));
qa.setAnswer(chatResVO.getAnswer());
qa.setAnswerMap(JSON.toJSONString(answerMap));
qa.setSegmentList(chatResVO.getSegmentList());
qa.setAnswerTime(new Date(end));
qa.setType(type);
qa.setIntentType(intentType);
@ -204,7 +211,7 @@ public class ChatServiceImpl implements ChatService {
chatResVO.setType(type);
chatResVO.setIntentType(intentType);
chatResVO.setConversationId(chatReqVO.getConversationId());
return chatResVO;
return R.ok(chatResVO);
}
@Override
@ -247,12 +254,21 @@ public class ChatServiceImpl implements ChatService {
* @param answerMap 答案map
*/
private void handleIndexResultQA(List<ModelIndex> modelIndices, String query, String caseId, Map<String, Object> answerMap) {
//如果案件分析状态不是分析成功，则先执行案件分析
ModelCase modelCase = modelCaseService.getById(caseId);
ModelIndex modelIndex = modelIndices.stream().filter(index -> query.contains(index.getName())).findFirst().get();
IndexResultQuery indexResultQuery = new IndexResultQuery();
indexResultQuery.setCaseId(caseId);
indexResultQuery.setIndexType(modelIndex.getIndexType());
indexResultQuery.setIndexName(modelIndex.getName());
IPage<IndexDetail> indexDetailPage = modelCaseService.getIndexDetail(indexResultQuery, 1, 1);
if (indexDetailPage.getRecords().isEmpty() || (modelCase.getTotalScore() == null && modelCase.getCaseAnalysisStatus() != CaseAnalysisStatusEnum.ANALYZED.getCode())) {
log.info("案件【{}】尚未执行模型分析，现在开始执行", modelCase.getCaseName());
AnalyseCaseDTO analyseCaseDTO = new AnalyseCaseDTO();
analyseCaseDTO.setCaseId(caseId);
modelService.analyseCaseNew(analyseCaseDTO);
}
indexDetailPage = modelCaseService.getIndexDetail(indexResultQuery, 1, 1);
if (!indexDetailPage.getRecords().isEmpty()) {
IndexDetail indexDetail = indexDetailPage.getRecords().get(0);
answerMap.put("indexName", modelIndex.getName());
@ -267,8 +283,9 @@ public class ChatServiceImpl implements ChatService {
qaMap.put("question", split.getQuestion());
qaMap.put("answer", split.getAnswer());
qaMap.put("noteRecordId", split.getNoteRecordId());
qaMap.put("fileIds", noteRecordService.getById(split.getNoteRecordId()).getFileIds());
qaMap.put("noteRecordName", split.getNoteName());
qaMap.put("splitId", split.getId());
qaMap.put("noteName", split.getNoteName());
qaMap.put("noteFileId", split.getNoteFileId());
qaSplitList.add(qaMap);
});
}

14
src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java
Unescape Escape View File

@ -191,12 +191,12 @@ public class ModelServiceImpl implements ModelService {
return R.fail("未找到案件信息");
}
CasePerson casePerson = casePersonMapper.selectOne(new LambdaQueryWrapper<CasePerson>()
.eq(CasePerson::getCaseId, analyseCaseDTO.getCaseId())
.eq(CasePerson::getCaseId, caseId)
.eq(CasePerson::getCaseActorFlag, 1)
.eq(CasePerson::getRoleCode, "1")
.eq(StrUtil.isNotEmpty(analyseCaseDTO.getLawActorName()), CasePerson::getName, analyseCaseDTO.getLawActorName()));
.eq(StrUtil.isNotEmpty(modelCase.getLawActor()), CasePerson::getName, modelCase.getLawActor()));
if (ObjectUtil.isEmpty(casePerson)) {
log.error("未找到的行为人：【{}】", analyseCaseDTO.getLawActorName());
log.error("未找到的行为人：【{}】", modelCase.getLawActor());
return R.fail("未找到的行为人");
}
List<ModelIndex> modelIndices = modelIndexService.list(new LambdaQueryWrapper<ModelIndex>().eq(ModelIndex::getDataStatus, "1").eq(ModelIndex::getCaseType, modelCase.getCaseType()));
@ -258,7 +258,7 @@ public class ModelServiceImpl implements ModelService {
ModelAtomicResult result = new ModelAtomicResult();
result.setIndexId(modelIndex.getId());
result.setCasePersonId(casePerson.getId());
result.setCaseId(analyseCaseDTO.getCaseId());
result.setCaseId(caseId);
result.setAtomicId(ruleCondition.getAtomicIndexId());
result.setAtomicResult(JudgeResultEnum.NOT_EXIST.getCode());
ModelAtomicResult exist = modelAtomicResultMapper.selectByCaseIdAndAtomicId(caseId, casePerson.getId(), modelIndex.getId(), ruleCondition.getAtomicIndexId());
@ -273,7 +273,7 @@ public class ModelServiceImpl implements ModelService {
operandUnitResultSet.add(relationSymbol == dbIndexAnalysis(caseId, modelAtomicIndex, evidenceDirectories, result));
break;
case OPERAND_TYPE_GRAPH:
operandUnitResultSet.add(relationSymbol == graphIndexAnalysis(casePerson.getName(), modelAtomicIndex.getQueryLang(), analyseCaseDTO.getCaseId(), ruleCondition, result));
operandUnitResultSet.add(relationSymbol == graphIndexAnalysis(casePerson.getName(), modelAtomicIndex.getQueryLang(), caseId, ruleCondition, result));
break;
case OPERAND_TYPE_STRUCTURE:
if (ruleCondition.getOperandUnitList().isEmpty()) {
@ -300,7 +300,7 @@ public class ModelServiceImpl implements ModelService {
modelIndexResult.setCaseId(caseId);
modelIndexResult.setIndexId(modelIndex.getId());
modelIndexResult.setAtomicIds(modelIndexAtomicRelations.stream().filter(relation -> relation.getModelIndexId().equals(modelIndex.getId())).map(ModelIndexAtomicRelation::getAtomicIndexId).collect(Collectors.joining(",")));
ModelIndexResult exist = modelIndexResultMapper.selectByCaseIdAndIndexId(analyseCaseDTO.getCaseId(), modelIndex.getId());
ModelIndexResult exist = modelIndexResultMapper.selectByCaseIdAndIndexId(caseId, modelIndex.getId());
if (exist != null) {
modelIndexResult.setId(exist.getId());
}
@ -327,7 +327,7 @@ public class ModelServiceImpl implements ModelService {
int max = Integer.max(gx + rz, gx + cz);
modelCase.setTotalScore(max);
log.info("更新案件得分情况。最终得分：{}分（共性+入罪/共性+出罪 取最大值）。入罪：{}分。出罪：{}分。共性：{}分。", max, rz, cz, gx);
caseStatusManageService.whenAnalyseCaseSuccess(analyseCaseDTO.getCaseId(), modelCase.getTotalScore());
caseStatusManageService.whenAnalyseCaseSuccess(caseId, modelCase.getTotalScore());
difyApiUtil.syncCaseFileToDifyKnowledgeBase(modelCase, modelCaseService.listCaseFileIds(caseId));
return R.ok();
}

9
src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java
Unescape Escape View File

@ -79,13 +79,13 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl<NoteRecordSplitMappe
@Override
@Transactional(transactionManager = "dataSourceTransactionManager", rollbackFor = Exception.class)
public String uploadRecords(NoteRecordReqVO records) throws IOException {
public String uploadRecords(NoteRecordReqVO records) {
return uploadRecords(records, false);
}
@Override
@Transactional(transactionManager = "dataSourceTransactionManager", rollbackFor = Exception.class)
public String uploadRecords(NoteRecordReqVO records, boolean extractFlag) throws IOException {
public String uploadRecords(NoteRecordReqVO records, boolean extractFlag) {
ModelCase modelCase = modelCaseService.getById(records.getCaseId());
Assert.notEmpty(modelCase.getCaseNo(), "案件编号不能为空");
@ -246,10 +246,11 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl<NoteRecordSplitMappe
}
@Override
public NoteRecordSplit saveRecordSplit(NoteRecord record, String fileName, String question, String answer) {
public NoteRecordSplit saveRecordSplit(NoteRecord record, String fileId, String fileName, String question, String answer) {
NoteRecordSplit noteRecord = new NoteRecordSplit();
noteRecord.setCaseId(record.getCaseId());
noteRecord.setNoteRecordId(record.getId());
noteRecord.setNoteFileId(fileId);
noteRecord.setNoteName(fileName);
noteRecord.setPersonName(record.getName());
noteRecord.setQuestion(question);
@ -276,7 +277,7 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl<NoteRecordSplitMappe
List<NoteRecordSplit> splitList = new ArrayList<>();
for (QARecordNodeDTO qa : qaList) {
splitList.add(
saveRecordSplit(record, minioFile.getFilename(), qa.getQuestion(), qa.getAnswer())
saveRecordSplit(record, fileId, minioFile.getFilename(), qa.getQuestion(), qa.getAnswer())
);
}
return splitList;

8
src/main/java/com/supervision/police/service/impl/OCRRecordServiceImpl.java
Unescape Escape View File

@ -16,7 +16,10 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@Slf4j
@ -35,6 +38,7 @@ public class OCRRecordServiceImpl implements OCRRecordService {
private final ModelRecordTypeService modelRecordTypeService;
private final CasePersonService casePersonService;
@Override
public String saveRecord(NoteRecordReqVO noteRecordReqVO) {
@ -190,7 +194,7 @@ public class OCRRecordServiceImpl implements OCRRecordService {
List<NoteRecordSplit> splitList = new ArrayList<>();
for (QARecordNodeDTO qa : qaList) {
splitList.add(
noteRecordSplitService.saveRecordSplit(noteRecord,
noteRecordSplitService.saveRecordSplit(noteRecord, recordFileDTO.getFileId(),
recordFileDTO.getFileName(), qa.getQuestion(), qa.getAnswer())
);
}

3
src/main/java/com/supervision/police/vo/ChatResVO.java
Unescape Escape View File

@ -29,7 +29,7 @@ public class ChatResVO {
private String type;
private String intentType;
private List<String> docs;
private List<KnowledgeBaseSegmentVO> segmentVOList = new ArrayList<>();
private List<KnowledgeBaseSegmentVO> segmentList = new ArrayList<>();
public ChatResVO() {
}
@ -52,6 +52,7 @@ public class ChatResVO {
if (StrUtil.isNotEmpty(conversationQa.getAnswerMap())){
this.answwerMap = JSONUtil.toBean(conversationQa.getAnswerMap(), Map.class);
}
this.setSegmentList(conversationQa.getSegmentList());
this.setType(conversationQa.getType());
this.setQuestionTime(conversationQa.getQuestionTime());
this.setIntentType(conversationQa.getIntentType());

34
src/test/java/com/supervision/demo/RecordSplitTest.java
Unescape Escape View File

@ -1,13 +1,25 @@
package com.supervision.demo;
import com.supervision.demo.dto.QARecordNodeDTO;
import com.supervision.minio.domain.MinioFile;
import com.supervision.minio.service.MinioService;
import com.supervision.police.domain.NoteRecord;
import com.supervision.police.service.NoteRecordService;
import com.supervision.police.service.NoteRecordSplitService;
import com.supervision.utils.RecordRegexUtil;
import com.supervision.utils.WordReadUtil;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.util.Arrays;
import java.util.List;
@SpringBootTest
@Slf4j
public class RecordSplitTest {
public static void main(String[] args) throws FileNotFoundException {
@ -27,4 +39,26 @@ public class RecordSplitTest {
System.out.println(qaRecordNodeDTO.getAnswer());
}
}
@Autowired
private NoteRecordSplitService noteRecordSplitService;
@Autowired
private NoteRecordService noteRecordService;
@Autowired
private MinioService minioService;
@Test
public void test() {
noteRecordSplitService.list().forEach(split -> {
NoteRecord noteRecord = noteRecordService.getById(split.getNoteRecordId());
List<MinioFile> minioFiles = minioService.listMinioFile(Arrays.stream(noteRecord.getFileIds().split(",")).toList());
minioFiles.forEach(minioFile -> {
if (minioFile.getFilename().equals(split.getNoteName())) {
split.setNoteFileId(minioFile.getId());
noteRecordSplitService.updateById(split);
log.info("问答对【{}】fileId已更新", split.getId());
}
});
});
}
}

Write Preview
Loading…
Cancel
Save