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/TSubjectController.java | 45 +++++++--------------------------------------
1 files changed, 7 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/controller/TSubjectController.java b/src/main/java/com/ots/project/exam/controller/TSubjectController.java
index 878c023..35434bf 100644
--- a/src/main/java/com/ots/project/exam/controller/TSubjectController.java
+++ b/src/main/java/com/ots/project/exam/controller/TSubjectController.java
@@ -1,5 +1,4 @@
package com.ots.project.exam.controller;
-
import com.ots.common.utils.poi.ExcelUtil;
import com.ots.framework.aspectj.lang.annotation.Log;
import com.ots.framework.aspectj.lang.enums.BusinessType;
@@ -13,32 +12,20 @@
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
-
import java.util.List;
-/**
- * 缁村害琛–ontroller
- *
- * @author ots
- * @date 2019-12-09
- */
@Controller
@RequestMapping("/exam/subject")
public class TSubjectController extends BaseController {
private String prefix = "exam/subject";
-
@Autowired
private ITSubjectService tSubjectService;
-
@RequiresPermissions("exam:subject:view")
@GetMapping()
public String subject() {
return prefix + "/subject";
}
-
- /**
- * 鏌ヨ缁村害琛ㄥ垪琛�
- */
+
@RequiresPermissions("exam:subject:list")
@PostMapping("/list")
@ResponseBody
@@ -47,10 +34,7 @@
List<TSubject> list = tSubjectService.selectTSubjectList(tSubject);
return getDataTable(list);
}
-
- /**
- * 瀵煎嚭缁村害琛ㄥ垪琛�
- */
+
@RequiresPermissions("exam:subject:export")
@PostMapping("/export")
@ResponseBody
@@ -59,18 +43,12 @@
ExcelUtil<TSubject> util = new ExcelUtil<TSubject>(TSubject.class);
return util.exportExcel(list, "subject");
}
-
- /**
- * 鏂板缁村害琛�
- */
+
@GetMapping("/add")
public String add() {
return prefix + "/add";
}
-
- /**
- * 鏂板淇濆瓨缁村害琛�
- */
+
@RequiresPermissions("exam:subject:add")
@Log(title = "缁村害琛�", businessType = BusinessType.INSERT)
@PostMapping("/add")
@@ -78,20 +56,14 @@
public AjaxResult addSave(TSubject tSubject) {
return toAjax(tSubjectService.insertTSubject(tSubject));
}
-
- /**
- * 淇敼缁村害琛�
- */
+
@GetMapping("/edit/{id}")
public String edit(@PathVariable("id") Long id, ModelMap mmap) {
TSubject tSubject = tSubjectService.selectTSubjectById(id);
mmap.put("tSubject", tSubject);
return prefix + "/edit";
}
-
- /**
- * 淇敼淇濆瓨缁村害琛�
- */
+
@RequiresPermissions("exam:subject:edit")
@Log(title = "缁村害琛�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@@ -99,10 +71,7 @@
public AjaxResult editSave(TSubject tSubject) {
return toAjax(tSubjectService.updateTSubject(tSubject));
}
-
- /**
- * 鍒犻櫎缁村害琛�
- */
+
@RequiresPermissions("exam:subject:remove")
@Log(title = "缁村害琛�", businessType = BusinessType.DELETE)
@PostMapping("/remove")
--
Gitblit v1.9.1