Merge branch 'dev' into dev-web

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

@@ -38,7 +38,7 @@ public class StudentController extends BaseController {
     @GetMapping("/list")
     @ApiOperation("[分页]查询学生列表")
     public TableDataInfo list(SysUser suQ) {
-        return getDataTable(studentService.list(suQ));
+        return getDataTable(studentService.list2(suQ));
     }
 
     // @GetMapping(value = "/letTry/{code}")
@@ -51,9 +51,8 @@ public class StudentController extends BaseController {
      * copy
      * 根据用户编号获取详细信息
      */
-    // @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping(value = "/{userId}")
-    @ApiOperation("根据userId获取详细信息")
+    @ApiOperation("根据userId获取学院详细信息")
     public AjaxResult getInfo(@PathVariable(value = "userId") Long userId) {
         // -------------------------------- tom add  --------------------------------
         // 覆盖data
@@ -62,7 +61,6 @@ public class StudentController extends BaseController {
         return success(studentService.selectStudentByUserId(userId));
     }
 
-    // @PreAuthorize("@ss.hasPermi('sim:student:query')")
 
     /**
      * 新增学生

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

@@ -35,16 +35,14 @@ public class TeacherController extends BaseController {
 
     @Autowired
     private ISysUserService userService;
-
     @Autowired
     private ISysRoleService roleService;
-
     @Autowired
     private ISysDeptService deptService;
-
     @Autowired
-    private ISysPostService postService;
-
+    private SysDeptMapper deptMapper;
+    @Autowired
+    private AddOnDeptService addOnDeptService;
     @Autowired
     private TeacherService teacherService;
 
@@ -55,10 +53,19 @@ public class TeacherController extends BaseController {
     }
 
     /**
-     * 新增教师
+     * copy
+     * 根据用户编号获取详细信息
      */
-    // @PreAuthorize("@ss.hasPermi('sim:teacher:add')")
-    // @Log(title = "用户管理", businessType = BusinessType.INSERT)
+    @GetMapping(value = "/{userId}")
+    @ApiOperation("根据userId获取教师详细信息")
+    public AjaxResult getInfo(@PathVariable(value = "userId") Long userId) {
+        // -------------------------------- tom add  --------------------------------
+        // 覆盖data
+        // ajax.put(AjaxResult.DATA_TAG, student);
+        // -------------------------------- tom add  --------------------------------
+        return success(teacherService.selectTeacherByUserId(userId));
+    }
+
     @PostMapping
     @ApiOperation("新增教师")
     public AjaxResult add(@Validated @RequestBody SysUser user) {
@@ -76,21 +83,16 @@ public class TeacherController extends BaseController {
         AjaxResult tempAjax = toAjax(userService.insertUser(user));
         // --------------------------------  --------------------------------
 
-        // 自动添加学生权限
-        SysUser find = userService.selectUserByUserName(user.getUserName());
-        logger.info(String.valueOf(find));
-        if (find != null) {
+        // 自动添加权限
+        SysUser suF = userService.selectUserByUserName(user.getUserName());
+        logger.info(String.valueOf(suF));
+        if (suF != null) {
             // roleService.insertAuthUsers(Consts.ROLE_ID_STUDENT, new Long[]{userId});
-            userService.insertUserAuth(find.getUserId(), new Long[]{Consts.ROLE_ID_TEACHER});
+            userService.insertUserAuth(suF.getUserId(), new Long[]{Consts.ROLE_ID_TEACHER});
         }
         return tempAjax;
     }
 
-    /**
-     * 修改教师
-     */
-    // @PreAuthorize("@ss.hasPermi('sim:teacher:edit')")
-    // @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation("修改教师")
     public AjaxResult edit(@Validated @RequestBody SysUser user) {
@@ -115,8 +117,6 @@ public class TeacherController extends BaseController {
     /**
      * 删除教师
      */
-    // @PreAuthorize("@ss.hasPermi('sim:teacher:remove')")
-    // @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
     @ApiOperation("删除教师")
     public AjaxResult remove(@PathVariable Long[] userIds) {
@@ -126,19 +126,11 @@ public class TeacherController extends BaseController {
         return toAjax(userService.deleteUserByIds(userIds));
     }
 
-    // @PreAuthorize("@ss.hasPermi('sim:teacher:resetPwd')")
-
-    @Autowired
-    private SysDeptMapper deptMapper;
-    @Autowired
-    private AddOnDeptService addOnDeptService;
-
     /**
      * 获取班级/部门列表
      *
      * @return
      */
-    //@PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/class-major/list")
     @ApiOperation("获取班级/部门列表")
     /**

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

@@ -75,11 +75,12 @@ public class StudentService {
      * @param suQ
      * @return
      */
-    public List<Student> list(SysUser suQ) {
+    public List<Student> list2(SysUser suQ) {
+        l.info("suQ:{}", suQ);
         // 分页
         PageUtils.startPage();
         suQ.setRoleId(Consts.ROLE_ID_STUDENT);
-        List<SysUser> listSu = sysUserService.selectAllocatedList(suQ);
+        List<SysUser> listSu = sysUserService.selectAllocatedListV2(suQ);
         List<Student> listSt = new ArrayList<>(listSu.size());
         listSu.forEach(su -> {
             Student st = new Student();

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

@@ -4,6 +4,8 @@ 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.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;
@@ -18,6 +20,7 @@ import org.springframework.stereotype.Service;
 import javax.validation.Validator;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 public class TeacherService {
@@ -102,13 +105,25 @@ public class TeacherService {
         PageUtils.startPage();
         suQ.setRoleId(Consts.ROLE_ID_TEACHER);
         List<SysUser> listSu = sysUserService.selectAllocatedListV2(suQ);
-        List<Teacher> listSt = new ArrayList<>(listSu.size());
+        List<Teacher> listT = new ArrayList<>(listSu.size());
         listSu.forEach(su -> {
             Teacher t = new Teacher();
             su.setPassword("~~~~");
             BeanUtils.copyProperties(su, t);
-            listSt.add(t);
+            listT.add(t);
         });
-        return listSt;
+        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);
+        }
+        return t;
     }
 }