Merge branch 'dev' into dev-web

ele6-catalyzer-ruoyi-vue/pom.xml

@@ -10,8 +10,8 @@
     </parent>
 
     <groupId>cn.ele6</groupId>
-    <artifactId>catalyzer-ruoyi-vue</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <artifactId>ele6-catalyzer-ruoyi-vue</artifactId>
+    <version>0.1-SNAPSHOT</version>
 
     <dependencies>
         <!-- ruoyi 通用工具-->

ele6-catalyzer-ruoyi-vue/src/main/java/cn/ele6/catalyzer/ruoyi/custom/RuoYiResponse.java

@@ -1,8 +0,0 @@
-package cn.ele6.catalyzer.ruoyi.custom;
-
-/**
- * RuoYiResponse tag interface.
- */
-public interface RuoYiResponse {
-
-}

ele6-catalyzer-ruoyi-vue/src/main/java/cn/ele6/catalyzer/ruoyi/custom/BaseService.java → ele6-catalyzer-ruoyi-vue/src/main/java/cn/ele6/catalyzer/ruoyi/vue/custom/Ele6RYBaseService.java

@@ -1,7 +1,7 @@
-package cn.ele6.catalyzer.ruoyi.custom;
+package cn.ele6.catalyzer.ruoyi.vue.custom;
 
-import cn.ele6.catalyzer.ruoyi.enhance.AjaxResult;
-import cn.ele6.catalyzer.ruoyi.enhance.TableDataInfo;
+import cn.ele6.catalyzer.ruoyi.vue.enhance.AjaxResult;
+import cn.ele6.catalyzer.ruoyi.vue.enhance.TableDataInfo;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.constant.HttpStatus;
@@ -17,9 +17,9 @@ import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
-public abstract class BaseService {
+public abstract class Ele6RYBaseService {
 
-    protected Logger l = LoggerFactory.getLogger(BaseService.class);
+    protected Logger l = LoggerFactory.getLogger(Ele6RYBaseService.class);
 
     /**
      * 设置请求分页数据

ele6-catalyzer-ruoyi-vue/src/main/java/cn/ele6/catalyzer/ruoyi/vue/custom/Ele6RYResponse.java

@@ -0,0 +1,8 @@
+package cn.ele6.catalyzer.ruoyi.vue.custom;
+
+/**
+ * RuoYiResponse tag interface.
+ */
+public interface Ele6RYResponse {
+
+}

ele6-catalyzer-ruoyi-vue/src/main/java/cn/ele6/catalyzer/ruoyi/enhance/AjaxResult.java → ele6-catalyzer-ruoyi-vue/src/main/java/cn/ele6/catalyzer/ruoyi/vue/enhance/AjaxResult.java

@@ -1,6 +1,6 @@
-package cn.ele6.catalyzer.ruoyi.enhance;
+package cn.ele6.catalyzer.ruoyi.vue.enhance;
 
-import cn.ele6.catalyzer.ruoyi.custom.RuoYiResponse;
+import cn.ele6.catalyzer.ruoyi.vue.custom.Ele6RYResponse;
 import com.ruoyi.common.constant.HttpStatus;
 import org.springframework.beans.BeanUtils;
 
@@ -9,7 +9,7 @@ import java.io.Serializable;
 /**
  * 同名类增强改造。
  */
-public class AjaxResult extends com.ruoyi.common.core.domain.AjaxResult implements Serializable, RuoYiResponse {
+public class AjaxResult extends com.ruoyi.common.core.domain.AjaxResult implements Serializable, Ele6RYResponse {
 
     /**
      * 返回成功消息

ele6-catalyzer-ruoyi-vue/src/main/java/cn/ele6/catalyzer/ruoyi/enhance/BaseController.java → ele6-catalyzer-ruoyi-vue/src/main/java/cn/ele6/catalyzer/ruoyi/vue/enhance/BaseController.java

@@ -1,13 +1,10 @@
-package cn.ele6.catalyzer.ruoyi.enhance;
+package cn.ele6.catalyzer.ruoyi.vue.enhance;
 
 /**
  *
  */
 public class BaseController extends com.ruoyi.common.core.controller.BaseController {
 
-
-
-
     public static AjaxResult convert(com.ruoyi.common.core.domain.AjaxResult o) {
         return AjaxResult.convert(o);
     }

ele6-catalyzer-ruoyi-vue/src/main/java/cn/ele6/catalyzer/ruoyi/enhance/BaseEntity.java → ele6-catalyzer-ruoyi-vue/src/main/java/cn/ele6/catalyzer/ruoyi/vue/enhance/BaseEntity.java

@@ -1,4 +1,4 @@
-package cn.ele6.catalyzer.ruoyi.enhance;
+package cn.ele6.catalyzer.ruoyi.vue.enhance;
 
 /**
  *

ele6-catalyzer-ruoyi-vue/src/main/java/cn/ele6/catalyzer/ruoyi/enhance/BaseException.java → ele6-catalyzer-ruoyi-vue/src/main/java/cn/ele6/catalyzer/ruoyi/vue/enhance/BaseException.java

@@ -1,4 +1,4 @@
-package cn.ele6.catalyzer.ruoyi.enhance;
+package cn.ele6.catalyzer.ruoyi.vue.enhance;
 
 /**
  *

ele6-catalyzer-ruoyi-vue/src/main/java/cn/ele6/catalyzer/ruoyi/enhance/TableDataInfo.java → ele6-catalyzer-ruoyi-vue/src/main/java/cn/ele6/catalyzer/ruoyi/vue/enhance/TableDataInfo.java

@@ -1,6 +1,6 @@
-package cn.ele6.catalyzer.ruoyi.enhance;
+package cn.ele6.catalyzer.ruoyi.vue.enhance;
 
-import cn.ele6.catalyzer.ruoyi.custom.RuoYiResponse;
+import cn.ele6.catalyzer.ruoyi.vue.custom.Ele6RYResponse;
 import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
@@ -8,7 +8,7 @@ import java.io.Serializable;
 /**
  * 同名类增强改造。
  */
-public class TableDataInfo extends com.ruoyi.common.core.page.TableDataInfo implements Serializable, RuoYiResponse {
+public class TableDataInfo extends com.ruoyi.common.core.page.TableDataInfo implements Serializable, Ele6RYResponse {
 
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -120,11 +120,11 @@ public class SysDeptController extends BaseController
     {
         if (deptService.hasChildByDeptId(deptId))
         {
-            return warn("存在下级部门,不允许删除");
+            return warn("存在下级组织,不允许删除");
         }
         if (deptService.checkDeptExistUser(deptId))
         {
-            return warn("部门存在用户,不允许删除");
+            return warn("该组织存在用户,不允许删除");
         }
         deptService.checkDeptDataScope(deptId);
         return toAjax(deptService.deleteDeptById(deptId));

ruoyi-sim/pom.xml

@@ -35,8 +35,8 @@
 
         <dependency>
             <groupId>cn.ele6</groupId>
-            <artifactId>catalyzer-ruoyi-vue</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
+            <artifactId>ele6-catalyzer-ruoyi-vue</artifactId>
+            <version>0.1-SNAPSHOT</version>
         </dependency>
 
         <!-- hutool -->

ruoyi-sim/src/main/java/com/ruoyi/sim/controller/RealExamCollectionController.java

@@ -1,6 +1,6 @@
 package com.ruoyi.sim.controller;
 
-import cn.ele6.catalyzer.ruoyi.enhance.TableDataInfo;
+import cn.ele6.catalyzer.ruoyi.vue.enhance.TableDataInfo;
 import com.ruoyi.sim.domain.vo.RealExamCollectionVo;
 import com.ruoyi.sim.service.impl.RealExamCollectionService;
 import io.swagger.annotations.Api;
@@ -14,10 +14,8 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.sim.domain.RealExamCollection;
 
 /**

ruoyi-sim/src/main/java/com/ruoyi/sim/controller/StudentController.java

@@ -55,7 +55,7 @@ public class StudentController extends BaseController {
         // 覆盖data
         // ajax.put(AjaxResult.DATA_TAG, student);
         // -------------------------------- tom add  --------------------------------
-        return success(studentService.selectStudentByUserId(userId));
+        return success(studentService.getInfo(userId));
     }
 
 

ruoyi-sim/src/main/java/com/ruoyi/sim/controller/TeacherController.java

@@ -63,7 +63,7 @@ public class TeacherController extends BaseController {
         // 覆盖data
         // ajax.put(AjaxResult.DATA_TAG, student);
         // -------------------------------- tom add  --------------------------------
-        return success(teacherService.selectTeacherByUserId(userId));
+        return teacherService.selectTeacherByUserId(userId);
     }
 
     @PostMapping

ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/RealExamCollectionService.java

@@ -3,8 +3,8 @@ package com.ruoyi.sim.service.impl;
 import java.util.ArrayList;
 import java.util.List;
 
-import cn.ele6.catalyzer.ruoyi.custom.BaseService;
-import cn.ele6.catalyzer.ruoyi.enhance.TableDataInfo;
+import cn.ele6.catalyzer.ruoyi.vue.custom.Ele6RYBaseService;
+import cn.ele6.catalyzer.ruoyi.vue.enhance.TableDataInfo;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.sim.domain.vo.RealExamCollectionVo;
@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @date 2024-12-17
  */
 @Service
-public class RealExamCollectionService extends BaseService {
+public class RealExamCollectionService extends Ele6RYBaseService {
     @Autowired
     private RealExamCollectionMapper realExamCollectionMapper;
 

ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/StudentService.java

@@ -1,25 +1,29 @@
 package com.ruoyi.sim.service.impl;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.sim.constant.Consts;
 import com.ruoyi.sim.domain.AddOnDept;
 import com.ruoyi.sim.domain.Major;
 import com.ruoyi.sim.domain.Student;
 import com.ruoyi.system.mapper.*;
+import com.ruoyi.system.service.ISysPostService;
+import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.GetMapping;
 
-import javax.validation.Validator;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Service
 public class StudentService {
@@ -28,21 +32,18 @@ public class StudentService {
 
     @Autowired
     private SysUserMapper userMapper;
-
     @Autowired
     private SysRoleMapper roleMapper;
-
     @Autowired
     private AddOnDeptService addOnDeptService;
-
     @Autowired
     private MajorService majorService;
-
     @Autowired
-    protected Validator validator;
-
+    private ISysUserService userService;
+    @Autowired
+    private ISysRoleService roleService;
     @Autowired
-    private ISysUserService sysUserService;
+    private ISysPostService postService;
 
     // @DataScope(deptAlias = "d", userAlias = "u")
     public List<Student> selectStudentListOld() {
@@ -80,11 +81,10 @@ public class StudentService {
         // 分页
         PageUtils.startPage();
         suQ.setRoleId(Consts.ROLE_ID_STUDENT);
-        List<SysUser> listSu = sysUserService.selectAllocatedListV2(suQ);
+        List<SysUser> listSu = userService.selectAllocatedListV2(suQ);
         List<Student> listSt = new ArrayList<>(listSu.size());
         listSu.forEach(su -> {
             Student st = new Student();
-            su.setPassword("~~~~");
             BeanUtils.copyProperties(su, st);
             listSt.add(st);
         });
@@ -106,16 +106,16 @@ public class StudentService {
             }
             break;
             case 3: {
-                list = sysUserService.selectUserList(new SysUser());
+                list = userService.selectUserList(new SysUser());
             }
             break;
             case 4: {
                 PageUtils.startPage();
-                list = sysUserService.selectUserList(new SysUser());
+                list = userService.selectUserList(new SysUser());
             }
             break;
             case 5: {
-                list = sysUserService.selectAllocatedList(new SysUser());
+                list = userService.selectAllocatedList(new SysUser());
             }
             break;
             case 6: {
@@ -123,16 +123,16 @@ public class StudentService {
                 PageUtils.startPage();
                 SysUser su = new SysUser();
                 su.setRoleId(Consts.ROLE_ID_STUDENT);
-                list = sysUserService.selectAllocatedList(su);
+                list = userService.selectAllocatedList(su);
             }
             break;
             case 7: {
-                list = sysUserService.selectUnallocatedList(new SysUser());
+                list = userService.selectUnallocatedList(new SysUser());
             }
             break;
             case 8: {
                 PageUtils.startPage();
-                list = sysUserService.selectUnallocatedList(new SysUser());
+                list = userService.selectUnallocatedList(new SysUser());
             }
             break;
         }
@@ -141,14 +141,12 @@ public class StudentService {
         }
     }
 
-
     public Student selectStudentByUserId(Long userId) {
         SysUser sysUser = userMapper.selectUserById(userId);
         Student student = new Student();
         // todo:用户角色判断。
         // 屏蔽密码
         if (Objects.nonNull(sysUser)) {
-            sysUser.setPassword("");
             BeanUtils.copyProperties(sysUser, student);
             Major m = getMajorByDeptId(sysUser.getDeptId());
             if (Objects.nonNull(m)) {
@@ -159,6 +157,27 @@ public class StudentService {
         return student;
     }
 
+    /**
+     * 根据用户编号获取详细信息
+     */
+    @GetMapping(value = {"/", "/{userId}"})
+    public AjaxResult getInfo(Long userId) {
+        // 不校验数据权限
+        // userService.checkUserDataScope(userId);
+
+        AjaxResult ajax = AjaxResult.success();
+        List<SysRole> roles = roleService.selectRoleAll();
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("posts", postService.selectPostAll());
+        if (StringUtils.isNotNull(userId)) {
+            SysUser sysUser = userService.selectUserById(userId);
+            ajax.put(AjaxResult.DATA_TAG, sysUser);
+            ajax.put("postIds", postService.selectPostListByUserId(userId));
+            ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
+        }
+        return ajax;
+    }
+
     public Major getMajorByDeptId(Long deptId) {
         AddOnDept a = addOnDeptService.selectAddOnDeptByDeptId(deptId);
         Major m = null;

ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/TeacherService.java

@@ -1,15 +1,15 @@
 package com.ruoyi.sim.service.impl;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.sim.constant.Consts;
-import com.ruoyi.sim.domain.Major;
-import com.ruoyi.sim.domain.Student;
 import com.ruoyi.sim.domain.Teacher;
 import com.ruoyi.system.mapper.*;
-import com.ruoyi.system.service.ISysConfigService;
-import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysPostService;
+import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,10 +17,10 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.validation.Validator;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Service
 public class TeacherService {
@@ -32,26 +32,12 @@ public class TeacherService {
 
     @Autowired
     private SysRoleMapper roleMapper;
-
-    @Autowired
-    private SysPostMapper postMapper;
-
     @Autowired
-    private SysUserRoleMapper userRoleMapper;
-
+    private ISysUserService userService;
     @Autowired
-    private SysUserPostMapper userPostMapper;
-
+    private ISysRoleService roleService;
     @Autowired
-    private ISysConfigService configService;
-
-    @Autowired
-    private ISysDeptService deptService;
-
-    @Autowired
-    protected Validator validator;
-    @Autowired
-    private ISysUserService sysUserService;
+    private ISysPostService postService;
 
     // @DataScope(deptAlias = "d", userAlias = "u")
     public List<SysUser> selectTeacherList() {
@@ -82,7 +68,7 @@ public class TeacherService {
         // 分页
         PageUtils.startPage();
         suQ.setRoleId(Consts.ROLE_ID_TEACHER);
-        List<SysUser> listSu = sysUserService.selectAllocatedList(suQ);
+        List<SysUser> listSu = userService.selectAllocatedList(suQ);
         List<Teacher> listSt = new ArrayList<>(listSu.size());
         listSu.forEach(su -> {
             Teacher t = new Teacher();
@@ -104,26 +90,37 @@ public class TeacherService {
         // 分页
         PageUtils.startPage();
         suQ.setRoleId(Consts.ROLE_ID_TEACHER);
-        List<SysUser> listSu = sysUserService.selectAllocatedListV2(suQ);
+        List<SysUser> listSu = userService.selectAllocatedListV2(suQ);
         List<Teacher> listT = new ArrayList<>(listSu.size());
         listSu.forEach(su -> {
             Teacher t = new Teacher();
-            su.setPassword("~~~~");
             BeanUtils.copyProperties(su, t);
             listT.add(t);
         });
         return listT;
     }
 
-    public Teacher selectTeacherByUserId(Long userId) {
-        SysUser sysUser = userMapper.selectUserById(userId);
-        Teacher t = new Teacher();
-        // todo:用户角色判断。
-        // 屏蔽密码
-        if (Objects.nonNull(sysUser)) {
-            sysUser.setPassword("~~~~");
-            BeanUtils.copyProperties(sysUser, t);
+    public AjaxResult selectTeacherByUserId(Long userId) {
+        // 不校验数据权限
+        // userService.checkUserDataScope(userId);
+
+        AjaxResult ajax = AjaxResult.success();
+        List<SysRole> roles = roleService.selectRoleAll();
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("posts", postService.selectPostAll());
+        if (StringUtils.isNotNull(userId)) {
+            SysUser sysUser = userService.selectUserById(userId);
+            ajax.put(AjaxResult.DATA_TAG, sysUser);
+            ajax.put("postIds", postService.selectPostListByUserId(userId));
+            ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
         }
-        return t;
+        return ajax;
+//        Teacher t = new Teacher();
+//        // todo:用户角色判断。
+//        // 屏蔽密码
+//        if (Objects.nonNull(sysUser)) {
+//            BeanUtils.copyProperties(sysUser, t);
+//        }
+//        return t;
     }
 }