Skip to content

S
server
Commit 261c4065 by 孙香冬
Options

no message

parent c59ac21d
Showing with 168 additions and 80 deletions
src/biz/csjInterface/zhdy_csqxtfz.ts
......@@ -16,9 +16,9 @@ export async function getData(req, res) {
ret["api2"] = getKeyValue("吴江区数据", 吴江区数据DataAndUnit.dataMap, 吴江区数据DataAndUnit.unitMap, false, false );
ret["api3"] = getChartData("长三角示范区一体化协同发展指数趋势",interfaceData.demonstrationInfo, false, false);
ret["api3"].yMaxValue = 120;
ret["api3"].yMaxValue = 150;
ret["api3"].yStepValue = 5;
ret["api3"].yMinValue = 80;
ret["api3"].yMinValue = 80;
let 青浦区数据Interface = await getArea("青浦");
let 青浦区数据DataAndUnit = objKeyReplace(青浦区数据Interface.dataInfo);
......@@ -28,7 +28,7 @@ export async function getData(req, res) {
let 嘉善县数据DataAndUnit = objKeyReplace(嘉善县数据Interface.dataInfo);
ret["api5"] = getKeyValue("嘉善县数据", 嘉善县数据DataAndUnit.dataMap, 嘉善县数据DataAndUnit.unitMap, false, false );
ret["apiarea"] = getKeyStringValue("范围数据", excelData.范围数据);
ret["apiarea"] = getKeyStringValue("范围数据", interfaceData.rangeInfo);
res.send(ret);
}
\ No newline at end of file
src/biz/csjInterface/zhdy_gsqy.ts
......@@ -25,7 +25,7 @@ export async function getData(req, res) {
ret["api4"].yMaxValue = 160;
ret["api4"].yStepValue = 40;
ret["apiarea"] = getKeyStringValue("范围数据", excelData.范围数据);
ret["apiarea"] = getKeyStringValue("范围数据", interfaceData.rangeInfo);
res.send(ret);
}
\ No newline at end of file
src/biz/csjInterface/zhdy_hyydfb.ts
......@@ -23,6 +23,6 @@ export async function getData(req, res) {
ret["api4"].yMaxValue = 100;
ret["api4"].yStepValue = 20;
ret["apiarea"] = getKeyStringValue("范围数据", excelData.范围数据);
ret["apiarea"] = getKeyStringValue("范围数据", interfaceData.rangeInfo);
res.send(ret);
}
\ No newline at end of file
src/biz/csjInterface/zhdy_jjjqd.ts
......@@ -6,7 +6,6 @@ import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreY
export async function getData(req, res) {
let ret:any = {};
let excelData:any = get智慧电眼_经济景气度();
let interfaceData = await getJjjqd();
let 基础数据DataAndUnit = objKeyReplace(interfaceData.basicInfo);
......@@ -23,7 +22,7 @@ export async function getData(req, res) {
ret["api4"].yMaxValue = 160;
ret["api4"].yStepValue = 40;
ret["apiarea"] = getKeyStringValue("范围数据", excelData.范围数据);
ret["apiarea"] = getKeyStringValue("范围数据", interfaceData.rangeInfo);
res.send(ret);
}
\ No newline at end of file
src/biz/csjInterface/zhdy_qydzxypg.ts
......@@ -6,7 +6,6 @@ import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreY
export async function getData(req, res) {
let ret:any = {};
let excelData:any = get智慧电眼_企业贷中信用评估();
let interfaceData = await getQydzxypg();
let 各信用等级企业分布情况DataAndUnit = objKeyReplace(interfaceData.distributionInfo);
......@@ -23,7 +22,7 @@ export async function getData(req, res) {
let 风险企业DataAndUnit = objKeyReplace(interfaceData.venture);
ret["api5"] = getKeyValue("风险企业", 风险企业DataAndUnit.dataMap, false, false, false );
ret["apiarea"] = getKeyStringValue("范围数据", excelData.范围数据);
ret["apiarea"] = getKeyStringValue("范围数据", interfaceData.rangeInfo);
res.send(ret);
}
src/biz/csjInterface/zhdy_sqjjhl.ts
......@@ -6,7 +6,6 @@ import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreY
export async function getData(req, res) {
let ret:any = {};
let excelData:any = get智慧电眼_商圈经济活力();
let interfaceData = await getSqjjhl();
let 基础数据DataAndUnit = objKeyReplace(interfaceData.basicInfo);
......@@ -25,7 +24,7 @@ export async function getData(req, res) {
ret["api10"] = getSingleYAndMoreData("朱家角古镇消费类型分析", checkNumber(interfaceData.zhuJiaJiaoConsumption), false, false);
ret["api11"] = getSingleYAndMoreData("朱家角古镇节假日活力指数分析", checkNumber(interfaceData.zhuJiaJiaoHoliday), false, false);
ret["apiarea"] = getKeyStringValue("范围数据", excelData.范围数据);
ret["apiarea"] = getKeyStringValue("范围数据", interfaceData.rangeInfo);
res.send(ret);
}
......
src/biz/csjInterface/zhdy_yskkqy.ts
......@@ -6,7 +6,6 @@ import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreY
export async function getData(req, res) {
let ret:any = {};
let excelData:any = get智慧电眼_疑似空壳企业监测();
let interfaceData = await getYskkqyjc();
let 基础数据DataAndUnit = objKeyReplace(interfaceData.basicInfo);
......@@ -21,7 +20,7 @@ export async function getData(req, res) {
let 分离数据 = objKeyReplace(interfaceData.industrialInfo);
for (let key in 分离数据.dataMap) {
let value = 分离数据.dataMap[key];
if (key != "房地产") {
if (key != "房地产业") {
非房地产[key] = `${value}${分离数据.unitMap[key] || '' }`;
房地产占比["非房地产"] += value;
} else {
......@@ -37,7 +36,7 @@ export async function getData(req, res) {
ret["api6"] = getKeyValue("行业疑似空壳企业分布", 房地产占比, "户", false, false);
ret["apiarea"] = getKeyStringValue("范围数据", excelData.范围数据);
ret["apiarea"] = getKeyStringValue("范围数据", interfaceData.rangeInfo);
res.send(ret);
}
src/biz/csjInterface/zhdy_zdwrqy.ts
......@@ -6,7 +6,6 @@ import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreY
export async function getData(req, res) {
let ret:any = {};
let excelData:any = get智慧电眼_重点污染企业生产();
let interfaceData = await getZdwrqysc();
//重点污染企业撒点数据
let pollutingCompaniesScatter = [
......@@ -48,7 +47,7 @@ export async function getData(req, res) {
// let 重点污染企业撒点数据DataAndUnit = interfaceData.pollutingCompaniesScatter;
ret["api8"] = {title: "重点污染企业撒点数据", dataList: pollutingCompaniesScatter};
ret["apiarea"] = getKeyStringValue("范围数据", excelData.范围数据);
ret["apiarea"] = getKeyStringValue("范围数据", interfaceData.rangeInfo);
res.send(ret);
}
src/biz/csjInterface/zhdy_zzkzl.ts
......@@ -6,7 +6,6 @@ import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreY
export async function getData(req, res) {
let ret:any = {};
let excelData:any = get智慧电眼_住宅空置率();
let interfaceData = await getZzkzl();
let idleInterface = await getIdleUserPower();
let rateInterface = await getResidentialVacancyRate();
......@@ -42,7 +41,7 @@ export async function getData(req, res) {
ret["api7"] = getMoreYChartData("重点区域空置户趋势", areasInterface.vacantHouseholds, false, {"空置率趋势":"%"});
ret["api8"] = getMoreYChartData("典型小区空置户趋势", trendsInterface.typicalResidential, false, {"空置率趋势":"%"});
ret["apiarea"] = getKeyStringValue("范围数据", excelData.范围数据);
ret["apiarea"] = getKeyStringValue("范围数据", interfaceData.rangeInfo);
res.send(ret);
}
src/data/interface/csqxtfz.ts
......@@ -3,7 +3,7 @@ import { getInterfaceByInterfaceName } from "./cronJob";
export async function getCsqxtfz() {
let interfaceName = "城市群协同发展";
let {basicData, wujiangDistriceData, qinpuDistriceData, jiashanDistriceData, demonstrationAreaIndexTrend} = await getInterfaceByInterfaceName(interfaceName);
let {basicData, demonstrationAreaIndexTrend, rangeData} = await getInterfaceByInterfaceName(interfaceName);
// ------------test----------
// let basicData:any = {"regionalIndex":116.6800,"economic":114.4600,"nonAgriculturalIndustries":114.3100,"resourcesEndowment":120.0800};
......@@ -11,9 +11,11 @@ export async function getCsqxtfz() {
// ------------end------------
if (JSON.stringify(basicData) === '{}') basicData = {regionalIndex:0, economic:0, nonAgriculturalIndustries:0, resourcesEndowment:0};
if (JSON.stringify(rangeData) === '{}') rangeData = {regionalScope:"", timeRange:""};
if(!basicData) throw new BizError(`${interfaceName} 缺少参数 basicData`);
if(!demonstrationAreaIndexTrend) throw new BizError(`${interfaceName} 缺少参数 demonstrationAreaIndexTrend`);
if(!rangeData) throw new BizError(`${interfaceName} 缺少参数 rangeData`);
let {regionalIndex, economic, nonAgriculturalIndustries, resourcesEndowment} = basicData;
let basicInfo = {
......@@ -30,12 +32,19 @@ export async function getCsqxtfz() {
demonstrationInfo[month] = value;
})
return {basicInfo, demonstrationInfo}
//范围数据
let {regionalScope, timeRange} = rangeData;
let rangeInfo = {
"区域范围": regionalScope,
"时间范围": timeRange
};
return {basicInfo, demonstrationInfo, rangeInfo}
}
export async function getArea(area) {
let interfaceName = "城市群协同发展";
let {basicData, wujiangDistriceData, qinpuDistriceData, jiashanDistriceData, demonstrationAreaIndexTrend} = await getInterfaceByInterfaceName(interfaceName);
let {wujiangDistriceData, qinpuDistriceData, jiashanDistriceData} = await getInterfaceByInterfaceName(interfaceName);
// ------------test----------
// let wujiangDistriceData:any = {"deJurePopulation":0.0000,"ardeJurePopulationea":0.0000,"GDP":0.0000,"totalElectricityConsumption":0.0000,"cumulativeInstallationCapacity":0.0000,"maximumSociallload":0.0000};
......
src/data/interface/gsqyscyx.ts
......@@ -3,7 +3,7 @@ import { getInterfaceByInterfaceName } from "./cronJob";
export async function getGsqyscyx() {
let interfaceName = "规上企业生产运行状况";
let {basicData, industryProductionIndex, industrialDistribution, productionIndexTrend} = await getInterfaceByInterfaceName(interfaceName);
let {basicData, productionIndexTrend, rangeData} = await getInterfaceByInterfaceName(interfaceName);
// ------------------test------------
// let basicData:any = {};
......@@ -11,9 +11,11 @@ export async function getGsqyscyx() {
// ------------------end------------
if (JSON.stringify(basicData) === '{}') basicData = {productionIndex:0};
if (JSON.stringify(rangeData) === '{}') rangeData = {regionalScope:"", timeRange:""};
if(!basicData) throw new BizError(`${interfaceName} 缺少参数 basicData`);
if(!productionIndexTrend) throw new BizError(`${interfaceName} 缺少参数 demonstrationAreaIndexTrend`);
if(!rangeData) throw new BizError(`${interfaceName} 缺少参数 rangeData`);
let {productionIndex} = basicData;
let basicInfo = {青浦区生产指数: productionIndex};
......@@ -24,13 +26,20 @@ export async function getGsqyscyx() {
let {year, productionIndices} = info;
productionInfo[year] = productionIndices;
})
//范围数据
let {regionalScope, timeRange} = rangeData;
let rangeInfo = {
"区域范围": regionalScope,
"时间范围": timeRange
};
return {basicInfo, productionInfo}
return {basicInfo, productionInfo, rangeInfo}
}
export async function getIndustrial(name) {
let interfaceName = "规上企业生产运行状况";
let {basicData, industryProductionIndex, industrialDistribution, productionIndexTrend} = await getInterfaceByInterfaceName(interfaceName);
let {industryProductionIndex, industrialDistribution} = await getInterfaceByInterfaceName(interfaceName);
// ----------------test------------
// let industryProductionIndex:any = {"industrial":0.00,"transportationAndWarehousingAndPostalServices":0.00,"wholesaleAndRetail":0.00,"leasingAndBusinessService":0.00,"publicServiceAndManagementOrganization":0.00};
......
src/data/interface/hyydfb.ts
......@@ -3,7 +3,7 @@ import { getInterfaceByInterfaceName } from "./cronJob";
export async function getHyydfb() {
let interfaceName = "行业用电分布";
let {basicData, demonstrationAreaIndustryElectricity, concentrationAnalysisOfKeyIndustries, electricityConsumptionByIndustry} = await getInterfaceByInterfaceName(interfaceName);
let {basicData, demonstrationAreaIndustryElectricity, concentrationAnalysisOfKeyIndustries, electricityConsumptionByIndustry, rangeData} = await getInterfaceByInterfaceName(interfaceName);
// ------------------test------------
// let basicData:any = {demonstrationAreaIndustryElectricity:""};
......@@ -14,8 +14,10 @@ export async function getHyydfb() {
if (JSON.stringify(basicData) === '{}') basicData = {demonstrationAreaIndustryElectricity:0};
if (JSON.stringify(electricityConsumptionByIndustry) === '{}') electricityConsumptionByIndustry = {"qingPuArea":{"农,林,牧,渔业":0.00,"工业":0.00,"建筑业":0.00,"交通运输，仓储和邮政业":0.00,"信息传输,软件和信息技术服务业":0.00,"批发和零售业":0.00,"住宿和餐饮业":0.00,"金融业":0.00,"房地产业":0.00,"租赁和商务服务业":0.00,"公共服务及管理组织":0.00},"wuJiangArea":{"农,林,牧,渔业":0.00,"工业":0.00,"建筑业":0.00,"交通运输，仓储和邮政业":0.00,"信息传输,软件和信息技术服务业":0.00,"批发和零售业":0.00,"住宿和餐饮业":0.00,"金融业":0.00,"房地产业":0.00,"租赁和商务服务业":0.00,"公共服务及管理组织":0.00},"jiaShanCounty":{"农,林,牧,渔业":0.00,"工业":0.00,"建筑业":0.00,"交通运输，仓储和邮政业":0.00,"信息传输,软件和信息技术服务业":0.00,"批发和零售业":0.00,"住宿和餐饮业":0.00,"金融业":0.00,"房地产业":0.00,"租赁和商务服务业":0.00,"公共服务及管理组织":0.00}};
if (JSON.stringify(rangeData) === '{}') rangeData = rangeData = {regionalScope:"", timeRange:""};
if (!basicData) throw new BizError(`${interfaceName} 缺少参数 chargingFacilities` );
if (!basicData) throw new BizError(`${interfaceName} 缺少参数 basicData` );
if (!rangeData) throw new BizError(`${interfaceName} 缺少参数 rangeData` );
let basicInfo = {示范区行业用电分布: basicData.demonstrationAreaIndustryElectricity};
......@@ -49,12 +51,19 @@ export async function getHyydfb() {
electricityInfo = {青浦区: qingPuArea, 吴江区: wuJiangArea, 嘉善县: jiaShanCounty};
// electricityInfo = {青浦区: qingPuAreaData, 吴江区: wuJiangAreaData, 嘉善县: jiaShanCountyData};
return {basicInfo, concentrationAnalysis, electricityInfo};
//范围数据
let {regionalScope, timeRange} = rangeData;
let rangeInfo = {
"区域范围": regionalScope,
"时间范围": timeRange
};
return {basicInfo, concentrationAnalysis, electricityInfo, rangeInfo};
}
export async function getElectricity() {
let interfaceName = "行业用电分布";
let {basicData, demonstrationAreaIndustryElectricity, concentrationAnalysisOfKeyIndustries, electricityConsumptionByIndustry} = await getInterfaceByInterfaceName(interfaceName);
let {demonstrationAreaIndustryElectricity} = await getInterfaceByInterfaceName(interfaceName);
// -----------------test---------------------
// let demonstrationAreaIndustryElectricity:any = {"fisheries":0.00,"industrial":0.00,"constructionIndustry":0.00,"transportationAndWarehousingAndPostalServices":0.00,"informationTechnologyServices":0.00,"wholesaleAndRetail":0.00,"accommodationAndCatering":0.00,"financialIndustry":0.00,"realEstate":0.00,"leasingAndBusinessService":0.00,"publicServiceAndManagementOrganization":0.00};
......@@ -67,17 +76,17 @@ export async function getElectricity() {
constructionIndustry, accommodationAndCatering, fisheries, leasingAndBusinessService, financialIndustry} = demonstrationAreaIndustryElectricity;
let areaIndustryElectricity = {
'工业': industrial,
'公共服务及管理组织': publicServiceAndManagementOrganization,
'房地产业': realEstate,
'批发和零售业': wholesaleAndRetail,
'信息传输、软件和信息技术服务业': informationTechnologyServices,
'交通运输、仓储和邮政服务': transportationAndWarehousingAndPostalServices,
'建筑业': constructionIndustry,
'住宿和餐饮业': accommodationAndCatering,
'农、林、牧、渔业': fisheries,
'租赁和商务服务业': leasingAndBusinessService,
'金融业': financialIndustry
'工业': industrial + "亿千瓦时",
'公共服务及管理组织': publicServiceAndManagementOrganization + "亿千瓦时",
'房地产业': realEstate + "亿千瓦时",
'批发和零售业': wholesaleAndRetail + "亿千瓦时",
'信息传输、软件和信息技术服务业': informationTechnologyServices + "亿千瓦时",
'交通运输、仓储和邮政服务': transportationAndWarehousingAndPostalServices + "亿千瓦时",
'建筑业': constructionIndustry + "亿千瓦时",
'住宿和餐饮业': accommodationAndCatering + "亿千瓦时",
'农、林、牧、渔业': fisheries + "亿千瓦时",
'租赁和商务服务业': leasingAndBusinessService + "亿千瓦时",
'金融业': financialIndustry + "亿千瓦时"
};
return {areaIndustryElectricity};
......
src/data/interface/interfaceConfig.ts
......@@ -11,7 +11,7 @@ import {INTERFACEREQUESTTYPEENUM} from "../../config/enum";
// }
export const Config = {
"绿色电力充电设施发展监控":{type:INTERFACEREQUESTTYPEENUM.即时更新, time:3600000*24, url:"http://10.131.170.184:17008/gesecp-server/gesecp/foreign/chargeFacilityDevelopmentMonitoring", reqType:"post", header:{}, body:{}},
"绿色电力清洁能源光伏接入情况":{type:INTERFACEREQUESTTYPEENUM.即时更新, time:3600000*24, url:"http://10.131.170.184:17008/gesecp-server/gesecp/foreign/cleanEnergyDevelopmentMonitoring", reqType:"post", header:{}, body:{}},
"绿色电力清洁能源光伏接入":{type:INTERFACEREQUESTTYPEENUM.即时更新, time:3600000*24, url:"http://10.131.170.184:17008/gesecp-server/gesecp/foreign/cleanEnergyDevelopmentMonitoring", reqType:"post", header:{}, body:{}},
"区域融合":{type:INTERFACEREQUESTTYPEENUM.即时更新, time:3600000*24, url:"http://10.131.170.184:17008/gesecp-server/gesecp/foreign/regionalFusion", reqType:"post", header:{}, body:{}},
"智慧电眼首页":{type:INTERFACEREQUESTTYPEENUM.即时更新, time:3600000*24, url:"http://10.131.170.184:17008/gesecp-server/gesecp/foreign/homepage", reqType:"post", header:{}, body:{}},
"城市群协同发展":{type:INTERFACEREQUESTTYPEENUM.即时更新, time:3600000*24, url:"http://10.131.170.184:17008/gesecp-server/gesecp/foreign/coordinatedDevelopment", reqType:"post", header:{}, body:{}},
......@@ -23,4 +23,5 @@ export const Config = {
"疑似空壳企业监测":{type:INTERFACEREQUESTTYPEENUM.即时更新, time:3600000*24, url:"http://10.131.170.184:17008/gesecp-server/gesecp/foreign/suspectedShellEnterprises", reqType:"post", header:{}, body:{}},
"重点污染企业生产":{type:INTERFACEREQUESTTYPEENUM.即时更新, time:3600000*24, url:"http://10.131.170.184:17008/gesecp-server/gesecp/foreign/keyPollutingEnterprises", reqType:"post", header:{}, body:{}},
"住宅空置率":{type:INTERFACEREQUESTTYPEENUM.即时更新, time:3600000*24, url:"http://10.131.170.184:17008/gesecp-server/gesecp/foreign/residentialVacancyRate", reqType:"post", header:{}, body:{}},
"示范区总体概况":{type:INTERFACEREQUESTTYPEENUM.即时更新, time:3600000*24, url:"http://10.131.170.184:17008/gesecp-server/gesecp/foreign/demonstrationArea", reqType:"post", header:{}, body:{}},
}
\ No newline at end of file
src/data/interface/jjjcd.ts
......@@ -3,7 +3,7 @@ import { getInterfaceByInterfaceName } from "./cronJob";
export async function getJjjqd() {
let interfaceName = "经济景气度";
let {basicData, prosperityIndexOfKeyRegions, industrialDistribution, economicSentimentIndex} = await getInterfaceByInterfaceName(interfaceName);
let {basicData, prosperityIndexOfKeyRegions, industrialDistribution, economicSentimentIndex, rangeData} = await getInterfaceByInterfaceName(interfaceName);
// -----------------test-----------------
// let basicData:any = {demonstrationAreaEconomicProsperity:89.0300, wuJiangDistrict:0.0000, qingPuDistrict:103.6485, jiaShanCounty:0.0000};
......@@ -15,11 +15,13 @@ export async function getJjjqd() {
if (JSON.stringify(basicData) === '{}') basicData = {demonstrationAreaEconomicProsperity:0, wuJiangDistrict:0, qingPuDistrict:0, jiaShanCounty:0}
if (JSON.stringify(prosperityIndexOfKeyRegions) === '{}') prosperityIndexOfKeyRegions = {xiHongQiao:0, xianXingQiDongArea:0, qingPuNewTown:0};
if (JSON.stringify(industrialDistribution) === '{}') industrialDistribution = {constructionIndustry:0, leasingAndBusinessService:0, wholesaleAndRetail:0, financialIndustry:0, realEstate:0, informationTechnologyServices:0, transportationAndWarehousingAndPostalServices:0, fisheries:0, industrial:0, accommodationAndCatering:0, publicServiceAndManagementOrganization:0};
if (JSON.stringify(rangeData) === '{}') rangeData = {regionalScope:"", timeRange:""};
if (!basicData) throw new BizError(`${interfaceName} 缺少参数 basicData` );
if (!prosperityIndexOfKeyRegions) throw new BizError(`${interfaceName} 缺少参数 prosperityIndexOfKeyRegions` );
if (!industrialDistribution) throw new BizError(`${interfaceName} 缺少参数 industrialDistribution` );
if (!economicSentimentIndex) throw new BizError(`${interfaceName} 缺少参数 economicSentimentIndex` );
if (!rangeData) throw new BizError(`${interfaceName} 缺少参数 rangeData` );
let basicInfo = {
示范区经济景气指数: basicData.demonstrationAreaEconomicProsperity,
......@@ -60,5 +62,12 @@ export async function getJjjqd() {
economicInfo[year] = trend;
})
return {basicInfo, prosperity, industrialInfo, economicInfo};
//范围数据
let {regionalScope, timeRange} = rangeData;
let rangeInfo = {
"区域范围": regionalScope,
"时间范围": timeRange
};
return {basicInfo, prosperity, industrialInfo, economicInfo, rangeInfo};
}
\ No newline at end of file
src/data/interface/qjnygfjr.ts
......@@ -3,13 +3,13 @@ import { getInterfaceByInterfaceName } from "./cronJob";
export async function getQjnygfjr() {
let interfaceName = "绿色电力清洁能源光伏接入";
let {totalCustomer, realTimeMonitoring, distributedPvCustomerTrends, distributedPhotovoltaicCustomer, totalGeneratingCapacity, theInstalledCapacity, powerAnalysis} = await getInterfaceByInterfaceName(interfaceName);
let {totalCustomer, realTimeMonitoring, distributedPvCustomerTrends, distributedPhotovoltaicCustomer, powerAnalysis} = await getInterfaceByInterfaceName(interfaceName);
// -----------------test---------------
// let totalCustomer:any = {};
// let realTimeMonitoring:any = {"NO2":0.0000,"SO2":0.0000,"CO2":0.0000};
// let distributedPvCustomerTrends = [];
// let distributedPhotovoltaicCustomer:any = {};
// let totalCustomer:any = {"nonResidentCustomer":144,"residentCustomer":2156};
// let realTimeMonitoring:any = {"NO2":136.0100,"SO2":272.0100,"CO2":9039.8100};
// let distributedPvCustomerTrends = [{"year":"2013","value":52},{"year":"2014","value":38},{"year":"2015","value":103},{"year":"2016","value":230},{"year":"2017","value":647},{"year":"2018","value":551},{"year":"2019","value":208},{"year":"2020","value":216},{"year":"2021","value":222}];
// let distributedPhotovoltaicCustomer:any = {"distributedPvCustomer":2300,"proportionOfNonResidents":6.26};
// let powerAnalysis = [{"month":"202109","powerGeneration":678.26,"theInternetCharge":283.06},{"month":"202110","powerGeneration":545.48,"theInternetCharge":261.63},{"month":"202111","powerGeneration":817.33,"theInternetCharge":391.54},{"month":"202112","powerGeneration":565.76,"theInternetCharge":221.11},{"month":"202201","powerGeneration":499.96,"theInternetCharge":171.82},{"month":"202202","powerGeneration":586.67,"theInternetCharge":241.58},{"month":"202203","powerGeneration":676.75,"theInternetCharge":306.13},{"month":"202204","powerGeneration":767.72,"theInternetCharge":520.13},{"month":"202205","powerGeneration":806.03,"theInternetCharge":451.83},{"month":"202206","powerGeneration":906.70,"theInternetCharge":331.05}];
// ----------------end------------------
......@@ -68,10 +68,10 @@ export async function getQjnygfjr() {
export async function getPowerGeneration() {
let interfaceName = "绿色电力清洁能源光伏接入";
let {totalCustomer, realTimeMonitoring, distributedPvCustomerTrends, distributedPhotovoltaicCustomer, totalGeneratingCapacity, theInstalledCapacity, powerAnalysis} = await getInterfaceByInterfaceName(interfaceName);
let {totalGeneratingCapacity} = await getInterfaceByInterfaceName(interfaceName);
// -------------------test---------------------
// let totalGeneratingCapacity:any = {};
// let totalGeneratingCapacity:any = {"grossGeneration":0.09,"proportionOfNonResidents":0.00};
// -------------------end----------------------
if (JSON.stringify(totalGeneratingCapacity) === '{}') totalGeneratingCapacity = {grossGeneration:0, proportionOfNonResidents:0};
......@@ -90,10 +90,10 @@ export async function getPowerGeneration() {
export async function getInstalledCapacity() {
let interfaceName = "绿色电力清洁能源光伏接入";
let {totalCustomer, realTimeMonitoring, distributedPvCustomerTrends, distributedPhotovoltaicCustomer, totalGeneratingCapacity, theInstalledCapacity, powerAnalysis} = await getInterfaceByInterfaceName(interfaceName);
let {theInstalledCapacity} = await getInterfaceByInterfaceName(interfaceName);
// ------------------test--------------
// let theInstalledCapacity:any = {installedCapacity:"123", proportionOfNonResidents:"4589"};
// let theInstalledCapacity:any = {"installedCapacity":123, "proportionOfNonResidents":4589};
// ------------------end---------------
if (JSON.stringify(theInstalledCapacity) === '{}') theInstalledCapacity = {installedCapacity:0, proportionOfNonResidents:0};
......
src/data/interface/qydzxypg.ts
......@@ -3,7 +3,7 @@ import { getInterfaceByInterfaceName } from "./cronJob";
export async function getQydzxypg() {
let interfaceName = "企业贷中信用评估";
let {distributionOfEachCreditRating, highQualityCreditEnterprise, ventureEnterprise, monthlyBusinessCreditChanges, industryCreditDistribution} = await getInterfaceByInterfaceName(interfaceName);
let {distributionOfEachCreditRating, highQualityCreditEnterprise, ventureEnterprise, monthlyBusinessCreditChanges, industryCreditDistribution, rangeData} = await getInterfaceByInterfaceName(interfaceName);
// -----------------test-----------------
// let distributionOfEachCreditRating:any = {"excellentCredit":0.0000,"goodCredit":0.0000,"generalCredit":0.0000,"poorCredit":0.0000};
......@@ -13,11 +13,13 @@ export async function getQydzxypg() {
// ------------------end-----------------
if (JSON.stringify(distributionOfEachCreditRating) === '{}') distributionOfEachCreditRating = {excellentCredit:0, goodCredit:0, generalCredit:0, poorCredit:0};
if (JSON.stringify(rangeData) === '{}') rangeData = {regionalScope:"", timeRange:""};
if (!distributionOfEachCreditRating) throw new BizError(`${interfaceName} 缺少参数 distributionOfEachCreditRating` );
if (!highQualityCreditEnterprise) throw new BizError(`${interfaceName} 缺少参数 highQualityCreditEnterprise` );
if (!ventureEnterprise) throw new BizError(`${interfaceName} 缺少参数 ventureEnterprise` );
if (!monthlyBusinessCreditChanges) throw new BizError(`${interfaceName} 缺少参数 monthlyBusinessCreditChanges` );
if (!rangeData) throw new BizError(`${interfaceName} 缺少参数 rangeData` );
//各信用等级企业分布情况
let {excellentCredit, goodCredit, generalCredit, poorCredit} = distributionOfEachCreditRating;
......@@ -58,12 +60,19 @@ export async function getQydzxypg() {
})
monthlyBusinessInfo = {信用极好: excellentCreditData, 信用良好: goodCreditData, 信用一般: generalCreditData, 信用差: poorCreditData}
return {distributionInfo, highQuality, venture, monthlyBusinessInfo};
//范围数据
let {regionalScope, timeRange} = rangeData;
let rangeInfo = {
"区域范围": regionalScope,
"时间范围": timeRange
};
return {distributionInfo, highQuality, venture, monthlyBusinessInfo, rangeInfo};
}
export async function getindustryCredit() {
let interfaceName = "企业贷中信用评估";
let {distributionOfEachCreditRating, highQualityCreditEnterprise, ventureEnterprise, monthlyBusinessCreditChanges, industryCreditDistribution} = await getInterfaceByInterfaceName(interfaceName);
let {industryCreditDistribution} = await getInterfaceByInterfaceName(interfaceName);
// let industryCreditDistribution = [{"industryName":"农,林,牧,渔业","excellentCredit":0.0000,"goodCredit":0.0000,"generalCredit":0.0000,"poorCredit":0.0000},{"industryName":"工业","excellentCredit":0.0000,"goodCredit":0.0000,"generalCredit":0.0000,"poorCredit":0.0000},{"industryName":"建筑业","excellentCredit":0.0000,"goodCredit":0.0000,"generalCredit":0.0000,"poorCredit":0.0000},{"industryName":"交通运输，仓储和邮政业","excellentCredit":0.0000,"goodCredit":0.0000,"generalCredit":0.0000,"poorCredit":0.0000},{"industryName":"信息传输,软件和信息技术服务业","excellentCredit":0.0000,"goodCredit":0.0000,"generalCredit":0.0000,"poorCredit":0.0000},{"industryName":"批发和零售业","excellentCredit":0.0000,"goodCredit":0.0000,"generalCredit":0.0000,"poorCredit":0.0000},{"industryName":"住宿和餐饮业","excellentCredit":0.0000,"goodCredit":0.0000,"generalCredit":0.0000,"poorCredit":0.0000},{"industryName":"金融业","excellentCredit":0.0000,"goodCredit":0.0000,"generalCredit":0.0000,"poorCredit":0.0000},{"industryName":"房地产业","excellentCredit":0.0000,"goodCredit":0.0000,"generalCredit":0.0000,"poorCredit":0.0000},{"industryName":"租赁和商务服务业","excellentCredit":0.0000,"goodCredit":0.0000,"generalCredit":0.0000,"poorCredit":0.0000},{"industryName":"公共服务及管理组织","excellentCredit":0.0000,"goodCredit":0.0000,"generalCredit":0.0000,"poorCredit":0.0000}];
if (!industryCreditDistribution) throw new BizError(`${interfaceName} 缺少参数 industryCreditDistribution` );
......
src/data/interface/sqjjhl.ts
......@@ -5,7 +5,7 @@ export async function getSqjjhl() {
let interfaceName = "商圈经济活力";
let {basicData, CIIEHolidayVitalityIndex, zhaoXiangDistrictHolidayVitalityIndex, qingPuNewTownHolidayVitalityIndex, zhuJiaJiaoHolidayVitalityIndex,
qingPuKeyBusinessDistrictIndex, CIIEConsumptionTypeAnalysis, zhaoXiangConsumptionTypeAnalysis, zhuJiaJiaoConsumptionTypeAnalysis,
qingPuNewTownConsumptionTypeAnalysis, qingPuEconomicVitalityTrend} = await getInterfaceByInterfaceName(interfaceName);
qingPuNewTownConsumptionTypeAnalysis, qingPuEconomicVitalityTrend, rangeData} = await getInterfaceByInterfaceName(interfaceName);
// ----------------test-------------------
// let basicData = {overallEconomicVitalityIndex:""};
......@@ -22,6 +22,7 @@ export async function getSqjjhl() {
// ---------------end------------------------
if (JSON.stringify(basicData) === '{}') basicData = {overallEconomicVitalityIndex:"0"};
if (JSON.stringify(rangeData) === '{}') rangeData = {regionalScope:"", timeRange:""};
if (!basicData) throw new BizError(`${interfaceName} 缺少参数 basicData` );
if (!CIIEHolidayVitalityIndex) throw new BizError(`${interfaceName} 缺少参数 CIIEHolidayVitalityIndex` );
......@@ -34,6 +35,7 @@ export async function getSqjjhl() {
if (!zhuJiaJiaoConsumptionTypeAnalysis) throw new BizError(`${interfaceName} 缺少参数 zhuJiaJiaoConsumptionTypeAnalysis` );
if (!qingPuNewTownConsumptionTypeAnalysis) throw new BizError(`${interfaceName} 缺少参数 qingPuNewTownConsumptionTypeAnalysis` );
if (!qingPuEconomicVitalityTrend) throw new BizError(`${interfaceName} 缺少参数 qingPuEconomicVitalityTrend` );
if (!rangeData) throw new BizError(`${interfaceName} 缺少参数 rangeData` );
let {overallEconomicVitalityIndex} = basicData;
let basicInfo = {总体经济活力指数: overallEconomicVitalityIndex};
......@@ -80,8 +82,15 @@ export async function getSqjjhl() {
})
qingPuEconomicVitalityTrendData = {青浦新城: qingPuNewTownData, 赵巷商业商务: CIIECoreAreaData, 朱家角古镇: zhaoXiangCommercialBusinessData, 进博会核心区: zhuJiaJiaoAncientTownData};
//范围数据
let {regionalScope, timeRange} = rangeData;
let rangeInfo = {
"区域范围": regionalScope,
"时间范围": timeRange
};
return {basicInfo, CIIEHoliday, zhaoXiangDistrictHoliday, qingPuNewTownHoliday, zhuJiaJiaoHoliday,
qingPuKeyBusiness, CIIEConsumption, zhaoXiangConsumption, zhuJiaJiaoConsumption, qingPuNewTownConsumption, qingPuEconomicVitalityTrendData};
qingPuKeyBusiness, CIIEConsumption, zhaoXiangConsumption, zhuJiaJiaoConsumption, qingPuNewTownConsumption, qingPuEconomicVitalityTrendData, rangeInfo};
}
//获取节假日活力指数分析
......
src/data/interface/yskkqyjc.ts
......@@ -3,12 +3,12 @@ import { getInterfaceByInterfaceName } from "./cronJob";
export async function getYskkqyjc() {
let interfaceName = "疑似空壳企业监测";
let {basicData, enterpriseDistributionDifferentCapacities, industrialDistribution, changesNumberShellCompanies, changesTrendShellCompanies} = await getInterfaceByInterfaceName(interfaceName);
let {basicData, enterpriseDistributionDifferentCapacities, industrialDistribution, changesNumberShellCompanies, changesTrendShellCompanies, rangeData} = await getInterfaceByInterfaceName(interfaceName);
// ----------------test----------------
// let basicData:any = {"numberOfShellEnterprises":0,"suspectedShellRate":0.00};
// let enterpriseDistributionDifferentCapacities:any = {"within100":0,"mithin315":0,"more315":0};
// let industrialDistribution:any = {};
// let basicData:any = {"numberOfShellEnterprises":454,"suspectedShellRate":10.09};
// let enterpriseDistributionDifferentCapacities:any = {"within100":21,"mithin315":377,"more315":56};
// let industrialDistribution:any = {"fisheries":11,"industrial":59,"transportationAndWarehousingAndPostalServices":1,"informationTechnologyServices":1,"wholesaleAndRetail":14,"financialIndustry":1,"realEstate":341,"leasingAndBusinessService":6,"publicServiceAndManagementOrganization":20};
// let changesNumberShellCompanies = [{"year":"2018","numberOfShellCompanies":308},{"year":"2019","numberOfShellCompanies":351},{"year":"2020","numberOfShellCompanies":394},{"year":"2021","numberOfShellCompanies":432},{"year":"2022","numberOfShellCompanies":454}];
// let changesTrendShellCompanies = [{"year":"2018","changeTrend":8.87},{"year":"2019","changeTrend":8.89},{"year":"2020","changeTrend":9.76},{"year":"2021","changeTrend":9.80},{"year":"2022","changeTrend":10.09}];
// ---------------end-------------------
......@@ -16,12 +16,14 @@ export async function getYskkqyjc() {
if (JSON.stringify(basicData) === '{}') basicData = {numberOfShellEnterprises:0, suspectedShellRate:0};
if (JSON.stringify(enterpriseDistributionDifferentCapacities) === '{}') enterpriseDistributionDifferentCapacities = {within100:0, mithin315:0, more315:0};
if (JSON.stringify(industrialDistribution) === '{}') industrialDistribution = {fisheries:0, industrial:0, transportationAndWarehousingAndPostalServices:0, informationTechnologyServices:0, wholesaleAndRetail:0, realEstate:0, leasingAndBusinessService:0, publicServiceAndManagementOrganization:0, constructionIndustry:0};
if (JSON.stringify(rangeData) === '{}') rangeData = {regionalScope:"", timeRange:""};
if (!basicData) throw new BizError(`${interfaceName} 缺少参数 basicData` );
if (!enterpriseDistributionDifferentCapacities) throw new BizError(`${interfaceName} 缺少参数 enterpriseDistributionDifferentCapacities` );
if (!industrialDistribution) throw new BizError(`${interfaceName} 缺少参数 industrialDistribution` );
if (!changesNumberShellCompanies) throw new BizError(`${interfaceName} 缺少参数 changesNumberShellCompanies` );
if (!changesTrendShellCompanies) throw new BizError(`${interfaceName} 缺少参数 changesTrendShellCompanies` );
if (!rangeData) throw new BizError(`${interfaceName} 缺少参数 rangeData` );
let {numberOfShellEnterprises, suspectedShellRate} = basicData;
let basicInfo = {
......@@ -67,6 +69,12 @@ export async function getYskkqyjc() {
changesTrendShellInfo[year] = changeTrend;
})
//范围数据
let {regionalScope, timeRange} = rangeData;
let rangeInfo = {
"区域范围": regionalScope,
"时间范围": timeRange
};
return {basicInfo, enterpriseDistribution, industrialInfo, changesNumberInfo, changesTrendShellInfo};
return {basicInfo, enterpriseDistribution, industrialInfo, changesNumberInfo, changesTrendShellInfo, rangeInfo};
}
\ No newline at end of file
src/data/interface/zdwrqysc.ts
......@@ -3,7 +3,7 @@ import { getInterfaceByInterfaceName } from "./cronJob";
export async function getZdwrqysc() {
let interfaceName = "重点污染企业生产";
let {pollutingEnterprises, productionByPollutingEnterprises, pollutingType, pollutingEnterprisesTOP10, comparisonOfPollutionTypesIndex, industryTypePollutantEnterprise, pollutingCompaniesScatter} = await getInterfaceByInterfaceName(interfaceName);
let {pollutingEnterprises, productionByPollutingEnterprises, pollutingType, pollutingEnterprisesTOP10, comparisonOfPollutionTypesIndex, industryTypePollutantEnterprise, pollutingCompaniesScatter, rangeData} = await getInterfaceByInterfaceName(interfaceName);
// ------------------test----------------
// let pollutingEnterprises:any = {"numPollutingEnterprises":48};
......@@ -18,6 +18,7 @@ export async function getZdwrqysc() {
if (JSON.stringify(pollutingEnterprises) === '{}') pollutingEnterprises = {numPollutingEnterprises:0};
if (JSON.stringify(productionByPollutingEnterprises) === '{}') productionByPollutingEnterprises = {pollutingEnterprisesIndex:0};
if (JSON.stringify(pollutingType) === '{}') pollutingType = {waterPollution:0, hazardousWaste:0, airPollution:0, soilPollution:0, otherHighlights:0};
if (JSON.stringify(rangeData) === '{}') rangeData = {regionalScope:"", timeRange:""};
if (!pollutingEnterprises) throw new BizError(`${interfaceName} 缺少参数 pollutingEnterprises` );
if (!productionByPollutingEnterprises) throw new BizError(`${interfaceName} 缺少参数 productionByPollutingEnterprises` );
......@@ -26,6 +27,7 @@ export async function getZdwrqysc() {
if (!comparisonOfPollutionTypesIndex) throw new BizError(`${interfaceName} 缺少参数 comparisonOfPollutionTypesIndex` );
if (!industryTypePollutantEnterprise) throw new BizError(`${interfaceName} 缺少参数 industryTypePollutantEnterprise` );
if (!pollutingCompaniesScatter) throw new BizError(`${interfaceName} 缺少参数 pollutingCompaniesScatter` );
if (!rangeData) throw new BizError(`${interfaceName} 缺少参数 rangeData` );
//污染企业数据
let pollutingInfo = {污染企业总数: pollutingEnterprises.numPollutingEnterprises};
......@@ -72,5 +74,12 @@ export async function getZdwrqysc() {
})
industryTypeInfo = {污染企业数: numberOfPollutingData, 生产指数: productionData};
return {pollutingInfo, productionInfo, pollutingTypeInfo, pollutionTypeInfo, pollutingTop10, industryTypeInfo, pollutingCompaniesScatter}
//范围数据
let {regionalScope, timeRange} = rangeData;
let rangeInfo = {
"区域范围": regionalScope,
"时间范围": timeRange
};
return {pollutingInfo, productionInfo, pollutingTypeInfo, pollutionTypeInfo, pollutingTop10, industryTypeInfo, pollutingCompaniesScatter, rangeInfo}
}
\ No newline at end of file
src/data/interface/zzkzl.ts
......@@ -4,22 +4,23 @@ import { getInterfaceByInterfaceName } from "./cronJob";
export async function getZzkzl() {
let interfaceName = "住宅空置率";
let {vacantHouseholdData, housingVacancyRateData, IdleUserPowerData, qingPuDistrictHousingVacancyRateTrend, housingVacancyRateInKeyAreas,
typicalResidentialVacancyRate, vacantHouseholdsInKeyAreas, typicalResidentialVacancyTrends} = await getInterfaceByInterfaceName(interfaceName);
typicalResidentialVacancyRate, vacantHouseholdsInKeyAreas, typicalResidentialVacancyTrends, rangeData} = await getInterfaceByInterfaceName(interfaceName);
// ----------------test---------------------
// let vacantHouseholdData:any = {};
// let housingVacancyRateData:any = {};
// let IdleUserPowerData:any = {};
// let vacantHouseholdData:any = {"numberOfVacantHouseholds":31924,"yoy":-2.77,"chainRatio":0.13,"statCycle":"202206"};
// let housingVacancyRateData:any = {"housingVacancyRate":7.76,"yoy":-6.27,"chainRatio":-0.11};
// let IdleUserPowerData:any = {"averagePowerConsumptionOfVacantUsers":0.47,"yoy":4.44,"chainRatio":58.33};
// let qingPuDistrictHousingVacancyRateTrend = [{"month":"202109","quantity":7.73},{"month":"202110","quantity":7.52},{"month":"202111","quantity":7.43},{"month":"202112","quantity":7.10},{"month":"202201","quantity":7.28},{"month":"202202","quantity":7.29},{"month":"202203","quantity":7.20},{"month":"202204","quantity":7.32},{"month":"202205","quantity":7.77},{"month":"202206","quantity":7.76}];
// let housingVacancyRateInKeyAreas = [{"keyAreaName":"青浦新城","userNum":0,"vacancyRate":0.00},{"keyAreaName":"西虹桥","userNum":0,"vacancyRate":0.00},{"keyAreaName":"先行启动区","userNum":0,"vacancyRate":0.00}];
// let housingVacancyRateInKeyAreas = [{"keyAreaName":"青浦新城","userNum":7025,"vacancyRate":6.76},{"keyAreaName":"西虹桥","userNum":1195,"vacancyRate":6.87},{"keyAreaName":"先行启动区","userNum":6812,"vacancyRate":13.07}];
// let typicalResidentialVacancyRate = [{"keyAreaName":"界泾港新村","userNum":0,"vacancyRate":0.00},{"keyAreaName":"桂花园","userNum":0,"vacancyRate":0.00},{"keyAreaName":"观湖御景","userNum":0,"vacancyRate":0.00},{"keyAreaName":"恒大御澜庭","userNum":0,"vacancyRate":0.00},{"keyAreaName":"崧泽华城","userNum":0,"vacancyRate":0.00},{"keyAreaName":"首创禧悦晴朗","userNum":0,"vacancyRate":0.00}];
// let vacantHouseholdsInKeyAreas = [];
// let vacantHouseholdsInKeyAreas = [{"month":"202101","quantity":10.50},{"month":"202102","quantity":10.30},{"month":"202103","quantity":10.70},{"month":"202104","quantity":10.60},{"month":"202105","quantity":10.30},{"month":"202106","quantity":10.00},{"month":"202107","quantity":9.80},{"month":"202108","quantity":9.30},{"month":"202109","quantity":8.80},{"month":"202110","quantity":7.97},{"month":"202111","quantity":7.77},{"month":"202112","quantity":7.41},{"month":"202201","quantity":8.00},{"month":"202202","quantity":8.13},{"month":"202203","quantity":8.23},{"month":"202204","quantity":8.31},{"month":"202205","quantity":8.74},{"month":"202206","quantity":8.66}];
// let typicalResidentialVacancyTrends = [];
// ----------------test---------------------
if (JSON.stringify(vacantHouseholdData) === '{}') vacantHouseholdData = {numberOfVacantHouseholds:0, chainRatio:0, yoy:0};
if (JSON.stringify(housingVacancyRateData) === '{}') housingVacancyRateData = {housingVacancyRate:0, chainRatio:0, yoy:0};
if (JSON.stringify(IdleUserPowerData) === '{}') IdleUserPowerData = {averagePowerConsumptionOfVacantUsers:0, chainRatio:0, yoy:0};
if (JSON.stringify(rangeData) === '{}') rangeData = {regionalScope:"", timeRange:""};
if (!vacantHouseholdData) throw new BizError(`${interfaceName} 缺少参数 vacantHouseholdData` );
if (!housingVacancyRateData) throw new BizError(`${interfaceName} 缺少参数 housingVacancyRateData` );
......@@ -29,6 +30,8 @@ export async function getZzkzl() {
if (!typicalResidentialVacancyRate) throw new BizError(`${interfaceName} 缺少参数 typicalResidentialVacancyRate` );
if (!vacantHouseholdsInKeyAreas) throw new BizError(`${interfaceName} 缺少参数 vacantHouseholdsInKeyAreas` );
if (!typicalResidentialVacancyTrends) throw new BizError(`${interfaceName} 缺少参数 typicalResidentialVacancyTrends` );
if (!rangeData) throw new BizError(`${interfaceName} 缺少参数 rangeData` );
//空置户数据
let {numberOfVacantHouseholds, chainRatio, yoy} = vacantHouseholdData;
......@@ -56,14 +59,20 @@ export async function getZzkzl() {
})
housingVacancyInfo = {用户数: userNumData, 空置率: vacancyRateData};
//范围数据
let {regionalScope, timeRange} = rangeData;
let rangeInfo = {
"区域范围": regionalScope,
"时间范围": timeRange
};
return {vacantHouseholdInfo, qingPuDistrictHousing, housingVacancyInfo};
return {vacantHouseholdInfo, qingPuDistrictHousing, housingVacancyInfo, rangeInfo};
}
export async function getHousingVacancyRate() {
let interfaceName = "住宅空置率";
let zzkzlData = await getInterfaceByInterfaceName(interfaceName);
// let zzkzlData:any = {housingVacancyRateData:{}};
// let zzkzlData:any = {housingVacancyRateData:{"housingVacancyRate":7.76,"yoy":-6.27,"chainRatio":-0.11}};
// -------------------test------------------------
if (JSON.stringify(zzkzlData.housingVacancyRateData) === '{}') zzkzlData.housingVacancyRateData = {housingVacancyRate:0, chainRatio:0, yoy:0};
......@@ -84,7 +93,7 @@ export async function getHousingVacancyRate() {
export async function getIdleUserPower() {
let interfaceName = "住宅空置率";
let zzkzlData = await getInterfaceByInterfaceName(interfaceName);
// let zzkzlData:any = {IdleUserPowerData:{}};
// let zzkzlData:any = {IdleUserPowerData:{"averagePowerConsumptionOfVacantUsers":0.47,"yoy":4.44,"chainRatio":58.33}};
// -------------------test------------------------
if (JSON.stringify(zzkzlData.IdleUserPowerData) === '{}') zzkzlData.IdleUserPowerData = {averagePowerConsumptionOfVacantUsers:0, chainRatio:0, yoy:0};
......@@ -107,7 +116,7 @@ export async function getResidentialVacancyRate() {
let zzkzlData = await getInterfaceByInterfaceName(interfaceName);
// -------------------test------------------------
// let zzkzlData = {typicalResidentialVacancyRate:[{"keyAreaName":"界泾港新村","userNum":0,"vacancyRate":0.00},{"keyAreaName":"桂花园","userNum":0,"vacancyRate":0.00},{"keyAreaName":"观湖御景","userNum":0,"vacancyRate":0.00},{"keyAreaName":"恒大御澜庭","userNum":0,"vacancyRate":0.00},{"keyAreaName":"崧泽华城","userNum":0,"vacancyRate":0.00},{"keyAreaName":"首创禧悦晴朗","userNum":0,"vacancyRate":0.00}]};
// let zzkzlData = {typicalResidentialVacancyRate:[{"keyAreaName":"界泾港新村","userNum":83,"vacancyRate":3.25},{"keyAreaName":"桂花园","userNum":18,"vacancyRate":2.41},{"keyAreaName":"观湖御景","userNum":66,"vacancyRate":37.71},{"keyAreaName":"恒大御澜庭","userNum":154,"vacancyRate":10.93},{"keyAreaName":"崧泽华城","userNum":1060,"vacancyRate":13.20},{"keyAreaName":"首创禧悦晴朗","userNum":422,"vacancyRate":13.89}]};
if (!zzkzlData.typicalResidentialVacancyRate) throw new BizError(`${interfaceName} 缺少参数 typicalResidentialVacancyRate` );
......@@ -130,7 +139,7 @@ export async function getResidentialVacancyRate() {
export async function getVacantHouseholdsInKeyAreas() {
let interfaceName = "住宅空置率";
let zzkzlData = await getInterfaceByInterfaceName(interfaceName);
// let zzkzlData = {vacantHouseholdsInKeyAreas:[]};
// let zzkzlData = {vacantHouseholdsInKeyAreas:[{"month":"202101","quantity":10.50},{"month":"202102","quantity":10.30},{"month":"202103","quantity":10.70},{"month":"202104","quantity":10.60},{"month":"202105","quantity":10.30},{"month":"202106","quantity":10.00},{"month":"202107","quantity":9.80},{"month":"202108","quantity":9.30},{"month":"202109","quantity":8.80},{"month":"202110","quantity":7.97},{"month":"202111","quantity":7.77},{"month":"202112","quantity":7.41},{"month":"202201","quantity":8.00},{"month":"202202","quantity":8.13},{"month":"202203","quantity":8.23},{"month":"202204","quantity":8.31},{"month":"202205","quantity":8.74},{"month":"202206","quantity":8.66}]};
if (!zzkzlData.vacantHouseholdsInKeyAreas) throw new BizError(`${interfaceName} 缺少参数 vacantHouseholdsInKeyAreas` );
......@@ -142,13 +151,13 @@ export async function getVacantHouseholdsInKeyAreas() {
vacantHouseholds[month] = quantity;
});
return {vacantHouseholds}
return {vacantHouseholds:{空置户趋势:vacantHouseholds}}
}
export async function getTypicalResidentialVacancyTrends() {
let interfaceName = "住宅空置率";
let zzkzlData = await getInterfaceByInterfaceName(interfaceName);
// let zzkzlData = {typicalResidentialVacancyTrends:[]};
// let zzkzlData = {typicalResidentialVacancyTrends:[{"month":"202101","quantity":13.80},{"month":"202102","quantity":14.00},{"month":"202103","quantity":14.50},{"month":"202104","quantity":17.60},{"month":"202105","quantity":17.00},{"month":"202106","quantity":17.40},{"month":"202107","quantity":16.90},{"month":"202108","quantity":15.10},{"month":"202109","quantity":14.30},{"month":"202110","quantity":18.49},{"month":"202111","quantity":18.23},{"month":"202112","quantity":17.00},{"month":"202201","quantity":11.23},{"month":"202202","quantity":10.56},{"month":"202203","quantity":10.98},{"month":"202204","quantity":11.13},{"month":"202205","quantity":11.62},{"month":"202206","quantity":11.30}]};
if (!zzkzlData.typicalResidentialVacancyTrends) throw new BizError(`${interfaceName} 缺少参数 typicalResidentialVacancyTrends` );
......@@ -160,5 +169,5 @@ export async function getTypicalResidentialVacancyTrends() {
typicalResidentialVacancyTrends[month] = quantity;
});
return {typicalResidential};
return {typicalResidential:{空置户趋势:typicalResidentialVacancyTrends}};
}
\ No newline at end of file
src/routers/router.ts
......@@ -13,7 +13,7 @@ import * as zhdyMsgbox8Biz from '../biz/zhdyMsgbox8';
import * as zhdyMsgbox9Biz from '../biz/zhdyMsgbox9';
import * as ptjcnlPageBiz from '../biz/ptjcnlPage';
import * as sfqztgkPageBiz from '../biz/sfqztgkPage';
// import * as sfqztgkPageBiz from '../biz/sfqztgkPage';
import * as qyehPageBiz from '../biz/qyehPage';
import * as zhnyPageBiz from '../biz/zhnyPage';
import * as lsdl_cdssPageBiz from '../biz/lsdl_cdssPage';
......@@ -33,6 +33,7 @@ import * as zhdy_yskkqyBiz from '../biz/csjInterface/zhdy_yskkqy';
import * as zhdy_zdwrqyBiz from '../biz/csjInterface/zhdy_zdwrqy';
import * as zhdy_zzkkzlBiz from '../biz/csjInterface/zhdy_zzkzl';
import * as interfaceZhdyBiz from '../biz/csjInterface/zhdy';
import * as sfqztgkPageBiz from '../biz/csjInterface/sfqztgk';
import * as sjlyBiz from '../biz/sjly'
import { checkToken } from '../middleware/checkToken';
......@@ -50,7 +51,7 @@ export function setRouter(httpServer){
// httpServer.get('/zhdyMsgbox8', asyncHandler(zhdyMsgbox8Biz.getData));
// httpServer.get('/zhdyMsgbox9', asyncHandler(zhdyMsgbox9Biz.getData));
httpServer.get('/ptjcnlPage', asyncHandler(ptjcnlPageBiz.getData));
httpServer.get('/sfqztgkPage', asyncHandler(sfqztgkPageBiz.getData));
// httpServer.get('/sfqztgkPage', asyncHandler(sfqztgkPageBiz.getData));
// httpServer.get('/qyehPage', asyncHandler(qyehPageBiz.getData));
httpServer.get('/qyehxlfzlPage', asyncHandler(qyehPageBiz.get线路负载率));
httpServer.get('/zhnyPage', asyncHandler(zhnyPageBiz.getData));
......@@ -62,7 +63,7 @@ export function setRouter(httpServer){
// httpServer.post('/lsdl_cdssPage', asyncHandler(lsdl_cdssPageBiz.getData));
// httpServer.post('/lsdl_qjnygfPage', asyncHandler(lsdl_qjnygfPageBiz.getData));
httpServer.post('/ptjcnlPage', asyncHandler(ptjcnlPageBiz.getData));
httpServer.post('/sfqztgkPage', asyncHandler(sfqztgkPageBiz.getData));
// httpServer.post('/sfqztgkPage', asyncHandler(sfqztgkPageBiz.getData));
// httpServer.post('/qyehPage', asyncHandler(qyehPageBiz.getData));
httpServer.post('/qyehxlfzlPage', asyncHandler(qyehPageBiz.get线路负载率));
httpServer.post('/zhnyPage', asyncHandler(zhnyPageBiz.getData));
......@@ -93,6 +94,7 @@ export function setRouter(httpServer){
httpServer.get('/zhdyMsgbox7', asyncHandler(zhdy_zdwrqyBiz.getData));
httpServer.get('/zhdyMsgbox9', asyncHandler(zhdy_zzkkzlBiz.getData));
httpServer.get('/zhdy', asyncHandler(interfaceZhdyBiz.getData));
httpServer.get('/sfqztgkPage', asyncHandler(sfqztgkPageBiz.getData));
httpServer.post('/lsdl_qjnygfPage', asyncHandler(lsdl_qjnygfBiz.getData));
httpServer.post('/lsdl_cdssPage', asyncHandler(lsdl_cdssBiz.getData));
......@@ -107,5 +109,6 @@ export function setRouter(httpServer){
httpServer.post('/zhdyMsgbox7', asyncHandler(zhdy_zdwrqyBiz.getData));
httpServer.post('/zhdyMsgbox9', asyncHandler(zhdy_zzkkzlBiz.getData));
httpServer.post('/zhdy', asyncHandler(interfaceZhdyBiz.getData));
httpServer.post('/sfqztgkPage', asyncHandler(sfqztgkPageBiz.getData));
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment