fix: 太阳能网控,设备休眠状态修改。
This commit is contained in:
@@ -66,6 +66,13 @@ public class DefineDeviceWarnCode {
|
||||
*/
|
||||
public static final int SaturaHigh = 1 << 10;
|
||||
|
||||
/**
|
||||
* 设备休眠(太阳能网控专用) 1 << 11 = 2048
|
||||
* 太阳能网控设备正常工作周期为 在线2分钟+休眠8分钟,
|
||||
* 休眠期间 IoT 平台上报离线,但属于正常行为,不等同于真正离线。
|
||||
*/
|
||||
public static final int DeviceSleeping = 1 << 11;
|
||||
|
||||
/**
|
||||
* 设备断电(控制器) 1 << 15 = 32768
|
||||
*/
|
||||
@@ -103,6 +110,9 @@ public class DefineDeviceWarnCode {
|
||||
if ((warnCode & DeviceOffline) != 0) {
|
||||
return "设备离线";
|
||||
}
|
||||
if ((warnCode & DeviceSleeping) != 0) {
|
||||
return "设备休眠";
|
||||
}
|
||||
if ((warnCode & ErrorPowerOff) != 0) {
|
||||
return "设备断电";
|
||||
}
|
||||
|
||||
@@ -809,7 +809,7 @@ public class PondController extends BaseController {
|
||||
warnCode |= device.getWarnCode();
|
||||
}
|
||||
|
||||
// 判断设备是否在线(简化判断,实际应根据业务逻辑)
|
||||
// 判断设备是否在线(DeviceSleeping 不算离线,太阳能网控休眠属于正常工作)
|
||||
if (device.getWarnCode() == null
|
||||
|| ((device.getWarnCode() & DefineDeviceWarnCode.DeviceTimeDead) == 0
|
||||
&& (device.getWarnCode() & DefineDeviceWarnCode.DeviceOffline) == 0)) {
|
||||
|
||||
Reference in New Issue
Block a user