1、优化分类能耗统计接口，调整能耗分项汇总api方法

service-ems/service-ems-biz/src/main/java/com/usky/ems/service/impl/EmsOverviewServiceImpl.java

@@ -247,8 +247,7 @@ public class EmsOverviewServiceImpl implements EmsOverviewService {
 
         LocalDateTime pariPassuEndTime = endTime.minusYears(1);
         LocalDateTime pariPassuStartTime = getStartTime(dateType, pariPassuEndTime);
-        BigDecimal pariPassuData = sumEnergyByProductCodes(productCodeList, identifier,
-                pariPassuStartTime, pariPassuEndTime);
+        BigDecimal pariPassuData = sumEnergyByProductCodes(productCodeList, identifier, pariPassuStartTime, pariPassuEndTime);
 
         LocalDateTime sequentialEndTime;
         if (dateType == 1) {
@@ -259,8 +258,7 @@ public class EmsOverviewServiceImpl implements EmsOverviewService {
             sequentialEndTime = endTime.minusYears(1);
         }
         LocalDateTime sequentialStartTime = getStartTime(dateType, sequentialEndTime);
-        BigDecimal sequentialData = sumEnergyByProductCodes(productCodeList, identifier,
-                sequentialStartTime, sequentialEndTime);
+        BigDecimal sequentialData = sumEnergyByProductCodes(productCodeList, identifier, sequentialStartTime, sequentialEndTime);
 
         return buildClassificationResult(data, sequentialData, pariPassuData, coalFactor, co2Factor);
     }
@@ -324,11 +322,11 @@ public class EmsOverviewServiceImpl implements EmsOverviewService {
             queryVO.setSuperTable("super_" + productCode.trim());
             queryVO.setStartTime(start);
             queryVO.setEndTime(end);
-            ApiResult<EnergyItemSumResultVO> apiResult = remoteTsdbProxyService.sumEnergyItem(queryVO);
-            if (apiResult == null || apiResult.getData() == null || apiResult.getData().getSumDiff() == null) {
+            EnergyItemSumResultVO apiResult = remoteTsdbProxyService.sumEnergyItem(queryVO);
+            if (apiResult == null || apiResult.getSumDiff() == null) {
                 continue;
             }
-            total = total.add(apiResult.getData().getSumDiff());
+            total = total.add(apiResult.getSumDiff());
         }
         return total;
     }

service-tsdb/service-tsdb-api/src/main/java/com/usky/demo/RemoteTsdbProxyService.java

@@ -93,5 +93,5 @@ public interface RemoteTsdbProxyService {
      * 能耗分项汇总（TDengine 超级表 LAST-FIRST 按设备聚合后求和）
      */
     @PostMapping("/energyItemSum")
-    ApiResult<EnergyItemSumResultVO> sumEnergyItem(@RequestBody EnergyItemSumQueryVO requestVO);
+    EnergyItemSumResultVO sumEnergyItem(@RequestBody EnergyItemSumQueryVO requestVO);
 }

service-tsdb/service-tsdb-api/src/main/java/com/usky/demo/factory/RemoteTsdbProxyFallbackFactory.java

@@ -94,7 +94,7 @@ public class RemoteTsdbProxyFallbackFactory implements FallbackFactory<RemoteTsd
             }
 
             @Override
-            public ApiResult<EnergyItemSumResultVO> sumEnergyItem(EnergyItemSumQueryVO requestVO)
+            public EnergyItemSumResultVO sumEnergyItem(EnergyItemSumQueryVO requestVO)
             {
                 throw new BusinessException("能耗分项汇总查询:" + throwable.getMessage());
             }

service-tsdb/service-tsdb-biz/src/main/java/com/usky/demo/controller/api/DataTsdbProxyControllerApi.java

@@ -160,11 +160,11 @@ public class DataTsdbProxyControllerApi implements RemoteTsdbProxyService {
      * 能耗分项汇总（对外 Feign）
      */
     @Override
-    public ApiResult<EnergyItemSumResultVO> sumEnergyItem(@RequestBody EnergyItemSumQueryVO requestVO) {
+    public EnergyItemSumResultVO sumEnergyItem(@RequestBody EnergyItemSumQueryVO requestVO) {
         if (!"taos".equals(sourcetype)) {
             throw new BusinessException("当前数据源不支持能耗分项汇总查询");
         }
-        return ApiResult.success(queryTdengineDataService.sumEnergyItemDiff(requestVO));
+        return queryTdengineDataService.sumEnergyItemDiff(requestVO);
     }
 
 }