diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/application/ApplicationController.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/application/ApplicationController.java index 41a7da17e..e52c5868b 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/application/ApplicationController.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/application/ApplicationController.java @@ -67,8 +67,8 @@ public class ApplicationController { @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('llm:application:query')") public CommonResult getApplication(@RequestParam("id") Long id) { - ApplicationDO application = applicationService.getApplication(id); - return success(BeanUtils.toBean(application, ApplicationRespVO.class)); + ApplicationRespVO application = applicationService.getApplication(id); + return success(application); } @GetMapping("/page") diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/application/vo/ApplicationRespVO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/application/vo/ApplicationRespVO.java index 7dbdb787a..9f2836d29 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/application/vo/ApplicationRespVO.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/application/vo/ApplicationRespVO.java @@ -35,6 +35,9 @@ public class ApplicationRespVO { @ExcelProperty("应用标签,保存多个标签ID,用逗号分隔") private String appLabel; + @Schema(description = "应用标签,保存多个标签名称,用逗号分隔", requiredMode = Schema.RequiredMode.REQUIRED) + private String appLabelName; + @Schema(description = "模型服务,模型服务ID") @ExcelProperty("模型服务,模型服务ID") private Long appModel; 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 5cdc4a72c..9ec90decd 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 @@ -42,7 +42,7 @@ public interface ApplicationService { * @param id 编号 * @return 大模型应用 */ - ApplicationDO getApplication(Long id); + ApplicationRespVO getApplication(Long id); /** * 获得大模型应用分页 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 f94991b82..ca0cbd5c7 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 @@ -79,17 +79,18 @@ public class ApplicationServiceImpl implements ApplicationService { } @Override - public ApplicationDO getApplication(Long id) { + public ApplicationRespVO getApplication(Long id) { ApplicationDO applicationDO = applicationMapper.selectById(id); - if (applicationDO.getAppLabel() != null && !applicationDO.getAppLabel().equals("")) { - String[] split = applicationDO.getAppLabel().split(","); + ApplicationRespVO bean = BeanUtils.toBean(applicationDO, ApplicationRespVO.class); + if (bean.getAppLabel() != null && !bean.getAppLabel().equals("")) { + String[] split = bean.getAppLabel().split(","); LambdaQueryWrapper wrapper = new LambdaQueryWrapper() .in(LabelDO::getId, split); List labelDOS = labelMapper.selectList(wrapper); List collect = labelDOS.stream().map(LabelDO::getLabelName).collect(Collectors.toList()); - applicationDO.setAppLabel(String.join(",", collect)); + bean.setAppLabelName(String.join(",", collect)); } - return applicationDO; + return bean; } @Override @@ -133,7 +134,7 @@ public class ApplicationServiceImpl implements ApplicationService { .in(LabelDO::getId, split); List labelDOS = labelMapper.selectList(wrapper); List collect = labelDOS.stream().map(LabelDO::getLabelName).collect(Collectors.toList()); - applicationRespVO.setAppLabel(String.join(",", collect)); + applicationRespVO.setAppLabelName(String.join(",", collect)); } } return result;