소스 검색

改造学生列表调用方式。

tom 5 달 전
부모
커밋
95dfbd1f23

+ 11 - 16
ruoyi-sim/src/main/java/com/ruoyi/sim/controller/StudentController.java

@@ -2,29 +2,24 @@ package com.ruoyi.sim.controller;
 
 import com.ruoyi.common.core.controller.BaseController;
 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.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.sim.domain.Student;
-import com.ruoyi.sim.service.impl.Consts;
+import com.ruoyi.sim.constant.Consts;
 import com.ruoyi.sim.service.impl.StudentService;
 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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 @Api("学生Controller")
 @RestController
@@ -33,16 +28,10 @@ public class StudentController extends BaseController {
 
     @Autowired
     private ISysUserService userService;
-
     @Autowired
     private ISysRoleService roleService;
-
     @Autowired
     private ISysDeptService deptService;
-
-    @Autowired
-    private ISysPostService postService;
-
     @Autowired
     private StudentService studentService;
 
@@ -61,6 +50,12 @@ public class StudentController extends BaseController {
         return getDataTable(list);
     }
 
+    @GetMapping(value = "/letTry/{code}")
+    @ApiOperation("letTry")
+    public void letTry(@PathVariable(value = "code") int code) {
+        studentService.letTry(code);
+    }
+
     /**
      * copy
      * 根据用户编号获取详细信息
@@ -101,11 +96,11 @@ public class StudentController extends BaseController {
         // --------------------------------  --------------------------------
 
         // 自动添加学生权限
-        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_STUDENT});
+            userService.insertUserAuth(suF.getUserId(), new Long[]{Consts.ROLE_ID_STUDENT});
         }
         return tempAjax;
     }

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

@@ -10,7 +10,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.sim.domain.Clazz;
 import com.ruoyi.sim.domain.Major;
 import com.ruoyi.sim.service.impl.AddOnDeptService;
-import com.ruoyi.sim.service.impl.Consts;
+import com.ruoyi.sim.constant.Consts;
 import com.ruoyi.sim.service.impl.TeacherService;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.service.ISysDeptService;

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

@@ -2,12 +2,15 @@ package com.ruoyi.sim.service.impl;
 
 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.AddOnDept;
 import com.ruoyi.sim.domain.Major;
 import com.ruoyi.sim.domain.Student;
 import com.ruoyi.system.mapper.*;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -22,7 +25,7 @@ import java.util.Objects;
 @Service
 public class StudentService {
 
-    private static final Logger log = LoggerFactory.getLogger(StudentService.class);
+    private static final Logger l = LoggerFactory.getLogger(StudentService.class);
 
     @Autowired
     private SysUserMapper userMapper;
@@ -31,21 +34,6 @@ public class StudentService {
     private SysRoleMapper roleMapper;
 
     @Autowired
-    private SysPostMapper postMapper;
-
-    @Autowired
-    private SysUserRoleMapper userRoleMapper;
-
-    @Autowired
-    private SysUserPostMapper userPostMapper;
-
-    @Autowired
-    private ISysConfigService configService;
-
-    @Autowired
-    private ISysDeptService deptService;
-
-    @Autowired
     private AddOnDeptService addOnDeptService;
 
     @Autowired
@@ -54,6 +42,9 @@ public class StudentService {
     @Autowired
     protected Validator validator;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
     // @DataScope(deptAlias = "d", userAlias = "u")
     public List<Student> selectStudentList() {
         SysUser su = new SysUser();
@@ -79,6 +70,55 @@ public class StudentService {
         return list2;
     }
 
+    public void letTry(int code) {
+        List<SysUser> list = null;
+        switch (code) {
+            case 1: {
+                SysUser su = new SysUser();
+                list = userMapper.selectUserList(su);
+            }
+            break;
+            case 2: {
+                PageUtils.startPage();
+                SysUser su = new SysUser();
+                list = userMapper.selectUserList(su);
+            }
+            break;
+            case 3: {
+                list = sysUserService.selectUserList(new SysUser());
+            }
+            break;
+            case 4: {
+                PageUtils.startPage();
+                list = sysUserService.selectUserList(new SysUser());
+            }
+            break;
+            case 5: {
+                list = sysUserService.selectAllocatedList(new SysUser());
+            }
+            break;
+            case 6: {
+                PageUtils.startPage();
+                SysUser su = new SysUser();
+                su.setRoleId(Consts.ROLE_ID_STUDENT);
+                list = sysUserService.selectAllocatedList(su);
+            }
+            break;
+            case 7: {
+                list = sysUserService.selectUnallocatedList(new SysUser());
+            }
+            break;
+            case 8: {
+                PageUtils.startPage();
+                list = sysUserService.selectUnallocatedList(new SysUser());
+            }
+            break;
+        }
+        for (SysUser o : list) {
+            l.info(o.toString());
+        }
+    }
+
 
     public Student selectStudentByUserId(Long userId) {
         SysUser sysUser = userMapper.selectUserById(userId);

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

@@ -2,6 +2,7 @@ package com.ruoyi.sim.service.impl;
 
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.sim.constant.Consts;
 import com.ruoyi.system.mapper.*;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysDeptService;