From 4eb705f531fc2b26c808b9f077968cec30d1cd34 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Sun, 26 May 2024 11:25:38 +0800 Subject: [PATCH] =?UTF-8?q?add:=E7=AB=99=E7=82=B9=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ExtraResolveStrategyService.java | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/ExtraResolveStrategyService.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/ExtraResolveStrategyService.java index ed8ffff..60d910d 100644 --- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/ExtraResolveStrategyService.java +++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/ExtraResolveStrategyService.java @@ -114,20 +114,20 @@ public class ExtraResolveStrategyService { real.setTime(DateUtil.format(date,DateUtil.PATTERN_DATETIME)); } } - if(Func.isNotEmpty(data.getItem())) { - if("历史".equals(data.getType())) { - // 历史数据需要手动查询功能ID供前端使用 - DataItemVO item = data.getItem(); - R> attrR = deviceClient.getOnlineAttr(item.getDeviceId()); - if(attrR.isSuccess() && CollectionUtil.isNotEmpty(attrR.getData())) { - List attrList = attrR.getData(); - Optional facDeviceIdOptional = attrList.stream().parallel().filter(f -> item.getSignage().equals(f.getSignage())) - .map(DeviceInstanceAttrVO::getFacDeviceAttrId).findFirst(); - logger.info("hzims-big-model:resolveShowParam:facDeviceId",facDeviceIdOptional.orElse("")); - item.setAttrId(facDeviceIdOptional.orElse(null)); - } - } - } +// if(Func.isNotEmpty(data.getItem())) { +// if("历史".equals(data.getType())) { +// // 历史数据需要手动查询功能ID供前端使用 +// DataItemVO item = data.getItem(); +// R> attrR = deviceClient.getOnlineAttr(item.getDeviceId()); +// if(attrR.isSuccess() && CollectionUtil.isNotEmpty(attrR.getData())) { +// List attrList = attrR.getData(); +// Optional facDeviceIdOptional = attrList.stream().parallel().filter(f -> item.getSignage().equals(f.getSignage())) +// .map(DeviceInstanceAttrVO::getFacDeviceAttrId).findFirst(); +// logger.info("hzims-big-model:resolveShowParam:facDeviceId",facDeviceIdOptional.orElse("")); +// item.setAttrId(facDeviceIdOptional.orElse(null)); +// } +// } +// } } param.put("data", data); result.setParams(param);