From 75173289ebdf9d710d6c89c3cff82e4b5aac99f2 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 22 九月 2022 16:52:41 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 0c9c0fe..52366f0 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;
@@ -37,7 +37,7 @@
if (!permissionConfig.check(MenuEnum.LIGHT_TASK_ADD.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.success(lightTaskService.newAddLightTask(param));
+ return ResponseUtil.success(lightTaskService.AddLightTask(param));
}
@@ -58,12 +58,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.getTaskIdList());
+ return ResponseUtil.success(result);
+
}
@PostMapping("/update/{taskId}")
@@ -71,7 +68,7 @@
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);
}
@@ -79,6 +76,7 @@
/**
* 娓呴櫎浠诲姟
+ *
* @param
* @return
*/
@@ -129,4 +127,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