From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001 From: linzhijie <19970921lzj> Date: 星期一, 12 四月 2021 15:44:53 +0800 Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua --- src/main/java/com/ots/project/exam/controller/EntTestSendtaskMailController.java | 44 +++++++------------------------------------- 1 files changed, 7 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/ots/project/exam/controller/EntTestSendtaskMailController.java b/src/main/java/com/ots/project/exam/controller/EntTestSendtaskMailController.java index daca0fb..50a3e5c 100644 --- a/src/main/java/com/ots/project/exam/controller/EntTestSendtaskMailController.java +++ b/src/main/java/com/ots/project/exam/controller/EntTestSendtaskMailController.java @@ -1,5 +1,4 @@ package com.ots.project.exam.controller; - import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -19,31 +18,20 @@ import com.ots.framework.web.page.TableDataInfo; import org.springframework.stereotype.Controller; -/** - * 閭閫�淇¤褰旵ontroller - * - * @author ots - * @date 2020-03-09 - */ @Controller @RequestMapping("/exam/mail") public class EntTestSendtaskMailController extends BaseController { private String prefix = "exam/mail"; - @Autowired private IEntTestSendtaskMailService entTestSendtaskMailService; - @RequiresPermissions("exam:mail:view") @GetMapping() public String mail() { return prefix + "/mail"; } - - /** - * 鏌ヨ閭閫�淇¤褰曞垪琛� - */ + @RequiresPermissions("exam:mail:list") @PostMapping("/list") @ResponseBody @@ -53,10 +41,7 @@ List<EntTestSendtaskMail> list = entTestSendtaskMailService.selectEntTestSendtaskMailList(entTestSendtaskMail); return getDataTable(list); } - - /** - * 瀵煎嚭閭閫�淇¤褰曞垪琛� - */ + @RequiresPermissions("exam:mail:export") @PostMapping("/export") @ResponseBody @@ -66,19 +51,13 @@ ExcelUtil<EntTestSendtaskMail> util = new ExcelUtil<EntTestSendtaskMail>(EntTestSendtaskMail.class); return util.exportExcel(list, "mail"); } - - /** - * 鏂板閭閫�淇¤褰� - */ + @GetMapping("/add") public String add() { return prefix + "/add"; } - - /** - * 鏂板淇濆瓨閭閫�淇¤褰� - */ + @RequiresPermissions("exam:mail:add") @Log(title = "閭閫�淇¤褰�", businessType = BusinessType.INSERT) @PostMapping("/add") @@ -87,10 +66,7 @@ { return toAjax(entTestSendtaskMailService.insertEntTestSendtaskMail(entTestSendtaskMail)); } - - /** - * 淇敼閭閫�淇¤褰� - */ + @GetMapping("/edit/{id}") public String edit(@PathVariable("id") Long id, ModelMap mmap) { @@ -98,10 +74,7 @@ mmap.put("entTestSendtaskMail", entTestSendtaskMail); return prefix + "/edit"; } - - /** - * 淇敼淇濆瓨閭閫�淇¤褰� - */ + @RequiresPermissions("exam:mail:edit") @Log(title = "閭閫�淇¤褰�", businessType = BusinessType.UPDATE) @PostMapping("/edit") @@ -110,10 +83,7 @@ { return toAjax(entTestSendtaskMailService.updateEntTestSendtaskMail(entTestSendtaskMail)); } - - /** - * 鍒犻櫎閭閫�淇¤褰� - */ + @RequiresPermissions("exam:mail:remove") @Log(title = "閭閫�淇¤褰�", businessType = BusinessType.DELETE) @PostMapping( "/remove") -- Gitblit v1.9.1