From 769de3cf6acba41be898dbfda57228f89a98a985 Mon Sep 17 00:00:00 2001 From: cjw Date: Thu, 30 May 2024 14:04:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=9C=B0=E5=9D=80=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0school=EF=BC=9B=E6=95=99=E8=81=8C=E5=B7=A5=E6=9D=83?= =?UTF-8?q?=E9=99=90=E8=B7=AF=E5=BE=84=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 +- .../file/controller/SysTeacherController.java | 40 ++++++++++++------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index fe5b211..03de2c4 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -25,7 +25,7 @@ server: port: 8080 servlet: # 应用的访问路径 - context-path: / + context-path: /school # undertow 配置 undertow: # HTTP post内容的最大大小。当值为-1时,默认值为大小是无限的 diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysTeacherController.java b/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysTeacherController.java index 1ae5b84..11c2145 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysTeacherController.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysTeacherController.java @@ -32,28 +32,38 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/file/teacher") +@RequestMapping("/teacher") public class SysTeacherController extends BaseController { - private final ISysTeacherService sysTeacherService; + private final ISysTeacherService teacherService; /** * 查询教职工信息列表 */ - @SaCheckPermission("file:teacher:list") - @GetMapping("/list") + @SaCheckPermission("school:teacher:pageList") + @GetMapping("/pageList") public TableDataInfo list(SysTeacherBo bo, PageQuery pageQuery) { - return sysTeacherService.queryPageList(bo, pageQuery); + return teacherService.queryPageList(bo, pageQuery); + } + + /** + * 查询教职工信息列表 + */ + @SaCheckPermission("school:teacher:list") + @GetMapping("/list") + public R> list(SysTeacherBo bo) { + List list = teacherService.queryList(bo); + return R.ok(list); } /** * 导出教职工信息列表 */ - @SaCheckPermission("file:teacher:export") + @SaCheckPermission("school:teacher:export") @Log(title = "教职工信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(SysTeacherBo bo, HttpServletResponse response) { - List list = sysTeacherService.queryList(bo); + List list = teacherService.queryList(bo); ExcelUtil.exportExcel(list, "教职工信息", SysTeacherVo.class, response); } @@ -62,33 +72,33 @@ public class SysTeacherController extends BaseController { * * @param teacherId 主键 */ - @SaCheckPermission("file:teacher:query") + @SaCheckPermission("school:teacher:query") @GetMapping("/{teacherId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long teacherId) { - return R.ok(sysTeacherService.queryById(teacherId)); + return R.ok(teacherService.queryById(teacherId)); } /** * 新增教职工信息 */ - @SaCheckPermission("file:teacher:add") + @SaCheckPermission("school:teacher:add") @Log(title = "教职工信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() public R add(@Validated(AddGroup.class) @RequestBody SysTeacherBo bo) { - return toAjax(sysTeacherService.insertByBo(bo)); + return toAjax(teacherService.insertByBo(bo)); } /** * 修改教职工信息 */ - @SaCheckPermission("file:teacher:edit") + @SaCheckPermission("school:teacher:edit") @Log(title = "教职工信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() public R edit(@Validated(EditGroup.class) @RequestBody SysTeacherBo bo) { - return toAjax(sysTeacherService.updateByBo(bo)); + return toAjax(teacherService.updateByBo(bo)); } /** @@ -96,11 +106,11 @@ public class SysTeacherController extends BaseController { * * @param teacherIds 主键串 */ - @SaCheckPermission("file:teacher:remove") + @SaCheckPermission("school:teacher:remove") @Log(title = "教职工信息", businessType = BusinessType.DELETE) @DeleteMapping("/{teacherIds}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] teacherIds) { - return toAjax(sysTeacherService.deleteWithValidByIds(List.of(teacherIds), true)); + return toAjax(teacherService.deleteWithValidByIds(List.of(teacherIds), true)); } }