From ea54aad7ab6a5cb3fddebe6e14e7ca82dde5fe59 Mon Sep 17 00:00:00 2001 From: hupeng Date: Sat, 15 Jun 2019 13:25:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E7=94=B5=E8=A1=A8=E6=B2=A1=E6=9C=89=E9=85=8D=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=9F=A5=E8=AF=A2=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/device/KwBoxV1Controller.java | 3 ++- .../service/kw/impl/KwBoxServiceImpl.java | 26 +++++++++++++++---- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java index 7858fd69b..ad7caaf65 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java @@ -83,7 +83,8 @@ public class KwBoxV1Controller extends BaseController { record.setStatus(EnumBoxStatus.REGISTERED.getCode()); kwBoxService.saveOrUpdate(record); Map data = new HashMap<>(); - data.put("config",kwBox.getConfig()); + if (kwBox.getConfig() != null) + data.put("config",kwBox.getConfig() ); List meters = kwBoxService.findMeters(kwBox); data.put("meters",meters); return new ResultData(data); diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java index b57c707aa..e621c59ad 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java @@ -117,11 +117,23 @@ public class KwBoxServiceImpl implements KwBoxService { List kwBoxMeters = kwBoxMeterService.findList(kwBoxMeter); + if (kwBoxMeters.isEmpty()) { + logger.info("没找到盒子表关联项: boxId="+kwBoxMeter.getBoxId()); + return null; + } KwMeter kwMeter = new KwMeter(); kwMeter.setIds(kwBoxMeters.stream().map(KwBoxMeter::getMeterId).collect(Collectors.toList())); + if (kwMeter.getIds().isEmpty()) { + logger.info("没找到盒子关联的表: boxId="+kwBoxMeter.getBoxId()); + return null; + } List kwMeters = kwMeterService.findList(kwMeter); + if (kwMeter.getIds().isEmpty()) { + logger.info("没找到盒子关联的表: ids=" + kwBoxMeter.getIds()); + return null; + } return kwMeters.stream().map(KwMeter::getAddress).collect(Collectors.toList()); } @@ -134,17 +146,21 @@ public class KwBoxServiceImpl implements KwBoxService { List kwBoxMeters = kwBoxMeterService.findList(kwBoxMeter); + if (kwBoxMeters.isEmpty()) { + logger.info("没找到盒子表关联项: boxId="+kwBoxMeter.getBoxId()); + return null; + } + KwMeter kwMeter = new KwMeter(); kwMeter.setAddress(addr); kwMeter.setIds(kwBoxMeters.stream().map(KwBoxMeter::getMeterId).collect(Collectors.toList())); List kwMeters = kwMeterService.findList(kwMeter); - - - if (kwMeters.size() > 0) - return kwMeters.get(0); - else + if (kwMeters.isEmpty()) { + logger.info("没找到盒子关联的表: ids="+kwBoxMeter.getIds() +",addr=",kwMeter.getAddress()); return null; + } + return kwMeters.get(0); } }