From 5679e1107afad357066164d70ba966e5f8de9fec Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 11 一月 2024 15:22:13 +0800
Subject: [PATCH] 开关统计修改ac1_outswitch1_trip 0-6 ，ac2_outswitch1_trip 0-6 ，分合闸BreakerState1：0~24 ，BreakerState2：0~8
---
src/main/java/com/whyc/service/CKPowerDevSignalService.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/service/CKPowerDevSignalService.java b/src/main/java/com/whyc/service/CKPowerDevSignalService.java
index 177a88c..1c1dcb7 100644
--- a/src/main/java/com/whyc/service/CKPowerDevSignalService.java
+++ b/src/main/java/com/whyc/service/CKPowerDevSignalService.java
@@ -62,9 +62,9 @@
}
//1娈典氦娴�
if(switchReal.getAc1OutSwitch1TripSt()==0){//鐪熷疄鍊�
- breakSwitch+= CommonUtil.getIntToBinary(switchReal.getAc1OutSwitch1TripReal(),new int[]{0,1,2,3,4,5,6,7});
+ breakSwitch+= CommonUtil.getIntToBinary(switchReal.getAc1OutSwitch1TripReal(),new int[]{0,1,2,3,4,5,6});
}else{
- breakSwitch+= CommonUtil.getIntToBinary(switchReal.getAc1OutSwitch1TripFake(),new int[]{0,1,2,3,4,5,6,7});
+ breakSwitch+= CommonUtil.getIntToBinary(switchReal.getAc1OutSwitch1TripFake(),new int[]{0,1,2,3,4,5,6});
}
@@ -76,9 +76,9 @@
}
//2娈典氦娴�
if(switchReal.getAc2OutSwitch1TripSt()==0){//鐪熷疄鍊�
- breakSwitch+= CommonUtil.getIntToBinary(switchReal.getAc2OutSwitch1TripReal(),new int[]{0,1,2,3,4,5,6,7});
+ breakSwitch+= CommonUtil.getIntToBinary(switchReal.getAc2OutSwitch1TripReal(),new int[]{0,1,2,3,4,5,6});
}else{
- breakSwitch+= CommonUtil.getIntToBinary(switchReal.getAc2OutSwitch1TripFake(),new int[]{0,1,2,3,4,5,6,7});
+ breakSwitch+= CommonUtil.getIntToBinary(switchReal.getAc2OutSwitch1TripFake(),new int[]{0,1,2,3,4,5,6});
}
//鐩存祦寰寮�鍏�
@@ -112,7 +112,7 @@
}
//缁熻鍒嗛椄
offSwitch+=CommonUtil.getIntToBinary(switchReal.getBreakerState1(),new int[]{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24});
- offSwitch+=CommonUtil.getIntToBinary(switchReal.getBreakerState2(),new int[]{0,1,2,3,4,5,6,7,8,9,10});
+ offSwitch+=CommonUtil.getIntToBinary(switchReal.getBreakerState2(),new int[]{0,1,2,3,4,5,6,7,8});
map.put("recordTime", DateUtil.format_YYYY_MM_DD_HH_MM_SS(switchReal.getRecordTime()));
}
--
Gitblit v1.9.1