From ea8e8e7dd5f10cff4054f5fde8fd3961aaac1834 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 14 十月 2022 16:55:30 +0800
Subject: [PATCH] 大气设备农耕
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java | 72 ++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 31 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 b54b5cb..27fc02c 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
@@ -1,6 +1,7 @@
package com.sandu.ximon.admin.controller;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.LightTaskDto;
@@ -16,7 +17,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Map;
/**
* 璺伅浠诲姟鐩稿叧鎺у埗绫�
@@ -36,20 +36,19 @@
if (!permissionConfig.check(MenuEnum.LIGHT_TASK_ADD.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- boolean result = lightTaskService.addLightTask(param);
- if (result) {
- return ResponseUtil.success("鏂板鎴愬姛");
- } else {
- return ResponseUtil.fail("鏂板澶辫触");
- }
+ return ResponseUtil.success(lightTaskService.AddLightTask(param));
}
+
@GetMapping("/list")
- public ResponseVO<Object> listLightTask(BaseConditionVO conditionVO, @RequestParam(value = "keyword", required = false) String 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);
+ List<LightTaskDto> taskList = lightTaskService.listLightTask(conditionVO, keyword, order, seq);
return ResponseUtil.successPage(taskList);
}
@@ -58,12 +57,9 @@
if (!permissionConfig.check(MenuEnum.LIGHT_TASK_DELETE.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- boolean result = lightTaskService.delLightTask(param.getTaskIdList());
- if (result) {
- return ResponseUtil.success("鍒犻櫎鎴愬姛");
- } else {
- return ResponseUtil.fail("鍒犻櫎澶辫触");
- }
+ String result = lightTaskService.delLightTask(param.getTaskId());
+ return ResponseUtil.success(result);
+
}
@PostMapping("/update/{taskId}")
@@ -71,31 +67,33 @@
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);
+ String result = lightTaskService.newUpdateLightTask(taskId, param);
return ResponseUtil.success(result);
}
+
+ /**
+ * 娓呴櫎浠诲姟
+ *
+ * @param
+ * @return
+ */
+// @PostMapping("/clear")
+// public ResponseVO<Object> clearLightTask(@RequestBody List<Long> poleIds) {
+// if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) {
+// return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+// }
+// boolean result = lightTaskService.clearLightTask(poleIds);
+// 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);
+
+ return ResponseUtil.success(lightTaskService.detailLightTask(taskId));
}
/**
@@ -127,4 +125,16 @@
}
+ @PostMapping("/check")
+ public ResponseVO<Object> checkTask(@RequestBody LightTaskParam param) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ if (!"0001".equals(param.getLightAddress()) && !"0002".equals(param.getLightAddress())) {
+ throw new BusinessException("鐏ご鍦板潃鏍煎紡涓嶆纭�");
+ }
+ return ResponseUtil.success(lightTaskService.checkTask(param));
+
+ }
+
}
--
Gitblit v1.9.3