zbj//1.功率负荷排名根据传入区域id进行筛选 代码调整

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/LargeScreenController.java

@@ -71,7 +71,7 @@ public class LargeScreenController extends BaseController {
     @ApiOperation("功率负荷排名")
     @ApiImplicitParam(name = "largeScreenParam", value = "功率负荷排名", required = true)
     public HttpResult<List<PowerOrderVO>> getPowerOrder(@RequestBody @Validated LargeScreenParam largeScreenParam) {
-        String methodDescribe = getMethodDescribe("getHomeostasisLoad");
+        String methodDescribe = getMethodDescribe("getPowerOrder");
         List<PowerOrderVO> result = largeScreenService.getPowerOrder(largeScreenParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java

@@ -18,6 +18,6 @@ public interface LargeScreenMapper {
 
     List<Map<String,Object>> getHomeostasisLoad (@Param("indexIds") List<String> indexIds, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    List<PowerOrderVO> getPowerOrder (LargeScreenParam largeScreenParam);
+    List<PowerOrderVO> getPowerOrder (@Param("lineIds") List<String> lineIds,@Param("largeScreenParam") LargeScreenParam largeScreenParam);
 
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/LargeScreenMapper.xml

@@ -47,13 +47,19 @@
         from (
         SELECT rsdhpd.line_id "id", round(max(rsdhpd.p), 0) "max"
         FROM r_stat_data_harmpower_p_d rsdhpd
-                 where rsdhpd.value_type = 'MAX'
+        <where>
-                   AND rsdhpd.time BETWEEN date_format(#{searchBeginTime}, '%y%m%d')
+        rsdhpd.line_id in
-                     AND date_format(#{searchEndTime}, '%y%m%d')
+        <foreach collection="lineIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        and rsdhpd.value_type = 'MAX'
+        AND rsdhpd.time BETWEEN date_format(#{largeScreenParam.searchBeginTime}, '%y%m%d')
+        AND date_format(#{largeScreenParam.searchEndTime}, '%y%m%d')
+        </where>
         group by rsdhpd.line_id
         ) t
         left join pq_line pl on pl.Id = t.id
-        ORDER BY t.max desc limit #{limit}
+        ORDER BY t.max desc limit #{largeScreenParam.limit}
     </select>
 
 </mapper>

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/LargeScreenServiceImpl.java

@@ -141,6 +141,23 @@ public class LargeScreenServiceImpl implements LargeScreenService {
      */
     @Override
     public List<PowerOrderVO> getPowerOrder(LargeScreenParam largeScreenParam) {
-        return largeScreenMapper.getPowerOrder(largeScreenParam);
+        DeviceInfoParam.BusinessParam deviceInfoParam = new DeviceInfoParam.BusinessParam();
+        //部门索引
+        deviceInfoParam.setDeptIndex(largeScreenParam.getDeptIndex());
+        //统计类型
+        SimpleDTO simpleDTO = new SimpleDTO();
+        simpleDTO.setCode(String.valueOf(StatisticsEnum.POWER_NETWORK));
+        deviceInfoParam.setStatisticalType(simpleDTO);
+        //添加时间
+        deviceInfoParam.setSearchBeginTime(largeScreenParam.getSearchBeginTime());
+        deviceInfoParam.setSearchEndTime(largeScreenParam.getSearchEndTime());
+
+        // 获取所有数据
+        List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData();
+
+        //获取所有监测点集合
+        List<String> lineIds = generalDeviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList());
+
+        return largeScreenMapper.getPowerOrder(lineIds,largeScreenParam);
     }
 }