ソースを参照

设备基础信息同步至资产表bug修改

jingyuanchao 1 年間 前
コミット
b19060fb95

+ 5 - 1
soc-modules/soc-modules-host/src/main/java/com/xunmei/host/iot/service/impl/IotDeviceInfoServiceImpl.java

@@ -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());