去除要素过滤

src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/IotWarnindicatorServiceImpl.java

@@ -138,32 +138,15 @@ public class IotWarnindicatorServiceImpl implements IIotWarnindicatorService {
                 return result;
             }
             JSONArray jsonArray = JSONArray.parseArray(iotDevicelasteddata.getDevldContent());
-            if (!jsonArray.isEmpty() && !warndataitemMap.isEmpty()) {
-                // 如果设备存在预设要素。则需要过滤非预设要素
-                for (int i = 0; i < jsonArray.size(); i++) {
-                    JSONObject dataItem = jsonArray.getJSONObject(i);
-                    IotWarndataitem iotWarndataitem = warndataitemMap.get(dataItem.getString("factorCode"));
-                    if (null != iotWarndataitem) {
-                        IotWarnindicator iotWarnindicator = new IotWarnindicator();
-                        iotWarnindicator.setWiAddress(dataItem.getString("address"));
-                        iotWarnindicator.setWiCode(dataItem.getString("factorCode"));
-                        iotWarnindicator.setWiName(dataItem.getString("factorName"));
-                        iotWarnindicator.setWiUnit(dataItem.getString("factorUnit"));
-                        iotWarnindicator.setWdBid(iotWarndataitem.getWdBid());
-                        result.add(iotWarnindicator);
-                    }
-                }
-            } else {
-                // 如果设备不存在预设要素。则直接返回设备上报的数据
-                for (int i = 0; i < jsonArray.size(); i++) {
-                    JSONObject dataItem = jsonArray.getJSONObject(i);
-                    IotWarnindicator iotWarnindicator = new IotWarnindicator();
-                    iotWarnindicator.setWiAddress(dataItem.getString("address"));
-                    iotWarnindicator.setWiCode(dataItem.getString("factorCode"));
-                    iotWarnindicator.setWiName(dataItem.getString("factorName"));
-                    iotWarnindicator.setWiUnit(dataItem.getString("factorUnit"));
-                    result.add(iotWarnindicator);
-                }
+            // 直接返回设备上报的数据
+            for (int i = 0; i < jsonArray.size(); i++) {
+                JSONObject dataItem = jsonArray.getJSONObject(i);
+                IotWarnindicator iotWarnindicator = new IotWarnindicator();
+                iotWarnindicator.setWiAddress(dataItem.getString("address"));
+                iotWarnindicator.setWiCode(dataItem.getString("factorCode"));
+                iotWarnindicator.setWiName(dataItem.getString("factorName"));
+                iotWarnindicator.setWiUnit(dataItem.getString("factorUnit"));
+                result.add(iotWarnindicator);
             }
         }
         return result;