From 9c492592e4360d1a517d75847e9049e0cc1a3b2c Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 23 六月 2022 17:16:36 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 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 8d80cd3..559f77e 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
@@ -2,14 +2,15 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
+import com.sandu.common.security.annotation.AnonymousAccess;
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;
@@ -27,7 +28,7 @@
@AllArgsConstructor
@RequestMapping("/v1/light/task")
public class LightTaskController {
-
+ private final LightEnergyDataService lightEnergyDataService;
private final LightTaskService lightTaskService;
private PermissionConfig permissionConfig;
@@ -44,12 +45,16 @@
}
}
+ @AnonymousAccess
@GetMapping("/list")
- public ResponseVO<Object> listLightTask(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword) {
- if (!permissionConfig.check(MenuEnum.LIGHT_TASK_LIST.getCode())) {
- return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
- }
- List<LightTaskDto> taskList = lightTaskService.listLightTask(conditionVO, 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);
}
@@ -71,12 +76,9 @@
if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- boolean result = lightTaskService.updateLightTask(taskId, param);
- if (result) {
- return ResponseUtil.success("缂栬緫鎴愬姛");
- } else {
- return ResponseUtil.fail("缂栬緫澶辫触");
- }
+ String result = lightTaskService.updateLightTask(taskId, param);
+ return ResponseUtil.success(result);
+
}
@GetMapping("/{taskId}")
@@ -90,6 +92,7 @@
/**
* 鍗曠伅涓嬪彂
+ *
* @param param
* @return
*/
@@ -105,4 +108,15 @@
return ResponseUtil.fail("涓嬪彂澶辫触");
}
}
+
+
+ @PostMapping("/energy")
+ public ResponseVO<Object> energy() {
+
+
+ lightTaskService.energy();
+ return ResponseUtil.success("lightEnergyDataService.energy(0)");
+ }
+
+
}
--
Gitblit v1.9.3