From bf13676673e9f0f090a68bd8cfbaefbf0d696d32 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期日, 26 十一月 2023 13:03:00 +0800
Subject: [PATCH] 讨论区关键字过滤、首页班级显示班级信息
---
src/main/java/com/qxueyou/scc/user/service/impl/UserService.java | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java b/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java
index 7820d96..8f5418f 100644
--- a/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java
+++ b/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java
@@ -3,6 +3,7 @@
import java.util.List;
import java.util.UUID;
+import com.qxueyou.scc.base.dao.CommonDAO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -39,6 +40,9 @@
@Autowired
IOrganizationService organizationService;
+ @Autowired
+ private CommonDAO commonDAO;
+
/**
* 鍒濆鍖栫敤鎴穡rapper
*/
@@ -65,8 +69,12 @@
System.out.println(user.getOrganizationId());
System.out.println(user.getUserId());
+// String hql = "from UserReRoleUser u where deleteFlag is false and userId = ? ";
+//
+// find(hql, CollectionUtils.newList(param.getUserId()), UserReRoleUser.class);
+
ClsClass objClsClass = this.findUnique("select c from StuStudent t,"
- + " ClsClass c where c.classId = t.classId "
+ + "ClsClass c where c.classId = t.classId "
+ " and c.orgId = ? and t.userId = ? and t.status = ? order by t.createTime desc", CollectionUtils.newList(user.getOrganizationId(), user.getUserId(), StuStudent.STATUS_ACTIVE), ClsClass.class);
wrapper.setUser(user);
wrapper.setOrg(org);
@@ -82,11 +90,11 @@
}
@Override
- public User insertUser(String name, String account, String mobilePhone, String password, Boolean sex, String orgId) {
- return newUser(name, account, mobilePhone, password, sex, orgId);
+ public User insertUser( String photo,String name, String account, String mobilePhone, String password, Boolean sex, String orgId) {
+ return newUser( photo,name, account, mobilePhone, password, sex, orgId);
}
- private User newUser(String name, String account, String mobilePhone, String password, Boolean sex, String orgId) {
+ private User newUser(String photo,String name, String account, String mobilePhone, String password, Boolean sex, String orgId) {
//闅忔満瀛楃涓�
String salt= UUID.randomUUID().toString();
User user = new User();
@@ -99,6 +107,7 @@
String newPassword= DigestUtils.md5DigestAsHex((salt+password).getBytes());
user.setPassword(newPassword);
user.setMobilePhone(mobilePhone);
+ user.setImgPath(photo);
user.setSex(sex);
user.setOrganizationId(orgId);
save(user);
@@ -131,14 +140,20 @@
@Override
public Result updatePassword(String userId, String usedPass, String pass) {
+ String hql = null;
+
+ List<Object> params = null;
+
User user = read(User.class, userId);
//闅忔満瀛楃涓�
String salt= UUID.randomUUID().toString();
+
+ String salts = user.getSalt();
//鐩愬��
user.setSalt(salt);
//瀵瑰瘑鐮佽繘琛屽姞瀵嗗鐞�
String newPassword= DigestUtils.md5DigestAsHex((salt+pass).getBytes());
- String newPasswords= DigestUtils.md5DigestAsHex((salt+usedPass).getBytes());
+ String newPasswords= DigestUtils.md5DigestAsHex((salts+usedPass).getBytes());
if (StringUtils.isNotBlank(usedPass) && StringUtils.isNotBlank(pass)) {
if (!user.getPassword().equals(newPasswords)) {
return new Result(false, "杈撳叆鐨勬棫瀵嗙爜閿欒");
@@ -166,6 +181,9 @@
user.setImgPath(headPath);
TraceUtils.setUpdateTrace(user);
save(user);
+ this.bulkUpdate("update StuStudent set photo = ? , " +
+ " updateTime = sysdate(), updateId = ? , updator = ? where userId = ? " ,
+ new Object[]{ headPath,userId, ClientUtils.getUserName(), userId } );
return new Result(true);
}
@@ -173,7 +191,7 @@
/**
* 鐢ㄦ埛璁剧疆鎵嬫満鍙�
*
- * @param headPath
+ * @param
* @return
*/
public Result updateUserInfo(String userId, String mobilePhone) {
@@ -237,9 +255,13 @@
@Override
public Result updateUser(String userId, String name, String account, String mobilePhone, String password,
Boolean sex) {
-
User dbUser = read(User.class, userId);
- String salt = dbUser.getSalt();
+ String salt = dbUser.getSalt();
+ if(salt == null){
+ salt= UUID.randomUUID().toString();
+ dbUser.setSalt(salt);
+ salt = dbUser.getSalt();
+ }
String newPassword= DigestUtils.md5DigestAsHex((salt+password).getBytes());
if (dbUser.getAccount().equals(account)) {
dbUser.setName(name);
@@ -268,4 +290,14 @@
return findCount("from User where account = ?", CollectionUtils.newList(account)) > 0;
}
+ @Override
+ public Result countUser() {
+ String hql = "from count User where sex=? and deleteFlag is false";
+ return new Result(true,findCount(hql,CollectionUtils.newList(1)));
+ }
+ @Override
+ public Result countUsersex() {
+ String hql = "from count User where sex=? and deleteFlag is false";
+ return new Result(true,findCount(hql,CollectionUtils.newList(0)));
+ }
}
--
Gitblit v1.8.0