|
|
|
@@ -117,11 +117,23 @@ public class KwBoxServiceImpl implements KwBoxService { |
|
|
|
|
|
|
|
List<KwBoxMeter> 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<KwMeter> 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<KwBoxMeter> 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<KwMeter> 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); |
|
|
|
} |
|
|
|
} |