站点负载分析接口调整,去掉分页参数

fiveep-controller/src/main/java/com/bizmatics/controller/web/SiteController.java

@@ -172,15 +172,11 @@ public class SiteController {
     /**
      * 站点管理-基础信息-站点负载分析
      * @param siteId 站点ID
-     * @param pageNum 页码
-     * @param pageSize 每页数量
      * @return 负载分析数据
      */
     @GetMapping("siteLoadAnalysis")
-    public ApiResult<CommonPage<SiteLoadAnalysisVO>> siteLoadAnalysis(@RequestParam(value = "siteId") Integer siteId,
-                                                                      @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
-                                                                      @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
-        return ApiResult.success(siteService.siteLoadAnalysis(siteId, pageNum, pageSize));
+    public ApiResult<List<SiteLoadAnalysisVO>> siteLoadAnalysis(@RequestParam(value = "siteId") Integer siteId) {
+        return ApiResult.success(siteService.siteLoadAnalysis(siteId));
     }
 }
 

fiveep-service/src/main/java/com/bizmatics/service/SiteService.java

@@ -98,6 +98,6 @@ public interface SiteService extends CrudService<Site> {
      * @param siteId 站点id
      * @return 站点负载分析
      */
-    CommonPage<SiteLoadAnalysisVO> siteLoadAnalysis(Integer siteId, Integer pageNum, Integer pageSize);
+    List<SiteLoadAnalysisVO> siteLoadAnalysis(Integer siteId);
 }
 

fiveep-service/src/main/java/com/bizmatics/service/impl/SiteServiceImpl.java

@@ -372,14 +372,14 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     }
 
     @Override
-    public CommonPage<SiteLoadAnalysisVO> siteLoadAnalysis(Integer siteId, Integer pageNum, Integer pageSize) {
+    public List<SiteLoadAnalysisVO> siteLoadAnalysis(Integer siteId) {
         List<SiteLoadAnalysisVO> records = new ArrayList<>();
         LambdaQueryWrapper<Site> siteQuery = Wrappers.lambdaQuery();
         siteQuery.eq(Site::getId, siteId);
         Site site = baseMapper.selectOne(siteQuery);
         log.info("站点信息：{}", site);
         if (site == null) {
-            return new CommonPage<>();
+            return records;
         }
 
         // 站点动态属性查询
@@ -399,6 +399,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
         siteLoadAnalysisVO.setRatedCapacity(Double.valueOf(site.getInstalledCapacity()));
         // 额定电压
         try {
+            assert siteDynamicProperties != null;
             siteLoadAnalysisVO.setRatedVoltage(StringUtils.isBlank(siteDynamicProperties.getVoltageLevel()) ? 0.0 : Double.parseDouble(siteDynamicProperties.getVoltageLevel()) / 1000.0);
         } catch (NumberFormatException e) {
             log.error("站点{}  电压等级（单位：V）格式转换错误{} ，已重置为0.0", siteDynamicProperties.getSiteId(), e);
@@ -415,7 +416,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
         List<DeviceList> typeOtherDevices = new ArrayList<>();
         List<String> deviceCodeList = new ArrayList<>();
         // Map<String, Double> pMap = new HashMap<>();
-        Double p = 0.0;
+        double p = 0.0;
 
         if (!deviceList.isEmpty()) {
             for (DeviceList device : deviceList) {
@@ -429,7 +430,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
             }
         } else {
             log.error("站点{}无设备", siteId);
-            return new CommonPage<>(records, records.size(), pageSize, pageNum);
+            return new ArrayList<>();
         }
 
         // pMap = (htAnalogDataService.getP(deviceCodeList)).stream().collect(Collectors.toMap(HtAnalogData::getDeviceName, HtAnalogData::getP));
@@ -448,7 +449,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
                 deviceLoadAnalysis.setDataTime(null);
                 records.add(deviceLoadAnalysis);
             }
-            return new CommonPage<>(records, records.size(), pageSize, pageNum);
+            return new ArrayList<>();
         }
         for (DeviceList device : deviceList) {
             log.info("设备信息：{}", device);
@@ -514,7 +515,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
             records.get(0).setLoadRate(0.0);
         }
 
-        return new CommonPage<>(records, records.size(), pageNum, pageSize);
+        return  records;
     }
 
 }