From bf5d9682beb8fa53c5adbd14bb3e458c1c859038 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 23 五月 2022 15:59:21 +0800
Subject: [PATCH] 单灯任务返回指令修改
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 25 +++++++++++++++++++++----
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java | 13 +++++++++----
2 files changed, 30 insertions(+), 8 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 913ed6a..ffbc777 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
@@ -71,12 +71,17 @@
if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- boolean result = lightTaskService.updateLightTask(taskId, param);
- if (result) {
+ int result = lightTaskService.updateLightTask(taskId, param);
+ if(result==0){
return ResponseUtil.success("缂栬緫鎴愬姛");
- } else {
- return ResponseUtil.fail("缂栬緫澶辫触");
+ }else if(result==1){
+ return ResponseUtil.success("鍘熶换鍔″瓨鍦ㄥ彂閫佹寚浠ゅ紓甯�,鏃т换鍔′繚鐣�,涓嬪彂鎴愬姛鐨勯儴鍒嗕繚瀛樿嚦瀵瑰簲鏂板浠诲姟");
+ }else if(result==2){
+ return ResponseUtil.fail("鍘熶换鍔″瓨鍦ㄥ彂閫佹寚浠ゅ紓甯�,浠诲姟涓嬪彂澶辫触,鏃т换鍔′繚鐣�");
+ }else {
+ return ResponseUtil.fail("鏈煡閿欒");
}
+
}
@GetMapping("/{taskId}")
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 908e53a..03b04c3 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
@@ -16,12 +16,10 @@
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.A5Frame;
import com.sandu.ximon.admin.manager.iot.frame.FrameBuilder;
import com.sandu.ximon.admin.manager.iot.frame.IRequestFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.A5LightTimerReqInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.response.A5LightTimerRespInnerFrame;
-import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.WrapResponseCommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
@@ -139,7 +137,7 @@
}
@Transactional(rollbackFor = Exception.class)
- public boolean updateLightTask(Long taskId, LightTaskParam param) {
+ public int updateLightTask(Long taskId, LightTaskParam param) {
if (StrUtil.length(param.getControlOrder()) % LightTaskParam.REQUEST_ORDER_LENGTH != 0) {
throw new BusinessException("鐏帶鍛戒护鏍煎紡涓嶆纭�");
}
@@ -185,12 +183,14 @@
List<LightTaskPoleRelation> newPoleAll = new ArrayList<>();
+ List<LightTaskPoleRelation> newPoleSuccess = new ArrayList<>();
if (CollectionUtil.isNotEmpty(newPoleIdList)) {
//鏂扮伅鏉嗕笅鍙戞柊浠诲姟
Map<String, List<LightTaskPoleRelation>> newPoleMap = sendControllerFrame(newPoleIdList, lightTask.getFramePayload(), param.getLightAddress());
//newPoleAll闆嗗悎鍚庨潰鐢ㄤ簬瀛樺偍鍏崇郴琛�
newPoleAll = newPoleMap.getOrDefault("all", new ArrayList<>());
+ newPoleSuccess = newPoleMap.getOrDefault("success", new ArrayList<>());
}
List<LightTaskPoleRelation> oldPoleFail = new ArrayList<>();
@@ -203,12 +203,14 @@
}
List<LightTaskPoleRelation> closePoleFail = new ArrayList<>();
+ List<LightTaskPoleRelation> closeSuccess = 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<>());
+ closeSuccess = closePoleMap.getOrDefault("success", new ArrayList<>());
}
//鏈夊け鏁楃殑闇�瑕佷繚瀛樻棫鐨勪换鍕�
@@ -264,6 +266,9 @@
all.addAll(closePoleFail);
+
+
+
List<Long> allPoleId = new ArrayList<>();
allPoleId.addAll(poleIdList);
allPoleId.addAll(oldList);
@@ -283,7 +288,19 @@
* 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
*/
- return true;
+ if(oldPoleFail.isEmpty()&&closePoleFail.isEmpty()){
+ //鍏ㄩ儴鎴愬姛
+ return 0;
+ }else if(!closeLight.isEmpty()||!oldPoleFail.isEmpty()){
+ //鍏崇伅澶辫触 鎴栬�呰鐩栦换鍔″け璐�
+ return 1;
+ }else if(newPoleSuccess.isEmpty()&&oldPoleSuccess.isEmpty()&&closeSuccess.isEmpty()){
+ //缂栬緫鍏ㄩ儴澶辫触
+ return 2;
+ }else {
+ //鍏朵粬鎯呭喌
+ return -1;
+ }
}
--
Gitblit v1.9.3