From a1c416b13a71c293c3430f2c9cbce97ee96085ba Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 26 五月 2022 17:06:12 +0800
Subject: [PATCH] 节目推送结果
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 8 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 27e5a79..b54b5cb 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
@@ -8,8 +8,8 @@
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;
@@ -27,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("鏂板鎴愬姛");
@@ -42,7 +45,7 @@
}
@GetMapping("/list")
- public ResponseVO<Object> listLightTask(BaseConditionVO conditionVO, @RequestParam(required = false) String 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("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
@@ -52,6 +55,9 @@
@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("鍒犻櫎鎴愬姛");
@@ -62,22 +68,47 @@
@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("涓嬪彂鎴愬姛");
@@ -85,4 +116,15 @@
return ResponseUtil.fail("涓嬪彂澶辫触");
}
}
+
+
+ @PostMapping("/energy")
+ public ResponseVO<Object> energy() {
+
+
+ lightTaskService.energy();
+ return ResponseUtil.success("lightEnergyDataService.energy(0)");
+ }
+
+
}
--
Gitblit v1.9.3