From 75072002f353a34ca0de4f8aaad04c8d1841407c Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 27 五月 2022 17:57:22 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java | 81 +++++++++++++++++++++++++++++++++++-----
1 files changed, 71 insertions(+), 10 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 4db6fe7..4eb169c 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
@@ -5,9 +5,12 @@
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.LightEnergyDataService;
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.*;
@@ -24,12 +27,15 @@
@AllArgsConstructor
@RequestMapping("/v1/light/task")
public class LightTaskController {
-
+ private final LightEnergyDataService lightEnergyDataService;
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("鏂板鎴愬姛");
@@ -39,13 +45,22 @@
}
@GetMapping("/list")
- public ResponseVO<Object> listLightTask(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword) {
- List<LightTaskDto> taskList = lightTaskService.listLightTask(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword);
+ public ResponseVO<Object> listLightTask(BaseConditionVO conditionVO,
+ @RequestParam(value = "keyword", required = false) String keyword,
+ @RequestParam(value = "order", required = false) Integer order,
+ @RequestParam(value = "seq", required = false) Integer seq) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_TASK_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ List<LightTaskDto> taskList = lightTaskService.listLightTask(conditionVO, keyword, order, seq);
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("鍒犻櫎鎴愬姛");
@@ -56,17 +71,63 @@
@PostMapping("/update/{taskId}")
public ResponseVO<Object> updateLightTask(@PathVariable Long taskId, @RequestBody @Validated LightTaskParam param) {
- boolean result = lightTaskService.updateLightTask(taskId, param);
- if (result) {
- return ResponseUtil.success("缂栬緫鎴愬姛");
- } else {
- return ResponseUtil.fail("缂栬緫澶辫触");
+ if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
+// int result = lightTaskService.updateLightTask(taskId, param);
+// if (result == 0) {
+// return ResponseUtil.success("鍏ㄩ儴鎴愬姛");
+// } else if (result == 1) {
+// return ResponseUtil.success("鍏ㄩ儴澶辫触");
+// } else if (result == 2) {
+// return ResponseUtil.fail("鍙湁鏃т换鍔�");
+// } else if (result == 3) {
+// return ResponseUtil.fail("閮ㄥ垎鎴愬姛锛岄儴鍒嗗け璐�");
+// } else {
+// return ResponseUtil.fail("鏈煡閿欒");
+// }
+
+ String result = lightTaskService.updateLightTask(taskId, param);
+ return ResponseUtil.success(result);
+
}
@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("涓嬪彂澶辫触");
+ }
+ }
+
+
+ @PostMapping("/energy")
+ public ResponseVO<Object> energy() {
+
+
+ lightTaskService.energy();
+ return ResponseUtil.success("lightEnergyDataService.energy(0)");
+ }
+
+
}
--
Gitblit v1.9.3