From 1b4274e27a60892492195e7e3a4b820dcd2b6be5 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 28 九月 2022 14:16:15 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java | 60 +++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 39 insertions(+), 21 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 559f77e..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,8 +1,8 @@
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.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.LightTaskDto;
import com.sandu.ximon.admin.param.LightTaskDelParam;
@@ -17,7 +17,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Map;
/**
* 璺伅浠诲姟鐩稿叧鎺у埗绫�
@@ -37,23 +36,18 @@
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));
}
- @AnonymousAccess
+
@GetMapping("/list")
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("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
-// }
+ if (!permissionConfig.check(MenuEnum.LIGHT_TASK_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
List<LightTaskDto> taskList = lightTaskService.listLightTask(conditionVO, keyword, order, seq);
return ResponseUtil.successPage(taskList);
}
@@ -63,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}")
@@ -76,18 +67,33 @@
if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) {
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));
}
/**
@@ -119,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