From e9c1bc2e789f6f9f8c52fbd10788ad5a0d1f841b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 12 七月 2024 13:39:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java
index 77ae849..1d7b664 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java
@@ -1,12 +1,16 @@
package com.ycl.jxkg.service.impl;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qiniu.util.Md5;
import com.ycl.jxkg.domain.entity.UserEventLog;
-import com.ycl.jxkg.domain.enums.RoleEnum;
-import com.ycl.jxkg.domain.enums.UserStatusEnum;
+import com.ycl.jxkg.domain.form.UpdatePwdForm;
+import com.ycl.jxkg.enums.RoleEnum;
+import com.ycl.jxkg.enums.UserStatusEnum;
import com.ycl.jxkg.domain.form.RegisterForm;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.domain.vo.StudentVO;
+import com.ycl.jxkg.enums.general.YesOrNoEnum;
import com.ycl.jxkg.event.UserEvent;
import com.ycl.jxkg.exception.BusinessException;
import com.ycl.jxkg.domain.entity.User;
@@ -23,6 +27,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.nio.charset.StandardCharsets;
import java.util.*;
@@ -32,6 +37,7 @@
private final UserMapper userMapper;
private final ApplicationEventPublisher eventPublisher;
+ private final AuthenticationService authenticationService;
public List<User> getUsers() {
@@ -83,6 +89,7 @@
@Override
public void insertUser(User user) {
+ user.setLastUpdatePasswordTime(new Date());
userMapper.insert(user);
eventPublisher.publishEvent(new OnRegistrationCompleteEvent(user));
}
@@ -90,6 +97,9 @@
@Override
@Transactional(rollbackFor = BusinessException.class)
public void insertUsers(List<User> users) {
+ users.stream().forEach(item -> {
+ item.setLastUpdatePasswordTime(new Date());
+ });
userMapper.insertUsers(users);
throw new BusinessException("test BusinessException roll back");
}
@@ -177,4 +187,13 @@
public List<StudentVO> classesStudent(Integer classesId) {
return userMapper.classesStudent(classesId);
}
+
+ @Override
+ public void updatePassword(UpdatePwdForm form) {
+ new LambdaUpdateChainWrapper<>(baseMapper)
+ .eq(User::getId, form.getUserId())
+ .set(User::getPassword, authenticationService.pwdEncode(form.getNewPassword()))
+ .set(User::getLastUpdatePasswordTime, new Date())
+ .update();
+ }
}
--
Gitblit v1.8.0