国网上送提交代码

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/LineDevGetDTO.java

@@ -70,5 +70,10 @@ public class LineDevGetDTO {
      */
     private LocalDateTime updateTime;
 
+    /**
+     * 是否上送国网是否是上送国网监测点,0-否 1-是
+     */
+    private Integer isUpToGrid;
+
 
 }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java

@@ -156,6 +156,7 @@ public class CommTerminalServiceImpl implements CommTerminalService {
                                 lineDevGetDTO.setLineTag(it.getMonitorTag());
                                 //预处理模块需要的id修改value为id
                                 lineDevGetDTO.setVoltageLevel(it.getVoltageLevel());
+                                lineDevGetDTO.setIsUpToGrid(it.getIsUpToGrid());
                                 lineList.add(lineDevGetDTO);
                             });
                         }

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java

@@ -81,7 +81,7 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
         List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(
                 DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
         for (DeptGetChildrenMoreDTO deptGetChildrenMoreDTO : calculatedParam.getIdList()) {
-            List<String> collect1 = deptGetChildrenMoreDTO.getLineBaseList().stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
+            List<String> collect1 = deptGetChildrenMoreDTO.getLineBaseList().stream().filter(temp->Objects.equals(temp.getIsUpToGrid(),1)).map(LineDevGetDTO::getPointId).collect(Collectors.toList());
 
 
             //站内有效监测点数量