fix

netflix-dao/src/main/java/com/cyksj/model/entity/GptTeamAccount.java

@@ -2,12 +2,17 @@ package com.cyksj.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.cyksj.model.BaseEntity;
-import lombok.Data;
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * GPT Team账号
  */
-@Data
+@Getter
+@Setter
+@SearchBean(tables = "gpt_team_account gta")
 public class GptTeamAccount extends BaseEntity {
 
     /**
@@ -35,4 +40,8 @@ public class GptTeamAccount extends BaseEntity {
      * 备注
      */
     private String remark;
+
+    @TableField(exist = false)
+    @DbField("select count(1) from gpt_team_user_bind_record gbr where gbr.token = gta.token")
+    private Integer count;
 }

netflix-service/src/main/java/com/cyksj/service/chatgpt/GptTeamAccountService.java

@@ -2,7 +2,6 @@ package com.cyksj.service.chatgpt;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.cyksj.model.entity.GptTeamAccount;
-import com.ejlchina.searcher.SearchResult;
 
 import java.util.List;
 
@@ -11,13 +10,6 @@ import java.util.List;
  */
 public interface GptTeamAccountService extends IService<GptTeamAccount> {
 
-    /**
-     * 分页查询
-     *
-     * @return 分页结果
-     */
-    SearchResult<GptTeamAccount> getPage();
-
     /**
      * 新增账号
      *

netflix-service/src/main/java/com/cyksj/service/chatgpt/impl/GptTeamAccountServiceImpl.java

@@ -8,15 +8,11 @@ import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.mapper.GptTeamAccountMapper;
 import com.cyksj.model.entity.GptTeamAccount;
 import com.cyksj.service.chatgpt.GptTeamAccountService;
-import com.ejlchina.searcher.BeanSearcher;
-import com.ejlchina.searcher.SearchResult;
-import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -30,16 +26,6 @@ import java.util.Set;
 @RequiredArgsConstructor
 public class GptTeamAccountServiceImpl extends ServiceImpl<GptTeamAccountMapper, GptTeamAccount> implements GptTeamAccountService {
 
-    private final BeanSearcher beanSearcher;
-    private final HttpServletRequest request;
-
-    @Override
-    public SearchResult<GptTeamAccount> getPage() {
-        return beanSearcher.search(GptTeamAccount.class, MapUtils.flatBuilder(request.getParameterMap())
-                .orderBy(GptTeamAccount::getId).desc()
-                .build());
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void addAccount(GptTeamAccount account) {

netflix-web/src/main/java/com/cyksj/web/controller/manage/account/CmsGptTeamAccountController.java

@@ -3,12 +3,16 @@ package com.cyksj.web.controller.manage.account;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.model.entity.GptTeamAccount;
+import com.cyksj.model.entity.GptTeamUserBindRecord;
 import com.cyksj.service.chatgpt.GptTeamAccountService;
+import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
+import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -22,13 +26,31 @@ public class CmsGptTeamAccountController {
 
     private final GptTeamAccountService gptTeamAccountService;
 
+    private final BeanSearcher beanSearcher;
+
+    private final HttpServletRequest request;
+
     /**
      * 获取GPT Team账号列表
      */
     @GetMapping("/get")
     public Result<SearchResult<GptTeamAccount>> getPage() {
-        SearchResult<GptTeamAccount> result = gptTeamAccountService.getPage();
-        return GatewayResponse.SUCCESS.newBuilder().toResult(result);
+        SearchResult<GptTeamAccount> search = beanSearcher.search(GptTeamAccount.class, MapUtils.flatBuilder(request.getParameterMap())
+                .orderBy(GptTeamAccount::getId).desc()
+                .build());
+        return GatewayResponse.SUCCESS.newBuilder().toResult(search);
+    }
+
+    /**
+     * gpt team账号用户加入列表
+     */
+    @GetMapping("/get/users")
+    public Result<List<GptTeamUserBindRecord>> getTeamUsers(String token) {
+        List<GptTeamUserBindRecord> list = beanSearcher.searchAll(GptTeamUserBindRecord.class, MapUtils.flatBuilder(request.getParameterMap())
+                .field(GptTeamUserBindRecord::getToken, token)
+                .orderBy(GptTeamUserBindRecord::getId).desc()
+                .build());
+        return GatewayResponse.SUCCESS.newBuilder().toResult(list);
     }
 
     /**