From bf5d9682beb8fa53c5adbd14bb3e458c1c859038 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 23 五月 2022 15:59:21 +0800
Subject: [PATCH] 单灯任务返回指令修改
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 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..ffbc777 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,7 +27,7 @@
@AllArgsConstructor
@RequestMapping("/v1/light/task")
public class LightTaskController {
-
+ private final LightEnergyDataService lightEnergyDataService;
private final LightTaskService lightTaskService;
private PermissionConfig permissionConfig;
@@ -45,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("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
@@ -71,12 +71,17 @@
if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- boolean result = lightTaskService.updateLightTask(taskId, param);
- if (result) {
+ int result = lightTaskService.updateLightTask(taskId, param);
+ if(result==0){
return ResponseUtil.success("缂栬緫鎴愬姛");
- } else {
- return ResponseUtil.fail("缂栬緫澶辫触");
+ }else if(result==1){
+ return ResponseUtil.success("鍘熶换鍔″瓨鍦ㄥ彂閫佹寚浠ゅ紓甯�,鏃т换鍔′繚鐣�,涓嬪彂鎴愬姛鐨勯儴鍒嗕繚瀛樿嚦瀵瑰簲鏂板浠诲姟");
+ }else if(result==2){
+ return ResponseUtil.fail("鍘熶换鍔″瓨鍦ㄥ彂閫佹寚浠ゅ紓甯�,浠诲姟涓嬪彂澶辫触,鏃т换鍔′繚鐣�");
+ }else {
+ return ResponseUtil.fail("鏈煡閿欒");
}
+
}
@GetMapping("/{taskId}")
@@ -90,6 +95,7 @@
/**
* 鍗曠伅涓嬪彂
+ *
* @param param
* @return
*/
@@ -105,4 +111,15 @@
return ResponseUtil.fail("涓嬪彂澶辫触");
}
}
+
+
+ @PostMapping("/energy")
+ public ResponseVO<Object> energy() {
+
+
+ lightTaskService.energy();
+ return ResponseUtil.success("lightEnergyDataService.energy(0)");
+ }
+
+
}
--
Gitblit v1.9.3