From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java | 82 ++++++++++++++++++++++++++++------------
1 files changed, 57 insertions(+), 25 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..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;
@@ -8,15 +9,14 @@
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;
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Map;
/**
* 璺伅浠诲姟鐩稿叧鎺у埗绫�
@@ -27,7 +27,7 @@
@AllArgsConstructor
@RequestMapping("/v1/light/task")
public class LightTaskController {
-
+ private final LightEnergyDataService lightEnergyDataService;
private final LightTaskService lightTaskService;
private PermissionConfig permissionConfig;
@@ -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(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,25 +67,38 @@
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.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));
}
/**
* 鍗曠伅涓嬪彂
+ *
* @param param
* @return
*/
@@ -105,4 +114,27 @@
return ResponseUtil.fail("涓嬪彂澶辫触");
}
}
+
+
+ @PostMapping("/energy")
+ public ResponseVO<Object> energy() {
+
+
+ lightTaskService.energy();
+ return ResponseUtil.success("lightEnergyDataService.energy(0)");
+ }
+
+
+ @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