Merge branch 'dev-api' into dev

ruoyi-sim/src/main/java/TaskController.java

@@ -0,0 +1,13 @@
+import com.ruoyi.common.core.controller.BaseController;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api("任务Controller")
+@RestController
+@RequestMapping("/sim/task")
+public class TaskController extends BaseController {
+
+
+    // @PreAuthorize("@ss.hasPermi('sim:task:list')")
+}

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

@@ -51,7 +51,7 @@ public class StudentController extends BaseController {
      * @param user
      * @return
      */
-    // @PreAuthorize("@ss.hasPermi('system:user:list')")
+    // @PreAuthorize("@ss.hasPermi('sim:student:list')")
     @GetMapping("/list")
     @ApiOperation("查询学生列表")
     public TableDataInfo list() {
@@ -60,10 +60,13 @@ public class StudentController extends BaseController {
         return getDataTable(list);
     }
 
+
+    // @PreAuthorize("@ss.hasPermi('sim:student:query')")
+
     /**
      * 新增学生
      */
-    // @PreAuthorize("@ss.hasPermi('system:user:add')")
+    // @PreAuthorize("@ss.hasPermi('sim:student:add')")
     // @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation("新增学生")
@@ -95,7 +98,7 @@ public class StudentController extends BaseController {
     /**
      * 修改学生
      */
-    // @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    // @PreAuthorize("@ss.hasPermi('sim:student:edit')")
     // @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation("修改学生")
@@ -121,7 +124,7 @@ public class StudentController extends BaseController {
     /**
      * 删除学生
      */
-    // @PreAuthorize("@ss.hasPermi('system:user:remove')")
+    // @PreAuthorize("@ss.hasPermi('sim:student:remove')")
     // @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
     @ApiOperation("删除学生")

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

@@ -0,0 +1,32 @@
+package com.ruoyi.sim.controller;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.sim.domain.Major;
+import com.ruoyi.sim.service.IMajorService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Api("TaskController")
+@RestController
+@RequestMapping("/sim/task")
+public class TaskController extends BaseController {
+
+    @Autowired
+    private IMajorService majorService;
+
+    @GetMapping("/list")
+    @PreAuthorize("@ss.hasPermi('sim:task:list')")
+    public TableDataInfo list(Major major) {
+        startPage();
+        List<Major> list = majorService.selectMajorList(major);
+        return getDataTable(list);
+    }
+}

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

@@ -50,7 +50,7 @@ public class TeacherController extends BaseController {
      * @param user
      * @return
      */
-    // @PreAuthorize("@ss.hasPermi('system:user:list')")
+    // @PreAuthorize("@ss.hasPermi('sim:teacher:list')")
     @GetMapping("/list")
     @ApiOperation("查询教师列表")
     public TableDataInfo list() {
@@ -59,10 +59,12 @@ public class TeacherController extends BaseController {
         return getDataTable(list);
     }
 
+    // @PreAuthorize("@ss.hasPermi('sim:teacher:query')")
+
     /**
      * 新增教师
      */
-    // @PreAuthorize("@ss.hasPermi('system:user:add')")
+    // @PreAuthorize("@ss.hasPermi('sim:teacher:add')")
     // @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation("新增教师")
@@ -94,7 +96,7 @@ public class TeacherController extends BaseController {
     /**
      * 修改教师
      */
-    // @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    // @PreAuthorize("@ss.hasPermi('sim:teacher:edit')")
     // @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation("修改教师")
@@ -120,7 +122,7 @@ public class TeacherController extends BaseController {
     /**
      * 删除教师
      */
-    // @PreAuthorize("@ss.hasPermi('system:user:remove')")
+    // @PreAuthorize("@ss.hasPermi('sim:teacher:remove')")
     // @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
     @ApiOperation("删除教师")
@@ -132,4 +134,6 @@ public class TeacherController extends BaseController {
         }
         return toAjax(userService.deleteUserByIds(userIds));
     }
+
+    // @PreAuthorize("@ss.hasPermi('sim:teacher:resetPwd')")
 }