|
|
@@ -531,9 +531,13 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
|
|
|
if (ObjectUtil.isEmpty(subDeviceList)) {
|
|
|
continue;
|
|
|
}
|
|
|
+ final ArrayList<Object> list = new ArrayList<>();
|
|
|
+ list.add("FSU_DoPowerControlBoxButton");
|
|
|
+ list.add("FSU_DoPowerCollection");
|
|
|
//处理通道或者动环传感器信息
|
|
|
for (SubDeviceInfo subDeviceInfo : subDeviceList) {
|
|
|
- boolean isFusDevice = ProductEnums.FSU_GATEWAY.getProductName().contains(dvsBaseInfo.getProductName());
|
|
|
+ //动环中 控电箱按钮与 市电总回路/八小时总回路通电状态不同步
|
|
|
+ boolean isFusDevice = ProductEnums.FSU_GATEWAY.getProductName().contains(dvsBaseInfo.getProductName()) && (!list.contains(dvsBaseInfo.getProductName()));
|
|
|
String productName = isFusDevice ? subDeviceInfo.getType() : dvsBaseInfo.getProductName();
|
|
|
IotDeviceInfo channelInfo = selectByTypeAndHostAndCode(serverInfo.getIotCode(), subDeviceInfo.getParentCode(), productName, subDeviceInfo.getDeviceCode());
|
|
|
|