水库填报修复-电站

xieb

2023-11-29 e3016cfd582c7cd6cf7a3cf93a29305a0df97a99

水库填报修复-电站

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java

@@ -2,6 +2,7 @@

import cn.gistack.sm.intelligentCall.entity.Scene;
import cn.gistack.sm.sjztmd.entity.TbAttResPowerStation;
import cn.gistack.sm.sjztmd.entity.TbAttResWaterDelivery;
import cn.gistack.sm.sjztmd.mapper.TbAttResPowerStationMapper;
import cn.gistack.sm.sjztmd.service.ITbAttResBaseService;
import cn.gistack.sm.sjztmd.service.ITbAttResPowerStationService;
@@ -18,7 +19,9 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;

/**
 * @ClassName TbAttResPowerStationServiceImpl
@@ -138,8 +141,16 @@
        setUpdateCheckLog(oldList,newList);

        // 取旧数据和新提交数据交集--更新
        List<TbAttResPowerStation> updateList = newList.stream().filter(vo -> oldList.stream().map(e ->
            e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
        List<TbAttResPowerStation> updateList = Stream.concat(oldList.stream(),newList.stream())
            .collect(Collectors.toMap(TbAttResPowerStation::getGuid, Function.identity(),(oldValue, newValue) -> {
                    oldValue.setCheckState(newValue.getCheckState());
                    return oldValue;
                }
            ))
            .values()
            .stream()
            .collect(Collectors.toList());


        // 更新数据
        boolean batch = updateBatchById(updateList);