From 1a442a18886f206316aae844f8012a71226b452b Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Wed, 5 Jun 2024 18:06:46 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=85=A8=E6=99=AF=E5=B1=95=E7=A4=BA=E5=86=80?=
 =?UTF-8?q?=E5=8C=97=E7=9B=91=E6=B5=8B=E8=BF=90=E8=A1=8C=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/device/biz/pojo/param/DeptGetLineParam.java | 7 +++++++
 .../com/njcn/device/pq/pojo/param/DeviceInfoParam.java   | 9 ++++++++-
 .../njcn/device/pq/controller/GridDiagramController.java | 1 +
 .../java/com/njcn/device/pq/mapper/DeptLineMapper.java   | 4 ++--
 .../com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml | 6 ++++++
 .../njcn/device/pq/mapper/mapping/LineDetailMapper.xml   | 1 +
 .../com/njcn/device/pq/mapper/mapping/LineMapper.xml     | 3 +++
 .../java/com/njcn/device/pq/service/DeptLineService.java | 4 ++--
 .../device/pq/service/impl/CommTerminalServiceImpl.java  | 9 +++++----
 .../njcn/device/pq/service/impl/DeptLineServiceImpl.java | 8 ++++----
 .../device/pq/service/impl/GridDiagramServiceImpl.java   | 5 +++++
 .../majornetwork/Impl/RmpEventDetailServiceImpl.java     | 1 +
 .../com/njcn/harmonic/service/impl/GridServiceImpl.java  | 8 ++++++++
 .../service/impl/PollutionSubstationServiceImpl.java     | 3 +++
 .../harmonic/service/impl/RMpTargetWarnDServiceImpl.java | 1 +
 .../service/majornetwork/impl/RStatLimitServiceImpl.java | 4 +++-
 16 files changed, 60 insertions(+), 14 deletions(-)

diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/param/DeptGetLineParam.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/param/DeptGetLineParam.java
index 4a64b261b..4dd609f40 100644
--- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/param/DeptGetLineParam.java
+++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/param/DeptGetLineParam.java
@@ -41,4 +41,11 @@ public class DeptGetLineParam {
     @ApiModelProperty("电网侧标识")
     @Range(min = 0, max = 2, message = "电网侧标识" + ValidMessage.PARAM_FORMAT_ERROR)
     private Integer powerFlag;
+
+    /**
+     * 监测点运行状态（0：运行；1：检修；2：停运；3：调试；4：退运）pq使用
+     */
+    @ApiModelProperty("监测点运行状态")
+    @Range(min = 0, max = 2, message = "监测点运行状态" + ValidMessage.PARAM_FORMAT_ERROR)
+    private Integer lineRunFlag;
 }
diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java
index bc8a64228..ceed502a6 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java
@@ -94,7 +94,14 @@ public class DeviceInfoParam implements Serializable {
     @ApiModelProperty("通讯状态")
     @Range(min = 0, max = 2, message = "通讯状态" + ValidMessage.PARAM_FORMAT_ERROR)
     private Integer comFlagStatus;
-    
+
+
+    /**
+     * 监测点运行状态（0：运行；1：检修；2：停运；3：调试；4：退运）
+     */
+    @ApiModelProperty("监测点运行状态")
+    @Range(min = 0, max = 2, message = "监测点运行状态" + ValidMessage.PARAM_FORMAT_ERROR)
+    private Integer lineRunFlag;
     /**
      * 默认全部监测点
      * @param deptIndex 部门索引
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GridDiagramController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GridDiagramController.java
index 9cea376e0..0c47491bf 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GridDiagramController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GridDiagramController.java
@@ -113,6 +113,7 @@ public class GridDiagramController extends BaseController {
     @ApiOperation("监测终端状态")
     public HttpResult<List<String>> getGridDiagramCityDev(@RequestBody GridDiagramParam param){
         String methodDescribe = getMethodDescribe("getGridDiagramCityDev");
+        param.getDeviceInfoParam().setLineRunFlag(0);
         List<String> gridDiagramCityDev = gridDiagramService.getGridDiagramCityDev(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, gridDiagramCityDev, methodDescribe);
     }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java
index aa88cd11a..83be88ac3 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java
@@ -72,11 +72,11 @@ public interface DeptLineMapper extends BaseMapper<DeptLine> {
     List<DeptLine> getLineByDeptRelation(@Param("devDataType")Integer devDataType);
 
 
-    List<LineDevGetDTO> lineDevGet(@Param("list")List<Integer> devType,@Param("type")Integer type);
+    List<LineDevGetDTO> lineDevGet(@Param("list")List<Integer> devType,@Param("type")Integer type,@Param("lineRunFlag") Integer lineRunFlag);
 
     List<TerminalGetBase> orgSubStationGet(@Param("list")List<Integer> devType);
 
-    List<TerminalGetBase.Extend> orgSubStationInfoGet(@Param("list")List<Integer> devType,@Param("powerFlag")Integer powerFlag);
+    List<TerminalGetBase.Extend> orgSubStationInfoGet(@Param("list")List<Integer> devType,@Param("powerFlag")Integer powerFlag,@Param("lineRunFlag") Integer lineRunFlag);
 
     List<String> getLineIdByDeptIds(@Param("deptIds")List<String> deptIds,@Param("runFlag")List<Integer> runFlag,@Param("dataType")List<Integer> dataType);
 
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml
index 7f4bd914d..b61a6084f 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml
@@ -66,6 +66,9 @@
             #{item}
         </foreach>
         and device.Run_Flag = 0
+        <if test="lineRunFlag!=null ">
+            and lineDetail.Run_Flag = #{lineRunFlag}
+        </if>
 
     </select>
 
@@ -118,6 +121,9 @@
         <if test="powerFlag!=null ">
             and lineDetail.Power_Flag = #{powerFlag}
         </if>
+        <if test="lineRunFlag!=null ">
+            and lineDetail.Run_Flag = #{lineRunFlag}
+        </if>
     </select>
     <select id="getLineIdByDeptIds" resultType="string">
         select
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml
index 628ffd6cf..bb48e8799 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml
@@ -81,6 +81,7 @@
             AND pqd.id = dev.id
             and	pqd.Dev_Model =1
             and	pqd.Run_Flag = 0
+            and	detail.Run_Flag = 0
             <if test="ids != null and ids.size > 0">
                 AND line.id IN
                 <foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
index afec3e55a..225096c4b 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
@@ -280,6 +280,9 @@
         <if test="deviceInfoParam.powerFlag!=2 and deviceInfoParam.powerFlag!=null ">
             and t2.Power_Flag = #{deviceInfoParam.powerFlag}
         </if>
+        <if test="deviceInfoParam.lineRunFlag!=null ">
+            and t2.Run_Flag = #{deviceInfoParam.lineRunFlag}
+        </if>
         <if test="deviceInfoParam.lineGrade!='' and deviceInfoParam.lineGrade!=null">
             and t2.line_grade = #{deviceInfoParam.lineGrade}
         </if>
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java
index fd60c07e2..2bd783503 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java
@@ -96,7 +96,7 @@ public interface DeptLineService extends IService<DeptLine> {
      * @author cdf
      * @date 2023/5/10
      */
-    Map<String, List<LineDevGetDTO>> lineDevGet(List<Integer> devType,Integer type);
+    Map<String, List<LineDevGetDTO>> lineDevGet(List<Integer> devType,Integer type,Integer lineRunFlag);
 
 
 
@@ -108,7 +108,7 @@ public interface DeptLineService extends IService<DeptLine> {
     Map<String, List<TerminalGetBase>> orgSubStationGet(List<Integer> devType);
 
 
-    List<TerminalGetBase.Extend> orgSubStationInfoGet(List<Integer> devType,Integer powerFlag);
+    List<TerminalGetBase.Extend> orgSubStationInfoGet(List<Integer> devType,Integer powerFlag,Integer lineRunFlag);
 
     List<SubGetBase> getSubStationList(SubstationParam substationParam);
 
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java
index f6d322332..1cc93d7c8 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java
@@ -83,7 +83,8 @@ public class CommTerminalServiceImpl implements CommTerminalService {
         List<DeptGetChildrenMoreDTO> result = new ArrayList<>();
         List<DeptGetBase> temDept = getDeptChildrenByParent(deptGetLineParam);
         Map<String, String> deptMap = temDept.stream().collect(Collectors.toMap(DeptGetBase::getUnitId, DeptGetBase::getUnitName));
-         Map<String, List<LineDevGetDTO>> map = deptLineService.lineDevGet(filterDataTypeNew(deptGetLineParam.getServerName()),1);
+         Map<String, List<LineDevGetDTO>> map = deptLineService.lineDevGet(filterDataTypeNew(deptGetLineParam.getServerName()),
+                 1,deptGetLineParam.getLineRunFlag());
         temDept.forEach(item -> {
             DeptGetChildrenMoreDTO deptGetChildrenMoreDTO = new DeptGetChildrenMoreDTO();
             deptGetChildrenMoreDTO.setUnitId(item.getUnitId());
@@ -155,7 +156,7 @@ public class CommTerminalServiceImpl implements CommTerminalService {
     public List<DeptGetBusBarDTO> deptBusBar(DeptGetLineParam deptGetLineParam) {
         List<DeptGetBusBarDTO> result = new ArrayList<>();
         List<DeptGetBase> temDept = getDeptChildrenByParent(deptGetLineParam);
-        Map<String, List<LineDevGetDTO>> map = deptLineService.lineDevGet(filterDataTypeNew(deptGetLineParam.getServerName()),2);
+        Map<String, List<LineDevGetDTO>> map = deptLineService.lineDevGet(filterDataTypeNew(deptGetLineParam.getServerName()),2,deptGetLineParam.getLineRunFlag());
         temDept.forEach(item -> {
             DeptGetBusBarDTO deptGetBusBarDTO = new DeptGetBusBarDTO();
             deptGetBusBarDTO.setUnitId(item.getUnitId());
@@ -183,7 +184,7 @@ public class CommTerminalServiceImpl implements CommTerminalService {
     public List<DeptGetDeviceDTO> deptGetDevice(DeptGetLineParam deptGetLineParam,Integer type) {
         List<DeptGetDeviceDTO> result = new ArrayList<>();
         List<DeptGetBase> temDept = getDeptChildrenByParent(deptGetLineParam);
-        Map<String, List<LineDevGetDTO>> map = deptLineService.lineDevGet(filterDataTypeNew(deptGetLineParam.getServerName()),3);
+        Map<String, List<LineDevGetDTO>> map = deptLineService.lineDevGet(filterDataTypeNew(deptGetLineParam.getServerName()),3,deptGetLineParam.getLineRunFlag());
         temDept.forEach(item -> {
             DeptGetDeviceDTO deptGetDeviceDTO = new DeptGetDeviceDTO();
             deptGetDeviceDTO.setUnitId(item.getUnitId());
@@ -221,7 +222,7 @@ public class CommTerminalServiceImpl implements CommTerminalService {
     public List<DeptGetSubStationDTO.Info> deptSubStationInfo(DeptGetLineParam deptGetLineParam) {
         List<DeptGetSubStationDTO.Info> result = new ArrayList<>();
         List<DeptGetBase> temDept = getDeptChildrenByParent(deptGetLineParam);
-        List<TerminalGetBase.Extend> anExtends = deptLineService.orgSubStationInfoGet(filterDataTypeNew(deptGetLineParam.getServerName()),deptGetLineParam.getPowerFlag());
+        List<TerminalGetBase.Extend> anExtends = deptLineService.orgSubStationInfoGet(filterDataTypeNew(deptGetLineParam.getServerName()),deptGetLineParam.getPowerFlag(),deptGetLineParam.getLineRunFlag());
         Map<String, List<TerminalGetBase.Extend>> orgSub = anExtends.stream().collect(Collectors.groupingBy(TerminalGetBase::getUnitId));
         Map<String, String> deptNameMap = temDept.stream().collect(Collectors.toMap(DeptGetBase::getUnitId, DeptGetBase::getUnitName));
         temDept.forEach(item -> {
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java
index b75efc12f..d29d679fa 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java
@@ -113,8 +113,8 @@ public class DeptLineServiceImpl extends ServiceImpl<DeptLineMapper, DeptLine> i
     }
 
     @Override
-    public Map<String, List<LineDevGetDTO>> lineDevGet(List<Integer> devDataType,Integer type) {
-        List<LineDevGetDTO> deptLines = deptLineMapper.lineDevGet(devDataType,type);
+    public Map<String, List<LineDevGetDTO>> lineDevGet(List<Integer> devDataType,Integer type,Integer lineRunFlag) {
+        List<LineDevGetDTO> deptLines = deptLineMapper.lineDevGet(devDataType,type, lineRunFlag);
         return deptLines.stream ().collect (Collectors.groupingBy (LineDevGetDTO::getUnitId));
     }
 
@@ -125,8 +125,8 @@ public class DeptLineServiceImpl extends ServiceImpl<DeptLineMapper, DeptLine> i
     }
 
     @Override
-    public List<TerminalGetBase.Extend> orgSubStationInfoGet(List<Integer> devType,Integer powerFlag) {
-        return deptLineMapper.orgSubStationInfoGet(devType, powerFlag);
+    public List<TerminalGetBase.Extend> orgSubStationInfoGet(List<Integer> devType,Integer powerFlag,Integer lineRunFlag) {
+        return deptLineMapper.orgSubStationInfoGet(devType, powerFlag,lineRunFlag);
     }
 
     @Override
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java
index 02ceb13ad..2152416ce 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java
@@ -83,6 +83,7 @@ public class GridDiagramServiceImpl implements GridDiagramService {
         List<Dept> data = deptFeignClient.getDirectSonSelf(param.getOrgId()).getData();
         DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
         deptGetLineParam.setDeptId(param.getOrgId());
+        deptGetLineParam.setLineRunFlag(0);
         List<DeptGetChildrenMoreDTO> deptGetChildrenMoreDTOS = commTerminalService.deptGetLine(deptGetLineParam);
         //监测点id集合
         List<String> lineIdsAll = deptGetChildrenMoreDTOS.stream().flatMap(x -> x.getLineBaseList().stream().map(LineDevGetDTO::getPointId)).distinct().collect(Collectors.toList());
@@ -247,6 +248,7 @@ public class GridDiagramServiceImpl implements GridDiagramService {
         List<Dept> data = deptFeignClient.getDirectSonSelf(param.getOrgId()).getData();
         DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
         deptGetLineParam.setDeptId(param.getOrgId());
+        deptGetLineParam.setLineRunFlag(0);
         List<DeptGetChildrenMoreDTO> deptGetChildrenMoreDTOS = commTerminalService.deptGetLine(deptGetLineParam);
 
 
@@ -279,6 +281,7 @@ public class GridDiagramServiceImpl implements GridDiagramService {
 
     @Override
     public Map<String, Long> getGridDiagramDevTendency(GridDiagramParam param, Integer type) {
+        param.getDeviceInfoParam().setLineRunFlag(0);
         List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(param.getDeviceInfoParam(), Stream.of(0).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList()));
         Map<String, Long> map = new LinkedHashMap<>();
         DateField dateField;
@@ -321,6 +324,7 @@ public class GridDiagramServiceImpl implements GridDiagramService {
 
     @Override
     public List<GridDiagramVO.DeviceData> getGridDiagramDevData(GridDiagramParam param) {
+        param.getDeviceInfoParam().setLineRunFlag(0);
         // 获取所有数据
         List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(param.getDeviceInfoParam(), Stream.of(0).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList()));
         List<String> devIDs = generalDeviceDTOList.stream().flatMap(x -> x.getDeviceIndexes().stream()).distinct().collect(Collectors.toList());
@@ -360,6 +364,7 @@ public class GridDiagramServiceImpl implements GridDiagramService {
 
     @Override
     public List<GridDiagramVO.DevData> getGridDiagramDevDataList(GridDiagramParam param) {
+        param.getDeviceInfoParam().setLineRunFlag(0);
         List<GridDiagramVO.DevData> info = new ArrayList<>();
         List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfoAsDept(param.getDeviceInfoParam(), null, Stream.of(1).collect(Collectors.toList()));
         List<String> devIds = generalDeviceDTOList.stream().flatMap(x -> x.getDeviceIndexes().stream()).collect(Collectors.toList());
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RmpEventDetailServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RmpEventDetailServiceImpl.java
index c273563bf..5e542102d 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RmpEventDetailServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RmpEventDetailServiceImpl.java
@@ -293,6 +293,7 @@ public class RmpEventDetailServiceImpl extends ServiceImpl<RmpEventDetailMapper,
         List<String> deptIDS = data.stream().map(x -> x.getId()).collect(Collectors.toList());
         DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
         deptGetLineParam.setDeptId(param.getId());
+        deptGetLineParam.setLineRunFlag(0);
         List<DeptGetChildrenMoreDTO> deptGetChildrenMoreDTOS = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData();
         List<LineDevGetDTO> collect = deptGetChildrenMoreDTOS.stream()
                 .filter(x->deptIDS.contains(x.getUnitId()))
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
index ae2d1ed0a..65206a4d7 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
@@ -73,6 +73,7 @@ public class GridServiceImpl implements IGridService {
         DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
         deptGetLineParam.setDeptId(param.getDeptIndex());
         deptGetLineParam.setServerName("harmonic-boot");
+        deptGetLineParam.setLineRunFlag(0);
         List<DeptGetChildrenMoreDTO> list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData();
         //获取监测点集合
         Map<String,List<String>> lineMap = this.getLineMap(list, param.getIsUpToGrid(), null);
@@ -124,6 +125,7 @@ public class GridServiceImpl implements IGridService {
         DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
         deptGetLineParam.setDeptId(param.getDeptIndex());
         deptGetLineParam.setServerName("harmonic-boot");
+        deptGetLineParam.setLineRunFlag(0);
         List<DeptGetChildrenMoreDTO> list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData();
         //获取监测点集合
         Map<String,List<String>> lineMap = this.getLineMap(list, param.getIsUpToGrid(), null);
@@ -165,6 +167,7 @@ public class GridServiceImpl implements IGridService {
         DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
         deptGetLineParam.setDeptId(param.getDeptIndex());
         deptGetLineParam.setServerName("harmonic-boot");
+        deptGetLineParam.setLineRunFlag(0);
         List<DeptGetChildrenMoreDTO> list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData();
         //获取监测点集合
         Map<String,List<String>> lineMap = this.getLineMap(list, param.getIsUpToGrid(), null);
@@ -252,6 +255,7 @@ public class GridServiceImpl implements IGridService {
         DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
         deptGetLineParam.setDeptId(param.getDeptIndex());
         deptGetLineParam.setServerName("harmonic-boot");
+        deptGetLineParam.setLineRunFlag(0);
         List<DeptGetChildrenMoreDTO> list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData();
         //获取监测点集合
         Map<String,List<String>> lineMap = this.getLineMap(list, param.getIsUpToGrid(), null);
@@ -300,6 +304,7 @@ public class GridServiceImpl implements IGridService {
         DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
         deptGetLineParam.setDeptId(param.getDeptIndex());
         deptGetLineParam.setServerName("harmonic-boot");
+        deptGetLineParam.setLineRunFlag(0);
         List<DeptGetChildrenMoreDTO> list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData();
         //获取监测点集合
         Map<String,List<String>> lineMap = this.getLineMap(list, param.getIsUpToGrid(), param.getVoltageLevel());
@@ -365,6 +370,7 @@ public class GridServiceImpl implements IGridService {
         DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
         deptGetLineParam.setDeptId(param.getDeptIndex());
         deptGetLineParam.setServerName("harmonic-boot");
+        deptGetLineParam.setLineRunFlag(0);
         List<DeptGetChildrenMoreDTO> list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData();
         //获取监测点集合
         Map<String,List<String>> lineMap = this.getLineMap(list, param.getIsUpToGrid(), null);
@@ -409,6 +415,7 @@ public class GridServiceImpl implements IGridService {
         DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
         deptGetLineParam.setDeptId(param.getDeptIndex());
         deptGetLineParam.setServerName("harmonic-boot");
+        deptGetLineParam.setLineRunFlag(0);
         List<DeptGetChildrenMoreDTO> list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData();
         //获取监测点集合
         Map<String,List<String>> lineMap = this.getLineMap(list, param.getIsUpToGrid(), null);
@@ -497,6 +504,7 @@ public class GridServiceImpl implements IGridService {
         DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
         deptGetLineParam.setDeptId(param.getDeptIndex());
         deptGetLineParam.setServerName("harmonic-boot");
+        deptGetLineParam.setLineRunFlag(0);
         List<DeptGetChildrenMoreDTO> list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData();
         //获取监测点集合
         Map<String,List<String>> lineMap = this.getLineMap(list, param.getIsUpToGrid(), null);
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java
index b0dbf7890..98d6e44f8 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java
@@ -660,6 +660,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
         DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
         deptGetLineParam.setDeptId(param.getId());
         deptGetLineParam.setPowerFlag(0);
+        deptGetLineParam.setLineRunFlag(0);
         List<DeptGetSubStationDTO.Info> deptGetChildrenMoreDTOS = commTerminalGeneralClient.deptGetSubStationInfo(deptGetLineParam).getData();
         //获取全部变电站信息
         List<SubGetBase> collect = deptGetChildrenMoreDTOS.stream().flatMap(x -> x.getStationIds().stream()).collect(Collectors.toList());
@@ -741,6 +742,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
         DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
         deptGetLineParam.setDeptId(param.getId());
         deptGetLineParam.setPowerFlag(0);
+        deptGetLineParam.setLineRunFlag(0);
         List<DeptGetSubStationDTO.Info> deptGetChildrenMoreDTOS = commTerminalGeneralClient.deptGetSubStationInfo(deptGetLineParam).getData();
         //获取全部变电站信息
         List<SubGetBase> collect = deptGetChildrenMoreDTOS.stream().flatMap(x -> x.getStationIds().stream()).collect(Collectors.toList());
@@ -780,6 +782,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
     public List<List<String>> getPollutionAlarmList(GridDiagramParam param) {
         List<List<String>> info = new ArrayList<>();
         param.getDeviceInfoParam().setPowerFlag(0);
+        param.getDeviceInfoParam().setLineRunFlag(0);
         List<GeneralDeviceDTO> data = generalDeviceInfoClient.getPracticalRunDeviceInfo(param.getDeviceInfoParam()).getData();
         List<String> subIds = data.stream().flatMap(x -> x.getSubIndexes().stream()).collect(Collectors.toList());
         List<RStatPollutionSubstationM> substationMlist = pollutionSubstationMMapper.selectList(new LambdaQueryWrapper<RStatPollutionSubstationM>()
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpTargetWarnDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpTargetWarnDServiceImpl.java
index a618e958b..6c02a7ea9 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpTargetWarnDServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpTargetWarnDServiceImpl.java
@@ -71,6 +71,7 @@ public class RMpTargetWarnDServiceImpl extends ServiceImpl<RMpTargetWarnDMapper,
         DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
         deptGetLineParam.setDeptId(param.getId());
         deptGetLineParam.setPowerFlag(0);
+        deptGetLineParam.setLineRunFlag(0);
         List<DeptGetSubStationDTO.Info> deptGetChildrenMoreDTOS = commTerminalGeneralClient.deptGetSubStationInfo(deptGetLineParam).getData();
 
         List<String> lineIDS = deptGetChildrenMoreDTOS.stream()
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java
index 4f9fc912d..9b08aa67f 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java
@@ -71,6 +71,7 @@ public class RStatLimitServiceImpl implements RStatLimitService {
     @Override
     public List<GridDiagramVO.LineData> getGridDiagramLineData(DeviceInfoParam.BusinessParam deviceInfoParam) {
         List<GridDiagramVO.LineData> info=new ArrayList<>();
+        deviceInfoParam.setLineRunFlag(0);
         List<GeneralDeviceDTO> data = generalDeviceInfoClient.getPracticalRunDeviceInfo(deviceInfoParam).getData();
         List<GeneralDeviceDTO> list = data.stream().sorted(Comparator.comparing(x -> x.getLineIndexes().size(),Comparator.reverseOrder())).collect(Collectors.toList());
         //终端总数量
@@ -148,6 +149,7 @@ public class RStatLimitServiceImpl implements RStatLimitService {
     @Override
     public List<GridDiagramVO.AreaData> getGridDiagramAreaData(DeviceInfoParam.BusinessParam param) {
         List<GridDiagramVO.AreaData> info = new ArrayList<>();
+        param.setLineRunFlag(0);
         GridDiagramVO.AreaData areaData ;
         //监测点总数
         List<GeneralDeviceDTO> data = generalDeviceInfoClient.getPracticalRunDeviceInfo(param).getData();
@@ -240,8 +242,8 @@ public class RStatLimitServiceImpl implements RStatLimitService {
 
     @Override
     public List<GridDiagramVO.RunData> getGridDiagramRunData(DeviceInfoParam.BusinessParam param) {
-
         List<GridDiagramVO.RunData> info = new ArrayList<>();
+        param.setLineRunFlag(0);
         //监测点总数
         List<GeneralDeviceDTO> data = generalDeviceInfoClient.getPracticalRunDeviceInfo(param).getData();
         List<String> line = data.stream().flatMap(x -> x.getLineIndexes().stream()).distinct().collect(Collectors.toList());