diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/user/service/MgrUserService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/user/service/MgrUserService.java index a1cfae61..4ac41fe6 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/user/service/MgrUserService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/user/service/MgrUserService.java @@ -7,9 +7,6 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.TypeReference; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bonus.canteen.core.auth.config.LoginProperties; @@ -118,7 +115,8 @@ public class MgrUserService extends ServiceImpl { public MgrUserInfo getUserInfoByUsername(String realUsername) throws Exception { MgrUserInSystem mgrUser = (MgrUserInSystem)Executors.readInSystem(() -> { - return null; // (MgrUserInSystem)this.mgrUserInSystemMapper.selectOne((Wrapper)((LambdaQueryWrapper)Wrappers.lambdaQuery(MgrUserInSystem.class).eq(MgrUserInSystem::getUsername, realUsername)).eq(MgrUserInSystem::getDelFlag, DelFlagEnum.DEL_FALSE.key())); + return (MgrUserInSystem)this.mgrUserInSystemMapper.selectOne(Wrappers.lambdaQuery(MgrUserInSystem.class) + .eq(MgrUserInSystem::getUsername, realUsername).eq(MgrUserInSystem::getDelFlag, DelFlagEnum.DEL_FALSE.key())); }); if (mgrUser == null) { log.info("***根据用户名 : {} 未查询到用户的数据, 返回用户名密码错误****************", realUsername); @@ -243,10 +241,9 @@ public class MgrUserService extends ServiceImpl { MqUtil.sendDelay(JSON.toJSONString(opsExpireMsgPO), LeMqConstant.Topic.AUTH_OPS_USER_EXPIRE, 86400000); } -// this.update((Wrapper)((LambdaUpdateWrapper)((LambdaUpdateWrapper) Wrappers.lambdaUpdate() -// .set(MgrUser::getLoginTime, LocalDateTime.now())) -// .set(MgrUser::getUptime, LocalDateTime.now())) -// .eq(MgrUser::getUserId, user.getId())); + this.update(Wrappers.lambdaUpdate(MgrUser.class).set(MgrUser::getLoginTime, LocalDateTime.now()) + .set(MgrUser::getUptime, LocalDateTime.now()) + .eq(MgrUser::getUserId, user.getId())); if (Objects.nonNull(this.loginProperties.getReservedRecentNum())) { SecureManager.revokeAuthenticate(user.getId(), this.loginProperties.getReservedRecentNum()); } @@ -269,11 +266,10 @@ public class MgrUserService extends ServiceImpl { String password = loginDTO.getPassword(); password = AesEncryptUtil.aesDecode(password); MgrUserInSystem user = (MgrUserInSystem) Executors.readInSystem(() -> { - return null; -// return (MgrUserInSystem)this.mgrUserInSystemMapper.selectOne((Wrapper)((LambdaQueryWrapper)Wrappers.lambdaQuery() -// .select(MgrUserInSystem::getPassword, MgrUserInSystem::getUserId, MgrUserInSystem::getLockFlag) -// .eq(MgrUserInSystem::getUsername, username)) -// .eq(MgrUserInSystem::getDelFlag, LeConstants.COMMON_NO)); + return (MgrUserInSystem)this.mgrUserInSystemMapper.selectOne(Wrappers.lambdaQuery(MgrUserInSystem.class) + .select(MgrUserInSystem::getPassword, MgrUserInSystem::getUserId, MgrUserInSystem::getLockFlag) + .eq(MgrUserInSystem::getUsername, username) + .eq(MgrUserInSystem::getDelFlag, LeConstants.COMMON_NO)); }); if (ObjectUtil.isNotNull(user) && encoder.matches(password, user.getPassword())) { flag = true;