From 441d84357308c82a388e0bc4a0c1d30b22816d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 24 Feb 2025 10:55:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E5=95=86=E5=88=9B=E5=BB=BA=E4=BA=BA=E5=92=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/entity/AppUser.java | 8 +-- .../repository/entity/AppUserApplyfor.java | 8 +-- .../impl/AppUserApplyforServiceImpl.java | 10 ++-- .../service/impl/AppUserServiceImpl.java | 60 +++++++------------ .../main/resources/mapper/AppUserMapper.xml | 26 ++++---- .../starter/service/SSEManagerBase.java | 2 +- 6 files changed, 46 insertions(+), 68 deletions(-) diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUser.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUser.java index e00a46dd..899408bc 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUser.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUser.java @@ -101,9 +101,9 @@ public class AppUser implements Serializable { private String languageCode; /** - * 创建人id + * 创建人 */ - private Integer createBy; + private String createBy; /** * 创建时间 @@ -111,9 +111,9 @@ public class AppUser implements Serializable { private LocalDateTime createTime; /** - * 更新人id + * 更新人 */ - private Integer updateBy; + private String updateBy; /** * 最后更新时间 diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUserApplyfor.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUserApplyfor.java index b37b87da..78fca73d 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUserApplyfor.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUserApplyfor.java @@ -95,9 +95,9 @@ public class AppUserApplyfor implements Serializable { private String salesUserName; /** - * 创建人id + * 创建人 */ - private Integer createBy; + private String createBy; /** * 创建时间 @@ -105,9 +105,9 @@ public class AppUserApplyfor implements Serializable { private LocalDateTime createTime; /** - * 更新人id + * 更新人 */ - private Integer updateBy; + private String updateBy; /** * 最后更新时间 diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java index d66073b9..b97ceee7 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java @@ -79,7 +79,7 @@ public class AppUserApplyforServiceImpl extends ServiceImpl impl @Resource private ITBaseCustomerService customerService; - @Resource - private IAdminUserService adminUserService; - @Resource private ITBasePositionService positionService; @@ -86,7 +84,7 @@ public class AppUserServiceImpl extends ServiceImpl impl public void disable(Integer id) { AppUser user=new AppUser() .setState(UserState.Disabled.getState()) - .setUpdateBy(AppUserUtil.getUserId()) + .setUpdateBy(AppUserUtil.getUserName()) .setUpdateTime(LocalDateTime.now()) .setId(id); updateById(user); @@ -128,7 +126,7 @@ public class AppUserServiceImpl extends ServiceImpl impl @Override public void updatePassword(Integer userId, String password) { AppUser user=getById(userId); - user.setPassword(PASSWORDENCODER.encode(password)).setUpdateBy(userId).setUpdateTime(LocalDateTime.now()); + user.setPassword(PASSWORDENCODER.encode(password)).setUpdateBy(user.getName()).setUpdateTime(LocalDateTime.now()); updateById(user); } @@ -171,7 +169,7 @@ public class AppUserServiceImpl extends ServiceImpl impl .setIsPrimary(true) .setLanguageCode(request.getLanguageCode()) .setSalesUserName(request.getSalesUserName()) -// .setCreateBy(AdminUserUtil.getUserId()) + .setCreateBy(AdminUserUtil.getUserName()) .setCreateTime(LocalDateTime.now()) .setState(UserState.ToBeActivated.getState()) .setExpireTime(LocalDateTime.of(LocalDateTime.now().getYear(), 12, 31, 8, 0, 0).toLocalDate()); @@ -307,22 +305,6 @@ public class AppUserServiceImpl extends ServiceImpl impl .page(new Page<>(request.getPage(), request.getPageSize())); return PageUtil.convert(page, d -> { TBaseArea area = adminAreaService.getById(d.getAreaId()); - String createBy = ""; - if (d.getIsPrimary()) { - if (Objects.nonNull(d.getCreateBy())) { - AdminUser adminUser = adminUserService.getById(d.getCreateBy()); - if (Objects.nonNull(adminUser)) { - createBy = adminUser.getUserName(); - } - } - } else { - AppUser appUser = getById(d.getCreateBy()); - createBy = appUser.getName(); - } - String updateBy = null; - if (Objects.nonNull(d.getUpdateBy())) { - updateBy = getById(d.getUpdateBy()).getName(); - } List companyIds = Arrays.stream(d.getCompanyId().split(",")).filter(StrUtil::isNotBlank).map(Integer::valueOf).collect(Collectors.toList()); List customers = customerService.listByIds(companyIds).stream().map(TBaseCustomer::getAgencyCompanyName).collect(Collectors.toList()); TBasePosition title = null; @@ -346,9 +328,9 @@ public class AppUserServiceImpl extends ServiceImpl impl .setAreaName(area.getAreaName()) .setUserState(d.getState()) .setExpireTime(d.getExpireTime()) - .setCreateBy(createBy) + .setCreateBy(d.getCreateBy()) .setCreateTime(d.getCreateTime()) - .setUpdateBy(updateBy) + .setUpdateBy(d.getUpdateBy()) .setPrimary(true) .setState(d.getExpireTime().isAfter(ChronoLocalDate.from(LocalDateTime.now())) ? 1 : 2) .setLastLoginTime(d.getLastLoginTime()) @@ -363,6 +345,7 @@ public class AppUserServiceImpl extends ServiceImpl impl if (request.getEnable()) { lambdaUpdate() .set(AppUser::getState, UserState.Activated.getState()) + .set(AppUser::getUpdateBy, AdminUserUtil.getUserId()) .set(AppUser::getUpdateTime, LocalDateTime.now()) .eq(AppUser::getIsDel, false) .in(AppUser::getId, request.getIds()) @@ -370,6 +353,7 @@ public class AppUserServiceImpl extends ServiceImpl impl } else { lambdaUpdate() .set(AppUser::getState, UserState.Disabled.getState()) + .set(AppUser::getUpdateBy, AdminUserUtil.getUserId()) .set(AppUser::getUpdateTime, LocalDateTime.now()) .eq(AppUser::getIsDel, false) .in(AppUser::getId, request.getIds()) @@ -380,13 +364,16 @@ public class AppUserServiceImpl extends ServiceImpl impl .filter(AppUser::getIsPrimary) .flatMap(u -> Arrays.stream(u.getCompanyId().split(","))) .collect(Collectors.toList()); - lambdaUpdate() - .set(AppUser::getState, UserState.Disabled.getState()) - .set(AppUser::getUpdateTime, LocalDateTime.now()) - .eq(AppUser::getIsDel, false) - .eq(AppUser::getIsPrimary, false) - .in(AppUser::getCompanyId, companyIds) - .update(); + if (CollectionUtil.isNotEmpty(companyIds)) { + lambdaUpdate() + .set(AppUser::getState, UserState.Disabled.getState()) + .set(AppUser::getUpdateBy, AdminUserUtil.getUserId()) + .set(AppUser::getUpdateTime, LocalDateTime.now()) + .eq(AppUser::getIsDel, false) + .eq(AppUser::getIsPrimary, false) + .in(AppUser::getCompanyId, companyIds) + .update(); + } } } @@ -409,11 +396,6 @@ public class AppUserServiceImpl extends ServiceImpl impl if (Objects.nonNull(d.getAreaId())) { areaName = appAreaService.getById(d.getAreaId()).getName(); } - AppUser createUser = getById(d.getCreateBy()); - String updateBy = null; - if (Objects.nonNull(d.getUpdateBy())) { - updateBy = getById(d.getUpdateBy()).getName(); - } TBaseCustomer customer=customerService.getById(Integer.valueOf(d.getCompanyId())); TBasePosition title=positionService.getById(d.getTitleId()); return new AppUserForAdminVO() @@ -436,9 +418,9 @@ public class AppUserServiceImpl extends ServiceImpl impl .setUserState(d.getState()) .setPrimary(false) .setExpireTime(d.getExpireTime()) - .setCreateBy(createUser.getName()) + .setCreateBy(d.getCreateBy()) .setCreateTime(d.getCreateTime()) - .setUpdateBy(updateBy) + .setUpdateBy(d.getUpdateBy()) .setState(d.getExpireTime().isAfter(ChronoLocalDate.from(LocalDateTime.now())) ? 1 : 2) .setLastLoginTime(d.getLastLoginTime()); }).collect(Collectors.toList()); @@ -485,7 +467,7 @@ public class AppUserServiceImpl extends ServiceImpl impl VUtils.trueThrowBusinessError(Objects.equals(appUser.getIsPrimary(), false)) .throwMessage(id + "不是主账号"); appUser.setExpireTime(appUser.getExpireTime().plusMonths(request.getMonth())); -// appUser.setUpdateBy(AdminUserUtil.getUserId()); + appUser.setUpdateBy(AdminUserUtil.getUserName()); appUser.setUpdateTime(now); updateById(appUser); }); diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml index 99b48a03..37f62558 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml @@ -3,12 +3,12 @@