From 7ba6ab3ed087573c2ba5aab499e490696449c9bf Mon Sep 17 00:00:00 2001 From: ire <931903008@qq.com> Date: Fri, 3 Jan 2025 19:29:13 +0800 Subject: [PATCH] =?UTF-8?q?prompt=E6=A8=A1=E6=9D=BF=20=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=EF=BC=8C=E5=BA=94=E7=94=A8=EF=BC=8C=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/PromptTemplatesRespVO.java | 6 ++++ .../application/ApplicationService.java | 2 ++ .../application/ApplicationServiceImpl.java | 5 +++ .../PromptTemplatesServiceImpl.java | 35 +++++++++++++++++-- 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/prompttemplates/vo/PromptTemplatesRespVO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/prompttemplates/vo/PromptTemplatesRespVO.java index 0d1bb04ef..e68072f91 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/prompttemplates/vo/PromptTemplatesRespVO.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/prompttemplates/vo/PromptTemplatesRespVO.java @@ -39,9 +39,15 @@ public class PromptTemplatesRespVO { @Schema(description = "标签Id列表", example = "[1, 2, 3]") private List tagIds; + @Schema(description = "标签名称列表", example = "[1, 2, 3]") + private List tagNames; + @Schema(description = "应用Id列表", example = "[1, 2, 3]") private List applicationIds; + @Schema(description = "应用名称列表", example = "[1, 2, 3]") + private List applicationNames; + @Schema(description = "使用量") @ExcelProperty("使用量") private int usedCount; diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/application/ApplicationService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/application/ApplicationService.java index 9ec90decd..d2b05ff57 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/application/ApplicationService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/application/ApplicationService.java @@ -54,4 +54,6 @@ public interface ApplicationService { List getApplicationList(ApplicationPageReqVO pageReqVO); + List getList(); + } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/application/ApplicationServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/application/ApplicationServiceImpl.java index ef0635fe1..e2539f3d4 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/application/ApplicationServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/application/ApplicationServiceImpl.java @@ -143,4 +143,9 @@ public class ApplicationServiceImpl implements ApplicationService { return result; } + @Override + public List getList() { + return applicationMapper.selectList(); + } + } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/prompttemplates/PromptTemplatesServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/prompttemplates/PromptTemplatesServiceImpl.java index 319fcb1dc..7f2c29f40 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/prompttemplates/PromptTemplatesServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/prompttemplates/PromptTemplatesServiceImpl.java @@ -2,12 +2,14 @@ package cn.iocoder.yudao.module.llm.service.prompttemplates; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.module.llm.controller.admin.prompttemplatesbackup.vo.PromptTemplatesBackupSaveReqVO; +import cn.iocoder.yudao.module.llm.dal.dataobject.application.ApplicationDO; import cn.iocoder.yudao.module.llm.dal.dataobject.label.LabelDO; import cn.iocoder.yudao.module.llm.dal.dataobject.prompttemplatesapplications.PromptTemplatesApplicationsDO; import cn.iocoder.yudao.module.llm.dal.dataobject.prompttemplatesbackup.PromptTemplatesBackupDO; import cn.iocoder.yudao.module.llm.dal.dataobject.prompttemplatestags.PromptTemplatesTagsDO; import cn.iocoder.yudao.module.llm.dal.mysql.prompttemplatesapplications.PromptTemplatesApplicationsMapper; import cn.iocoder.yudao.module.llm.dal.mysql.prompttemplatestags.PromptTemplatesTagsMapper; +import cn.iocoder.yudao.module.llm.service.application.ApplicationService; import cn.iocoder.yudao.module.llm.service.label.LabelService; import cn.iocoder.yudao.module.llm.service.prompttemplatesbackup.PromptTemplatesBackupService; import cn.iocoder.yudao.module.system.api.dict.DictDataApi; @@ -48,6 +50,8 @@ public class PromptTemplatesServiceImpl implements PromptTemplatesService { private LabelService labelService; @Resource private PromptTemplatesBackupService promptTemplatesBackupService; + @Resource + private ApplicationService applicationService; @Override public Long createPromptTemplates(PromptTemplatesSaveReqVO createReqVO) { @@ -226,6 +230,19 @@ public class PromptTemplatesServiceImpl implements PromptTemplatesService { PageResult pageDoList = this.promptTemplatesMapper.selectPage(pageReqVO); PageResult pageRespList = BeanUtils.toBean(pageDoList, PromptTemplatesRespVO.class); List templatesRespList = pageRespList.getList(); + + List labelList = labelService.getLabelList(); + HashMap labelMap = new HashMap<>(); + for (LabelDO labelDO : labelList) { + labelMap.put(labelDO.getId(),labelDO.getLabelName()); + } + + List appList = applicationService.getList(); + HashMap appMap = new HashMap<>(); + for (ApplicationDO applicationDO : appList) { + appMap.put(applicationDO.getId(),applicationDO.getAppName()); + } + for(PromptTemplatesRespVO respVO : templatesRespList) { // TODO 使用量查询暂时设置为0 respVO.setUsedCount(0); @@ -236,16 +253,28 @@ public class PromptTemplatesServiceImpl implements PromptTemplatesService { List tagIds = tagDOList.stream() .map(p->p.getTagId().toString()) .collect(Collectors.toList()); - respVO.setTagIds(tagIds); + + List labelNameList = new ArrayList<>(); + for (String tagId : tagIds) { + labelNameList.add(labelMap.get(Long.parseLong(tagId))); + } +// respVO.setTagIds(tagIds); + respVO.setTagNames(labelNameList); } } catch(Exception e) { e.printStackTrace(); } try { - Long applicationCount = this.promptTemplatesApplicationsMapper.selectCount( + List applicationIds = this.promptTemplatesApplicationsMapper.selectList( new QueryWrapper() .eq("prompt_template_id", respVO.getId())); - respVO.setApplicationCount(Integer.parseInt(applicationCount.toString())); + + List appNames = new ArrayList<>(); + for (PromptTemplatesApplicationsDO applicationId : applicationIds) { + appNames.add(appMap.get(applicationId.getId())); + } + respVO.setApplicationCount(applicationIds.size()); + respVO.setApplicationNames(appNames); } catch(Exception e) { e.printStackTrace(); }