Bläddra i källkod

[电表][修改]:电表状态更新

release_toaliyun_real
hupeng 6 år sedan
förälder
incheckning
a76d1e3251
4 ändrade filer med 10 tillägg och 11 borttagningar
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/KwMeterMapper.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/kw/KwMeterService.java
  3. +4
    -2
      mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java
  4. +3
    -6
      mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/KwMeterMapper.java Visa fil

@@ -8,6 +8,6 @@ import java.util.List;
public interface KwMeterMapper extends CommonMapper<KwMeter, Long> { public interface KwMeterMapper extends CommonMapper<KwMeter, Long> {


List<KwMeter> findList(KwMeter param); List<KwMeter> findList(KwMeter param);
int updateBatch(KwMeter param);


} }

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/kw/KwMeterService.java Visa fil

@@ -36,14 +36,14 @@ public interface KwMeterService {
* *
* @param record * @param record
*/ */
ResultData saveOrUpdate(KwMeter record);
void saveOrUpdate(KwMeter record);


/** /**
* 保存或更新实体 * 保存或更新实体
* *
* @param record * @param record
*/ */
ResultData updateBatch(KwMeter record);
int updateBatch(KwMeter record);
/** /**
* 根据Id删除实体 * 根据Id删除实体
* *


+ 4
- 2
mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java Visa fil

@@ -120,9 +120,10 @@ public class KwBoxServiceImpl implements KwBoxService {
} }
}); });


KwMeter kwMeter = new KwMeter();
List<Long> onlines = kwMeterDataList.stream().filter(md->md.getTotalPower()!=null).map(KwMeterData::getMeterId).collect(Collectors.toList()); List<Long> onlines = kwMeterDataList.stream().filter(md->md.getTotalPower()!=null).map(KwMeterData::getMeterId).collect(Collectors.toList());
if (onlines.size() > 0) { if (onlines.size() > 0) {
KwMeter kwMeter = new KwMeter();
kwMeter.setIds(onlines); kwMeter.setIds(onlines);
kwMeter.setOnlineStatus(EnumMeterOnlineStatus.ONLINE.getCode()); kwMeter.setOnlineStatus(EnumMeterOnlineStatus.ONLINE.getCode());
kwMeter.setUpdateTime(new Date()); kwMeter.setUpdateTime(new Date());
@@ -132,7 +133,7 @@ public class KwBoxServiceImpl implements KwBoxService {
param.setIds(onlines); param.setIds(onlines);
List<KwMeterData> lastRecordList = kwMeterDataService.findLastRecordList(param); List<KwMeterData> lastRecordList = kwMeterDataService.findLastRecordList(param);
kwMeterDataList.stream().forEach(md->{ kwMeterDataList.stream().forEach(md->{
Optional<KwMeterData> data = lastRecordList.stream().filter(lr->lr.getMeterId() == md.getMeterId()).findAny();
Optional<KwMeterData> data = lastRecordList.stream().filter(lr->lr.getMeterId().equals(md.getMeterId())).findAny();
if (data.isPresent()) { if (data.isPresent()) {
md.setUsedPower( md.setUsedPower(
md.getTotalPower()-data.get().getTotalPower()); md.getTotalPower()-data.get().getTotalPower());
@@ -144,6 +145,7 @@ public class KwBoxServiceImpl implements KwBoxService {


List<Long> offlines = kwMeterDataList.stream().filter(md->md.getTotalPower()==null).map(KwMeterData::getMeterId).collect(Collectors.toList()); List<Long> offlines = kwMeterDataList.stream().filter(md->md.getTotalPower()==null).map(KwMeterData::getMeterId).collect(Collectors.toList());
if (offlines.size() > 0) { if (offlines.size() > 0) {
KwMeter kwMeter = new KwMeter();
kwMeter.setIds(onlines); kwMeter.setIds(onlines);
kwMeter.setOnlineStatus(EnumMeterOnlineStatus.OFFLINE.getCode()); kwMeter.setOnlineStatus(EnumMeterOnlineStatus.OFFLINE.getCode());
kwMeter.setUpdateTime(new Date()); kwMeter.setUpdateTime(new Date());


+ 3
- 6
mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java Visa fil

@@ -36,7 +36,7 @@ public class KwMeterServiceImpl implements KwMeterService {




@Override @Override
public ResultData saveOrUpdate(KwMeter record) {
public void saveOrUpdate(KwMeter record) {
if (record.getId() == null) { if (record.getId() == null) {
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId()); record.setId(idWorker.nextId());
@@ -47,14 +47,11 @@ public class KwMeterServiceImpl implements KwMeterService {
record.setUpdateTime(new Date()); record.setUpdateTime(new Date());
kwMeterMapper.updateByPrimaryKeySelective(record); kwMeterMapper.updateByPrimaryKeySelective(record);
} }
return new ResultData();
} }


@Override @Override
public ResultData updateBatch(KwMeter record) {


return new ResultData();
public int updateBatch(KwMeter record) {
return kwMeterMapper.updateBatch(record);
} }


@Override @Override


Laddar…
Avbryt
Spara