From 2ac07c17cd4176fd61bed3a8c09ea192b7d89be7 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 07 七月 2022 15:58:30 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 156 +++++++++++++++++++++++++++++++++++++---------------
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java | 7 --
2 files changed, 112 insertions(+), 51 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 bb08f3a..6caa79f 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
@@ -37,12 +37,7 @@
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.newAddLightTask(param));
}
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 56dd258..b1906bb 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
@@ -6,7 +6,6 @@
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.HexUtil;
import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
@@ -67,39 +66,42 @@
private final ClientService clientService;
private final LightEnergyDataService lightEnergyDataService;
+
/**
* 鏂板璺伅浠诲姟
+ * @param param
+ * @return
*/
@Transactional(rollbackFor = Exception.class)
- public boolean addLightTask(LightTaskParam param) {
+ public String newAddLightTask(LightTaskParam param) {
if (StrUtil.length(param.getControlOrder()) % LightTaskParam.REQUEST_ORDER_LENGTH != 0) {
throw new BusinessException("鐏帶鍛戒护鏍煎紡涓嶆纭�");
}
+// LightTask lightTask = getById(null);
+
+
int week = 0;
for (Integer w : param.getWeekList()) {
week |= w;
}
- LightTask lightTask = new LightTask();
- 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());
- lightTask.setCreateUser(SecurityUtils.getUsername());
- lightTask.setFramePayload(buildControlFramePayload(param.getOpenOrder(), param.getCloseOrder(), param.getControlOrder(), week));
- if (!save(lightTask)) {
+
+ LightTask newLightTask = new LightTask();
+ newLightTask.setTaskName(param.getTaskName());
+
+ newLightTask.setClientId(clientService.getClientId());
+ newLightTask.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());
@@ -107,37 +109,101 @@
poleCodeList = poleList.stream().map(Pole::getDeviceCode).collect(Collectors.toList());
}
}
- String content = "{浠诲姟ID锛�" + lightTask.getTaskId() + "锛� 浠诲姟鍚嶏細" + lightTask.getTaskName() + "}锛寋鍐呭抚鎸囦护" + lightTask.getFramePayload() + "锛� 鐏潌ID锛�" + param.getPoleIdList().toString() + "锛� 鎺у埗鐨勭伅澶村湴鍧�锛�" + param.getLightAddress() + " }";
+ 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();
+ //璁板綍杩欎簺鐏潌鍘熷厛鐨勪换鍔�
+ List<LightTaskPoleRelation> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList));
+ //璁板綍杩欎簺鐏潌鍘熷厛鐨刬d
+ 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());
+ //鏂板涓嶅瓨鍦ㄥ叧鐏搷浣�
+
+
+ List<LightTaskPoleRelation> newPoleMap = new ArrayList<>();
+ if (!newPoleIdList.isEmpty()) {
+ //鏂扮伅鏉嗕笅鍙戞柊浠诲姟
+ newPoleMap = sendControllerFrame(newLightTask, newPoleIdList, newLightTask.getFramePayload(), param.getLightAddress());
+
+ }
+
+ List<LightTaskPoleRelation> oldPoleFail = new ArrayList<>();
+ List<LightTaskPoleRelation> oldPoleSuccess = new ArrayList<>();
+ if (!oldPoleIdList.isEmpty()) {
+ //瑕嗙洊鎿嶄綔鐏潌
+ Map<String, List<LightTaskPoleRelation>> oldPoleMap = sendControllerFrame(oldPoleIdList, newLightTask.getFramePayload(), param.getLightAddress());
+ oldPoleFail = oldPoleMap.getOrDefault("fail", new ArrayList<>());
+ oldPoleSuccess = oldPoleMap.getOrDefault("success", new ArrayList<>());
+ }
+ //瑕嗙洊鎴愬姛 娣诲姞鏂扮殑浠诲姟鍏崇郴
+ if (!oldPoleSuccess.isEmpty()) {
+ oldPoleSuccess.forEach(
+ success -> {
+ success.setTaskId(newLightTask.getTaskId());
+ }
+ );
+ }
+
+ //鍒ゆ柇鏃х伅鏉嗚鐩栨搷浣滄槸鍚﹀瓨鍦ㄥけ璐� 濡傛灉瀛樺湪澶辫触锛屽垯淇濆瓨鏃х殑浠诲姟鍏崇郴
+ List<LightTaskPoleRelation> failOldLightTaskStatusAndPoles = new ArrayList<>();
+ if (!oldPoleFail.isEmpty()) {
+ //鑾峰彇澶辫触鐨勭伅鏉唅d
+ List<Long> failPoleIdList = oldPoleFail.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());
+ //浠巓ldLightTaskStatusAndPoles鑾峰彇澶辫触鐨勭伅鏉嗗師鍏堢殑浠诲姟缁戝畾鍏崇郴.
+ failOldLightTaskStatusAndPoles = oldLightTaskStatusAndPoles.stream()
+ .filter(lightTaskPoleRelation -> failPoleIdList.contains(lightTaskPoleRelation.getPoleId())).collect(Collectors.toList());
+ }
+
/**
- * 鏂板璺伅浠诲姟鏃ュ織璁板綍缁撴潫
+ * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍寮�濮�
*/
- List<Long> poleIdList = param.getPoleIdList();
- if (CollectionUtil.isNotEmpty(poleIdList)) {
+ String content1 = "{浠诲姟ID锛�" + newLightTask.getTaskId() + "锛� 浠诲姟鍚嶏細" + newLightTask.getTaskName() + "}," + " 鐏潌ID锛�" + param.getPoleIdList().toString() + " }";
+ StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "涓嬪彂璺伅浠诲姟", content1);
+ /**
+ * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
+ */
- List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, poleIdList, lightTask.getFramePayload(), param.getLightAddress());
+ List<LightTaskPoleRelation> all = new ArrayList<>();
+ all.addAll(newPoleMap);
+ all.addAll(oldPoleSuccess);
+ //鏃х伅鏉嗕笅鍙戝け璐ヤ笉闇�瑕佷繚瀛樹俊绠＄郴
- // 娣诲姞缁戝畾鐏潌
- 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);
- /**
- * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
- */
+ //鍒犻櫎鏃х伅鏉嗕腑瑕嗙洊鎴愬姛鐨勪换鍔d
+ List<Long> oldSuccessPoleId = new ArrayList<>();
+ for (LightTaskPoleRelation bean : oldPoleSuccess) {
+ oldSuccessPoleId.add(bean.getPoleId());
}
- return true;
+ if (!oldSuccessPoleId.isEmpty()) {
+ lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldSuccessPoleId));
+
+ }
+
+ //淇濆瓨鏂扮伅鏉嗕互鍙婃棫鐏潌瑕嗙洊鎴愬姛鐨勪换鍔″叧绯�
+ if (!all.isEmpty()) {
+ lightTaskPoleRelationService.saveBatch(all);
+ }
+
+ if (!param.getPoleIdList().isEmpty() && !all.isEmpty() && !oldPoleFail.isEmpty()) {
+ return "浠诲姟涓瓨鍦ㄤ笅鍙戝紓甯革紝寮傚父鐏潌鍘熶换鍔″叧绯讳繚鐣�";
+ } else if (!param.getPoleIdList().isEmpty() && all.isEmpty()) {
+ //鎵�鏈夌伅鏉嗛兘涓嬪彂澶辫触 鏂板鐨勪换鍔′笉淇濈暀
+ removeById(newLightTask);
+ throw new BusinessException("鎸囦护涓嬪彂澶辫触,璇锋鏌ョ伅鏉嗙姸鎬佸悗閲嶆柊鏂板浠诲姟");
+ } else {
+ return "浠诲姟鏂板鎴愬姛";
+ }
+
+
}
+
@Transactional(rollbackFor = Exception.class)
public String updateLightTask(Long taskId, LightTaskParam param) {
@@ -362,7 +428,7 @@
String orderBy = orderByResult + " " + orderBySeq;
PageHelper.startPage(conditionVO.getPageNo(), conditionVO.getPageSize(), orderBy);
- List<LightTask> list = baseMapper.listTask(SecurityUtils.getClientId(),keyword,orderBy);
+ List<LightTask> list = baseMapper.listTask(SecurityUtils.getClientId(), keyword, orderBy);
Page<LightTaskDto> page = new Page<>();
--
Gitblit v1.9.3