导出新增 连个列，以及同步数据库时点位名修改未成功问题

zxl

2025-03-28 d384786ab5868cd4d856691372eee5359e7d9b2c

 ycl-server/src/main/java/com/ycl/task/MonitorTask.java

@@ -115,6 +115,7 @@
                monitorList.add(monitor);
                ywPointList.add(point);
            }
            log.error("同步mongo新ywpoint数据{}",ywPointList);
            //添加老数据
            List<String> numbers = CollectionUtils.isEmpty(monitorList) ? new ArrayList<>() : monitorList.stream().map(TMonitor::getSerialNumber).collect(Collectors.toList());
            monitorVOMap.forEach((key, value) -> {
@@ -126,11 +127,12 @@
                    if (osdCheckResult != null) {
                        monitor.setDeviceType(osdCheckResult.getDeviceBrand());
                    }

                    monitorList.add(monitor);
                }
            });
            //转换
            List<String> points = CollectionUtils.isEmpty(ywPointList) ? new ArrayList<>() : ywPointList.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList());
            //pointMap点位旧数据 设备码map
            pointMap.forEach((key, value) -> {
                //老设备状态改为不参与考核
                if (!points.contains(key)) {
@@ -140,7 +142,7 @@
                    ywPointList.add(value);
                }
            });

            log.error("同步mongo新加旧ywpoint数据{}",ywPointList);
            log.info("result集合{},设备集合{},点位集合{}", oneMachineFileResults.size(), monitorList.size(), ywPointList.size());
            //插入数据库
            if (!CollectionUtils.isEmpty(monitorList)) {
@@ -161,6 +163,10 @@
        YwPoint ywPoint = new YwPoint();
        if (pointMap.containsKey(result.getSerialNumber().getValue())) {
            ywPoint = pointMap.get(result.getSerialNumber().getValue());
            //更新定位名
            if (ywPoint != null) {
                ywPoint.setPointName(result.getName().getValue());
            }
        } else {
            ywPoint.setPointName(result.getName().getValue());
            ywPoint.setStatus(PointStatus.WAIT.getDesc());