From d938c951a1669b4df877ffc6521aef17f0fac809 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 28 十月 2022 17:53:05 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 709 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 380 insertions(+), 329 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 b4bdff6..c528e04 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
@@ -2,10 +2,11 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.HexUtil;
import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
@@ -28,8 +29,9 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.TaskOrderUtil;
-import com.sandu.ximon.dao.bo.LightTaskPoleRelationBo;
-import com.sandu.ximon.dao.bo.LightTaskStatusAndPole;
+import com.sandu.ximon.admin.vo.LightTaskInfoVO;
+import com.sandu.ximon.admin.vo.LightTaskRelationVO;
+import com.sandu.ximon.admin.vo.LightTaskVO;
import com.sandu.ximon.dao.domain.LightEnergyData;
import com.sandu.ximon.dao.domain.LightTask;
import com.sandu.ximon.dao.domain.LightTaskPoleRelation;
@@ -37,7 +39,6 @@
import com.sandu.ximon.dao.enums.DeviceRespStatusEnums;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.LightTaskMapper;
-import com.sandu.ximon.dao.mapper.LightTaskPoleRelationMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -74,11 +75,14 @@
* @return
*/
@Transactional(rollbackFor = Exception.class)
- public String newAddLightTask(LightTaskParam param) {
+ public String AddLightTask(LightTaskParam param) {
if (StrUtil.length(param.getControlOrder()) % LightTaskParam.REQUEST_ORDER_LENGTH != 0) {
throw new BusinessException("鐏帶鍛戒护鏍煎紡涓嶆纭�");
}
-// LightTask lightTask = getById(null);
+
+ if (!"0001".equals(param.getLightAddress()) && !"0002".equals(param.getLightAddress())) {
+ throw new BusinessException("鐏ご鍦板潃鏍煎紡涓嶆纭�");
+ }
int week = 0;
@@ -89,7 +93,7 @@
LightTask newLightTask = new LightTask();
newLightTask.setTaskName(param.getTaskName());
- newLightTask.setClientId(clientService.getClientId());
+ newLightTask.setClientId(clientService.getClientId(SecurityUtils.getUserId()));
newLightTask.setUserId(SecurityUtils.getUserId());
newLightTask.setWeek(week);
@@ -105,43 +109,28 @@
throw new BusinessException("淇濆瓨璺伅浠诲姟澶辫触");
}
List<String> poleCodeList = new ArrayList<>();
- if (CollectionUtil.isNotEmpty(param.getPoleIdList())) {
- List<Pole> poleList = SpringContextHolder.getBean(PoleService.class).listByIds(param.getPoleIdList());
+ //浼犲叆鐨勭伅鏉唅d闆嗗悎
+ List<Long> poleIdList = new ArrayList<>();
+ //鍘婚噸
+ for (Long item : param.getPoleIdList()) {
+ if (!poleIdList.contains(item)) {
+ poleIdList.add(item);
+ }
+ }
+
+ if (CollectionUtil.isNotEmpty(poleIdList)) {
+ List<Pole> poleList = SpringContextHolder.getBean(PoleService.class).listByIds(poleIdList);
if (CollectionUtil.isNotEmpty(poleList)) {
poleCodeList = poleList.stream().map(Pole::getDeviceCode).collect(Collectors.toList());
}
}
- String content = "{浠诲姟ID锛�" + newLightTask.getTaskId() + "锛� 浠诲姟鍚嶏細" + newLightTask.getTaskName() + "}锛寋鍐呭抚鎸囦护" + newLightTask.getFramePayload() + "锛� 鐏潌ID锛�" + param.getPoleIdList().toString() + "锛� 鎺у埗鐨勭伅澶村湴鍧�锛�" + param.getLightAddress() + " }";
+ String content = "{浠诲姟ID锛�" + newLightTask.getTaskId() + "锛� 浠诲姟鍚嶏細" + newLightTask.getTaskName() + "}锛寋鍐呭抚鎸囦护" + newLightTask.getFramePayload() + "锛� 鐏潌ID锛�" + poleIdList.toString() + "锛� 鎺у埗鐨勭伅澶村湴鍧�锛�" + param.getLightAddress() + " }";
StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "鏂板璺伅浠诲姟", content);
- //浼犲叆鐨勭伅鏉唅d闆嗗悎
- List<Long> poleIdList = param.getPoleIdList();
//璁板綍杩欎簺鐏潌鍘熷厛鐨勪换鍔�
- List<LightTaskPoleRelation> oldLightTaskStatusAndPoles;
- if ("FFFF".equals(param.getLightAddress())) {
- oldLightTaskStatusAndPoles = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
- .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, "0001"));
- List<LightTaskPoleRelation> list = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
- .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, "0002"));
- oldLightTaskStatusAndPoles.addAll(list);
- } else {
- oldLightTaskStatusAndPoles = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
- .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
- }
-
- /**
- * 閲嶅浠诲姟鐨勭伅澶�
- */
- List<Long> taskIds = oldLightTaskStatusAndPoles.stream().map(LightTaskPoleRelation::getTaskId).collect(Collectors.toList());
- List<Long> poleIds = oldLightTaskStatusAndPoles.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());
- //poleIds涓噸澶嶅厓绱犲彧淇濈暀涓�涓�
- taskIds = taskIds.stream().distinct().collect(Collectors.toList());
- poleIds = poleIds.stream().distinct().collect(Collectors.toList());
- if (!oldLightTaskStatusAndPoles.isEmpty()) {
- throw new BusinessException("浠诲姟涓瓨鍦ㄥ凡鏈変换鍔＄殑鍗曠伅," + "浠诲姟id涓簕" + taskIds + "}, "
- + "鐏潌id涓簕" + poleIds + "}");
- }
+ List<LightTaskPoleRelation> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
+ .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
List<LightTaskPoleRelation> newPoleMap = new ArrayList<>();
@@ -151,46 +140,77 @@
}
+ newPoleMap.forEach(
+ commend -> {
+ //寮�鍏崇伅鏃堕棿
+ commend.setSysScheduled(JSON.toJSONString(newLightTask));
+ System.out.println(commend.getIssueStatus() + "鐘舵��");
+ if (commend.getIssueStatus() == 0) {
+ //涓嬪彂鎴愬姛 鏇存柊绯荤粺瀹氭椂鍜岀‖浠跺畾鏃�
+ commend.setDeviceScheduled(JSON.toJSONString(newLightTask));
+ } else {
+ //涓嬪彂澶辫触 鏇存柊绯荤粺瀹氭椂 淇濈暀纭欢瀹氭椂 纭欢瀹氭椂
+// commend.setSysScheduled(s);
+ oldLightTaskStatusAndPoles.forEach(task -> {
+ if (task.getLightAddress().equals(commend.getLightAddress()) && task.getDeviceCode().equals(commend.getDeviceCode())) {
+ //鍚屼竴涓伅澶�
+ commend.setDeviceScheduled(task.getDeviceScheduled());
+ }
+ });
+
+ }
+ }
+ );
+
/**
* 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍寮�濮�
*/
- String content1 = "{浠诲姟ID锛�" + newLightTask.getTaskId() + "锛� 浠诲姟鍚嶏細" + newLightTask.getTaskName() + "}," + " 鐏潌ID锛�" + param.getPoleIdList().toString() + " }";
+ String content1 = "{浠诲姟ID锛�" + newLightTask.getTaskId() + "锛� 浠诲姟鍚嶏細" + newLightTask.getTaskName() + "}," + " 鐏潌ID锛�" + poleIdList.toString() + " }";
StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "涓嬪彂璺伅浠诲姟", content1);
/**
* 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
*/
- List<LightTaskPoleRelation> all = new ArrayList<>();
- all.addAll(newPoleMap);
- int num = (int) newPoleMap.stream().filter(lightTaskPoleRelation -> lightTaskPoleRelation.getIssueStatus() != 0).count();
+ //鍒犻櫎鏃х殑鍏崇郴
+ lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
+ .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, newLightTask.getLightAdress()));
- //淇濆瓨鏂扮伅鏉嗕互鍙婃棫鐏潌瑕嗙洊鎴愬姛鐨勪换鍔″叧绯�
- if (!all.isEmpty()) {
- lightTaskPoleRelationService.saveBatch(all);
+ boolean b = true;
+ //淇濆瓨浠诲姟鍏崇郴
+ if (!newPoleMap.isEmpty()) {
+ b = lightTaskPoleRelationService.saveBatch(newPoleMap);
}
- if (!param.getPoleIdList().isEmpty() && num == newPoleMap.size()) {
+ if (!b) {
//鎵�鏈夌伅鏉嗛兘涓嬪彂澶辫触 鏂板鐨勪换鍔′笉淇濈暀
removeById(newLightTask);
throw new BusinessException("鎸囦护涓嬪彂澶辫触,璇锋鏌ョ伅鏉嗙姸鎬佸悗閲嶆柊鏂板浠诲姟");
} else {
return "浠诲姟鏂板鎴愬姛";
}
-
-
}
+ /**
+ * 缂栬緫璺伅浠诲姟
+ *
+ * @param taskId
+ * @param param
+ * @return
+ */
@Transactional(rollbackFor = Exception.class)
- public String updateLightTask(Long taskId, LightTaskParam param) {
+ public String newUpdateLightTask(Long taskId, LightTaskParam param) {
if (StrUtil.length(param.getControlOrder()) % LightTaskParam.REQUEST_ORDER_LENGTH != 0) {
throw new BusinessException("鐏帶鍛戒护鏍煎紡涓嶆纭�");
}
- LightTask lightTask = getById(taskId);
- if (lightTask == null) {
+ if (!"0001".equals(param.getLightAddress()) && !"0002".equals(param.getLightAddress())) {
+ throw new BusinessException("鐏ご鍦板潃鏍煎紡涓嶆纭�");
+ }
+ LightTask newLightTask = getById(taskId);
+ if (newLightTask == null) {
throw new BusinessException("鎵句笉鍒拌矾鐏换鍔�");
}
@@ -200,10 +220,9 @@
week |= w;
}
- LightTask newLightTask = new LightTask();
newLightTask.setTaskName(param.getTaskName());
- newLightTask.setClientId(clientService.getClientId());
+ newLightTask.setClientId(clientService.getClientId(SecurityUtils.getUserId()));
newLightTask.setUserId(SecurityUtils.getUserId());
newLightTask.setWeek(week);
@@ -215,56 +234,48 @@
newLightTask.setUpdateTime(LocalDateTime.now());
newLightTask.setFramePayload(buildControlFramePayload(param.getOpenOrder(), param.getCloseOrder(), param.getControlOrder(), week));
+ updateById(newLightTask);
//缂栬緫鍚庣伅鏉咺D闆嗗悎
- List<Long> poleIdList = param.getPoleIdList();
- if (poleIdList.isEmpty()) {
- throw new BusinessException("缂栬緫浠诲姟鏃惰閫夋嫨鐏潌");
+ List<Long> poleIdList = new ArrayList<>();
+ //鍘婚噸
+ for (Long item : param.getPoleIdList()) {
+ if (!poleIdList.contains(item)) {
+ poleIdList.add(item);
+ }
}
//璁板綍浠诲姟缂栬緫鍣ㄥ墠鐏潌ID闆嗗悎
- List<LightTaskStatusAndPole> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.listPoleAndStatusIdByTaskId(taskId);
- List<Long> oldList = oldLightTaskStatusAndPoles.stream().map(LightTaskStatusAndPole::getId).collect(Collectors.toList());
+// List<LightTaskStatusAndPole> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.listPoleAndStatusIdByTaskId(taskId);
+ List<LightTaskPoleRelation> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, taskId));
+ List<Long> oldList = oldLightTaskStatusAndPoles.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());
- //鍒ゆ柇param.getPoleIdList()涓槸鍚︽湁鏃х殑鐏潌ID (鐩存帴涓嬪彂)
- List<Long> newPoleIdList = param.getPoleIdList().stream().filter(poleId -> !oldList.contains(poleId)).collect(Collectors.toList());
- //鍒ゆ柇param.getPoleIdList()涓槸鍚︽湁鏂扮殑鐏潌ID (瑕嗙洊鎿嶄綔)
- List<Long> oldPoleIdList = param.getPoleIdList().stream().filter(poleId -> oldList.contains(poleId)).collect(Collectors.toList());
- //oldList涓湁鐨勭伅鏉咺D锛屼絾鏄痯aram.getPoleIdList()涓病鏈� (鍏崇伅鎿嶄綔)
- List<Long> closeLight = oldList.stream().filter(poleId -> !param.getPoleIdList().contains(poleId)).collect(Collectors.toList());
+ //鍒ゆ柇poleIdList涓槸鍚︽湁鏃х殑鐏潌ID (鐩存帴涓嬪彂)
+ List<Long> newPoleIdList = poleIdList.stream().filter(poleId -> !oldList.contains(poleId)).collect(Collectors.toList());
+ //鍒ゆ柇poleIdList涓槸鍚︽湁鏂扮殑鐏潌ID (瑕嗙洊鎿嶄綔)
+ List<Long> oldPoleIdList = poleIdList.stream().filter(poleId -> oldList.contains(poleId)).collect(Collectors.toList());
+
+
+ //oldList涓湁鐨勭伅鏉咺D锛屼絾鏄痯oleIdList涓病鏈� (鍏崇伅鎿嶄綔)
+ List<Long> closeLight = oldList.stream().filter(poleId -> !poleIdList.contains(poleId)).collect(Collectors.toList());
//鍙栧嚭瑕嗙洊鎿嶄綔鐨勫叧绯讳俊鎭�
//璁板綍杩欎簺鐏潌鍘熷厛鐨勪换鍔�
List<LightTaskPoleRelation> oldRelation = new ArrayList<>();
- if ("FFFF".equals(param.getLightAddress())) {
- // 鐏潌涓瓨鍦ㄥ叾浠栦换鍔＄殑鐏ご
- if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
- oldRelation = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldPoleIdList)
- .ne(LightTaskPoleRelation::getTaskId, taskId).eq(LightTaskPoleRelation::getLightAddress, "0001"));
- List<LightTaskPoleRelation> list = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldPoleIdList)
- .ne(LightTaskPoleRelation::getTaskId, taskId).eq(LightTaskPoleRelation::getLightAddress, "0002"));
- oldRelation.addAll(list);
- }
- } else {
- if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
- oldRelation = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldPoleIdList)
- .ne(LightTaskPoleRelation::getTaskId, taskId).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
- }
+
+ if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
+ List<Long> oldRelationList = new ArrayList<>();
+ oldRelationList.addAll(oldPoleIdList);
+ oldRelationList.addAll(closeLight);
+ oldRelation = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldRelationList)
+ .ne(LightTaskPoleRelation::getTaskId, taskId).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
}
- /**
- * 閲嶅浠诲姟鐨勭伅澶�
- */
- if (!oldRelation.isEmpty()) {
- List<Long> taskIds = oldRelation.stream().map(LightTaskPoleRelation::getTaskId).collect(Collectors.toList());
- List<Long> poleIds = oldRelation.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());
- //poleIds涓噸澶嶅厓绱犲彧淇濈暀涓�涓�
- taskIds = taskIds.stream().distinct().collect(Collectors.toList());
- poleIds = poleIds.stream().distinct().collect(Collectors.toList());
- throw new BusinessException("浠诲姟涓瓨鍦ㄥ凡鏈変换鍔＄殑鍗曠伅," + "浠诲姟id涓簕" + taskIds + "}, "
- + "鐏潌id涓簕" + poleIds + "}");
- }
+ //鍙栧嚭浠诲姟涓師鏈夌殑浠诲姟淇℃伅
+ List<LightTaskPoleRelation> relations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
+ .eq(LightTaskPoleRelation::getTaskId, taskId).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
+ relations.addAll(oldRelation);
List<LightTaskPoleRelation> newPoleAll = new ArrayList<>();
List<LightTaskPoleRelation> newPoleSuccess = new ArrayList<>();
@@ -273,10 +284,12 @@
//鏂扮伅鏉嗕笅鍙戞柊浠诲姟
Map<String, List<LightTaskPoleRelation>> newPoleMap = sendControllerFrame(newPoleIdList, newLightTask.getFramePayload(), param.getLightAddress());
- //newPoleAll闆嗗悎鍚庨潰鐢ㄤ簬瀛樺偍鍏崇郴琛�
- newPoleAll = newPoleMap.getOrDefault("all", new ArrayList<>());
- newPoleSuccess = newPoleMap.getOrDefault("success", new ArrayList<>());
- newPoleFail = newPoleMap.getOrDefault("fail", new ArrayList<>());
+ if (newPoleMap != null) {
+ //newPoleAll闆嗗悎鍚庨潰鐢ㄤ簬瀛樺偍鍏崇郴琛�
+ newPoleAll = newPoleMap.getOrDefault("all", new ArrayList<>());
+ newPoleSuccess = newPoleMap.getOrDefault("success", new ArrayList<>());
+ newPoleFail = newPoleMap.getOrDefault("fail", new ArrayList<>());
+ }
}
List<LightTaskPoleRelation> oldPoleFail = new ArrayList<>();
@@ -284,8 +297,10 @@
if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
//瑕嗙洊鎿嶄綔鐏潌
Map<String, List<LightTaskPoleRelation>> oldPoleMap = sendControllerFrame(oldPoleIdList, newLightTask.getFramePayload(), param.getLightAddress());
- oldPoleFail = oldPoleMap.getOrDefault("fail", new ArrayList<>());
- oldPoleSuccess = oldPoleMap.getOrDefault("success", new ArrayList<>());
+ if (oldPoleMap != null) {
+ oldPoleFail = oldPoleMap.getOrDefault("fail", new ArrayList<>());
+ oldPoleSuccess = oldPoleMap.getOrDefault("success", new ArrayList<>());
+ }
}
@@ -293,107 +308,117 @@
List<LightTaskPoleRelation> closePoleSuccess = new ArrayList<>();
System.out.println(closeLight + "closeLight");
if (CollectionUtil.isNotEmpty(closeLight) && closeLight != null && closeLight.get(0) != null) {
- //鍏崇伅鍐呭抚
- String framePayloadClose = "7F0000007F173B00";
+ //娓呴櫎甯ф寚浠�
+ String framePayloadClose = "";
//鍏崇伅鎿嶄綔鐏潌
Map<String, List<LightTaskPoleRelation>> closePoleMap = sendControllerFrame(closeLight, framePayloadClose, param.getLightAddress());
- closePoleFail = closePoleMap.getOrDefault("fail", new ArrayList<>());
- closePoleSuccess = closePoleMap.getOrDefault("success", new ArrayList<>());
- }
-
-
- if (closePoleFail.size() == 0) {
- //鏃т换鍔′腑鍏ㄩ儴鍙戦�佹寚浠ゆ垚鍔燂紝鏇存柊鍘熸湰浠诲姟涓殑鏁版嵁
- newLightTask.setTaskId(lightTask.getTaskId());
- updateById(newLightTask);
- } else {
- if (!newPoleSuccess.isEmpty()) {
- //鏈夊け鏁楃殑闇�瑕佷繚瀛樻棫鐨勪换鍕欙紝鏂板鏂扮殑浠诲姟鏁版嵁杩涜淇濆瓨
- save(newLightTask);
+ if (closePoleMap != null) {
+ closePoleFail = closePoleMap.getOrDefault("fail", new ArrayList<>());
+ closePoleSuccess = closePoleMap.getOrDefault("success", new ArrayList<>());
}
}
+
/**
* 缂栬緫璺伅浠诲姟鏃ュ織璁板綍寮�濮�
*/
List<String> poleCodeList = new ArrayList<>();
- if (CollectionUtil.isNotEmpty(param.getPoleIdList())) {
- List<Pole> poleList = SpringContextHolder.getBean(PoleService.class).listByIds(param.getPoleIdList());
+ if (CollectionUtil.isNotEmpty(poleIdList)) {
+ List<Pole> poleList = SpringContextHolder.getBean(PoleService.class).listByIds(poleIdList);
if (CollectionUtil.isNotEmpty(poleList)) {
poleCodeList = poleList.stream().map(Pole::getDeviceCode).collect(Collectors.toList());
}
}
- String content = "{浠诲姟ID锛�" + newLightTask.getTaskId() + "锛� 浠诲姟鍚嶏細" + newLightTask.getTaskName() + "}锛寋鍐呭抚鎸囦护" + newLightTask.getFramePayload() + "锛� 鐏潌ID锛�" + param.getPoleIdList().toString() + "锛� 鎺у埗鐨勭伅澶村湴鍧�锛�" + param.getLightAddress() + " }";
+ String content = "{浠诲姟ID锛�" + newLightTask.getTaskId() + "锛� 浠诲姟鍚嶏細" + newLightTask.getTaskName() + "}锛寋鍐呭抚鎸囦护" + newLightTask.getFramePayload() + "锛� 鐏潌ID锛�" + poleIdList.toString() + "锛� 鎺у埗鐨勭伅澶村湴鍧�锛�" + param.getLightAddress() + " }";
StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "缂栬緫璺伅浠诲姟", content);
/**
* 缂栬緫璺伅浠诲姟鏃ュ織璁板綍缁撴潫
*/
- for (LightTaskPoleRelation bean : newPoleSuccess) {
- bean.setTaskId(newLightTask.getTaskId());
- }
- //鎴愬姛鐢ㄦ柊鐨勪换鍔D
- for (LightTaskPoleRelation bean : oldPoleSuccess) {
- bean.setTaskId(newLightTask.getTaskId());
- }
- //澶辫触鐢ㄦ棫鐨勪换鍔D
- for (LightTaskPoleRelation bean : oldPoleFail) {
- bean.setTaskId(lightTask.getTaskId());
- }
-
- //澶辫触鐢ㄦ棫鐨勪换鍔D
- for (LightTaskPoleRelation bean : closePoleFail) {
- bean.setTaskId(lightTask.getTaskId());
- }
List<LightTaskPoleRelation> all = new ArrayList<>();
all.addAll(newPoleSuccess);
- all.addAll(oldPoleFail);
+ all.addAll(newPoleFail);
all.addAll(oldPoleSuccess);
all.addAll(oldPoleFail);
- all.addAll(closePoleFail);
- List<Long> allPoleId = new ArrayList<>();
- for (LightTaskPoleRelation bean : newPoleSuccess) {
- allPoleId.add(bean.getPoleId());
- }
- for (LightTaskPoleRelation bean : closePoleSuccess) {
- allPoleId.add(bean.getPoleId());
- }
- for (LightTaskPoleRelation bean : oldPoleSuccess) {
- allPoleId.add(bean.getPoleId());
- }
-
- if (!allPoleId.isEmpty()) {
- lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, allPoleId));
+ if (closePoleFail.size() != 0) {
+ List<LightTaskPoleRelation> colesFail = new ArrayList<>();
+ //鍘熸潵浠诲姟涓湰韬氨涓嬪彂澶辫触鐨勪换鍔� 鍗崇‖浠跺畾鏃朵负绌� 缂栬緫鍚庤繘琛屽叧鐏搷浣� 鍙洿鎺ュ墧闄や换鍔″叧绯�
+ closePoleFail.forEach(
+ close -> {
+ relations.forEach(
+ task -> {
+ System.out.println(task.getLightAddress().equals(close.getLightAddress()) + " addressResult");
+ System.out.println(close.getLightAddress() + " close.getLightAddress()");
+ if (task.getLightAddress().equals(close.getLightAddress()) && task.getDeviceCode().equals(close.getDeviceCode())
+ && task.getDeviceScheduled() != null && !task.getDeviceScheduled().isEmpty()) {
+ colesFail.add(close);
+ }
+ }
+ );
+ all.addAll(colesFail);
+ }
+ );
}
+
if (!all.isEmpty()) {
- lightTaskPoleRelationService.saveBatch(all);
+ List<LightTaskPoleRelation> finalOldRelation = relations;
+ all.forEach(
+ commend -> {
+ // 鏇存柊绯荤粺瀹氭椂
+ commend.setSysScheduled(JSON.toJSONString(newLightTask));
+ commend.setTaskId(taskId);
+ // 鍏堣缃‖浠跺畾鏃朵负涓婃鐨勭‖浠跺畾鏃� 涓嶈鎴愬姛澶辫触
+ finalOldRelation.forEach(task -> {
+ if (task.getLightAddress().equals(commend.getLightAddress()) && task.getDeviceCode().equals(commend.getDeviceCode())) {
+ //鍚屼竴涓伅澶�
+ commend.setDeviceScheduled(task.getDeviceScheduled());
+ if (commend.getIssueStatus() == 0) {
+ //涓嬪彂鎴愬姛 鏇存柊绯荤粺瀹氭椂鍜岀‖浠跺畾鏃�
+ commend.setDeviceScheduled(JSON.toJSONString(newLightTask));
+ }
+
+ }
+ });
+
+ }
+ );
+ }
+ boolean b = true;
+
+ //缂栬緫鍓嶅悗鎵�鏈夌殑鐏潌ID闆嗗悎
+ poleIdList.addAll(oldList);
+ //鍘婚噸
+ List<Long> collect = poleIdList.stream().distinct().collect(Collectors.toList());
+ if (!collect.isEmpty()) {
+ lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
+ .in(LightTaskPoleRelation::getPoleId, collect).eq(LightTaskPoleRelation::getLightAddress, newLightTask.getLightAdress()));
+
+ }
+
+
+ if (!all.isEmpty()) {
+ b = lightTaskPoleRelationService.saveBatch(all);
}
/**
* 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍寮�濮�
*/
- String content1 = "{浠诲姟ID锛�" + newLightTask.getTaskId() + "锛� 浠诲姟鍚嶏細" + newLightTask.getTaskName() + "}," + " 鐏潌ID锛�" + param.getPoleIdList().toString() + " }";
+ String content1 = "{浠诲姟ID锛�" + newLightTask.getTaskId() + "锛� 浠诲姟鍚嶏細" + newLightTask.getTaskName() + "}," + " 鐏潌ID锛�" + poleCodeList.toString() + " }";
StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "涓嬪彂璺伅浠诲姟", content1);
/**
* 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
*/
- if (newPoleFail.isEmpty() && closePoleFail.isEmpty() && oldPoleFail.isEmpty()) {
+ if (b) {
return "缂栬緫鎴愬姛";
- } else if (newPoleSuccess.isEmpty() && closePoleSuccess.isEmpty() && oldPoleSuccess.isEmpty()) {
- throw new BusinessException("缂栬緫澶辫触,璇锋鏌ュ師鏈夎澶囧拰缂栬緫鍚庣殑璁惧鏄惁鍦ㄧ嚎!");
- } else if (!closePoleFail.isEmpty() && !newPoleSuccess.isEmpty() && !oldPoleFail.isEmpty()) {
- return "鍘熶换鍔′腑瀛樺湪涓嬪彂寮傚父锛屽師浠诲姟淇濈暀锛屽垱寤烘柊浠诲姟杩涜淇濆瓨";
- } else if (!newPoleFail.isEmpty() && !newPoleSuccess.isEmpty()) {
- return "鏂颁换鍔′腑瀛樺湪涓嬪彂寮傚父锛屽拷鐣ュ紓甯告搷浣滅殑鐏潌";
} else {
- return "鎿嶄綔寮傚父";
+ return "缂栬緫澶辫触";
}
}
@@ -543,65 +568,26 @@
LightTaskPoleRelation lightTaskPoleRelation = new LightTaskPoleRelation();
lightTaskPoleRelation.setPoleId(pole.getId());
lightTaskPoleRelation.setTaskId(lightTask.getTaskId());
+
// rrpc 鍙戠敓瀹氭椂鍛戒护
- if ("FFFF".equals(lightAddress)) {
- LightTaskPoleRelation lightTaskPoleRelation01 = new LightTaskPoleRelation();
- lightTaskPoleRelation01.setPoleId(pole.getId());
- lightTaskPoleRelation01.setTaskId(lightTask.getTaskId());
- lightTaskPoleRelation01.setLightAddress("0001");
-
- LightTaskPoleRelation lightTaskPoleRelation02 = new LightTaskPoleRelation();
- lightTaskPoleRelation02.setPoleId(pole.getId());
- lightTaskPoleRelation02.setTaskId(lightTask.getTaskId());
- lightTaskPoleRelation02.setLightAddress("0002");
-
- // 鐏ご1 rrpc 鍙戠敓瀹氭椂鍛戒护
- try {
- A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame01 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0001");
- //鐏ご1
- if (a5LightTimerRespInnerFrame01 == null) {
- lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
- } else {
- lightTaskPoleRelation01.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame01.getResponseStatus()));
- }
-
- } catch (BusinessException e) {
- lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
- }
-
- // 鐏ご2 rrpc 鍙戠敓瀹氭椂鍛戒护
- try {
- A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame02 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0002");
- //鐏ご2
- if (a5LightTimerRespInnerFrame02 == null) {
- lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
- } else {
- lightTaskPoleRelation02.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame02.getResponseStatus()));
- }
-
- } catch (BusinessException e) {
- lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
- }
-
- lightTaskPoleRelationList.add(lightTaskPoleRelation01);
- lightTaskPoleRelationList.add(lightTaskPoleRelation02);
- } else {
- lightTaskPoleRelation.setLightAddress(lightAddress);
- // rrpc 鍙戠敓瀹氭椂鍛戒护
- try {
- A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame = sendTimeRRpc(framePayload, pole.getDeviceCode(), lightAddress);
- if (a5LightTimerRespInnerFrame == null) {
- lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
- } else {
- lightTaskPoleRelation.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame.getResponseStatus()));
- }
- } catch (BusinessException e) {
+ lightTaskPoleRelation.setDeviceCode(pole.getDeviceCode());
+ lightTaskPoleRelation.setLightAddress(lightAddress);
+ // rrpc 鍙戠敓瀹氭椂鍛戒护
+ try {
+ A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame = sendTimeRRpc(framePayload, pole.getDeviceCode(), lightAddress);
+ if (a5LightTimerRespInnerFrame == null) {
lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
+ } else {
+ lightTaskPoleRelation.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame.getResponseStatus()));
}
- lightTaskPoleRelationList.add(lightTaskPoleRelation);
+ } catch (BusinessException e) {
+ e.printStackTrace();
+ lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
}
-
+ lightTaskPoleRelationList.add(lightTaskPoleRelation);
}
+
+// }
return lightTaskPoleRelationList;
}
@@ -640,71 +626,25 @@
// rrpc 鍙戠敓瀹氭椂鍛戒护
- if ("FFFF".equals(lightAddress)) {
- LightTaskPoleRelation lightTaskPoleRelation01 = new LightTaskPoleRelation();
- lightTaskPoleRelation01.setPoleId(pole.getId());
- lightTaskPoleRelation01.setLightAddress("0001");
-
- LightTaskPoleRelation lightTaskPoleRelation02 = new LightTaskPoleRelation();
- lightTaskPoleRelation02.setPoleId(pole.getId());
- lightTaskPoleRelation02.setLightAddress("0002");
-
- // 鐏ご1 rrpc 鍙戠敓瀹氭椂鍛戒护
- try {
- A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame01 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0001");
- //鐏ご1
- if (a5LightTimerRespInnerFrame01 == null) {
- lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
- fail.add(lightTaskPoleRelation01);
- } else {
- lightTaskPoleRelation01.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame01.getResponseStatus()));
- success.add(lightTaskPoleRelation01);
- }
-
- } catch (BusinessException e) {
- lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
- fail.add(lightTaskPoleRelation01);
- }
-
- // 鐏ご2 rrpc 鍙戠敓瀹氭椂鍛戒护
- try {
- A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame02 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0002");
- //鐏ご2
- if (a5LightTimerRespInnerFrame02 == null) {
- lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
- fail.add(lightTaskPoleRelation02);
- } else {
- lightTaskPoleRelation02.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame02.getResponseStatus()));
- success.add(lightTaskPoleRelation02);
- }
-
- } catch (BusinessException e) {
- lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
- fail.add(lightTaskPoleRelation02);
- }
-
- lightTaskPoleRelationList.add(lightTaskPoleRelation01);
- lightTaskPoleRelationList.add(lightTaskPoleRelation02);
- } else {
- lightTaskPoleRelation.setLightAddress(lightAddress);
- // rrpc 鍙戠敓瀹氭椂鍛戒护
- try {
- A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame = sendTimeRRpc(framePayload, pole.getDeviceCode(), lightAddress);
- if (a5LightTimerRespInnerFrame == null) {
- lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
- fail.add(lightTaskPoleRelation);
- } else {
- lightTaskPoleRelation.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame.getResponseStatus()));
- success.add(lightTaskPoleRelation);
- }
- } catch (BusinessException e) {
+ lightTaskPoleRelation.setLightAddress(lightAddress);
+ lightTaskPoleRelation.setDeviceCode(pole.getDeviceCode());
+ // rrpc 鍙戠敓瀹氭椂鍛戒护
+ try {
+ A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame = sendTimeRRpc(framePayload, pole.getDeviceCode(), lightAddress);
+ if (a5LightTimerRespInnerFrame == null) {
lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
fail.add(lightTaskPoleRelation);
+ } else {
+ lightTaskPoleRelation.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame.getResponseStatus()));
+ success.add(lightTaskPoleRelation);
}
- lightTaskPoleRelationList.add(lightTaskPoleRelation);
+ } catch (BusinessException e) {
+ lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
+ fail.add(lightTaskPoleRelation);
}
-
+ lightTaskPoleRelationList.add(lightTaskPoleRelation);
}
+
map.put("success", success);
map.put("fail", fail);
map.put("all", lightTaskPoleRelationList);
@@ -714,43 +654,114 @@
@Transactional(rollbackFor = Exception.class)
- public boolean delLightTask(List<Long> taskIdList) {
- List<LightTask> lightTaskList = listByIds(taskIdList);
- if (CollectionUtil.isEmpty(lightTaskList)) {
+ public String delLightTask(Long taskId) {
+ LightTask byId = getById(taskId);
+ if (byId == null) {
throw new BusinessException("鎵句笉鍒颁换鍔′俊鎭�");
}
- List<LightTaskPoleRelation> list = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList));
- if (list.size() != 0) {
- throw new BusinessException("鍒犻櫎浠诲姟澶辫触锛屽垹闄ょ殑浠诲姟鏈夌伅鏉嗘鍦ㄤ娇鐢�");
- }
+ //鍙栧嚭浠诲姟鍏崇郴
+ List<LightTaskPoleRelation> relations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, taskId));
- // 鍒犻櫎浠诲姟
- if (!removeByIds(taskIdList)) {
- throw new BusinessException("鍒犻櫎浠诲姟澶辫触");
- }
+ //鍙栧嚭鐏潌id
+ List<Long> poleIds = relations.stream().map(LightTaskPoleRelation::getPoleId).distinct().collect(Collectors.toList());
- /**
- * 鍒犻櫎鎺х伅浠诲姟鏃ュ織璁板綍寮�濮�
- */
- String content = "{鎺х伅浠诲姟id锛�" + taskIdList + " }";
- StoreOperationRecordsUtils.storeOperationData(null, null, "鍒犻櫎鎺х伅浠诲姟", content);
- /**
- * 鍒犻櫎鎺х伅浠诲姟鏃ュ織璁板綍缁撴潫
- */
- return true;
+ if (poleIds != null && poleIds.size() > 0) {
+ //瀛樺湪浠诲姟鍏崇郴 涓嬪彂娓呴櫎浠诲姟鎸囦护
+ Map<String, List<LightTaskPoleRelation>> ffff = sendControllerFrame(poleIds, "", byId.getLightAdress());
+
+ if (ffff == null) {
+ throw new BusinessException("鍒犻櫎澶辫触");
+ }
+
+ /**
+ * 鍒犻櫎鎺х伅浠诲姟鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鎺х伅浠诲姟id锛�" + taskId + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鍒犻櫎鎺х伅浠诲姟", content);
+ /**
+ * 鍒犻櫎鎺х伅浠诲姟鏃ュ織璁板綍缁撴潫
+ */
+ if (ffff.get("fail").size() == 0) {
+ //鍏ㄩ儴娓呴櫎鎴愬姛 鍒犻櫎鍏ㄩ儴浠诲姟鍏崇郴
+ lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, taskId));
+ //鍒犻櫎浠诲姟
+ removeById(taskId);
+ return "浠诲姟鍒犻櫎鎴愬姛";
+ } else if (ffff.get("success").size() != ffff.get("all").size()) {
+ //閮ㄥ垎鎴愬姛 鍒犻櫎鎴愬姛閮ㄥ垎鐨勫叧绯� 淇濈暀浠诲姟
+ List<LightTaskPoleRelation> relations1 = ffff.get("success");
+ if (relations1 != null && relations1.size() > 0) {
+ relations1.forEach(lightTaskPoleRelation -> {
+ lightTaskPoleRelationService.remove(Wrappers.lambdaUpdate(LightTaskPoleRelation.class)
+ .eq(LightTaskPoleRelation::getPoleId, lightTaskPoleRelation.getPoleId()).eq(LightTaskPoleRelation::getTaskId, taskId));
+ });
+ }
+ return "閮ㄥ垎浠诲姟鍒犻櫎鎴愬姛,娓呴櫎浠诲姟澶辫触鐨勪换鍔″強鏁版嵁淇濈暀!";
+ } else if (ffff.get("fail").size() == ffff.get("all").size()) {
+ //鍏ㄩ儴澶辫触 淇濈暀浠诲姟
+ return "浠诲姟鍒犻櫎澶辫触 ,璇锋鏌ョ‖浠惰澶�!";
+ } else {
+ return "浠诲姟鍒犻櫎澶辫触,鏈煡閿欒绫诲瀷!";
+ }
+ } else {
+ //涓嶅瓨鍦ㄤ换鍔″叧绯� 绌轰换鍔＄洿鎺ュ垹闄�
+ removeById(taskId);
+ return "浠诲姟鍒犻櫎鎴愬姛";
+ }
}
/**
* 浠诲姟璇︽儏
*/
- public Map<Object, Object> detailLightTask(Long taskId) {
+ public Object detailLightTask(Long taskId) {
LightTask lightTask = getById(taskId);
if (lightTask == null) {
throw new BusinessException("鎵句笉鍒颁换鍔�");
}
- List<LightTaskStatusAndPole> lightTaskStatusAndPoles = lightTaskPoleRelationService.listPoleAndStatusIdByTaskId(taskId);
- return MapUtil.builder().put("task", lightTask).put("poles", lightTaskStatusAndPoles).build();
+ LightTaskInfoVO vo = new LightTaskInfoVO();
+
+// LightTaskDto lightTaskDto = new LightTaskDto();
+// BeanUtils.copyProperties(lightTask, lightTaskDto);
+
+ lightTask.setWeekList(TaskOrderUtil.parseLightWeek2List(lightTask.getWeek()));
+
+ vo.setLightTask(lightTask);
+ List<LightTaskRelationVO> relations = new ArrayList<>();
+ List<LightTaskPoleRelation> taskPoleRelations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
+ .eq(LightTaskPoleRelation::getTaskId, taskId));
+ if (taskPoleRelations != null && !taskPoleRelations.isEmpty()) {
+ taskPoleRelations.forEach(
+ relation -> {
+ LightTaskRelationVO lightTaskRelationVO = new LightTaskRelationVO();
+ lightTaskRelationVO.setLightAddress(relation.getLightAddress());
+ lightTaskRelationVO.setIssueStatus(relation.getIssueStatus());
+ lightTaskRelationVO.setPoleId(relation.getPoleId());
+ Pole byId = poleService.getById(relation.getPoleId());
+ if (byId != null) {
+ lightTaskRelationVO.setPoleName(byId.getPoleName());
+ }
+
+ LightTaskVO sys = JSONObject.parseObject(relation.getSysScheduled(), LightTaskVO.class);
+ sys.setWeekList(TaskOrderUtil.parseLightWeek2List(sys.getWeek()));
+ lightTaskRelationVO.setSysScheduled(sys);
+
+ LightTaskVO device = JSONObject.parseObject(relation.getDeviceScheduled(), LightTaskVO.class);
+ if (device != null) {
+ device.setWeekList(TaskOrderUtil.parseLightWeek2List(device.getWeek()));
+ lightTaskRelationVO.setDeviceScheduled(device);
+ }
+ relations.add(lightTaskRelationVO);
+ }
+ );
+
+ vo.setRelations(relations);
+ }
+
+// List<LightTaskStatusAndPole> lightTaskStatusAndPoles = lightTaskPoleRelationService.listPoleAndStatusIdByTaskId(taskId);
+
+// return MapUtil.builder().put("task", lightTask).put("poles", lightTaskStatusAndPoles).build();
+ return vo;
}
/**
@@ -805,11 +816,21 @@
* 涓嬪彂鍗曚釜鐏潌鐨勪换鍔�
*/
public boolean issueLightTask(LightTaskIssueParam param) {
- LightTask lightTask = getById(param.getTaskId());
+
+ LightTaskPoleRelation relation = lightTaskPoleRelationService.getOne(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
+ .eq(LightTaskPoleRelation::getPoleId, param.getPoleId()).eq(LightTaskPoleRelation::getTaskId, param.getTaskId()));
+
+ if (relation == null) {
+ throw new BusinessException("鎵句笉鍒颁换鍔″叧绯�,鏃犳硶琛ュ彂");
+ }
+ LightTask lightTask = JSONObject.parseObject(relation.getSysScheduled(), LightTask.class);
+// LightTask lightTask = getById(param.getTaskId());
if (lightTask == null) {
throw new BusinessException("鎵句笉鍒颁换鍔�");
}
+ //杞崲甯ф寚浠�
String framePayload = buildControlFramePayload(lightTask.getOpenOrder(), lightTask.getCloseOrder(), lightTask.getControlOrder(), lightTask.getWeek());
+ //鍙戦�乺rpc 寰楀埌鍙戦�佺粨鏋�
List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, ListUtil.toList(param.getPoleId()), framePayload, lightTask.getLightAdress());
/**
@@ -828,11 +849,17 @@
if (CollectionUtil.isNotEmpty(lightTaskPoleRelationList)) {
- return lightTaskPoleRelationService.update(lightTaskPoleRelationList.get(0), Wrappers.lambdaUpdate(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, param.getPoleId()).eq(LightTaskPoleRelation::getTaskId, param.getTaskId()));
+ LightTaskPoleRelation lightTaskPoleRelation = lightTaskPoleRelationList.get(0);
+ if (lightTaskPoleRelation.getIssueStatus() == 0) {
+ //涓嬪彂鎴愬姛 鏇存柊纭欢瀹氭椂 杩斿洖鎴愬姛
+ relation.setDeviceScheduled(JSON.toJSONString(lightTaskPoleRelation));
+ lightTaskPoleRelationService.updateById(relation);
+ return true;
+ } else {
+ return false;
+ }
}
-
-
- return true;
+ return false;
}
@@ -840,46 +867,31 @@
* 璁＄畻鍔熺巼鍙婅兘鑰�
*/
public void energy() {
- List<LightTask> lightTasks = list(Wrappers.lambdaQuery(LightTask.class));
- List<Long> taskIdList = new ArrayList<>();
- for (LightTask bean : lightTasks) {
- taskIdList.add(bean.getTaskId());
- }
- if (taskIdList.size() != 0) {
- List<LightTaskPoleRelationBo> list = SpringContextHolder.getBean(LightTaskPoleRelationMapper.class).test(taskIdList);
- for (LightTaskPoleRelationBo bean : list) {
+ //鎵�鏈夊瓨鍦ㄤ换鍔＄殑鐏潌鍏崇郴
+ List<LightTaskPoleRelation> list = lightTaskPoleRelationService.list();
+ for (LightTaskPoleRelation bean : list) {
+ if (bean.getDeviceScheduled() != null) {
+ //瀛樺湪纭欢浠诲姟
+ LightTask lightTask = JSONObject.parseObject(bean.getDeviceScheduled(), LightTask.class);
LightTaskDto lightTaskDto = new LightTaskDto();
- BeanUtils.copyProperties(bean, lightTaskDto);
- lightTaskDto.setWeekList(TaskOrderUtil.parseLightWeek2List(bean.getWeek()));
+ BeanUtils.copyProperties(lightTask, lightTaskDto);
+ lightTaskDto.setWeekList(TaskOrderUtil.parseLightWeek2List(lightTask.getWeek()));
BigDecimal energySaving;
BigDecimal energy;
//鑾峰彇鏄ㄥぉ鐨勬槦鏈熸暟
LocalDateTime now = LocalDateTime.now();
LocalDateTime yesterday = now.minusDays(1);
int week = yesterday.getDayOfWeek().getValue();
- if (!list.isEmpty()) {
- //鏈夌粦瀹氱伅鏉� 杩涜璁＄畻
- if (lightTaskDto.getWeekList().contains(week)) {
- //浠诲姟鏈夎鏄熸湡鏁� 璁＄畻
- energySaving = SpringContextHolder.getBean(LightService.class).jisuan(lightTaskDto);
- energy = SpringContextHolder.getBean(LightService.class).jisuanEnergy(lightTaskDto);
- } else {
- //浠诲姟鏃犺鏄熸湡鏁� 杩斿洖
- energySaving = new BigDecimal(1);
- energy = BigDecimal.ZERO;
- }
- for (int i = 0; i < list.size(); i++) {
- LightTaskPoleRelation relation = list.get(i);
- if (relation.getIssueStatus() != 0) {
- //浠诲姟涓嬪彂澶辫触 杩斿洖
- energySaving = new BigDecimal(1);
- energy = BigDecimal.ZERO;
- }
- }
+
+ if (lightTaskDto.getWeekList().contains(week)) {
+ //浠诲姟鏈夎鏄熸湡鏁� 璁＄畻
+ energySaving = SpringContextHolder.getBean(LightService.class).jisuan(lightTaskDto, bean);
+ energy = SpringContextHolder.getBean(LightService.class).jisuanEnergy(lightTaskDto, bean);
+ System.out.println("鑳借��: " + energy + ", 鑺傝兘鐜�: " + energySaving);
} else {
- //鏈粦瀹氱伅鏉� 鐩存帴杩斿洖
+ //浠诲姟鏃犺鏄熸湡鏁� 杩斿洖
energySaving = new BigDecimal(1);
energy = BigDecimal.ZERO;
}
@@ -888,19 +900,22 @@
* 瀛樺偍鏁版嵁
*/
+ System.out.println("鑳借��: " + energy + ", 鑺傝兘鐜�: " + energySaving);
LightEnergyData lightEnergyData = new LightEnergyData();
- lightEnergyData.setTaskId(bean.getTaskId());
+ lightEnergyData.setTaskId(lightTask.getTaskId());
lightEnergyData.setYtdTime(yesterday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
lightEnergyData.setEnergySaving(energySaving);
lightEnergyData.setEnergy(energy);
- lightEnergyData.setUserId(bean.getUserId());
- lightEnergyData.setClientId(bean.getClientId());
+ lightEnergyData.setLightAdderss(lightTask.getLightAdress());
+ lightEnergyData.setUserId(lightTask.getUserId());
+ lightEnergyData.setClientId(lightTask.getClientId());
lightEnergyData.setPoleId(bean.getPoleId());
//淇濆瓨鑳借�楁暟鎹埌鏁版嵁搴�
lightEnergyDataService.save(lightEnergyData);
}
-
}
+
+
}
public boolean clearLightTask(List<Long> poleIds) {
@@ -910,4 +925,40 @@
});
return true;
}
+
+
+ public Map checkTask(LightTaskParam param) {
+ /**
+ * 閲嶅浠诲姟鐨勭伅澶�
+ */
+ String lightAddress = param.getLightAddress();
+ List<Long> poleIdList = param.getPoleIdList();
+ List<LightTaskPoleRelation> lightTaskPoleRelations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
+ .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, lightAddress));
+ //閲嶅鐨勪换鍔d
+ List<Long> taskIds = lightTaskPoleRelations.stream().map(LightTaskPoleRelation::getTaskId).collect(Collectors.toList());
+ //閲嶅鐨勭伅鏉唅d
+ List<Long> oldPoleIds = lightTaskPoleRelations.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());
+ //鏈噸澶嶇殑鐏潌id
+ List<Long> finalOldPoleIds = oldPoleIds;
+ //鍙栧嚭瀛樺湪浜巔oleIdList鑰屼笉鍦╫ldPoleIds涓殑鐏潌
+ List<Long> newPoleIds = poleIdList.stream().filter(id -> !finalOldPoleIds.contains(id)).collect(Collectors.toList());
+
+ //閲嶅鍏冪礌鍙繚鐣欎竴涓�
+ taskIds = taskIds.stream().distinct().collect(Collectors.toList());
+ oldPoleIds = oldPoleIds.stream().distinct().collect(Collectors.toList());
+ newPoleIds = newPoleIds.stream().distinct().collect(Collectors.toList());
+ Map map = new HashMap();
+ if (!lightTaskPoleRelations.isEmpty()) {
+
+ map.put("result", "false");
+ map.put("newPoleIds", newPoleIds);
+ map.put("oldPoleIds", oldPoleIds);
+ map.put("taskIds", taskIds);
+ } else {
+ map.put("result", "true");
+ map.put("msg", "浠诲姟涓棤閲嶅鐏潌鍦板潃");
+ }
+ return map;
+ }
}
--
Gitblit v1.9.3