From 9685fb9745918fb47dcb313149f1b792d2d53107 Mon Sep 17 00:00:00 2001 From: ire <931903008@qq.com> Date: Tue, 31 Dec 2024 10:19:48 +0800 Subject: [PATCH 1/2] bug --- .../llm/service/basemodel/BaseModelServiceImpl.java | 2 +- .../admin/user/vo/user/UserStudentExcelVO.java | 10 ++++++++-- .../admin/user/vo/user/UserTeacherExcelVO.java | 10 ++++++++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelServiceImpl.java index a98823cc5..d01540860 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelServiceImpl.java @@ -75,7 +75,7 @@ public class BaseModelServiceImpl implements BaseModelService { @Override public List getBaseModelList() { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(BaseModelDO::getIsActive,0); + queryWrapper.eq(BaseModelDO::getIsActive,1); List baseModelDOS = baseModelMapper.selectList(queryWrapper); return baseModelDOS; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserStudentExcelVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserStudentExcelVO.java index bd8f24b05..807500c9a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserStudentExcelVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserStudentExcelVO.java @@ -1,11 +1,17 @@ package cn.iocoder.yudao.module.system.controller.admin.user.vo.user; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; @Data -@ExcelIgnoreUnannotated +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Accessors(chain = false) // 设置 chain = false，避免用户导入有问题 public class UserStudentExcelVO { @ExcelProperty("登录账号") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserTeacherExcelVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserTeacherExcelVO.java index 4a3986fb1..7f3d2ef11 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserTeacherExcelVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserTeacherExcelVO.java @@ -1,11 +1,17 @@ package cn.iocoder.yudao.module.system.controller.admin.user.vo.user; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; @Data -@ExcelIgnoreUnannotated +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Accessors(chain = false) // 设置 chain = false，避免用户导入有问题 public class UserTeacherExcelVO { @ExcelProperty("登录账号") From 23bc3d31901fb5633f1da79d737507200f9a4c91 Mon Sep 17 00:00:00 2001 From: ire <931903008@qq.com> Date: Tue, 31 Dec 2024 10:43:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=20=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/knowledgebase/KnowledgeBaseController.java | 8 ++++++++ .../llm/service/knowledgebase/KnowledgeBaseService.java | 2 ++ .../service/knowledgebase/KnowledgeBaseServiceImpl.java | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/knowledgebase/KnowledgeBaseController.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/knowledgebase/KnowledgeBaseController.java index 670b99494..f899e3cdb 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/knowledgebase/KnowledgeBaseController.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/knowledgebase/KnowledgeBaseController.java @@ -77,6 +77,14 @@ public class KnowledgeBaseController { return success(BeanUtils.toBean(pageResult, KnowledgeBaseRespVO.class)); } + @GetMapping("/list") + @Operation(summary = "获得知识库分页") + @PreAuthorize("@ss.hasPermission('llm:knowledge-base:query')") + public CommonResult> getKnowledgeBaseList() { + List list = knowledgeBaseService.getKnowledgeBaseList(); + return success(BeanUtils.toBean(list, KnowledgeBaseRespVO.class)); + } + @GetMapping("/export-excel") @Operation(summary = "导出知识库 Excel") @PreAuthorize("@ss.hasPermission('llm:knowledge-base:export')") diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/knowledgebase/KnowledgeBaseService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/knowledgebase/KnowledgeBaseService.java index 9ca89f434..fc42f4bd5 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/knowledgebase/KnowledgeBaseService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/knowledgebase/KnowledgeBaseService.java @@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.llm.controller.admin.knowledgebase.vo.KnowledgeBa import cn.iocoder.yudao.module.llm.dal.dataobject.knowledgebase.KnowledgeBaseDO; import javax.validation.Valid; +import java.util.List; /** * 知识库 Service 接口 @@ -52,4 +53,5 @@ public interface KnowledgeBaseService { */ PageResult getKnowledgeBasePage(KnowledgeBasePageReqVO pageReqVO); + List getKnowledgeBaseList(); } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/knowledgebase/KnowledgeBaseServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/knowledgebase/KnowledgeBaseServiceImpl.java index 2b630103e..c2d7e0a45 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/knowledgebase/KnowledgeBaseServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/knowledgebase/KnowledgeBaseServiceImpl.java @@ -13,6 +13,7 @@ import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionU import static cn.iocoder.yudao.module.llm.enums.ErrorCodeConstants.KNOWLEDGE_BASE_NOT_EXISTS; import javax.annotation.Resource; +import java.util.List; /** * 知识库 Service 实现类 @@ -68,4 +69,9 @@ public class KnowledgeBaseServiceImpl implements KnowledgeBaseService { return knowledgeBaseMapper.selectPage(pageReqVO); } + @Override + public List getKnowledgeBaseList() { + return knowledgeBaseMapper.selectList(); + } + }