@gizone/rrs-client 4.2.9-alpha.557 → 4.2.9-alpha.561

package/.openapi-generator/FILES

@@ -171,6 +171,7 @@ models/energy-cost-scenarios-info-vo.ts
 models/energy-cost-setting-delete-dto.ts
 models/energy-cost-setting-summy-add-dto.ts
 models/energy-cost-setting-summy-update-dto.ts
+models/energy-cost-trend-vo.ts
 models/energy-cost-unit-price-analysis-vo.ts
 models/energy-cost-update-setting-dto.ts
 models/equipment-add-redis-list-dto.ts
@@ -298,6 +299,7 @@ models/json-result-list-dashboard-work-order-type-subcategory-group-stats-vo.ts
 models/json-result-list-energy-cost-analysis-list-vo.ts
 models/json-result-list-energy-cost-month-setting-list-summary-standards-vo.ts
 models/json-result-list-energy-cost-month-setting-list-vo.ts
+models/json-result-list-energy-cost-trend-vo.ts
 models/json-result-list-equipment-detail-dto.ts
 models/json-result-list-equipment-qr-code-dto.ts
 models/json-result-list-equipment-system-tree-dto.ts
@@ -370,6 +372,7 @@ models/json-result-switch-park-v2-dto.ts
 models/json-result-sys-dept.ts
 models/json-result-sys-user-msg-dto.ts
 models/json-result-sys-user.ts
+models/json-result-two-energy-consumption-summar-vo.ts
 models/json-result-user-add-redis-list-vo.ts
 models/json-result-user-settings-entity.ts
 models/json-result-violation-work-order-details-dto.ts
@@ -391,6 +394,7 @@ models/monitoring-coverage-alert-info.ts
 models/monitoring-coverage-alert-process-vo.ts
 models/monitoring-coverage-alert-reason-enum.ts
 models/monitoring-coverage-alert-work-order-details-dto.ts
+models/monthly-data-vo.ts
 models/network-monitor-repair-add-vo.ts
 models/network-monitor-repair-decision-vo.ts
 models/network-monitor-repair-details-dto.ts
@@ -539,6 +543,7 @@ models/system-user-msg-source-type-enum.ts
 models/system-user-msg-type-enum.ts
 models/table-data-info.ts
 models/third-party-system-enum.ts
+models/two-energy-consumption-summar-vo.ts
 models/user-add-redis-list-vo.ts
 models/user-batch-import-upload-request.ts
 models/user-bind-body.ts

package/apis/energy-cost-analysis-controller-api.ts

@@ -31,6 +31,10 @@ import type { JsonResultEnergyCostPerUnitAnalysisVO } from '../models';
 import type { JsonResultEnergyCostUnitPriceAnalysisVO } from '../models';
 // @ts-ignore
 import type { JsonResultListEnergyCostAnalysisListVO } from '../models';
+// @ts-ignore
+import type { JsonResultListEnergyCostTrendVO } from '../models';
+// @ts-ignore
+import type { JsonResultTwoEnergyConsumptionSummarVO } from '../models';
 /**
  * EnergyCostAnalysisControllerApi - axios parameter creator
  * @export
@@ -65,6 +69,46 @@ export const EnergyCostAnalysisControllerApiAxiosParamCreator = function (config
 
 
     
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(energyCostAnalysisQueryDTO, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 获取当年各场景的用量趋势图数据
+         * @summary 用量趋势分析
+         * @param {EnergyCostAnalysisQueryDTO} energyCostAnalysisQueryDTO 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        getUsageTrend: async (energyCostAnalysisQueryDTO: EnergyCostAnalysisQueryDTO, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'energyCostAnalysisQueryDTO' is not null or undefined
+            assertParamExists('getUsageTrend', 'energyCostAnalysisQueryDTO', energyCostAnalysisQueryDTO)
+            const localVarPath = `/gizone/energy/cost/analysis/trend`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication tokenScheme required
+            // http bearer authentication required
+            await setBearerAuthToObject(localVarHeaderParameter, configuration)
+
+
+    
             localVarHeaderParameter['Content-Type'] = 'application/json';
 
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -145,6 +189,166 @@ export const EnergyCostAnalysisControllerApiAxiosParamCreator = function (config
 
 
     
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(energyCostAnalysisQueryDTO, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 二级面板
+         * @summary 二级面板-用能汇总
+         * @param {EnergyCostAnalysisQueryDTO} energyCostAnalysisQueryDTO 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        twoEnergyConsumptionSummar: async (energyCostAnalysisQueryDTO: EnergyCostAnalysisQueryDTO, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'energyCostAnalysisQueryDTO' is not null or undefined
+            assertParamExists('twoEnergyConsumptionSummar', 'energyCostAnalysisQueryDTO', energyCostAnalysisQueryDTO)
+            const localVarPath = `/gizone/energy/cost/analysis/two-energy-consumption-summar`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication tokenScheme required
+            // http bearer authentication required
+            await setBearerAuthToObject(localVarHeaderParameter, configuration)
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(energyCostAnalysisQueryDTO, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 二级面板
+         * @summary 二级面板-单平单价分析
+         * @param {EnergyCostAnalysisQueryDTO} energyCostAnalysisQueryDTO 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        twoPerAreaAnalysis: async (energyCostAnalysisQueryDTO: EnergyCostAnalysisQueryDTO, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'energyCostAnalysisQueryDTO' is not null or undefined
+            assertParamExists('twoPerAreaAnalysis', 'energyCostAnalysisQueryDTO', energyCostAnalysisQueryDTO)
+            const localVarPath = `/gizone/energy/cost/analysis/two-per-area-analysis`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication tokenScheme required
+            // http bearer authentication required
+            await setBearerAuthToObject(localVarHeaderParameter, configuration)
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(energyCostAnalysisQueryDTO, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 二级面板
+         * @summary 二级面板-单耗分析
+         * @param {EnergyCostAnalysisQueryDTO} energyCostAnalysisQueryDTO 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        twoPerUnitAnalysis: async (energyCostAnalysisQueryDTO: EnergyCostAnalysisQueryDTO, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'energyCostAnalysisQueryDTO' is not null or undefined
+            assertParamExists('twoPerUnitAnalysis', 'energyCostAnalysisQueryDTO', energyCostAnalysisQueryDTO)
+            const localVarPath = `/gizone/energy/cost/analysis/two-per-unit-analysis`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication tokenScheme required
+            // http bearer authentication required
+            await setBearerAuthToObject(localVarHeaderParameter, configuration)
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(energyCostAnalysisQueryDTO, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 二级面板
+         * @summary 二级面板-单价分析
+         * @param {EnergyCostAnalysisQueryDTO} energyCostAnalysisQueryDTO 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        twoUnitPriceAnalysis: async (energyCostAnalysisQueryDTO: EnergyCostAnalysisQueryDTO, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'energyCostAnalysisQueryDTO' is not null or undefined
+            assertParamExists('twoUnitPriceAnalysis', 'energyCostAnalysisQueryDTO', energyCostAnalysisQueryDTO)
+            const localVarPath = `/gizone/energy/cost/analysis/two-unit-price-analysis`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication tokenScheme required
+            // http bearer authentication required
+            await setBearerAuthToObject(localVarHeaderParameter, configuration)
+
+
+    
             localVarHeaderParameter['Content-Type'] = 'application/json';
 
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -220,6 +424,19 @@ export const EnergyCostAnalysisControllerApiFp = function(configuration?: Config
             const localVarOperationServerBasePath = operationServerMap['EnergyCostAnalysisControllerApi.getAnalysisList']?.[localVarOperationServerIndex]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
+        /**
+         * 获取当年各场景的用量趋势图数据
+         * @summary 用量趋势分析
+         * @param {EnergyCostAnalysisQueryDTO} energyCostAnalysisQueryDTO 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async getUsageTrend(energyCostAnalysisQueryDTO: EnergyCostAnalysisQueryDTO, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<JsonResultListEnergyCostTrendVO>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.getUsageTrend(energyCostAnalysisQueryDTO, options);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EnergyCostAnalysisControllerApi.getUsageTrend']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
+        },
         /**
          * 计算园区单平单价，包括实际、年平均、上月、去年同期等指标
          * @summary 单平单价分析
@@ -246,6 +463,58 @@ export const EnergyCostAnalysisControllerApiFp = function(configuration?: Config
             const localVarOperationServerBasePath = operationServerMap['EnergyCostAnalysisControllerApi.perUnitAnalysis']?.[localVarOperationServerIndex]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
+        /**
+         * 二级面板
+         * @summary 二级面板-用能汇总
+         * @param {EnergyCostAnalysisQueryDTO} energyCostAnalysisQueryDTO 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async twoEnergyConsumptionSummar(energyCostAnalysisQueryDTO: EnergyCostAnalysisQueryDTO, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<JsonResultTwoEnergyConsumptionSummarVO>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.twoEnergyConsumptionSummar(energyCostAnalysisQueryDTO, options);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EnergyCostAnalysisControllerApi.twoEnergyConsumptionSummar']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
+        },
+        /**
+         * 二级面板
+         * @summary 二级面板-单平单价分析
+         * @param {EnergyCostAnalysisQueryDTO} energyCostAnalysisQueryDTO 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async twoPerAreaAnalysis(energyCostAnalysisQueryDTO: EnergyCostAnalysisQueryDTO, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<JsonResultEnergyCostPerAreaAnalysisVO>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.twoPerAreaAnalysis(energyCostAnalysisQueryDTO, options);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EnergyCostAnalysisControllerApi.twoPerAreaAnalysis']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
+        },
+        /**
+         * 二级面板
+         * @summary 二级面板-单耗分析
+         * @param {EnergyCostAnalysisQueryDTO} energyCostAnalysisQueryDTO 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async twoPerUnitAnalysis(energyCostAnalysisQueryDTO: EnergyCostAnalysisQueryDTO, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<JsonResultEnergyCostPerUnitAnalysisVO>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.twoPerUnitAnalysis(energyCostAnalysisQueryDTO, options);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EnergyCostAnalysisControllerApi.twoPerUnitAnalysis']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
+        },
+        /**
+         * 二级面板
+         * @summary 二级面板-单价分析
+         * @param {EnergyCostAnalysisQueryDTO} energyCostAnalysisQueryDTO 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async twoUnitPriceAnalysis(energyCostAnalysisQueryDTO: EnergyCostAnalysisQueryDTO, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<JsonResultEnergyCostUnitPriceAnalysisVO>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.twoUnitPriceAnalysis(energyCostAnalysisQueryDTO, options);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EnergyCostAnalysisControllerApi.twoUnitPriceAnalysis']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
+        },
         /**
          * 计算园区平均单价，包括当期、年平均、上月等指标
          * @summary 单价分析
@@ -279,6 +548,16 @@ export const EnergyCostAnalysisControllerApiFactory = function (configuration?:
         getAnalysisList(requestParameters: EnergyCostAnalysisControllerApiGetAnalysisListRequest, options?: RawAxiosRequestConfig): AxiosPromise<JsonResultListEnergyCostAnalysisListVO> {
             return localVarFp.getAnalysisList(requestParameters.energyCostAnalysisQueryDTO, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 获取当年各场景的用量趋势图数据
+         * @summary 用量趋势分析
+         * @param {EnergyCostAnalysisControllerApiGetUsageTrendRequest} requestParameters Request parameters.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        getUsageTrend(requestParameters: EnergyCostAnalysisControllerApiGetUsageTrendRequest, options?: RawAxiosRequestConfig): AxiosPromise<JsonResultListEnergyCostTrendVO> {
+            return localVarFp.getUsageTrend(requestParameters.energyCostAnalysisQueryDTO, options).then((request) => request(axios, basePath));
+        },
         /**
          * 计算园区单平单价，包括实际、年平均、上月、去年同期等指标
          * @summary 单平单价分析
@@ -299,6 +578,46 @@ export const EnergyCostAnalysisControllerApiFactory = function (configuration?:
         perUnitAnalysis(requestParameters: EnergyCostAnalysisControllerApiPerUnitAnalysisRequest, options?: RawAxiosRequestConfig): AxiosPromise<JsonResultEnergyCostPerUnitAnalysisVO> {
             return localVarFp.perUnitAnalysis(requestParameters.energyCostAnalysisQueryDTO, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 二级面板
+         * @summary 二级面板-用能汇总
+         * @param {EnergyCostAnalysisControllerApiTwoEnergyConsumptionSummarRequest} requestParameters Request parameters.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        twoEnergyConsumptionSummar(requestParameters: EnergyCostAnalysisControllerApiTwoEnergyConsumptionSummarRequest, options?: RawAxiosRequestConfig): AxiosPromise<JsonResultTwoEnergyConsumptionSummarVO> {
+            return localVarFp.twoEnergyConsumptionSummar(requestParameters.energyCostAnalysisQueryDTO, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 二级面板
+         * @summary 二级面板-单平单价分析
+         * @param {EnergyCostAnalysisControllerApiTwoPerAreaAnalysisRequest} requestParameters Request parameters.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        twoPerAreaAnalysis(requestParameters: EnergyCostAnalysisControllerApiTwoPerAreaAnalysisRequest, options?: RawAxiosRequestConfig): AxiosPromise<JsonResultEnergyCostPerAreaAnalysisVO> {
+            return localVarFp.twoPerAreaAnalysis(requestParameters.energyCostAnalysisQueryDTO, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 二级面板
+         * @summary 二级面板-单耗分析
+         * @param {EnergyCostAnalysisControllerApiTwoPerUnitAnalysisRequest} requestParameters Request parameters.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        twoPerUnitAnalysis(requestParameters: EnergyCostAnalysisControllerApiTwoPerUnitAnalysisRequest, options?: RawAxiosRequestConfig): AxiosPromise<JsonResultEnergyCostPerUnitAnalysisVO> {
+            return localVarFp.twoPerUnitAnalysis(requestParameters.energyCostAnalysisQueryDTO, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 二级面板
+         * @summary 二级面板-单价分析
+         * @param {EnergyCostAnalysisControllerApiTwoUnitPriceAnalysisRequest} requestParameters Request parameters.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        twoUnitPriceAnalysis(requestParameters: EnergyCostAnalysisControllerApiTwoUnitPriceAnalysisRequest, options?: RawAxiosRequestConfig): AxiosPromise<JsonResultEnergyCostUnitPriceAnalysisVO> {
+            return localVarFp.twoUnitPriceAnalysis(requestParameters.energyCostAnalysisQueryDTO, options).then((request) => request(axios, basePath));
+        },
         /**
          * 计算园区平均单价，包括当期、年平均、上月等指标
          * @summary 单价分析
@@ -326,6 +645,20 @@ export interface EnergyCostAnalysisControllerApiGetAnalysisListRequest {
     readonly energyCostAnalysisQueryDTO: EnergyCostAnalysisQueryDTO
 }
 
+/**
+ * Request parameters for getUsageTrend operation in EnergyCostAnalysisControllerApi.
+ * @export
+ * @interface EnergyCostAnalysisControllerApiGetUsageTrendRequest
+ */
+export interface EnergyCostAnalysisControllerApiGetUsageTrendRequest {
+    /**
+     * 
+     * @type {EnergyCostAnalysisQueryDTO}
+     * @memberof EnergyCostAnalysisControllerApiGetUsageTrend
+     */
+    readonly energyCostAnalysisQueryDTO: EnergyCostAnalysisQueryDTO
+}
+
 /**
  * Request parameters for perAreaAnalysis operation in EnergyCostAnalysisControllerApi.
  * @export
@@ -354,6 +687,62 @@ export interface EnergyCostAnalysisControllerApiPerUnitAnalysisRequest {
     readonly energyCostAnalysisQueryDTO: EnergyCostAnalysisQueryDTO
 }
 
+/**
+ * Request parameters for twoEnergyConsumptionSummar operation in EnergyCostAnalysisControllerApi.
+ * @export
+ * @interface EnergyCostAnalysisControllerApiTwoEnergyConsumptionSummarRequest
+ */
+export interface EnergyCostAnalysisControllerApiTwoEnergyConsumptionSummarRequest {
+    /**
+     * 
+     * @type {EnergyCostAnalysisQueryDTO}
+     * @memberof EnergyCostAnalysisControllerApiTwoEnergyConsumptionSummar
+     */
+    readonly energyCostAnalysisQueryDTO: EnergyCostAnalysisQueryDTO
+}
+
+/**
+ * Request parameters for twoPerAreaAnalysis operation in EnergyCostAnalysisControllerApi.
+ * @export
+ * @interface EnergyCostAnalysisControllerApiTwoPerAreaAnalysisRequest
+ */
+export interface EnergyCostAnalysisControllerApiTwoPerAreaAnalysisRequest {
+    /**
+     * 
+     * @type {EnergyCostAnalysisQueryDTO}
+     * @memberof EnergyCostAnalysisControllerApiTwoPerAreaAnalysis
+     */
+    readonly energyCostAnalysisQueryDTO: EnergyCostAnalysisQueryDTO
+}
+
+/**
+ * Request parameters for twoPerUnitAnalysis operation in EnergyCostAnalysisControllerApi.
+ * @export
+ * @interface EnergyCostAnalysisControllerApiTwoPerUnitAnalysisRequest
+ */
+export interface EnergyCostAnalysisControllerApiTwoPerUnitAnalysisRequest {
+    /**
+     * 
+     * @type {EnergyCostAnalysisQueryDTO}
+     * @memberof EnergyCostAnalysisControllerApiTwoPerUnitAnalysis
+     */
+    readonly energyCostAnalysisQueryDTO: EnergyCostAnalysisQueryDTO
+}
+
+/**
+ * Request parameters for twoUnitPriceAnalysis operation in EnergyCostAnalysisControllerApi.
+ * @export
+ * @interface EnergyCostAnalysisControllerApiTwoUnitPriceAnalysisRequest
+ */
+export interface EnergyCostAnalysisControllerApiTwoUnitPriceAnalysisRequest {
+    /**
+     * 
+     * @type {EnergyCostAnalysisQueryDTO}
+     * @memberof EnergyCostAnalysisControllerApiTwoUnitPriceAnalysis
+     */
+    readonly energyCostAnalysisQueryDTO: EnergyCostAnalysisQueryDTO
+}
+
 /**
  * Request parameters for unitPriceAnalysis operation in EnergyCostAnalysisControllerApi.
  * @export
@@ -387,6 +776,18 @@ export class EnergyCostAnalysisControllerApi extends BaseAPI {
         return EnergyCostAnalysisControllerApiFp(this.configuration).getAnalysisList(requestParameters.energyCostAnalysisQueryDTO, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 获取当年各场景的用量趋势图数据
+     * @summary 用量趋势分析
+     * @param {EnergyCostAnalysisControllerApiGetUsageTrendRequest} requestParameters Request parameters.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof EnergyCostAnalysisControllerApi
+     */
+    public getUsageTrend(requestParameters: EnergyCostAnalysisControllerApiGetUsageTrendRequest, options?: RawAxiosRequestConfig) {
+        return EnergyCostAnalysisControllerApiFp(this.configuration).getUsageTrend(requestParameters.energyCostAnalysisQueryDTO, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 计算园区单平单价，包括实际、年平均、上月、去年同期等指标
      * @summary 单平单价分析
@@ -411,6 +812,54 @@ export class EnergyCostAnalysisControllerApi extends BaseAPI {
         return EnergyCostAnalysisControllerApiFp(this.configuration).perUnitAnalysis(requestParameters.energyCostAnalysisQueryDTO, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 二级面板
+     * @summary 二级面板-用能汇总
+     * @param {EnergyCostAnalysisControllerApiTwoEnergyConsumptionSummarRequest} requestParameters Request parameters.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof EnergyCostAnalysisControllerApi
+     */
+    public twoEnergyConsumptionSummar(requestParameters: EnergyCostAnalysisControllerApiTwoEnergyConsumptionSummarRequest, options?: RawAxiosRequestConfig) {
+        return EnergyCostAnalysisControllerApiFp(this.configuration).twoEnergyConsumptionSummar(requestParameters.energyCostAnalysisQueryDTO, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 二级面板
+     * @summary 二级面板-单平单价分析
+     * @param {EnergyCostAnalysisControllerApiTwoPerAreaAnalysisRequest} requestParameters Request parameters.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof EnergyCostAnalysisControllerApi
+     */
+    public twoPerAreaAnalysis(requestParameters: EnergyCostAnalysisControllerApiTwoPerAreaAnalysisRequest, options?: RawAxiosRequestConfig) {
+        return EnergyCostAnalysisControllerApiFp(this.configuration).twoPerAreaAnalysis(requestParameters.energyCostAnalysisQueryDTO, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 二级面板
+     * @summary 二级面板-单耗分析
+     * @param {EnergyCostAnalysisControllerApiTwoPerUnitAnalysisRequest} requestParameters Request parameters.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof EnergyCostAnalysisControllerApi
+     */
+    public twoPerUnitAnalysis(requestParameters: EnergyCostAnalysisControllerApiTwoPerUnitAnalysisRequest, options?: RawAxiosRequestConfig) {
+        return EnergyCostAnalysisControllerApiFp(this.configuration).twoPerUnitAnalysis(requestParameters.energyCostAnalysisQueryDTO, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 二级面板
+     * @summary 二级面板-单价分析
+     * @param {EnergyCostAnalysisControllerApiTwoUnitPriceAnalysisRequest} requestParameters Request parameters.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof EnergyCostAnalysisControllerApi
+     */
+    public twoUnitPriceAnalysis(requestParameters: EnergyCostAnalysisControllerApiTwoUnitPriceAnalysisRequest, options?: RawAxiosRequestConfig) {
+        return EnergyCostAnalysisControllerApiFp(this.configuration).twoUnitPriceAnalysis(requestParameters.energyCostAnalysisQueryDTO, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 计算园区平均单价，包括当期、年平均、上月等指标
      * @summary 单价分析