From 011d0362c6f9fd4ba995e738c9214cef4582d0ac Mon Sep 17 00:00:00 2001 From: "DESKTOP-DDTUS3E\\yaxin" Date: Thu, 24 Oct 2024 13:31:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4=EF=BC=8C?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E9=9B=86?= =?UTF-8?q?=E5=90=88=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AEId?= =?UTF-8?q?=E6=9F=A5=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../police/controller/PromptController.java | 10 +++++++- .../police/service/NotePromptService.java | 3 ++- .../service/impl/NotePromptServiceImpl.java | 24 ++++++++++++------- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/supervision/police/controller/PromptController.java b/src/main/java/com/supervision/police/controller/PromptController.java index 86bca62..8bd898d 100644 --- a/src/main/java/com/supervision/police/controller/PromptController.java +++ b/src/main/java/com/supervision/police/controller/PromptController.java @@ -11,6 +11,8 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @Slf4j @RequestMapping("/prompt") @@ -37,7 +39,13 @@ public class PromptController { @PostMapping("/promptDebugging") @Operation(summary = "提示词调试") - public R promptDebugging(@RequestBody NotePromptDTO notePromptDTO) { + public R promptDebugging(@RequestBody NotePromptDTO notePromptDTO) { return R.ok(promptService.promptDebugging(notePromptDTO)); } + + @PostMapping("/getById") + @Operation(summary = "提示词调试") + public R getById(@RequestParam String id) { + return R.ok(promptService.getById(id)); + } } diff --git a/src/main/java/com/supervision/police/service/NotePromptService.java b/src/main/java/com/supervision/police/service/NotePromptService.java index 423b46f..800a09f 100644 --- a/src/main/java/com/supervision/police/service/NotePromptService.java +++ b/src/main/java/com/supervision/police/service/NotePromptService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.supervision.police.domain.NotePrompt; import com.supervision.police.dto.NotePromptDTO; +import org.apache.poi.ss.formula.functions.T; import java.util.List; @@ -14,5 +15,5 @@ public interface NotePromptService extends IService { IPage listPrompt(int page, int size, NotePrompt notePrompt); - String promptDebugging(NotePromptDTO notePromptDTO); + List promptDebugging(NotePromptDTO notePromptDTO); } diff --git a/src/main/java/com/supervision/police/service/impl/NotePromptServiceImpl.java b/src/main/java/com/supervision/police/service/impl/NotePromptServiceImpl.java index 475e7b0..549d6dc 100644 --- a/src/main/java/com/supervision/police/service/impl/NotePromptServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/NotePromptServiceImpl.java @@ -2,23 +2,30 @@ package com.supervision.police.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fasterxml.jackson.databind.ObjectMapper; import com.supervision.common.constant.NotePromptConstants; import com.supervision.common.utils.StringUtils; import com.supervision.demo.dto.QARecordNodeDTO; import com.supervision.minio.domain.MinioFile; import com.supervision.minio.service.MinioService; -import com.supervision.police.domain.*; +import com.supervision.police.domain.ModelRecordType; +import com.supervision.police.domain.NotePrompt; +import com.supervision.police.domain.NotePromptTypeRel; +import com.supervision.police.domain.NoteRecordSplit; import com.supervision.police.dto.LLMExtractDto; import com.supervision.police.dto.NotePromptDTO; import com.supervision.police.mapper.NotePromptMapper; import com.supervision.police.service.*; +import com.supervision.thread.TripleExtractTask; 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.T; import org.springframework.ai.chat.ChatClient; import org.springframework.ai.chat.ChatResponse; import org.springframework.ai.chat.messages.UserMessage; @@ -48,7 +55,7 @@ public class NotePromptServiceImpl extends ServiceImpl qaList = RecordRegexUtil.recordRegex(text, ""); log.info("拆分问答对:{}", qaList.size()); if (qaList.isEmpty()) { - return "未找到问答对"; + return null; } QARecordNodeDTO qaRecordNodeDTO = qaList.get(0); HashMap paramMap = new HashMap<>(); @@ -159,7 +165,7 @@ public class NotePromptServiceImpl extends ServiceImpl llmExtractDtos = llmExtractService.extractAttribute(Collections.singletonList(llmExtractDto)); if (CollUtil.isNotEmpty(llmExtractDtos)) { - result = llmExtractDtos.get(0).toString(); + return llmExtractDtos.get(0).getExtractAttributes(); } } else { log.info("未找到对应的调试类型...【{}】", type); } - return result; + return null; } }