From 66a1fea480a81799d289b16c461662df1ccf6188 Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期四, 13 一月 2022 11:26:56 +0800
Subject: [PATCH] 路灯亮度控制
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 24 ++----------------------
1 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
index 7dad952..a35919b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
@@ -30,7 +30,7 @@
import com.sandu.ximon.dao.domain.LightTask;
import com.sandu.ximon.dao.domain.LightTaskPoleRelation;
import com.sandu.ximon.dao.domain.Pole;
-import com.sandu.ximon.dao.enums.IssueStatusEnums;
+import com.sandu.ximon.dao.enums.DeviceRespStatusEnums;
import com.sandu.ximon.dao.mapper.LightTaskMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -54,11 +54,8 @@
@AllArgsConstructor
public class LightTaskService extends BaseServiceImpl<LightTaskMapper, LightTask> {
-
- // private final LightTaskQuartzService lightTaskQuartzService;
private final PoleService poleService;
private final LightTaskPoleRelationService lightTaskPoleRelationService;
-
/**
* 鏂板璺伅浠诲姟
@@ -84,10 +81,6 @@
if (!save(lightTask)) {
throw new BusinessException("淇濆瓨璺伅浠诲姟澶辫触");
}
-// List<LightTaskQuartz> list = lightTaskQuartzService.addLightTaskQuartz(lightTask);
-// if (CollectionUtil.isEmpty(list)) {
-// throw new BusinessException("娣诲姞瀹氭椂浠诲姟澶辫触");
-// }
List<Long> poleIdList = param.getPoleIdList();
if (CollectionUtil.isNotEmpty(poleIdList)) {
@@ -129,11 +122,6 @@
if (!updateById(lightTask)) {
throw new BusinessException("缂栬緫浠诲姟澶辫触");
}
-
-// List<LightTaskQuartz> list = lightTaskQuartzService.updateLightTaskQuartz(lightTask);
-// if (CollectionUtil.isEmpty(list)) {
-// throw new BusinessException("缂栬緫瀹氭椂浠诲姟澶辫触");
-// }
List<Long> poleIdList = param.getPoleIdList();
if (CollectionUtil.isNotEmpty(poleIdList)) {
@@ -192,7 +180,6 @@
return page;
}
-
// 姣忎釜璺伅鍙戦�佹帶鍒跺抚 杩斿洖鍏宠仈鍒楄〃
private List<LightTaskPoleRelation> sendControllerFrame(LightTask lightTask, List<Long> poleIdList,String framePayload) {
List<LightTaskPoleRelation> lightTaskPoleRelationList = new ArrayList<>();
@@ -210,7 +197,7 @@
lightTaskPoleRelation.setPoleId(pole.getId());
lightTaskPoleRelation.setTaskId(lightTask.getTaskId());
if (a5LightTimerRespInnerFrame == null) {
- lightTaskPoleRelation.setIssueStatus(IssueStatusEnums.OTHER_ERROR.getCode());
+ lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
} else {
lightTaskPoleRelation.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame.getResponseStatus()));
}
@@ -235,11 +222,6 @@
if (!lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList))) {
throw new BusinessException("鍒犻櫎缁戝畾鐏潌澶辫触");
}
-
-// // 鍒犻櫎瀹氭椂鍣�
-// if (!lightTaskQuartzService.removeLightTaskQuartz(taskIdList)) {
-// throw new BusinessException("鍒犻櫎瀹氭椂鍣ㄥけ璐�");
-// }
return true;
}
@@ -307,8 +289,6 @@
/**
* 涓嬪彂鍗曚釜鐏潌鐨勪换鍔�
*
- * @param param
- * @return
*/
public boolean issueLightTask(LightTaskIssueParam param) {
LightTask lightTask = getById(param.getTaskId());
--
Gitblit v1.9.3