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

TASK:mixi;

Browse Source
This commit is contained in:
shahaibo
2024-04-26 15:38:54 +08:00
parent efa448ec0e
commit 51d73952f4
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/mixi/common/enums/RolePermissionResourceEnum.java
View File

@@ -69,7 +69,7 @@ public enum RolePermissionResourceEnum {
/** /**
* Mi-Tu 报表 * Mi-Tu 报表
*/ */
REPORT_EXPORTING("Report Exporting","REPORT-EXPORTING",null,null,null,11), REPORT_EXPORTING("Report Exporting","REPORT_EXPORTING",null,null,null,11),
; ;
/** /**

2
src/main/java/com/mixi/common/tasks/MiTuExportScheduledTask.java
View File

@@ -58,7 +58,7 @@ public class MiTuExportScheduledTask {
// weeklySellThrReport(); // weeklySellThrReport();
// WeeklyHeavyStockReport(); // WeeklyHeavyStockReport();
// QuarterlyProductGroupingReport(); // QuarterlyProductGroupingReport();
customerTypeAnalysis(); // customerTypeAnalysis();
// getBestSell(); // getBestSell();
} }

6
src/main/java/com/mixi/model/dto/AppAccountLoginDTO.java
View File

@@ -10,9 +10,9 @@ import javax.validation.constraints.NotBlank;
@ApiModel("app登入") @ApiModel("app登入")
public class AppAccountLoginDTO { public class AppAccountLoginDTO {
@NotBlank(message = "User Phone cannot be empty!") @NotBlank(message = "User Account cannot be empty!")
@ApiModelProperty("用户手机号") @ApiModelProperty("用户账号")
private String userPhone; private String userAccount;
@NotBlank(message = "password cannot be empty!") @NotBlank(message = "password cannot be empty!")
@ApiModelProperty("密码") @ApiModelProperty("密码")

8
src/main/java/com/mixi/service/AccountService.java
View File

@@ -224,7 +224,7 @@ public class AccountService extends ServiceImpl<AccountMapper, TAccount>{
} }
@Transactional @Transactional
public AppAccountLoginVO appLogin(AppAccountLoginDTO accountLoginDTO) { public AppAccountLoginVO appLogin(AppAccountLoginDTO accountLoginDTO) {
TAccount tAccount = getOneByPhone(accountLoginDTO.getUserPhone()); TAccount tAccount = getOneByAccount(accountLoginDTO.getUserAccount());
Assert.notNull(tAccount,"User not registered!"); Assert.notNull(tAccount,"User not registered!");
Assert.isTrue(accountLoginDTO.getPassword().equals(tAccount.getUserPassword()), "Password error!"); Assert.isTrue(accountLoginDTO.getPassword().equals(tAccount.getUserPassword()), "Password error!");
@@ -298,6 +298,12 @@ public class AccountService extends ServiceImpl<AccountMapper, TAccount>{
queryWrapper.eq(TAccount.APP_USER, 1); queryWrapper.eq(TAccount.APP_USER, 1);
return accountMapper.selectOne(queryWrapper); return accountMapper.selectOne(queryWrapper);
} }
private TAccount getOneByAccount(String account) {
QueryWrapper<TAccount> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(TAccount::getUserAccount, account);
queryWrapper.lambda().eq(TAccount::getAppUser, 1);
return accountMapper.selectOne(queryWrapper);
}
public Boolean existByRoleId(Long roleId) { public Boolean existByRoleId(Long roleId) {
QueryWrapper<TAccount> queryWrapper = new QueryWrapper<>(); QueryWrapper<TAccount> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(TAccount.ROLE_ID,roleId); queryWrapper.eq(TAccount.ROLE_ID,roleId);