From ec09e9f2c72ff37654076c327008ac89ed32a8c3 Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期六, 24 六月 2023 17:44:11 +0800
Subject: [PATCH] 导入导出
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java | 99 ++++++++++++++++++++++++++++++-------------------
1 files changed, 61 insertions(+), 38 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java
index 405be71..6ce9dc7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java
@@ -1,44 +1,35 @@
package com.ruoyi.system.service.impl.sys;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-import javax.validation.Validator;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.system.api.domain.dto.AppEditUserDto;
-import com.ruoyi.system.api.domain.poji.member.Member;
-import com.ruoyi.system.domain.pojo.coupon.Coupon;
-import com.ruoyi.system.mapper.coupon.CouponMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.SpringUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanValidators;
import com.ruoyi.common.datascope.annotation.DataScope;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.dto.AppEditUserDto;
+import com.ruoyi.system.api.domain.dto.MgtUserIdByDept;
import com.ruoyi.system.api.domain.poji.sys.SysRole;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.domain.pojo.sys.SysPost;
import com.ruoyi.system.domain.pojo.sys.SysUserPost;
import com.ruoyi.system.domain.pojo.sys.SysUserRole;
-import com.ruoyi.system.mapper.sys.SysPostMapper;
-import com.ruoyi.system.mapper.sys.SysRoleMapper;
-import com.ruoyi.system.mapper.sys.SysUserMapper;
-import com.ruoyi.system.mapper.sys.SysUserPostMapper;
-import com.ruoyi.system.mapper.sys.SysUserRoleMapper;
+import com.ruoyi.system.mapper.sys.*;
import com.ruoyi.system.service.sys.ISysConfigService;
import com.ruoyi.system.service.sys.ISysUserService;
-import org.springframework.util.ObjectUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import javax.validation.Validator;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* 用户 业务层处理
@@ -50,25 +41,25 @@
{
private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
- @Autowired
+ @Resource
private SysUserMapper userMapper;
- @Autowired
+ @Resource
private SysRoleMapper roleMapper;
- @Autowired
+ @Resource
private SysPostMapper postMapper;
- @Autowired
+ @Resource
private SysUserRoleMapper userRoleMapper;
- @Autowired
+ @Resource
private SysUserPostMapper userPostMapper;
- @Autowired
+ @Resource
private ISysConfigService configService;
- @Autowired
+ @Resource
protected Validator validator;
/**
@@ -85,13 +76,17 @@
}
@Override
- public SysUser selectUserByPhoneNumber(String phoneNumber) {
+ public SysUser selectUserByPhoneNumber(String phoneNumber,String userType) {
SysUser sysUser = new SysUser();
sysUser.setPhonenumber(phoneNumber);
List<SysUser> userList = this.selectUserList(sysUser);
SysUser queryUser = null;
if(!userList.isEmpty()){
- queryUser = userList.get(0);
+ for(SysUser sysUser1 : userList){
+ if(sysUser1.getUserType().equals(userType)){
+ queryUser = sysUser1;
+ }
+ }
}
return queryUser;
}
@@ -294,9 +289,22 @@
* @return 结果
*/
@Override
- public boolean registerUser(SysUser user)
+ public SysUser registerUser(SysUser user)
{
- return userMapper.insertUser(user) > 0;
+ int id = userMapper.insertUser(user);
+ log.info("user------------------"+user.toString());
+ return user;
+ }
+
+ /**
+ *
+ * @param mobile
+ * @return
+ */
+ @Override
+ public SysUser getSysUserByMobile(String mobile){
+ SysUser sysUser = this.selectUserByPhoneNumber(mobile,"00");
+ return sysUser;
}
/**
@@ -591,19 +599,19 @@
switch (editType){
case 1:
sysUser.setNickName(editValue);
- sysUser.setUpdateTime(new Date());
+ sysUser.setUpdateTime(DateUtils.getNowDate());
sysUser.setUpdateBy(String.valueOf(appEditUserDto.getUserId()));
userMapper.updateUser(sysUser);
break;
case 2:
sysUser.setAvatar(editValue);
- sysUser.setUpdateTime(new Date());
+ sysUser.setUpdateTime(DateUtils.getNowDate());
sysUser.setUpdateBy(String.valueOf(appEditUserDto.getUserId()));
userMapper.updateUser(sysUser);
break;
case 3:
sysUser.setSex(editValue);
- sysUser.setUpdateTime(new Date());
+ sysUser.setUpdateTime(DateUtils.getNowDate());
sysUser.setUpdateBy(String.valueOf(appEditUserDto.getUserId()));
userMapper.updateUser(sysUser);
break;
@@ -614,4 +622,19 @@
}
}
+
+
+ /**
+ * @description 获取部门用户
+ * @author jqs
+ * @date 2023/6/21 16:00
+ * @param userIdByDept
+ * @return MgtUserIdByDept
+ */
+ @Override
+ public MgtUserIdByDept getUserIdByDept(MgtUserIdByDept userIdByDept){
+ List<Long> userIdList = userMapper.getUserIdByDept(userIdByDept);
+ userIdByDept.setUserIdList(userIdList);
+ return userIdByDept;
+ }
}
--
Gitblit v1.7.1