1.冀北电网一张图-变电站统计电网侧统计

2.公共方法增加点电网侧信息
3.修改区域监测点终端等信息接口

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/param/DeptGetLineParam.java

@@ -1,8 +1,10 @@
 package com.njcn.device.biz.pojo.param;
 
 
+import com.njcn.web.constant.ValidMessage;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.NotBlank;
 
@@ -30,6 +32,13 @@ public class DeptGetLineParam {
     private Boolean monitorStateRunning=true;
 
     @ApiModelProperty(name = "isUpToGrid",value = "0.非送国网 1.需要送国网的")
-    private Integer isUpToGrid;
 
+    private Integer isUpToGrid;
+    /**
+     * 0-电网侧
+     * 1-非电网侧
+     */
+    @ApiModelProperty("电网侧标识")
+    @Range(min = 0, max = 2, message = "电网侧标识" + ValidMessage.PARAM_FORMAT_ERROR)
+    private Integer powerFlag;
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/GridDiagramVO.java

@@ -154,6 +154,12 @@ public class GridDiagramVO {
         @ApiModelProperty(name = "lineList", value = "监测点集合")
         private List<String> lineList;
 
+        @ApiModelProperty(name = "onlineNum", value = "在线监测点个数")
+        private Integer onlineNum;
+
+        @ApiModelProperty(name = "onlineList", value = "在线监测点集合")
+        private List<String> onlineList;
+
         @ApiModelProperty(name = "alarm", value = "告警监测点个数")
         private Integer alarm;
 
@@ -163,7 +169,17 @@ public class GridDiagramVO {
         @ApiModelProperty(name = "subNum", value = "变电站个数")
         private Integer subNum;
 
+        @ApiModelProperty(name = "alarmSubNum", value = "告警变电站数量")
+        private Integer alarmSubNum;
+
+        @ApiModelProperty(name = "alarmSubList", value = "告警变电站监测点数量")
+        private List<String> alarmSubList;
+
         @ApiModelProperty(name = "deviceNum", value = "终端个数")
         private Integer deviceNum;
+
+        @ApiModelProperty(name = "onDevice", value = "在线终端数量")
+        private Integer onDevice;
+
     }
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GridDiagramController.java

@@ -55,6 +55,7 @@ public class GridDiagramController extends BaseController {
     @ApiOperation("变电站趋势分析")
     public HttpResult<Map<String, Long>> getGridDiagramSubTendency(@RequestBody GridDiagramParam param){
         String methodDescribe = getMethodDescribe("getGridDiagramSubTendency");
+        param.getDeviceInfoParam().setPowerFlag(0);
         Map<String, Long> gridDiagramDevTendency = gridDiagramService.getGridDiagramDevTendency(param,3);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, gridDiagramDevTendency, methodDescribe);
     }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java

@@ -76,7 +76,7 @@ public interface DeptLineMapper extends BaseMapper<DeptLine> {
 
     List<TerminalGetBase> orgSubStationGet(@Param("list")List<Integer> devType);
 
-    List<TerminalGetBase.Extend> orgSubStationInfoGet(@Param("list")List<Integer> devType);
+    List<TerminalGetBase.Extend> orgSubStationInfoGet(@Param("list")List<Integer> devType,@Param("powerFlag")Integer powerFlag);
 
     List<String> getLineIdByDeptIds(@Param("deptIds")List<String> deptIds,@Param("runFlag")List<Integer> runFlag,@Param("dataType")List<Integer> dataType);
 

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml

@@ -115,6 +115,9 @@
         <foreach collection="list" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
+        <if test="powerFlag!=null ">
+            and lineDetail.Power_Flag = #{powerFlag}
+        </if>
     </select>
     <select id="getLineIdByDeptIds" resultType="string">
         select

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java

@@ -107,7 +107,7 @@ public interface DeptLineService extends IService<DeptLine> {
     Map<String, List<TerminalGetBase>> orgSubStationGet(List<Integer> devType);
 
 
-    List<TerminalGetBase.Extend> orgSubStationInfoGet(List<Integer> devType);
+    List<TerminalGetBase.Extend> orgSubStationInfoGet(List<Integer> devType,Integer powerFlag);
 
     List<SubGetBase> getSubStationList(SubstationParam substationParam);
 

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

@@ -221,7 +221,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()));
+        List<TerminalGetBase.Extend> anExtends = deptLineService.orgSubStationInfoGet(filterDataTypeNew(deptGetLineParam.getServerName()),deptGetLineParam.getPowerFlag());
         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 -> {

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java

@@ -122,8 +122,8 @@ public class DeptLineServiceImpl extends ServiceImpl<DeptLineMapper, DeptLine> i
     }
 
     @Override
-    public List<TerminalGetBase.Extend> orgSubStationInfoGet(List<Integer> devType) {
-        return deptLineMapper.orgSubStationInfoGet(devType);
+    public List<TerminalGetBase.Extend> orgSubStationInfoGet(List<Integer> devType,Integer powerFlag) {
+        return deptLineMapper.orgSubStationInfoGet(devType, powerFlag);
     }
 
     @Override