From 3666157d14201d39a0e61588582fee97fac95ad1 Mon Sep 17 00:00:00 2001
From: Albert <janzhou123@users.noreply.github.com>
Date: 星期二, 13 五月 2025 09:59:36 +0800
Subject: [PATCH] Merge pull request #1 from ageerle/main
---
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/UserModelService.java | 35 ++---------------------------------
1 files changed, 2 insertions(+), 33 deletions(-)
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/UserModelService.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/UserModelService.java
index ada36d0..01b677d 100644
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/UserModelService.java
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/UserModelService.java
@@ -1,26 +1,16 @@
package org.ruoyi.chat.service.chat;
-import cn.dev33.satoken.stp.StpUtil;
import lombok.RequiredArgsConstructor;
import org.ruoyi.chat.enums.DisplayType;
-import org.ruoyi.chat.enums.UserGradeType;
-import org.ruoyi.common.satoken.utils.LoginHelper;
import org.ruoyi.domain.bo.ChatModelBo;
-import org.ruoyi.domain.bo.ChatPackagePlanBo;
import org.ruoyi.domain.vo.ChatModelVo;
-import org.ruoyi.domain.vo.ChatPackagePlanVo;
import org.ruoyi.service.IChatModelService;
-import org.ruoyi.service.IChatPackagePlanService;
-import org.ruoyi.system.domain.vo.SysUserVo;
-import org.ruoyi.system.service.ISysUserService;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
/**
- * 鎻忚堪锛氱敤鎴锋ā鍨嬩俊鎭�
+ * 鐢ㄦ埛妯″瀷淇℃伅
*
* @author ageerle@163.com
* date 2025/4/10
@@ -32,30 +22,9 @@
private final IChatModelService chatModelService;
- private final ISysUserService userService;
-
- private final IChatPackagePlanService packagePlanService;
-
public List<ChatModelVo> modelList(ChatModelBo bo) {
bo.setModelShow(DisplayType.VISIBLE.getCode());
- List<ChatModelVo> chatModelList = chatModelService.queryList(bo);
- ChatPackagePlanBo sysPackagePlanBo = new ChatPackagePlanBo();
- if (StpUtil.isLogin()) {
- Long userId = LoginHelper.getLoginUser().getUserId();
- SysUserVo sysUserVo = userService.selectUserById(userId);
- if (UserGradeType.UNPAID.getCode().equals(sysUserVo.getUserGrade())){
- sysPackagePlanBo.setName("Free");
- ChatPackagePlanVo chatPackagePlanVo = packagePlanService.queryList(sysPackagePlanBo).get(0);
- List<String> array = new ArrayList<>(Arrays.asList(chatPackagePlanVo.getPlanDetail().split(",")));
- chatModelList.removeIf(model -> !array.contains(model.getModelName()));
- }
- }else {
- sysPackagePlanBo.setName("Visitor");
- ChatPackagePlanVo sysPackagePlanVo = packagePlanService.queryList(sysPackagePlanBo).get(0);
- List<String> array = new ArrayList<>(Arrays.asList(sysPackagePlanVo.getPlanDetail().split(",")));
- chatModelList.removeIf(model -> !array.contains(model.getModelName()));
- }
- return new ArrayList<>(chatModelList);
+ return chatModelService.queryList(bo);
}
}
--
Gitblit v1.9.3