From c060df1d22f23f059c03c432b6ff420bcb9801cf Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 18 五月 2022 15:41:41 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java
index fbcd48e..7fe4172 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java
@@ -3,15 +3,20 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
+import com.sandu.ximon.admin.dto.LightTaskDto;
import com.sandu.ximon.admin.param.LightTaskDelParam;
+import com.sandu.ximon.admin.param.LightTaskIssueParam;
import com.sandu.ximon.admin.param.LightTaskParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.LightTaskService;
import com.sandu.ximon.dao.domain.LightTask;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Map;
/**
* 璺伅浠诲姟鐩稿叧鎺у埗绫�
@@ -24,10 +29,13 @@
public class LightTaskController {
private final LightTaskService lightTaskService;
-
+ private PermissionConfig permissionConfig;
@PostMapping("/add")
public ResponseVO<Object> addLightTask(@RequestBody @Validated LightTaskParam param) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_TASK_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = lightTaskService.addLightTask(param);
if (result) {
return ResponseUtil.success("鏂板鎴愬姛");
@@ -37,13 +45,19 @@
}
@GetMapping("/list")
- public ResponseVO<Object> listLightTask(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword) {
- List<LightTask> taskList = lightTaskService.listLightTask(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword);
+ public ResponseVO<Object> listLightTask(BaseConditionVO conditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_TASK_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ List<LightTaskDto> taskList = lightTaskService.listLightTask(conditionVO, keyword);
return ResponseUtil.successPage(taskList);
}
@PostMapping("/del")
public ResponseVO<Object> delLightTask(@RequestBody @Validated LightTaskDelParam param) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_TASK_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = lightTaskService.delLightTask(param.getTaskIdList());
if (result) {
return ResponseUtil.success("鍒犻櫎鎴愬姛");
@@ -54,6 +68,9 @@
@PostMapping("/update/{taskId}")
public ResponseVO<Object> updateLightTask(@PathVariable Long taskId, @RequestBody @Validated LightTaskParam param) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = lightTaskService.updateLightTask(taskId, param);
if (result) {
return ResponseUtil.success("缂栬緫鎴愬姛");
@@ -61,4 +78,32 @@
return ResponseUtil.fail("缂栬緫澶辫触");
}
}
+
+ @GetMapping("/{taskId}")
+ public ResponseVO<Object> detailLightTask(@PathVariable Long taskId) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_TASK_DETAIL.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ Map<Object, Object> objectObjectMap = lightTaskService.detailLightTask(taskId);
+ return ResponseUtil.success(objectObjectMap);
+ }
+
+ /**
+ * 鍗曠伅涓嬪彂
+ *
+ * @param param
+ * @return
+ */
+ @PostMapping("/issue")
+ public ResponseVO<Object> issueLightTask(@RequestBody @Validated LightTaskIssueParam param) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_TASK_ISSUE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ boolean result = lightTaskService.issueLightTask(param);
+ if (result) {
+ return ResponseUtil.success("涓嬪彂鎴愬姛");
+ } else {
+ return ResponseUtil.fail("涓嬪彂澶辫触");
+ }
+ }
}
--
Gitblit v1.9.3