From 62f6ac3b8ad64b1d66abda5474467f5733de9755 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 23 五月 2022 14:39:26 +0800
Subject: [PATCH] 单灯任务
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 530 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 488 insertions(+), 42 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 d17178b..53f2370 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
@@ -11,7 +11,9 @@
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.dto.LightTaskDto;
import com.sandu.ximon.admin.dto.SingleLightOrderDto;
import com.sandu.ximon.admin.manager.iot.frame.FrameBuilder;
@@ -25,8 +27,10 @@
import com.sandu.ximon.admin.param.LightTaskIssueParam;
import com.sandu.ximon.admin.param.LightTaskParam;
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.LightTaskStatusAndPole;
+import com.sandu.ximon.dao.domain.LightEnergyData;
import com.sandu.ximon.dao.domain.LightTask;
import com.sandu.ximon.dao.domain.LightTaskPoleRelation;
import com.sandu.ximon.dao.domain.Pole;
@@ -38,11 +42,11 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @author chenjiantian
@@ -56,6 +60,9 @@
private final PoleService poleService;
private final LightTaskPoleRelationService lightTaskPoleRelationService;
+ private final LightTaskMapper lightTaskMapper;
+ private final ClientService clientService;
+ private final LightEnergyDataService lightEnergyDataService;
/**
* 鏂板璺伅浠诲姟
@@ -70,9 +77,13 @@
week |= w;
}
LightTask lightTask = new LightTask();
- lightTask.setClientId(SecurityUtils.getClientId());
+ if (SecurityUtils.getClientId() != null) {
+ lightTask.setClientId(clientService.getClientId());
+ lightTask.setUserId(SecurityUtils.getUserId());
+ }
lightTask.setTaskName(param.getTaskName());
lightTask.setWeek(week);
+ lightTask.setLightAdress(param.getLightAddress());
lightTask.setCloseOrder(param.getCloseOrder());
lightTask.setOpenOrder(param.getOpenOrder());
lightTask.setControlOrder(param.getControlOrder());
@@ -82,10 +93,27 @@
throw new BusinessException("淇濆瓨璺伅浠诲姟澶辫触");
}
+
+ /**
+ * 鏂板璺伅浠诲姟鏃ュ織璁板綍寮�濮�
+ */
+ List<String> poleCodeList = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(param.getPoleIdList())) {
+ List<Pole> poleList = SpringContextHolder.getBean(PoleService.class).listByIds(param.getPoleIdList());
+ if (CollectionUtil.isNotEmpty(poleList)) {
+ poleCodeList = poleList.stream().map(Pole::getDeviceCode).collect(Collectors.toList());
+ }
+ }
+ String content = "{浠诲姟ID锛�" + lightTask.getTaskId() + "锛� 浠诲姟鍚嶏細" + lightTask.getTaskName() + "}锛寋鍐呭抚鎸囦护" + lightTask.getFramePayload() + "锛� 鐏潌ID锛�" + param.getPoleIdList().toString() + "锛� 鎺у埗鐨勭伅澶村湴鍧�锛�" + param.getLightAddress() + " }";
+ StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "鏂板璺伅浠诲姟", content);
+ /**
+ * 鏂板璺伅浠诲姟鏃ュ織璁板綍缁撴潫
+ */
+
List<Long> poleIdList = param.getPoleIdList();
if (CollectionUtil.isNotEmpty(poleIdList)) {
- List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, poleIdList, lightTask.getFramePayload());
+ List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, poleIdList, lightTask.getFramePayload(), param.getLightAddress());
// 娣诲姞缁戝畾鐏潌
if (!lightTaskPoleRelationService.saveBatch(lightTaskPoleRelationList)) {
@@ -94,6 +122,16 @@
// 涓�涓伅鏉嗗彧鑳戒娇鐢ㄤ竴涓换鍔★紝鏂颁换鍔¤瑕嗙洊鏃т换鍔�
lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList).ne(LightTaskPoleRelation::getTaskId, lightTask.getTaskId()));
+
+ /**
+ * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍寮�濮�
+ */
+
+ String content1 = "{浠诲姟ID锛�" + lightTask.getTaskId() + "锛� 浠诲姟鍚嶏細" + lightTask.getTaskName() + "}," + " 鐏潌ID锛�" + param.getPoleIdList().toString() + " }";
+ StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "涓嬪彂璺伅浠诲姟", content1);
+ /**
+ * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
+ */
}
return true;
}
@@ -107,39 +145,304 @@
if (lightTask == null) {
throw new BusinessException("鎵句笉鍒拌矾鐏换鍔�");
}
+
+
+ //璁板綍浠诲姟缂栬緫鍣ㄥ墠鐏潌ID
+ List<LightTaskStatusAndPole> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.listPoleAndStatusIdByTaskId(taskId);
+
+
int week = 0;
for (Integer w : param.getWeekList()) {
week |= w;
}
- lightTask.setTaskName(param.getTaskName());
- lightTask.setWeek(week);
- lightTask.setControlOrder(param.getControlOrder());
- lightTask.setOpenOrder(param.getOpenOrder());
- lightTask.setCloseOrder(param.getCloseOrder());
- lightTask.setUpdateTime(LocalDateTime.now());
- lightTask.setFramePayload(buildControlFramePayload(param.getOpenOrder(), param.getCloseOrder(), param.getControlOrder(), week));
- if (!updateById(lightTask)) {
+ LightTask newLightTask = new LightTask();
+ newLightTask.setTaskName(param.getTaskName());
+ if (SecurityUtils.getClientId() != null) {
+ lightTask.setClientId(clientService.getClientId());
+ lightTask.setUserId(SecurityUtils.getUserId());
+ }
+ newLightTask.setWeek(week);
+ newLightTask.setCreateUser(SecurityUtils.getUsername());
+ newLightTask.setControlOrder(param.getControlOrder());
+ newLightTask.setOpenOrder(param.getOpenOrder());
+ newLightTask.setCloseOrder(param.getCloseOrder());
+ newLightTask.setLightAdress(param.getLightAddress());
+ newLightTask.setUpdateTime(LocalDateTime.now());
+ newLightTask.setFramePayload(buildControlFramePayload(param.getOpenOrder(), param.getCloseOrder(), param.getControlOrder(), week));
+
+ if (!save(newLightTask)) {
throw new BusinessException("缂栬緫浠诲姟澶辫触");
}
+ /**
+ * 缂栬緫璺伅浠诲姟鏃ュ織璁板綍寮�濮�
+ */
+// List<String> poleCodeList = new ArrayList<>();
+// if (CollectionUtil.isNotEmpty(param.getPoleIdList())) {
+// List<Pole> poleList = SpringContextHolder.getBean(PoleService.class).listByIds(param.getPoleIdList());
+// 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()
+// + " }";
+// StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "缂栬緫璺伅浠诲姟", content);
+ /**
+ * 缂栬緫璺伅浠诲姟鏃ュ織璁板綍缁撴潫
+ */
+
List<Long> poleIdList = param.getPoleIdList();
if (CollectionUtil.isNotEmpty(poleIdList)) {
+ List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(newLightTask, poleIdList, lightTask.getFramePayload(), param.getLightAddress());
+ //鐘舵�佷笉涓�0 鏂板缓浠诲姟
+ lightTaskPoleRelationList.forEach(taskResult -> {
+ //淇濆瓨涓嬪彂澶辫触鐨勪换鍔″叧鑱斿叧绯伙紝鐘舵�佷负O鎴愬姛锛屽叾浠栫姸鎬侀兘涓哄け璐�
+ if (taskResult.getIssueStatus() == 0) {
+ for (LightTaskStatusAndPole bean : oldLightTaskStatusAndPoles) {
+ if (bean.getId().equals(taskResult.getPoleId())) {
+ oldLightTaskStatusAndPoles.remove(bean);
+ break;
+ }
+ }
+ }
+ });
+ //淇敼鐏潌浠诲姟缁戝畾鍏崇郴琛�
+ for (LightTaskPoleRelation bean : lightTaskPoleRelationList) {
+ LightTaskPoleRelation one = lightTaskPoleRelationService.getOne(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, bean.getPoleId()));
- List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, poleIdList, lightTask.getFramePayload());
+ //鎴愬姛鎵嶄慨鏀癸紝澶辫触涓嶅彉
+ if (bean.getIssueStatus() == 0) {
+ if (one != null) {
+ one.setTaskId(newLightTask.getTaskId());
+ lightTaskPoleRelationService.updateById(one);
+ } else {
+ lightTaskPoleRelationService.save(bean);
+ }
+ } else {
+ if (one == null) {
+ lightTaskPoleRelationService.save(bean);
+ }
- lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, lightTask.getTaskId()));
- // 娣诲姞缁戝畾鐏潌
- if (!lightTaskPoleRelationService.saveBatch(lightTaskPoleRelationList)) {
- throw new BusinessException("缁戝畾鐏潌澶辫触");
+ }
}
- // 涓�涓伅鏉嗗彧鑳戒娇鐢ㄤ竴涓换鍔★紝鏂颁换鍔¤瑕嗙洊鏃т换鍔�
- lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList).ne(LightTaskPoleRelation::getTaskId, lightTask.getTaskId()));
+ List<Long> failPoleId = new ArrayList<>();
+ for (LightTaskStatusAndPole bean1 : oldLightTaskStatusAndPoles) {
+ failPoleId.add(bean1.getId());
+ }
+ //鎵ц鍏崇伅
+ String framePayloadClose = "7f0000007f173b00";
+
+ List<LightTaskPoleRelation> lightTaskPoleRelations = new ArrayList<>();
+ if (!failPoleId.isEmpty()) {
+ lightTaskPoleRelations = sendControllerFrame(lightTask, failPoleId, framePayloadClose, lightTask.getLightAdress());
+ }
+
+ //鐘舵�佷笉涓�0 鏂板缓浠诲姟
+ lightTaskPoleRelations.forEach(taskResult -> {
+ //淇濆瓨涓嬪彂澶辫触鐨勪换鍔″叧鑱斿叧绯伙紝鐘舵�佷负O鎴愬姛锛屽叾浠栫姸鎬侀兘涓哄け璐�
+ if (taskResult.getIssueStatus() == 0) {
+ for (LightTaskStatusAndPole bean : oldLightTaskStatusAndPoles) {
+ if (bean.getId().equals(taskResult.getPoleId())) {
+ oldLightTaskStatusAndPoles.remove(bean);
+ lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, lightTask.getTaskId()).eq(LightTaskPoleRelation::getPoleId, bean.getId()));
+ break;
+ }
+ }
+ }
+ });
+
+
+ //浠诲姟椤哄埄瀹屾垚
+ if (oldLightTaskStatusAndPoles.size() == 0) {
+ removeById(lightTask);
+ }
+
+
+// // 娣诲姞缁戝畾鐏潌
+// if (!lightTaskPoleRelationService.saveBatch(lightTaskPoleRelationList)) {
+// throw new BusinessException("缁戝畾鐏潌澶辫触");
+// }
+//
+// // 涓�涓伅鏉嗗彧鑳戒娇鐢ㄤ竴涓换鍔★紝鏂颁换鍔¤瑕嗙洊鏃т换鍔�
+// lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList).ne(LightTaskPoleRelation::getTaskId, lightTask.getTaskId()));
+
+ /**
+ * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍寮�濮�
+ */
+
+// String content1 = "{浠诲姟ID锛�" + lightTask.getTaskId()
+// + "锛� 浠诲姟鍚嶏細" + lightTask.getTaskName()
+// + "}," + " 鐏潌ID锛�" + param.getPoleIdList().toString()
+// + " }";
+// StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "涓嬪彂璺伅浠诲姟", content1);
+ /**
+ * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
+ */
}
return true;
}
+
+
+ @Transactional(rollbackFor = Exception.class)
+ public boolean 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) {
+ throw new BusinessException("鎵句笉鍒拌矾鐏换鍔�");
+ }
+
+
+ int week = 0;
+ for (Integer w : param.getWeekList()) {
+ week |= w;
+ }
+
+ LightTask newLightTask = new LightTask();
+ newLightTask.setTaskName(param.getTaskName());
+ if (SecurityUtils.getClientId() != null) {
+ lightTask.setClientId(clientService.getClientId());
+ lightTask.setUserId(SecurityUtils.getUserId());
+ }
+ newLightTask.setWeek(week);
+ newLightTask.setCreateUser(SecurityUtils.getUsername());
+ newLightTask.setControlOrder(param.getControlOrder());
+ newLightTask.setOpenOrder(param.getOpenOrder());
+ newLightTask.setCloseOrder(param.getCloseOrder());
+ newLightTask.setLightAdress(param.getLightAddress());
+ newLightTask.setUpdateTime(LocalDateTime.now());
+ newLightTask.setFramePayload(buildControlFramePayload(param.getOpenOrder(), param.getCloseOrder(), param.getControlOrder(), week));
+
+// if (!save(newLightTask)) {
+// throw new BusinessException("缂栬緫浠诲姟澶辫触");
+// }
+
+ /**
+ * 缂栬緫璺伅浠诲姟鏃ュ織璁板綍寮�濮�
+ */
+// List<String> poleCodeList = new ArrayList<>();
+// if (CollectionUtil.isNotEmpty(param.getPoleIdList())) {
+// List<Pole> poleList = SpringContextHolder.getBean(PoleService.class).listByIds(param.getPoleIdList());
+// 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()
+// + " }";
+// StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "缂栬緫璺伅浠诲姟", content);
+ /**
+ * 缂栬緫璺伅浠诲姟鏃ュ織璁板綍缁撴潫
+ */
+
+ //缂栬緫鍚庣伅鏉咺D闆嗗悎
+ List<Long> poleIdList = param.getPoleIdList();
+ //璁板綍浠诲姟缂栬緫鍣ㄥ墠鐏潌ID闆嗗悎
+ List<LightTaskStatusAndPole> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.listPoleAndStatusIdByTaskId(taskId);
+ List<Long> oldList = oldLightTaskStatusAndPoles.stream().map(LightTaskStatusAndPole::getId).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());
+
+
+ if (CollectionUtil.isNotEmpty(poleIdList)) {
+ List<LightTaskPoleRelation> newPoleAll = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(newPoleIdList)) {
+ //鏂扮伅鏉嗕笅鍙戞柊浠诲姟
+ Map<String, List<LightTaskPoleRelation>> newPoleMap = sendControllerFrame(newPoleIdList, lightTask.getFramePayload(), param.getLightAddress());
+
+ //newPoleAll闆嗗悎鍚庨潰鐢ㄤ簬瀛樺偍鍏崇郴琛�
+ newPoleAll = newPoleMap.getOrDefault("all", new ArrayList<>());
+ }
+
+ List<LightTaskPoleRelation> oldPoleFail = new ArrayList<>();
+ List<LightTaskPoleRelation> oldPoleSuccess = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
+ //瑕嗙洊鎿嶄綔鐏潌
+ Map<String, List<LightTaskPoleRelation>> oldPoleMap = sendControllerFrame(oldPoleIdList, lightTask.getFramePayload(), param.getLightAddress());
+ oldPoleFail = oldPoleMap.getOrDefault("fail", new ArrayList<>());
+ }
+
+ List<LightTaskPoleRelation> closePoleFail = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(closeLight)) {
+ //鎵ц鍏崇伅鍐呭抚
+ String framePayloadClose = "7f0000007f173b00";
+ //瑕嗙洊鎿嶄綔鐏潌
+ Map<String, List<LightTaskPoleRelation>> closePoleMap = sendControllerFrame(closeLight, framePayloadClose, param.getLightAddress());
+ closePoleFail = closePoleMap.getOrDefault("fail", new ArrayList<>());
+ }
+
+ //鏈夊け鏁楃殑闇�瑕佷繚瀛樻棫鐨勪换鍕�
+ if (closePoleFail.size() == 0 && oldPoleFail.size() == 0) {
+ newLightTask.setTaskId(lightTask.getTaskId());
+ updateById(newLightTask);
+ } else {
+ save(newLightTask);
+ }
+
+ for (LightTaskPoleRelation bean : newPoleAll) {
+ 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(newPoleAll);
+ all.addAll(oldPoleSuccess);
+ all.addAll(oldPoleFail);
+ all.addAll(closePoleFail);
+
+
+ List<Long> allPoleId = new ArrayList<>();
+ allPoleId.addAll(poleIdList);
+ allPoleId.addAll(oldList);
+ lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, allPoleId));
+ lightTaskPoleRelationService.saveBatch(all);
+
+
+ /**
+ * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍寮�濮�
+ */
+
+// String content1 = "{浠诲姟ID锛�" + lightTask.getTaskId()
+// + "锛� 浠诲姟鍚嶏細" + lightTask.getTaskName()
+// + "}," + " 鐏潌ID锛�" + param.getPoleIdList().toString()
+// + " }";
+// StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "涓嬪彂璺伅浠诲姟", content1);
+ /**
+ * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
+ */
+ }
+
+ return true;
+ }
+
/**
* 鍙戦�佺伅鎺ц姹�
@@ -148,25 +451,27 @@
* @param deviceCode 璁惧鍚�
* @return 杩斿洖甯�
*/
- public A5LightTimerRespInnerFrame sendTimeRRpc(String framePayload, String deviceCode) {
- IRequestFrame requestFrame = FrameBuilder.builderA5().innerFrame(new A5LightTimerReqInnerFrame(framePayload))
- .orderType(A5OrderEnum.REQUEST_LIGHT_DATA.getCode()).build();
- WrapResponseCommonFrame<A5LightTimerRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(deviceCode, requestFrame, A5LightTimerRespInnerFrame.class);
+ public A5LightTimerRespInnerFrame sendTimeRRpc(String framePayload, String deviceCode, String lightAddress) {
+ IRequestFrame requestFrame = FrameBuilder.builderA5().innerFrame(new A5LightTimerReqInnerFrame(framePayload, lightAddress)).orderType(A5OrderEnum.REQUEST_LIGHT_DATA.getCode()).build();
+ WrapResponseCommonFrame<A5LightTimerRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(deviceCode, requestFrame, A5LightTimerRespInnerFrame.class);
return Optional.ofNullable(responseCommonFrame).map(WrapResponseCommonFrame::getResponseInnerFrame).orElse(null);
}
- public List<LightTaskDto> listLightTask(int pageNo, int pageSize, String keyword) {
+ public List<LightTaskDto> listLightTask(BaseConditionVO conditionVO, String keyword) {
LambdaQueryWrapper<LightTask> wrapper = Wrappers.lambdaQuery(LightTask.class);
if (StrUtil.isNotBlank(keyword)) {
wrapper.like(LightTask::getTaskName, keyword);
}
- Long clientId = SecurityUtils.getClientId();
- if (clientId != null) {
- wrapper.eq(LightTask::getClientId, clientId);
+ //涓嶆槸瓒呯闇�瑕佺瓫閫�
+ if (SecurityUtils.getClientId() != null) {
+ wrapper.eq(LightTask::getClientId, SecurityUtils.getUserId()).or(w -> {
+ w.eq(LightTask::getUserId, SecurityUtils.getUserId());
+ });
}
- PageHelper.startPage(pageNo, pageSize);
+ if (conditionVO != null) {
+ PageHelper.startPage(conditionVO.getPageNo(), conditionVO.getPageSize());
+ }
List<LightTask> list = list(wrapper);
Page<LightTaskDto> page = new Page<>();
@@ -180,9 +485,35 @@
return page;
}
+ /**
+ * 鎵ц涓殑璺伅浠诲姟
+ *
+ * @return
+ */
+ public List<LightTaskDto> listTask() {
+ Long clientId = SecurityUtils.getClientId();
+ List<LightTask> lightTasks = lightTaskMapper.listLightTask(clientId);
+ Page<LightTaskDto> page = new Page<>();
+ BeanUtils.copyProperties(lightTasks, page);
+ for (LightTask lightTask : lightTasks) {
+ LightTaskDto lightTaskDto = new LightTaskDto();
+ BeanUtils.copyProperties(lightTask, lightTaskDto);
+ lightTaskDto.setWeekList(TaskOrderUtil.parseLightWeek2List(lightTask.getWeek()));
+ page.add(lightTaskDto);
+ }
+ return page;
+ }
+
+
// 姣忎釜璺伅鍙戦�佹帶鍒跺抚 杩斿洖鍏宠仈鍒楄〃
- private List<LightTaskPoleRelation> sendControllerFrame(LightTask lightTask, List<Long> poleIdList, String framePayload) {
+ private List<LightTaskPoleRelation> sendControllerFrame(LightTask lightTask, List<Long> poleIdList, String framePayload, String lightAddress) {
List<LightTaskPoleRelation> lightTaskPoleRelationList = new ArrayList<>();
+ //鎴愬姛
+ List<LightTaskPoleRelation> success = new ArrayList<>();
+ //澶辫触
+ List<LightTaskPoleRelation> fail = new ArrayList<>();
+
+ Map map = new HashMap();
List<Pole> poles = poleService.listByIds(poleIdList);
if (CollectionUtil.isEmpty(poles)) {
@@ -192,10 +523,10 @@
for (Pole pole : poles) {
LightTaskPoleRelation lightTaskPoleRelation = new LightTaskPoleRelation();
lightTaskPoleRelation.setPoleId(pole.getId());
- lightTaskPoleRelation.setTaskId(lightTask.getTaskId());
+// lightTaskPoleRelation.setTaskId(lightTask.getTaskId());
// rrpc 鍙戠敓瀹氭椂鍛戒护
try {
- A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame = sendTimeRRpc(framePayload, pole.getDeviceCode());
+ A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame = sendTimeRRpc(framePayload, pole.getDeviceCode(), lightAddress);
if (a5LightTimerRespInnerFrame == null) {
lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
} else {
@@ -210,6 +541,49 @@
return lightTaskPoleRelationList;
}
+
+ private Map<String, List<LightTaskPoleRelation>> sendControllerFrame(List<Long> poleIdList, String framePayload, String lightAddress) {
+ List<LightTaskPoleRelation> lightTaskPoleRelationList = new ArrayList<>();
+ //鎴愬姛
+ List<LightTaskPoleRelation> success = new ArrayList<>();
+ //澶辫触
+ List<LightTaskPoleRelation> fail = new ArrayList<>();
+
+ Map<String, List<LightTaskPoleRelation>> map = new HashMap();
+
+ List<Pole> poles = poleService.listByIds(poleIdList);
+ if (CollectionUtil.isEmpty(poles)) {
+ return null;
+ }
+
+ for (Pole pole : poles) {
+ LightTaskPoleRelation lightTaskPoleRelation = new LightTaskPoleRelation();
+ lightTaskPoleRelation.setPoleId(pole.getId());
+// lightTaskPoleRelation.setTaskId(lightTask.getTaskId());
+ // 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.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
+ fail.add(lightTaskPoleRelation);
+ }
+
+ lightTaskPoleRelationList.add(lightTaskPoleRelation);
+ }
+ map.put("success", success);
+ map.put("fail", fail);
+ map.put("all", lightTaskPoleRelationList);
+ return map;
+ }
+
+
@Transactional(rollbackFor = Exception.class)
public boolean delLightTask(List<Long> taskIdList) {
List<LightTask> lightTaskList = listByIds(taskIdList);
@@ -217,16 +591,34 @@
throw new BusinessException("鎵句笉鍒颁换鍔′俊鎭�");
}
+ List<LightTaskPoleRelation> list = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList));
+ if (list.size() != 0) {
+ throw new BusinessException("鍒犻櫎浠诲姟澶辫触锛屽垹闄ょ殑浠诲姟鏈夌伅鏉嗘鍦ㄤ娇鐢�");
+ }
+
// 鍒犻櫎浠诲姟
if (!removeByIds(taskIdList)) {
throw new BusinessException("鍒犻櫎浠诲姟澶辫触");
}
+ boolean del;
// 鍒犻櫎缁戝畾鐏潌
- if (!lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList))) {
- throw new BusinessException("鍒犻櫎缁戝畾鐏潌澶辫触");
- }
+// if (!lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).notIn(LightTaskPoleRelation::getTaskId, taskIdList))) {
+// throw new BusinessException("鏈壘鍒颁换鍔�/鐏潌缁戝畾鍏崇郴");
+// }
+// lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList));
+ taskIdList.forEach(taskId -> {
+ lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, taskId));
+ });
+ /**
+ * 鍒犻櫎鎺х伅浠诲姟鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鎺х伅浠诲姟id锛�" + taskIdList + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鍒犻櫎鎺х伅浠诲姟", content);
+ /**
+ * 鍒犻櫎鎺х伅浠诲姟鏃ュ織璁板綍缁撴潫
+ */
return true;
}
@@ -299,12 +691,66 @@
throw new BusinessException("鎵句笉鍒颁换鍔�");
}
String framePayload = buildControlFramePayload(lightTask.getOpenOrder(), lightTask.getCloseOrder(), lightTask.getControlOrder(), lightTask.getWeek());
- List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, ListUtil.toList(param.getPoleId()), framePayload);
- if (CollectionUtil.isNotEmpty(lightTaskPoleRelationList)) {
- return lightTaskPoleRelationService.update(lightTaskPoleRelationList.get(0),
- Wrappers.lambdaUpdate(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, param.getPoleId())
- .eq(LightTaskPoleRelation::getTaskId, param.getTaskId()));
+ List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, ListUtil.toList(param.getPoleId()), framePayload, lightTask.getLightAdress());
+
+ /**
+ * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍寮�濮�
+ */
+ List<String> poleCodeList = new ArrayList<>();
+ List<Pole> list = SpringContextHolder.getBean(PoleService.class).list(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, param.getPoleId()));
+ if (CollectionUtil.isNotEmpty(list)) {
+ poleCodeList = list.stream().map(Pole::getDeviceCode).collect(Collectors.toList());
}
+ String content = "{浠诲姟ID锛�" + lightTask.getTaskId() + "锛� 浠诲姟鍚嶏細" + lightTask.getTaskName() + "}," + " 鐏潌ID锛�" + param.getPoleId() + " }";
+ StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "涓嬪彂璺伅浠诲姟", content);
+ /**
+ * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
+ */
+
+
+ if (CollectionUtil.isNotEmpty(lightTaskPoleRelationList)) {
+ return lightTaskPoleRelationService.update(lightTaskPoleRelationList.get(0), Wrappers.lambdaUpdate(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, param.getPoleId()).eq(LightTaskPoleRelation::getTaskId, param.getTaskId()));
+ }
+
+
return true;
}
+
+
+ /**
+ * 璁＄畻鍔熺巼鍙婅兘鑰�
+ */
+ public void energy() {
+ List<LightTask> lightTasks = list(Wrappers.lambdaQuery(LightTask.class));
+ for (LightTask lightTask : lightTasks) {
+ List<LightTaskPoleRelation> list = SpringContextHolder.getBean(LightTaskPoleRelationService.class).list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, lightTask.getTaskId()));
+
+ LightTaskDto lightTaskDto = new LightTaskDto();
+ BeanUtils.copyProperties(lightTask, lightTaskDto);
+ lightTaskDto.setWeekList(TaskOrderUtil.parseLightWeek2List(lightTask.getWeek()));
+
+ BigDecimal energySaving = SpringContextHolder.getBean(LightService.class).jisuan(lightTaskDto);
+ BigDecimal energy = SpringContextHolder.getBean(LightService.class).jisuanEnergy(lightTaskDto);
+
+ //鑾峰彇鏄ㄥぉ鐨勬槦鏈熸暟
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime yesterday = now.minusDays(1);
+
+
+ LightEnergyData lightEnergyData = new LightEnergyData();
+ lightEnergyData.setTaskId(lightTask.getTaskId());
+ lightEnergyData.setYtdTime(yesterday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ lightEnergyData.setEnergySaving(energySaving);
+ lightEnergyData.setEnergy(energy);
+ lightEnergyData.setUserId(lightTask.getUserId());
+ lightEnergyData.setClientId(lightTask.getClientId());
+
+ //淇濆瓨鑳借�楁暟鎹埌鏁版嵁搴�
+ lightEnergyDataService.save(lightEnergyData);
+
+ System.out.println(lightEnergyData + "---------------");
+ //ID 浠诲姟id
+ }
+ }
+
}
--
Gitblit v1.9.3