From a76d1e32517879d568202693c8b38182cbfb0f77 Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 16 Jul 2019 14:29:24 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E7=94=B5=E8=A1=A8=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/mapper/KwMeterMapper.java | 2 +- .../java/com/iformall/service/kw/KwMeterService.java | 4 ++-- .../com/iformall/service/kw/impl/KwBoxServiceImpl.java | 6 ++++-- .../com/iformall/service/kw/impl/KwMeterServiceImpl.java | 9 +++------ 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/KwMeterMapper.java b/mallinkService/src/main/java/com/iformall/mapper/KwMeterMapper.java index 9554cf64e..7bc9c12d2 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/KwMeterMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/KwMeterMapper.java @@ -8,6 +8,6 @@ import java.util.List; public interface KwMeterMapper extends CommonMapper { List findList(KwMeter param); - + int updateBatch(KwMeter param); } diff --git a/mallinkService/src/main/java/com/iformall/service/kw/KwMeterService.java b/mallinkService/src/main/java/com/iformall/service/kw/KwMeterService.java index 6cff3fa25..56f8114dc 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/KwMeterService.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/KwMeterService.java @@ -36,14 +36,14 @@ public interface KwMeterService { * * @param record */ - ResultData saveOrUpdate(KwMeter record); + void saveOrUpdate(KwMeter record); /** * 保存或更新实体 * * @param record */ - ResultData updateBatch(KwMeter record); + int updateBatch(KwMeter record); /** * 根据Id删除实体 * 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 8029a7073..1f3c953f1 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 @@ -120,9 +120,10 @@ public class KwBoxServiceImpl implements KwBoxService { } }); - KwMeter kwMeter = new KwMeter(); + List onlines = kwMeterDataList.stream().filter(md->md.getTotalPower()!=null).map(KwMeterData::getMeterId).collect(Collectors.toList()); if (onlines.size() > 0) { + KwMeter kwMeter = new KwMeter(); kwMeter.setIds(onlines); kwMeter.setOnlineStatus(EnumMeterOnlineStatus.ONLINE.getCode()); kwMeter.setUpdateTime(new Date()); @@ -132,7 +133,7 @@ public class KwBoxServiceImpl implements KwBoxService { param.setIds(onlines); List lastRecordList = kwMeterDataService.findLastRecordList(param); kwMeterDataList.stream().forEach(md->{ - Optional data = lastRecordList.stream().filter(lr->lr.getMeterId() == md.getMeterId()).findAny(); + Optional data = lastRecordList.stream().filter(lr->lr.getMeterId().equals(md.getMeterId())).findAny(); if (data.isPresent()) { md.setUsedPower( md.getTotalPower()-data.get().getTotalPower()); @@ -144,6 +145,7 @@ public class KwBoxServiceImpl implements KwBoxService { List offlines = kwMeterDataList.stream().filter(md->md.getTotalPower()==null).map(KwMeterData::getMeterId).collect(Collectors.toList()); if (offlines.size() > 0) { + KwMeter kwMeter = new KwMeter(); kwMeter.setIds(onlines); kwMeter.setOnlineStatus(EnumMeterOnlineStatus.OFFLINE.getCode()); kwMeter.setUpdateTime(new Date()); diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java index 6f8f19358..53b909c4e 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java @@ -36,7 +36,7 @@ public class KwMeterServiceImpl implements KwMeterService { @Override - public ResultData saveOrUpdate(KwMeter record) { + public void saveOrUpdate(KwMeter record) { if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); @@ -47,14 +47,11 @@ public class KwMeterServiceImpl implements KwMeterService { record.setUpdateTime(new Date()); kwMeterMapper.updateByPrimaryKeySelective(record); } - return new ResultData(); } @Override - public ResultData updateBatch(KwMeter record) { - - - return new ResultData(); + public int updateBatch(KwMeter record) { + return kwMeterMapper.updateBatch(record); } @Override