From 4e53338c0c6859a43693f3f690f0c05da888a02e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 12 八月 2022 11:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 424 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 337 insertions(+), 87 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 5da0d5a..cc93454 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,44 @@
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 +111,130 @@
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;
+ if ("FFFF".equals(param.getLightAddress())) {
+ oldLightTaskStatusAndPoles = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, "0001").or(relation -> {
+ relation.eq(LightTaskPoleRelation::getLightAddress, "0002");
+ }));
+ } else {
+ oldLightTaskStatusAndPoles = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
+ }
+
/**
- * 鏂板璺伅浠诲姟鏃ュ織璁板綍缁撴潫
+ * 閲嶅浠诲姟鐨勭伅澶�
+ */
+ if (!oldLightTaskStatusAndPoles.isEmpty()) {
+ throw new BusinessException("浠诲姟涓瓨鍦ㄥ凡鏈変换鍔＄殑鍗曠伅," + "浠诲姟id涓簕" + oldLightTaskStatusAndPoles.stream().map(LightTaskPoleRelation::getTaskId).collect(Collectors.toList()) + "}, " + "鐏潌id涓簕" + oldLightTaskStatusAndPoles.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList()) + "}");
+ }
+ //璁板綍杩欎簺鐏潌鍘熷厛鐨刬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<Long> oldPoleIdListHasNewLightAddress = oldPoleIdList.stream().filter(poleId -> {
+// List<LightTaskPoleRelation> lightTaskPoleRelations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
+// .eq(LightTaskPoleRelation::getPoleId, poleId).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
+// if (CollectionUtil.isNotEmpty(lightTaskPoleRelations)) {
+// return !lightTaskPoleRelations.get(0).getLightAddress().equals(param.getLightAddress());
+// }
+// return false;
+// }).collect(Collectors.toList());
+
+// if (!oldPoleIdListHasNewLightAddress.isEmpty()) {
+// throw new BusinessException("浠诲姟涓瓨鍦ㄥ凡鏈変换鍔＄殑鍗曠伅,鐏潌id涓簕" + oldPoleIdListHasNewLightAddress + "}");
+// }
+
+ 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).eq(LightTaskPoleRelation::getTaskId, oldLightTaskStatusAndPoles.get(0).getTaskId()));
+
+ }
+
+ //淇濆瓨鏂扮伅鏉嗕互鍙婃棫鐏潌瑕嗙洊鎴愬姛鐨勪换鍔″叧绯�
+ if (!all.isEmpty()) {
+// all.forEach(
+// bean->{
+// lightTaskPoleRelationService.save(bean);
+// }
+// );
+ 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) {
@@ -185,6 +282,40 @@
List<Long> closeLight = oldList.stream().filter(poleId -> !param.getPoleIdList().contains(poleId)).collect(Collectors.toList());
+ //鍙栧嚭瑕嗙洊鎿嶄綔鐨勫叧绯讳俊鎭�
+ //璁板綍杩欎簺鐏潌鍘熷厛鐨勪换鍔�
+ List<LightTaskPoleRelation> oldRelation;
+ if ("FFFF".equals(param.getLightAddress())) {
+ // 鐏潌涓瓨鍦ㄥ叾浠栦换鍔＄殑鐏ご
+ oldRelation = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldPoleIdList).eq(LightTaskPoleRelation::getLightAddress, "0001").or(relation -> {
+ relation.eq(LightTaskPoleRelation::getLightAddress, "0002");
+ }).ne(LightTaskPoleRelation::getTaskId, taskId));
+ } else {
+ oldRelation = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldPoleIdList).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
+ }
+
+ /**
+ * 閲嶅浠诲姟鐨勭伅澶�
+ */
+ if (!oldLightTaskStatusAndPoles.isEmpty()) {
+ throw new BusinessException("浠诲姟涓瓨鍦ㄥ凡鏈変换鍔＄殑鍗曠伅," + "浠诲姟id涓簕" + oldRelation.stream().map(LightTaskPoleRelation::getTaskId).collect(Collectors.toList()) + "}, " + "鐏潌id涓簕" + oldRelation.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList()) + "}");
+ }
+
+
+ //鍒ゆ柇鏃х伅鏉嗘槸鍚︽湁鏂扮伅澶村湴鍧�
+ List<Long> oldPoleIdListHasNewLightAddress = oldPoleIdList.stream().filter(poleId -> {
+ List<LightTaskPoleRelation> lightTaskPoleRelations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, poleId).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
+ if (CollectionUtil.isNotEmpty(lightTaskPoleRelations)) {
+ return !lightTaskPoleRelations.get(0).getLightAddress().equals(param.getLightAddress());
+ }
+ return false;
+ }).collect(Collectors.toList());
+
+ if (!oldPoleIdListHasNewLightAddress.isEmpty()) {
+ throw new BusinessException("浠诲姟涓瓨鍦ㄥ凡鏈変换鍔＄殑鍗曠伅,鐏潌id涓簕" + oldPoleIdListHasNewLightAddress + "}");
+ }
+
+
List<LightTaskPoleRelation> newPoleAll = new ArrayList<>();
List<LightTaskPoleRelation> newPoleSuccess = new ArrayList<>();
List<LightTaskPoleRelation> newPoleFail = new ArrayList<>();
@@ -210,7 +341,7 @@
List<LightTaskPoleRelation> closePoleFail = new ArrayList<>();
List<LightTaskPoleRelation> closePoleSuccess = new ArrayList<>();
if (CollectionUtil.isNotEmpty(closeLight)) {
- //鎵ц鍏崇伅鍐呭抚
+ //鍏崇伅鍐呭抚
String framePayloadClose = "7f0000007f173b00";
//瑕嗙洊鎿嶄綔鐏潌
Map<String, List<LightTaskPoleRelation>> closePoleMap = sendControllerFrame(closeLight, framePayloadClose, param.getLightAddress());
@@ -306,7 +437,7 @@
return "缂栬緫鎴愬姛";
} else if (newPoleSuccess.isEmpty() && oldPoleSuccess.isEmpty() && closePoleSuccess.isEmpty()) {
throw new BusinessException("缂栬緫澶辫触,璇锋鏌ョ紪杈戠殑璁惧鏄惁鍦ㄧ嚎!");
- } else if (!closePoleFail.isEmpty() || !oldPoleFail.isEmpty()) {
+ } else if (!closePoleFail.isEmpty() /*|| !oldPoleFail.isEmpty()*/) {
return "鍘熶换鍔′腑瀛樺湪涓嬪彂寮傚父锛屽師浠诲姟淇濈暀锛屽垱寤烘柊浠诲姟杩涜淇濆瓨";
} else if (!newPoleFail.isEmpty()) {
return "鏂颁换鍔′腑瀛樺湪涓嬪彂寮傚父锛屽拷鐣ュ紓甯告搷浣滅殑鐏潌";
@@ -333,16 +464,6 @@
}
public List<LightTaskDto> listLightTask(BaseConditionVO conditionVO, String keyword, Integer order, Integer seq) {
- LambdaQueryWrapper<LightTask> wrapper = Wrappers.lambdaQuery(LightTask.class);
- if (StrUtil.isNotBlank(keyword)) {
- wrapper.like(LightTask::getTaskName, keyword);
- }
- //涓嶆槸瓒呯闇�瑕佺瓫閫�
- if (SecurityUtils.getClientId() != null) {
- wrapper.eq(LightTask::getClientId, SecurityUtils.getUserId()).or(w -> {
- w.eq(LightTask::getUserId, SecurityUtils.getUserId());
- });
- }
//鎺掑簭瀛楁
String orderByResult = "task_id";
@@ -372,7 +493,8 @@
String orderBy = orderByResult + " " + orderBySeq;
PageHelper.startPage(conditionVO.getPageNo(), conditionVO.getPageSize(), orderBy);
- List<LightTask> list = list(wrapper);
+ List<LightTask> list = baseMapper.listTask(SecurityUtils.getClientId(), keyword, orderBy);
+
Page<LightTaskDto> page = new Page<>();
BeanUtils.copyProperties(list, page);
@@ -380,6 +502,40 @@
LightTaskDto lightTaskDto = new LightTaskDto();
BeanUtils.copyProperties(lightTask, lightTaskDto);
lightTaskDto.setWeekList(TaskOrderUtil.parseLightWeek2List(lightTask.getWeek()));
+
+
+ //鍒ゆ柇鐏ご鏄惁瀛樺湪浠诲姟
+ List<LightTaskPoleRelation> lightTaskPoleRelationList = lightTaskPoleRelationService.list(Wrappers.<LightTaskPoleRelation>lambdaQuery().eq(LightTaskPoleRelation::getTaskId, lightTask.getTaskId()));
+
+ //涓嬪彂鎴愬姛鐨勭伅鏉嗘暟閲�
+ Integer successCount = baseMapper.successCount(lightTaskDto.getTaskId());
+ ///浠诲姟涓�荤殑鐏潌鏁伴噺
+ Integer toTalCount = baseMapper.toTalCount(lightTaskDto.getTaskId());
+ if (successCount == null) {
+ successCount = 0;
+ }
+ if (toTalCount == null) {
+ toTalCount = 0;
+ }
+ if (toTalCount == 0) {
+ //浠诲姟涓病鏈夌伅鏉�
+ lightTaskDto.setSyncStatus("鏈悓姝�");
+ } else {
+ //浠诲姟涓湁鐏潌
+ if (successCount == 0) {
+ //涓嬪彂鎴愬姛鏈�0
+ lightTaskDto.setSyncStatus("鏈悓姝�");
+ } else if (successCount != 0 && successCount < toTalCount) {
+ //瀛樺湪涓嬪彂鎴愬姛 浣嗗苟鏈叏閮ㄦ垚鍔�
+ lightTaskDto.setSyncStatus("閮ㄥ垎鍚屾");
+ } else if (toTalCount.equals(successCount) && toTalCount != 0 && successCount != 0) {
+ //鍏ㄩ儴鎴愬姛
+ lightTaskDto.setSyncStatus("宸插悓姝�");
+ } else {
+ //鏈煡绫诲瀷
+ lightTaskDto.setSyncStatus("鍚屾鐘舵�佸嚭閿�");
+ }
+ }
page.add(lightTaskDto);
}
return page;
@@ -428,22 +584,71 @@
}
for (Pole pole : poles) {
+ if (pole.getDeviceCode() == null || pole.getDeviceCode().equals("")) {
+ removeById(lightTask.getTaskId());
+ throw new BusinessException("鐏潌涓嶅瓨鍦╩ac,涓嶈兘涓嬪彂浠诲姟 璇锋鏌ョ伅鏉嗘槸鍚﹀瓨鍦ㄥ崟鐏�");
+ }
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());
- } else {
- lightTaskPoleRelation.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame.getResponseStatus()));
+ 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());
}
- } catch (BusinessException e) {
- lightTaskPoleRelation.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.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
+ }
+ lightTaskPoleRelationList.add(lightTaskPoleRelation);
}
- lightTaskPoleRelationList.add(lightTaskPoleRelation);
}
return lightTaskPoleRelationList;
}
@@ -471,25 +676,80 @@
}
for (Pole pole : poles) {
+ if (pole.getDeviceCode() == null || pole.getDeviceCode().equals("")) {
+ throw new BusinessException("鐏潌涓嶅瓨鍦╩ac,涓嶈兘涓嬪彂浠诲姟 璇锋鏌ョ伅鏉嗘槸鍚﹀瓨鍦ㄥ崟鐏�");
+ }
LightTaskPoleRelation lightTaskPoleRelation = new LightTaskPoleRelation();
lightTaskPoleRelation.setPoleId(pole.getId());
-// lightTaskPoleRelation.setTaskId(lightTask.getTaskId());
+ //鍏崇郴琛ㄦ彃鍏ョ伅澶村湴鍧�
+ lightTaskPoleRelation.setLightAddress(lightAddress);
+
+
// rrpc 鍙戠敓瀹氭椂鍛戒护
- try {
- A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame = sendTimeRRpc(framePayload, pole.getDeviceCode(), lightAddress);
- if (a5LightTimerRespInnerFrame == null) {
+ 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.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);
}
- lightTaskPoleRelationList.add(lightTaskPoleRelation);
}
map.put("success", success);
map.put("fail", fail);
@@ -514,16 +774,6 @@
if (!removeByIds(taskIdList)) {
throw new BusinessException("鍒犻櫎浠诲姟澶辫触");
}
-
- boolean del;
- // 鍒犻櫎缁戝畾鐏潌
-// 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));
- });
/**
* 鍒犻櫎鎺х伅浠诲姟鏃ュ織璁板綍寮�濮�
--
Gitblit v1.9.3