rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/gongfu' into feature/data-permission

This commit is contained in:
曹鹏飞 2026-01-20 09:24:20 +08:00
parent 8a6bbcc7a1 3c77153dfc
commit e0579c4c5c
2 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/task/AppUserScheduledTasks.java
View File

@ -18,38 +18,38 @@ import java.util.stream.Collectors;
@Slf4j
public class AppUserScheduledTasks {
@Resource
private IAppUserService appUserService;
/**
* 禁用已过期代理商
* 每天午夜12点执行一次
*/
@Transactional
@Scheduled(cron = "0 0 0 * * ?")
public void disableExpiredAppUser() {
List<AppUser> primaryAppUsers=appUserService.lambdaQuery()
.eq(AppUser::getIsPrimary, true)
.lt(AppUser::getExpireTime, LocalDateTime.now().toLocalDate())
.list();
if (CollectionUtil.isNotEmpty(primaryAppUsers)){
appUserService.lambdaUpdate()
.set(AppUser::getState, UserState.Disabled.getState())
.set(AppUser::getUpdateTime, LocalDateTime.now())
.ne(AppUser::getState, UserState.Disabled.getState())
.in(AppUser::getId, primaryAppUsers.stream().map(AppUser::getId).collect(Collectors.toList()))
.update();
for (AppUser primaryUser : primaryAppUsers) {
List<AppUser> children=appUserService.getChildren(primaryUser);
if (CollectionUtil.isNotEmpty(children)){
appUserService.lambdaUpdate()
.set(AppUser::getState, UserState.Disabled.getState())
.set(AppUser::getUpdateTime, LocalDateTime.now())
.ne(AppUser::getState, UserState.Disabled.getState())
.in(AppUser::getId, children.stream().map(AppUser::getId).collect(Collectors.toList()))
.update();
}
}
}
}
// @Resource
// private IAppUserService appUserService;
//
// /**
// * 禁用已过期代理商
// * 每天午夜12点执行一次
// */
// @Transactional
// @Scheduled(cron = "0 0 0 * * ?")
// public void disableExpiredAppUser() {
// List<AppUser> primaryAppUsers=appUserService.lambdaQuery()
// .eq(AppUser::getIsPrimary, true)
// .lt(AppUser::getExpireTime, LocalDateTime.now().toLocalDate())
// .list();
// if (CollectionUtil.isNotEmpty(primaryAppUsers)){
// appUserService.lambdaUpdate()
// .set(AppUser::getState, UserState.Disabled.getState())
// .set(AppUser::getUpdateTime, LocalDateTime.now())
// .ne(AppUser::getState, UserState.Disabled.getState())
// .in(AppUser::getId, primaryAppUsers.stream().map(AppUser::getId).collect(Collectors.toList()))
// .update();
// for (AppUser primaryUser : primaryAppUsers) {
// List<AppUser> children=appUserService.getChildren(primaryUser);
// if (CollectionUtil.isNotEmpty(children)){
// appUserService.lambdaUpdate()
// .set(AppUser::getState, UserState.Disabled.getState())
// .set(AppUser::getUpdateTime, LocalDateTime.now())
// .ne(AppUser::getState, UserState.Disabled.getState())
// .in(AppUser::getId, children.stream().map(AppUser::getId).collect(Collectors.toList()))
// .update();
// }
// }
// }
// }
}

6
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
View File

@ -595,7 +595,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
if (request.getEnable()) {
lambdaUpdate()
.set(AppUser::getState, UserState.Activated.getState())
.set(AppUser::getUpdateBy, AdminUserUtil.getUserId())
.set(AppUser::getUpdateBy, AdminUserUtil.getUserName())
.set(AppUser::getUpdateTime, LocalDateTime.now())
.eq(AppUser::getIsDel, false)
.in(AppUser::getId, request.getIds())
@ -603,7 +603,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
} else {
lambdaUpdate()
.set(AppUser::getState, UserState.Disabled.getState())
.set(AppUser::getUpdateBy, AdminUserUtil.getUserId())
.set(AppUser::getUpdateBy, AdminUserUtil.getUserName())
.set(AppUser::getUpdateTime, LocalDateTime.now())
.eq(AppUser::getIsDel, false)
.in(AppUser::getId, request.getIds())
@ -617,7 +617,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
if (CollectionUtil.isNotEmpty(companyIds)) {
lambdaUpdate()
.set(AppUser::getState, UserState.Disabled.getState())
.set(AppUser::getUpdateBy, AdminUserUtil.getUserId())
.set(AppUser::getUpdateBy, AdminUserUtil.getUserName())
.set(AppUser::getUpdateTime, LocalDateTime.now())
.eq(AppUser::getIsDel, false)
.eq(AppUser::getIsPrimary, false)