diff --git a/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java b/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java index 4b55ff0..22ce765 100644 --- a/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java +++ b/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java @@ -94,8 +94,7 @@ public class StatServiceImpl implements IStatService { } //直连设备 else if (Objects.equals(DicDataEnum.CONNECT_DEV.getCode(),code)) { - if (Objects.equals(appAutoDataMessage.getDid(),1)){ - lineId = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appAutoDataMessage.getId())), Map.class).get("0").toString(); + if (Objects.equals(appAutoDataMessage.getDid(),1)){lineId = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appAutoDataMessage.getId())), Map.class).get("0").toString(); } else if (Objects.equals(appAutoDataMessage.getDid(),2)){ lineId = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appAutoDataMessage.getId())), Map.class).get(appAutoDataMessage.getMsg().getClDid().toString()).toString(); } @@ -111,19 +110,19 @@ public class StatServiceImpl implements IStatService { for (AppAutoDataMessage.DataArray item : list) { switch (item.getDataAttr()) { case 1: - log.info("处理最大值"); + log.info("{}-->处理最大值", po.getNdid()); dataArrayParam.setStatMethod("max"); break; case 2: - log.info("处理最小值"); + log.info("{}-->处理最小值", po.getNdid()); dataArrayParam.setStatMethod("min"); break; case 3: - log.info("处理avg"); + log.info("{}-->处理avg", po.getNdid()); dataArrayParam.setStatMethod("avg"); break; case 4: - log.info("处理cp95"); + log.info("{}-->处理cp95", po.getNdid()); dataArrayParam.setStatMethod("cp95"); break; default: