aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUGFIX:超管创建机构管理员

Browse Source
This commit is contained in:
xupei
2025-08-27 10:15:59 +08:00
parent 18c38b020e
commit 35604e5130
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/ai/da/model/dto/AccountAddDTO.java
View File

@@ -4,12 +4,14 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data @Data
@ApiModel("AccountAdd") @ApiModel("AccountAddDTO")
@NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class AccountAddDTO { public class AccountAddDTO {
@@ -31,14 +33,19 @@ public class AccountAddDTO {
@ApiModelProperty("End time of account validity ") @ApiModelProperty("End time of account validity ")
private String validEndTime; private String validEndTime;
@ApiModelProperty("是否是试用用户 0 否 | 1 是")
private Integer isTrial; private Integer isTrial;
@ApiModelProperty("分配积分")
private BigDecimal credits; private BigDecimal credits;
@ApiModelProperty("用户角色")
private Integer systemUser; private Integer systemUser;
@ApiModelProperty("学校名称 | 企业名称")
private String organizationName; private String organizationName;
@ApiModelProperty("可分配子账号总数（仅适用于学校或教育管理员）")
private Integer subAccountNum; private Integer subAccountNum;
public AccountAddDTO(String userEmail, String userName, String country, String validStartTime, String validEndTime, Integer isTrial, BigDecimal credits, Integer systemUser) { public AccountAddDTO(String userEmail, String userName, String country, String validStartTime, String validEndTime, Integer isTrial, BigDecimal credits, Integer systemUser) {

15
src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
View File

@@ -1255,15 +1255,15 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
static { static {
HikariConfig config = new HikariConfig(); HikariConfig config = new HikariConfig();
// config.setJdbcUrl("jdbc:mysql://code-create.com.hk:3306/db1nfvsgmjp3b8"); config.setJdbcUrl("jdbc:mysql://code-create.com.hk:3306/db1nfvsgmjp3b8");
// config.setUsername("uafqtz4gsvfrw"); config.setUsername("uafqtz4gsvfrw");
// config.setPassword("aida123456."); config.setPassword("aida123456.");
// config.setJdbcUrl("jdbc:mysql://18.167.251.121:33008/aida"); // config.setJdbcUrl("jdbc:mysql://18.167.251.121:33008/aida");
// config.setUsername("aida_con"); // config.setUsername("aida_con");
// config.setPassword("123456"); // config.setPassword("123456");
config.setJdbcUrl("jdbc:mysql://localhost:3306/code-create-local?serverTimezone=UTC"); // config.setJdbcUrl("jdbc:mysql://localhost:3306/code-create-local?serverTimezone=UTC");
config.setUsername("root"); // config.setUsername("root");
config.setPassword("root"); // config.setPassword("root");
config.addDataSourceProperty("cachePrepStmts", "true"); config.addDataSourceProperty("cachePrepStmts", "true");
config.addDataSourceProperty("prepStmtCacheSize", "250"); config.addDataSourceProperty("prepStmtCacheSize", "250");
config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048"); config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
@@ -1643,7 +1643,8 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
private List<Account> getValidAdminAccounts(long currentEpochMilli) { private List<Account> getValidAdminAccounts(long currentEpochMilli) {
QueryWrapper<Account> queryWrapper = new QueryWrapper<>(); QueryWrapper<Account> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda() queryWrapper.lambda()
.select(Account::getId, Account::getOrganizationName, Account::getCreditsUsageLimit) .select(Account::getId, Account::getOrganizationName,
Account::getCreditsUsageLimit, Account::getSubAccountNum)
.eq(Account::getSystemUser, 7) // 教育版管理员 .eq(Account::getSystemUser, 7) // 教育版管理员
.gt(Account::getValidEndTime, currentEpochMilli); // 账号有效期内 .gt(Account::getValidEndTime, currentEpochMilli); // 账号有效期内

1
src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
View File

@@ -536,6 +536,7 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl<QuestionnaireMappe
if (Objects.nonNull(accountAddDTO.getCredits())){ if (Objects.nonNull(accountAddDTO.getCredits())){
account.setCredits(accountAddDTO.getCredits()); account.setCredits(accountAddDTO.getCredits());
account.setCreditsUsageLimit(accountAddDTO.getCredits());
} }
if (Objects.nonNull(accountAddDTO.getSubAccountNum())){ if (Objects.nonNull(accountAddDTO.getSubAccountNum())){
account.setSubAccountNum(accountAddDTO.getSubAccountNum()); account.setSubAccountNum(accountAddDTO.getSubAccountNum());