From 56fd563ad23c79991baf40d346fe563e4cc2e05c Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 3 Sep 2024 09:05:38 +0800 Subject: [PATCH] fix --- .../java/com/iformall/service/impl/WxEnergyServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java index a2177906a..cb8d8ac99 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -185,6 +185,9 @@ public class WxEnergyServiceImpl implements WxEnergyService { }else if (record.getPhysicsType() == EnumEnergyMeterPhysicsType.PUBLIC.getCode() || record.getPhysicsType() == EnumEnergyMeterPhysicsType.SUMMARY.getCode()) { List floorIds = record.getFloorIds(); List buildindIds = record.getBuildingIds(); + if (null == floorIds || floorIds.size() <= 0 || null == buildindIds || buildindIds.size() <= 0 ) { + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"必须选择楼层和楼座"); + } FloorBuildingIdDTO dto = getFloorBuildingIds(record, floorIds, buildindIds); record.setType(dto.getType().getCode()); aliasIds = dto.getIds(); @@ -906,6 +909,9 @@ public class WxEnergyServiceImpl implements WxEnergyService { Map shopMap = wxShopService.findShopMap(shopq); for (int i = 0 ; i < record.getMeterReadingList().size(); i ++) { WxEnergyMeterReading r = record.getMeterReadingList().get(i); + if (StringUtils.isBlank(r.getCurNumber())) { + continue; + } //获取上一次的数据 WxEnergyMeterReading pre = findPre(r); if (null != pre) {