《完善用户信息》完善用户登录这块09

12795959 · yushien · 3cfb2396 · 12795959 · 12795959 · 12795959
Commit 12795959 authored Jul 26, 2023 by yushien
7 changed files
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -23,6 +23,7 @@ import com.ruoyi.common.utils.StreamUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.vo.SysUserExportVo;
+import com.ruoyi.system.domain.vo.SysUserImportNewVo;
 import com.ruoyi.system.domain.vo.SysUserImportVo;
 import com.ruoyi.system.listener.SysUserImportListener;
 import com.ruoyi.system.service.ISysDeptService;
@@ -119,6 +120,53 @@ public class SysUserController extends BaseController {
    }
    /**
+     * 获取导入模板
+     */
+    @PostMapping("/importTemplateNew")
+    public void importTemplateNew(HttpServletResponse response) {
+        ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", SysUserImportNewVo.class, response);
+    }
+    /**
+     * 导入数据
+     *
+     * @param file  导入文件
+     * @param updateSupport 是否更新已存在数据
+     */
+    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
+    @PostMapping(value = "/importDataNew", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public R<Void> importDataNew(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
+        List<SysUserImportNewVo> sysUserImportNewVos = ExcelUtil.importExcel(file.getInputStream(), SysUserImportNewVo.class);
+        if(CollUtil.isNotEmpty(sysUserImportNewVos)){
+            sysUserImportNewVos.forEach(sui->{
+                SysUser sysUser = userService.selectUserByUserName(sui.getUserName());
+                if(BeanUtil.isNotEmpty(sysUser) || StringUtils.isEmpty(sui.getNickName()) || StringUtils.isEmpty(sui.getUserName()) || StringUtils.isEmpty(sui.getSex()) || StringUtils.isEmpty(sui.getPassword()) ){
+                    //存在该用户无需导入
+                    return;
+                }
+                SysUser usi=new SysUser();
+                usi.setNickName(sui.getNickName());
+                usi.setUserName(sui.getUserName());
+                if(sui.getSex().equals("老师")){
+                    usi.setSex("1");
+                }
+                if(sui.getSex().equals("学生")){
+                    usi.setSex("0");
+                }
+                usi.setStatus("0");
+                usi.setRemark("系统导入用户数据");
+                usi.setPassword(BCrypt.hashpw(usi.getPassword()));
+                Long[] role=new Long[1];
+                role[0]=new Long(2);
+                usi.setRoleIds(role);
+                userService.insertUser(usi);
+            });
+        }
+        return R.ok();
+    }
+    /**
     * 根据用户编号获取详细信息
     *
     * @param userId 用户ID
@@ -151,9 +199,9 @@ public class SysUserController extends BaseController {
    @PostMapping
    public R<Void> add(@Validated @RequestBody SysUser user) {
        //新增逻辑处理
-        if(StringUtils.isNotEmpty(user.getDeptList())){
+        if(CollUtil.isNotEmpty(user.getDeptInsetArray())){
            //判断是否为父级
-            List<String> colList = CollUtil.newArrayList(user.getDeptList().split(","));
+            List<String> colList = user.getDeptInsetArray();
            List<String> uio=new ArrayList<>();
            colList.forEach(syu->{
                List<SysDept> sysDep = deptService.selectDeptListByDeID(new Long(syu));
@@ -170,6 +218,9 @@ public class SysUserController extends BaseController {
                user.setDeptList(CollUtil.join(uio, ","));
            }
        }
+        Long[] role=new Long[1];
+        role[0]=new Long(2);
+        user.setRoleIds(role);
        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
            return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
@@ -192,9 +243,9 @@ public class SysUserController extends BaseController {
    @PutMapping
    public R<Void> edit(@Validated @RequestBody SysUser user) {
        //修改用户逻辑
-        if(StringUtils.isNotEmpty(user.getDeptList())){
+        if(CollUtil.isNotEmpty(user.getDeptInsetArray())){
            //判断是否为父级
-            List<String> colList = CollUtil.newArrayList(user.getDeptList().split(","));
+            List<String> colList = user.getDeptInsetArray();
            List<String> uio=new ArrayList<>();
            colList.forEach(syu->{
                List<SysDept> sysDep = deptService.selectDeptListByDeID(new Long(syu));

--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -164,6 +164,14 @@ public class SysUser extends BaseEntity {
    @TableField(exist = false)
    private List<String> deptListArray;
+    /**
+     * 班级数组
+     */
+    @TableField(exist = false)
+    private List<String> deptInsetArray;
    public SysUser(Long userId) {
        this.userId = userId;
    }

--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportNewVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportNewVo.java
+package com.ruoyi.system.domain.vo;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import java.io.Serializable;
+/**
+ * 用户对象导入VO
+ *
+ * @author Lion Li
+ */
+@Data
+@NoArgsConstructor
+// @Accessors(chain = true) // 导入不允许使用 会找不到set方法
+public class SysUserImportNewVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 用户账号
+     */
+    @ExcelProperty(value = "学号")
+    private String userName;
+    /**
+     * 密码
+     */
+    @ExcelProperty(value = "密码")
+    private String password;
+    /**
+     * 用户昵称
+     */
+    @ExcelProperty(value = "用户昵称")
+    private String nickName;
+    /**
+     * 用户性别
+     */
+    @ExcelProperty(value = "用户身份")
+    private String sex;
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -48,6 +48,8 @@ public interface ISysUserService {
     */
    SysUser selectUserByUserName(String userName);
    /**
     * 通过手机号查询用户
     *

--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -27,6 +27,7 @@ import com.ruoyi.system.mapper.*;
 import com.ruoyi.system.service.ISysUserService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.javassist.runtime.Desc;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -82,6 +83,7 @@ public class SysUserServiceImpl implements ISysUserService {
            .eq(ObjectUtil.isNotNull(user.getUserId()), "u.user_id", user.getUserId())
            .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
            .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
+            .eq(StringUtils.isNotBlank(user.getSex()), "u.sex", user.getSex())
            .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
            .between(params.get("beginTime") != null && params.get("endTime") != null,
                "u.create_time", params.get("beginTime"), params.get("endTime"))

--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -55,8 +55,8 @@
        SELECT *
        FROM
        sys_dept
-        where st.del_flag='0'
+        where del_flag='0'
-        AND st.parent_id =#{deptList}
+        AND parent_id =#{deptList}
    </select>

--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -126,6 +126,7 @@
            sys_user u
                left join sys_dept d on u.dept_id = d.dept_id
            ${ew.getCustomSqlSegment}
+            order by  u.user_id DESC
    </select>
    <select id="selectUserList" resultMap="SysUserResult">