From 1bf1b023ea45114a1d5ac7b85e18ab5aa40d5cf5 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 15 八月 2022 16:48:01 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 0571c99..789d202 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
@@ -265,9 +265,6 @@
}
-
-
-
List<LightTaskPoleRelation> newPoleAll = new ArrayList<>();
List<LightTaskPoleRelation> newPoleSuccess = new ArrayList<>();
List<LightTaskPoleRelation> newPoleFail = new ArrayList<>();
@@ -294,7 +291,7 @@
List<LightTaskPoleRelation> closePoleFail = new ArrayList<>();
List<LightTaskPoleRelation> closePoleSuccess = new ArrayList<>();
System.out.println(closeLight + "closeLight");
- if (CollectionUtil.isNotEmpty(closeLight) && closeLight != null&& closeLight.get(0) != null) {
+ if (CollectionUtil.isNotEmpty(closeLight) && closeLight != null && closeLight.get(0) != null) {
//鍏崇伅鍐呭抚
String framePayloadClose = "7f0000007f173b00";
//鍏崇伅鎿嶄綔鐏潌
@@ -407,8 +404,10 @@
*/
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);
+ System.out.println(requestFrame + " --------requestFrame");
+ WrapResponseCommonFrame<A5LightTimerRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(deviceCode, requestFrame, A5LightTimerRespInnerFrame.class);
+ System.out.println(responseCommonFrame + " -----------responseCommonFrame");
StoreOperationRecordsUtils.storeInnerFrameData(deviceCode, "鍗曠伅甯�-鎺х伅", requestFrame, responseCommonFrame);
return Optional.ofNullable(responseCommonFrame).map(WrapResponseCommonFrame::getResponseInnerFrame).orElse(null);
@@ -637,7 +636,7 @@
// rrpc 鍙戠敓瀹氭椂鍛戒护
- if ("FFFF".equals(lightAddress)) {
+ /* if ("FFFF".equals(lightAddress)) {
LightTaskPoleRelation lightTaskPoleRelation01 = new LightTaskPoleRelation();
lightTaskPoleRelation01.setPoleId(pole.getId());
lightTaskPoleRelation01.setLightAddress("0001");
@@ -682,7 +681,8 @@
lightTaskPoleRelationList.add(lightTaskPoleRelation01);
lightTaskPoleRelationList.add(lightTaskPoleRelation02);
- } else {
+ } else */
+ {
lightTaskPoleRelation.setLightAddress(lightAddress);
// rrpc 鍙戠敓瀹氭椂鍛戒护
try {
@@ -705,6 +705,7 @@
map.put("success", success);
map.put("fail", fail);
map.put("all", lightTaskPoleRelationList);
+ log.error("鍙戦�佹帶鍒跺櫒甯х粨鏋滐細{}", map);
return map;
}
--
Gitblit v1.9.3