Skip to content

Z
zjntServer
Commit de620a0c by chenjinjing
Options

no message

parent b96e715a
Showing with 307 additions and 113 deletions
res/zjny.xlsx
No preview for this file type
serverConfig.xml
<config> <config>
<port>40029</port> <port>13271</port>
<imgPath>http://192.168.0.71:40029</imgPath> <imgPath>http://127.0.0.1:13271</imgPath>
<token>73n6124cv7rq614c572x80jma7mj3yhs</token> <token>73n6124cv7rq614c572x80jma7mj3yhs</token>
<userName>1</userName> <userName>1</userName>
<plantId>735608</plantId> <plantId>735608</plantId>
......
src/biz/cyszhgl.ts
...@@ -14,6 +14,9 @@ export function getData(req, res) { ...@@ -14,6 +14,9 @@ export function getData(req, res) {
let sfjdglPackageData = keyValuePackage(excelData['示范基地概览'].dataList); let sfjdglPackageData = keyValuePackage(excelData['示范基地概览'].dataList);
ret['sfjdgl'] = getKeyValueOut('示范基地概览', sfjdglPackageData); ret['sfjdgl'] = getKeyValueOut('示范基地概览', sfjdglPackageData);
let lychxjdzmjPackageData = keyValuePackage(excelData['绿叶菜核心基地总面积'].dataList);
ret['lychxjdzmj'] = getKeyValueOut('绿叶菜核心基地面积', lychxjdzmjPackageData);
let rzqyqkTableData = tablePackage(excelData["入驻企业情况"].headerList[0], excelData["入驻企业情况"].bodyList); let rzqyqkTableData = tablePackage(excelData["入驻企业情况"].headerList[0], excelData["入驻企业情况"].bodyList);
ret['rzqyqk'] = getTableOut( '入驻企业情况', rzqyqkTableData); ret['rzqyqk'] = getTableOut( '入驻企业情况', rzqyqkTableData);
...@@ -38,6 +41,18 @@ export function getData(req, res) { ...@@ -38,6 +41,18 @@ export function getData(req, res) {
let znggfxPackageData = keyValuePackage(excelData['智能灌溉分析'].dataList); let znggfxPackageData = keyValuePackage(excelData['智能灌溉分析'].dataList);
ret['znggfx'] = getKeyValueOut('智能灌溉分析', znggfxPackageData); ret['znggfx'] = getKeyValueOut('智能灌溉分析', znggfxPackageData);
let znggTableData = {};
excelData["智能灌溉"].dataList.forEach( info => {
let {ntwz, trsd, ggsj, ggjgsj, sfxygg} = info;
info["img"] = `${systemConfig.imgPath}/监控/${ntwz}.png`;
znggTableData[ntwz] = info;
})
ret['zngg'] = {title:'智能灌溉', dataList:znggTableData};
let gglqsfxPackageData = onceYBarChartPackage( excelData['灌溉量趋势分析'], '','');
ret['gglqsfx'] = getOnceYBarChartOut('灌溉量趋势分析', gglqsfxPackageData);
let scxyfxPackageData = onceYBarChartPackage(excelData['蔬菜效益分析'], '日统计', '' ); let scxyfxPackageData = onceYBarChartPackage(excelData['蔬菜效益分析'], '日统计', '' );
ret['scxyfx'] = getOnceYBarChartOut('蔬菜效益分析', scxyfxPackageData); ret['scxyfx'] = getOnceYBarChartOut('蔬菜效益分析', scxyfxPackageData);
...@@ -63,18 +78,6 @@ export function getData(req, res) { ...@@ -63,18 +78,6 @@ export function getData(req, res) {
let szcyPackageData = keyValuePackage(excelData['数字产业'].dataList); let szcyPackageData = keyValuePackage(excelData['数字产业'].dataList);
let szhglPackageData = keyValuePackage(excelData['数字化管理'].dataList); let szhglPackageData = keyValuePackage(excelData['数字化管理'].dataList);
ret['szcy'] = getKeyValueOut('数字产业', szcyPackageData.concat(szhglPackageData)); ret['szcy'] = getKeyValueOut('数字产业', szcyPackageData.concat(szhglPackageData));
let znggTableData = {};
excelData["智能灌溉"].dataList.forEach( info => {
let {ntwz, trsd, ggsj, ggjgsj, sfxygg} = info;
info["img"] = `${systemConfig.imgPath}/监控/${ntwz}.png`;
znggTableData[ntwz] = info;
})
ret['zngg'] = {title:'智能灌溉', dataList:znggTableData};
let gglqsfxPackageData = onceYBarChartPackage( excelData['灌溉量趋势分析'], '','');
ret['gglqsfx'] = getOnceYBarChartOut('灌溉量趋势分析', gglqsfxPackageData);
// let gglqsfxPackageData = {}; // let gglqsfxPackageData = {};
// excelData["灌溉量趋势分析"].forEach( info => { // excelData["灌溉量趋势分析"].forEach( info => {
// let itemChart = onceYBarChartPackage( [info], '',''); // let itemChart = onceYBarChartPackage( [info], '','');
...@@ -87,7 +90,7 @@ export function getData(req, res) { ...@@ -87,7 +90,7 @@ export function getData(req, res) {
} }
/** /**
* 种植种类/种植分布 * 种植种类
*/ */
export function zzzl(req, res) { export function zzzl(req, res) {
let {type} = req.query; let {type} = req.query;
...@@ -125,3 +128,31 @@ export function zzzl(req, res) { ...@@ -125,3 +128,31 @@ export function zzzl(req, res) {
res.send(ret); res.send(ret);
} }
/**
* 种植分布
*/
export function zzfb(req, res) {
let excelData = cyszhglTableData();
let ret:any = {};
let zzfbAllTableData:any = tablePackage(excelData["种植分布"].headerList[0], excelData["种植分布"].bodyList);
let zzfbInfo = {};
zzfbAllTableData.dataList.forEach( info => {
let {A, B, C, D} = info;
if (!zzfbInfo[D]) zzfbInfo[D] = [];
zzfbInfo[D].push({
key:A,
value:B || "0株",
rate:C || "0亩",
img:`${systemConfig.imgPath}/种植类别/${A}.png`
});
})
ret["zzfb"] = zzfbInfo;
res.send(ret);
}
src/biz/getData.ts
...@@ -10,21 +10,85 @@ import { get } from "../util/request"; ...@@ -10,21 +10,85 @@ import { get } from "../util/request";
let guangfuData = { let guangfuData = {
jbqk: [ jbqk: [
{
key: "安全运行天数",
value: 426,
},
{
key: "组件总功率",
value: 32871,
},
{
key: "设备总数",
value: 15,
},
], ],
nhfx: { nhfx: {
count: [ count: [
{ {
key: "年用电量", key: "年用电量",
value: 0, value: "56279.4",
}, },
{ {
key: "光伏发电量", key: "光伏发电量",
value: "61312.7", value: "65262.4",
}, },
], ],
charData: [ charData: [
{
key: 2018,
value: 0,
},
{
key: 2019,
value: 0,
},
{
key: 2020,
value: 0,
},
{
key: 2021,
value: 0,
},
{
key: 2022,
value: 0,
},
{
key: 2023,
value: 24.61,
},
{
key: 2024,
value: 154.19,
},
], ],
dayData: [ dayData: [
{
key: "06:00",
value: 677.2000179290771,
},
{
key: "07:00",
value: 53791.40002441406,
},
{
key: "08:00",
value: 177091.796875,
},
{
key: "09:00",
value: 278128.203125,
},
{
key: "10:00",
value: 337899.998046875,
},
{
key: "11:00",
value: 369778.896484375,
}
], ],
}, },
trsy: { trsy: {
...@@ -39,11 +103,11 @@ let guangfuData = { ...@@ -39,11 +103,11 @@ let guangfuData = {
}, },
{ {
key: "发电量", key: "发电量",
value: "61312.7", value: "65262.4",
}, },
{ {
key: "发电时长", key: "发电时长",
value: 0, value: 10214.754980833333,
}, },
], ],
charData: [ charData: [
...@@ -77,34 +141,82 @@ let guangfuData = { ...@@ -77,34 +141,82 @@ let guangfuData = {
{ {
key: "装机容量", key: "装机容量",
value: 46, value: 46,
unit: "" unit: "",
}, },
{ {
key: "总发电量", key: "总发电量",
value: "61312.7", value: "65262.4",
unit: "KW" unit: "KW",
}, },
{ {
key: "实时功率", key: "实时功率",
value: 13.80, value: 13.80,
unit: "KW" unit: "KW",
}, },
], ],
xyfxfd: { xyfxfd: {
count: [ count: [
{
key: "今日发电",
value: "184.3",
},
{
key: "日功率",
value: 0,
},
{
key: "当前功率",
value: 0,
},
{
key: "等效小时数",
value: 0,
},
], ],
chartData: [ chartData: [
{
key: "2024-12-22",
value: "113",
},
{
key: "2024-12-23",
value: "50.9",
},
{
key: "2024-12-24",
value: "172.7",
},
{
key: "2024-12-25",
value: "69.9",
},
{
key: "2024-12-26",
value: "124.1",
},
{
key: "2024-12-27",
value: "169.1",
},
{
key: "2024-12-28",
value: "190",
},
{
key: "2024-12-29",
value: "184.3",
},
], ],
}, },
xyfx: { xyfx: {
count: [ count: [
{ {
key: "今日收益", key: "今日收益",
value: 113.52, value: 110.58,
}, },
{ {
key: "当月收益", key: "当月收益",
value: 2008.74, value: 2130.84,
}, },
{ {
key: "累计收益", key: "累计收益",
...@@ -113,9 +225,40 @@ let guangfuData = { ...@@ -113,9 +225,40 @@ let guangfuData = {
], ],
chartData: { chartData: {
"今年": [ "今年": [
{
key: "2024-12-22",
value: 67.8,
},
{
key: "2024-12-23",
value: 30.54,
},
{
key: "2024-12-24",
value: 103.61999999999999,
},
{
key: "2024-12-25",
value: 41.940000000000005,
},
{
key: "2024-12-26",
value: 74.46,
},
{
key: "2024-12-27",
value: 101.46,
},
{
key: "2024-12-28",
value: 114,
},
{
key: "2024-12-29",
value: 110.58,
},
], ],
"去年": [ "去年": [],
],
}, },
}, },
jnjp: { jnjp: {
...@@ -135,12 +278,12 @@ let guangfuData = { ...@@ -135,12 +278,12 @@ let guangfuData = {
{ {
key: "电力烟尘", key: "电力烟尘",
value: "0.032克/千瓦时", value: "0.032克/千瓦时",
} },
], ],
chartData: [ chartData: [
], ],
}, },
}; };
/** /**
* 初始化接口数据 * 初始化接口数据
*/ */
...@@ -156,7 +299,7 @@ export async function guangfuInit() { ...@@ -156,7 +299,7 @@ export async function guangfuInit() {
* @param res * @param res
*/ */
export async function getLeft(req, res) { export async function getLeft(req, res) {
let ret:any = {}; let ret: any = {};
ret['jbqk'] = getKeyValueOut('基本情况', guangfuData.jbqk); ret['jbqk'] = getKeyValueOut('基本情况', guangfuData.jbqk);
...@@ -177,40 +320,40 @@ export async function getLeft(req, res) { ...@@ -177,40 +320,40 @@ export async function getLeft(req, res) {
* @param res * @param res
*/ */
export async function getData(req, res) { export async function getData(req, res) {
let ret:any = {}; let ret: any = {};
ret['ztsj'] = getKeyValueOut('整体数据', guangfuData.ztsj); ret['ztsj'] = getKeyValueOut('整体数据', guangfuData.ztsj);
//source=pc&weather_type=observe&province=上海&city=上海&county=浦东新区 //source=pc&weather_type=observe&province=上海&city=上海&county=浦东新区
let query = { let query = {
source:"pc", source: "pc",
weather_type:"observe", weather_type: "observe",
province:"上海", province: "上海",
city:"上海", city: "上海",
county:"浦东新区" county: "浦东新区"
} }
let weatherData:any = await get("https://wis.qq.com/weather/common", query); let weatherData: any = await get("https://wis.qq.com/weather/common", query);
let weather = { let weather = {
"天气":"", "天气": "",
"温度":"", "温度": "",
"风向":"", "风向": "",
"风力等级":"", "风力等级": "",
"湿度":"", "湿度": "",
"降水量":"", "降水量": "",
"图片":"" "图片": ""
} }
if(weatherData) { if (weatherData) {
let observe = weatherData.body.data.observe; let observe = weatherData.body.observe;
weather = { weather = {
"天气":observe.weather, "天气": observe.weather,
"温度":observe.degree, "温度": observe.degree,
"风向":observe.wind_direction_name, "风向": observe.wind_direction_name,
"风力等级":observe.wind_power, "风力等级": observe.wind_power,
"湿度":observe.humidity, "湿度": observe.humidity,
"降水量":observe.precipitation, "降水量": observe.precipitation,
"图片":`${systemConfig.imgPath}/天气/${observe.weather}.png` "图片": `${systemConfig.imgPath}/天气/${observe.weather}.png`
} }
} }
ret['weather'] = {title:"天气", dataList:weather}; ret['weather'] = { title: "天气", dataList: weather };
res.send(ret); res.send(ret);
} }
...@@ -222,13 +365,13 @@ export async function getData(req, res) { ...@@ -222,13 +365,13 @@ export async function getData(req, res) {
* @param res * @param res
*/ */
export async function getRight(req, res) { export async function getRight(req, res) {
let ret:any = {}; let ret: any = {};
ret['xyfxfd'] = getKeyValueOut('效益分析-发电量', guangfuData.xyfxfd.count); ret['xyfxfd'] = getKeyValueOut('效益分析-发电量', guangfuData.xyfxfd.count);
ret['xyfxfdqst'] = getKeyValueOut('效益分析-发电量趋势', guangfuData.xyfxfd.chartData); ret['xyfxfdqst'] = getKeyValueOut('效益分析-发电量趋势', guangfuData.xyfxfd.chartData);
ret['xyfx'] = getKeyValueOut('效益分析', guangfuData.xyfx.count); ret['xyfx'] = getKeyValueOut('效益分析', guangfuData.xyfx.count);
ret['xyfxqst'] = {title:"效益分析趋势", dataList:guangfuData.xyfx.chartData} ret['xyfxqst'] = { title: "效益分析趋势", dataList: guangfuData.xyfx.chartData }
ret['jnjp'] = getKeyValueOut('节能减排', guangfuData.jnjp.count); ret['jnjp'] = getKeyValueOut('节能减排', guangfuData.jnjp.count);
ret['jnjpqst'] = getKeyValueOut('节能减排趋势', guangfuData.jnjp.chartData); ret['jnjpqst'] = getKeyValueOut('节能减排趋势', guangfuData.jnjp.chartData);
......
src/biz/hjszzl.ts
...@@ -35,8 +35,8 @@ export function getData(req, res) { ...@@ -35,8 +35,8 @@ export function getData(req, res) {
let chzlcxPackageData = onceYBarChartPackage( excelData['虫害治理成效'], '',''); let chzlcxPackageData = onceYBarChartPackage( excelData['虫害治理成效'], '','');
ret['chzlcx'] = getOnceYBarChartOut('虫害治理成效', chzlcxPackageData); ret['chzlcx'] = getOnceYBarChartOut('虫害治理成效', chzlcxPackageData);
let tqjcPackageData = keyValuePackage(excelData['天气检测'].dataList); // let tqjcPackageData = keyValuePackage(excelData['天气检测'].dataList);
ret['tqjc'] = getKeyValueOut('天气检测', tqjcPackageData); // ret['tqjc'] = getKeyValueOut('天气检测', tqjcPackageData);
let trjcPackageData = keyValuePackage(excelData['土壤检测'].dataList); let trjcPackageData = keyValuePackage(excelData['土壤检测'].dataList);
ret['trjc'] = getKeyValueOut('土壤检测', trjcPackageData); ret['trjc'] = getKeyValueOut('土壤检测', trjcPackageData);
...@@ -53,7 +53,7 @@ export function getData(req, res) { ...@@ -53,7 +53,7 @@ export function getData(req, res) {
let img = `${systemConfig.imgPath}/${bhczlPackageData[i]}`; let img = `${systemConfig.imgPath}/${bhczlPackageData[i]}`;
bhczl.push(img); bhczl.push(img);
} }
ret['bhczl'] = getStringOut('病害虫治理', bhczlPackageData); ret['bhczl'] = getStringOut('病害虫治理', bhczl);
let chjcdyjPackageData = keyValuePackage(excelData['虫害检测灯预警'].dataList); let chjcdyjPackageData = keyValuePackage(excelData['虫害检测灯预警'].dataList);
ret['chjcdyj'] = getKeyValueOut('虫害检测灯预警', chjcdyjPackageData); ret['chjcdyj'] = getKeyValueOut('虫害检测灯预警', chjcdyjPackageData);
......
src/biz/jdaqgl.ts
...@@ -41,8 +41,8 @@ export function getData(req, res) { ...@@ -41,8 +41,8 @@ export function getData(req, res) {
let gzztlbTableData = tablePackage(excelData["故障状态列表"].headerList[0], excelData["故障状态列表"].bodyList); let gzztlbTableData = tablePackage(excelData["故障状态列表"].headerList[0], excelData["故障状态列表"].bodyList);
ret['gzztlb'] = getTableOut( '故障状态列表', gzztlbTableData); ret['gzztlb'] = getTableOut( '故障状态列表', gzztlbTableData);
let tqsjPackageData = keyValuePackage(excelData['天气数据'].dataList); // let tqsjPackageData = keyValuePackage(excelData['天气数据'].dataList);
ret['tqsj'] = getKeyValueOut('天气数据', tqsjPackageData); // ret['tqsj'] = getKeyValueOut('天气数据', tqsjPackageData);
let sbyhjcPackageData = keyValuePackage(excelData['设备运行监测'].dataList); let sbyhjcPackageData = keyValuePackage(excelData['设备运行监测'].dataList);
ret['sbyhjc'] = getKeyValueOut('设备运行监测', sbyhjcPackageData); ret['sbyhjc'] = getKeyValueOut('设备运行监测', sbyhjcPackageData);
...@@ -64,8 +64,19 @@ export function getData(req, res) { ...@@ -64,8 +64,19 @@ export function getData(req, res) {
// let zdqyjkPackageData = keyValuePackage(excelData['重点区域监控'].dataList); // let zdqyjkPackageData = keyValuePackage(excelData['重点区域监控'].dataList);
// ret['zdqyjk'] = getKeyValueOut('重点区域监控', zdqyjkPackageData); // ret['zdqyjk'] = getKeyValueOut('重点区域监控', zdqyjkPackageData);
// rtsp://admin:a1357924680@192.168.8.210:554/Streaming/Channels/101?transportmode=multicast
// rtsp://admin:a1357924680@192.168.8.194:554/Streaming/Channels/101?transportmode=multicast
// rtsp://admin:a1357924680@192.168.8.105:554/Streaming/Channels/101?transportmode=multicast
// rtsp://admin:a1357924680@192.168.8.153:554/Streaming/Channels/101?transportmode=multicast
let zdqyjkTableData = tablePackage(excelData["重点区域监控"].headerList[0], excelData["重点区域监控"].bodyList); let zdqyjkTableData = tablePackage(excelData["重点区域监控"].headerList[0], excelData["重点区域监控"].bodyList);
ret['zdqyjk'] = getTableOut( '重点区域监控', zdqyjkTableData); let zdqyjkData = {titleList:zdqyjkTableData.titleList, dataList:[]};
zdqyjkTableData.dataList.forEach( info => {
let {A, B, C, D, E, F} = info;
let imgUrl = `${systemConfig.imgPath}/监控/${C}`;
zdqyjkData.dataList.push({A, B, C:imgUrl, D, E, F});
})
ret['zdqyjk'] = getTableOut( '重点区域监控', zdqyjkData);
// let zdqyjkData = []; // let zdqyjkData = [];
// zdqyjkPackageData.forEach( info => { // zdqyjkPackageData.forEach( info => {
// let {key, value} = info; // let {key, value} = info;
......
src/biz/yzdqxdnyzl.ts
...@@ -11,8 +11,8 @@ export function getData(req, res) { ...@@ -11,8 +11,8 @@ export function getData(req, res) {
let ret:any = {}; let ret:any = {};
/**中上 */ /**中上 */
let ztsjfbPackageData = keyValuePackage(excelData['总体数据分布'].dataList); // let ztsjfbPackageData = keyValuePackage(excelData['总体数据分布'].dataList);
ret['ztsjfb'] = getKeyValueOut('总体数据分布', ztsjfbPackageData); // ret['ztsjfb'] = getKeyValueOut('总体数据分布', ztsjfbPackageData);
/**左屏 */ /**左屏 */
let zrzyPackageData = keyValuePackage(excelData['张江镇自然资源'].dataList); let zrzyPackageData = keyValuePackage(excelData['张江镇自然资源'].dataList);
...@@ -21,8 +21,17 @@ export function getData(req, res) { ...@@ -21,8 +21,17 @@ export function getData(req, res) {
let szylylPackageData = keyValuePackage(excelData['水资源利用率'].dataList); let szylylPackageData = keyValuePackage(excelData['水资源利用率'].dataList);
ret['szylyl'] = getKeyValueOut('水资源利用率', szylylPackageData); ret['szylyl'] = getKeyValueOut('水资源利用率', szylylPackageData);
let qyqkPackageData = keyValuePackage(excelData['企业情况'].dataList); // let cyjgPackageData = keyValuePackage(excelData['产业结构'].dataList);
ret['qyqk'] = getKeyValueOut('企业情况', qyqkPackageData); // ret['cyjg'] = getKeyValueOut('产业结构', cyjgPackageData);
let cyztjgPackageData = keyValuePackage(excelData['产业主体结构'].dataList);
ret['cyztjg'] = getKeyValueOut('产业主体结构', cyztjgPackageData);
// let qyqkPackageData = keyValuePackage(excelData['企业情况'].dataList);
// ret['qyqk'] = getKeyValueOut('企业情况', qyqkPackageData);
let cyryjbqkPackageData = keyValuePackage(excelData['从业人员基本情况'].dataList);
ret['cyryjbqk'] = getKeyValueOut('从业人员基本情况', cyryjbqkPackageData);
let zyyglxPackageData = keyValuePackage(excelData['专业员工类型'].dataList); let zyyglxPackageData = keyValuePackage(excelData['专业员工类型'].dataList);
ret['zyyglx'] = getKeyValueOut('专业员工类型', zyyglxPackageData); ret['zyyglx'] = getKeyValueOut('专业员工类型', zyyglxPackageData);
...@@ -30,12 +39,6 @@ export function getData(req, res) { ...@@ -30,12 +39,6 @@ export function getData(req, res) {
let cyryqkPackageData = keyValuePackage(excelData['从业人员情况'].dataList); let cyryqkPackageData = keyValuePackage(excelData['从业人员情况'].dataList);
ret['cyryqk'] = getKeyValueOut('从业人员情况', cyryqkPackageData); ret['cyryqk'] = getKeyValueOut('从业人员情况', cyryqkPackageData);
let cyjgPackageData = keyValuePackage(excelData['产业结构'].dataList);
ret['cyjg'] = getKeyValueOut('产业结构', cyjgPackageData);
let cyztjgPackageData = keyValuePackage(excelData['产业主体结构'].dataList);
ret['cyztjg'] = getKeyValueOut('产业主体结构', cyztjgPackageData);
/**右屏 */ /**右屏 */
let zdxmjsPackageData = keyValuePackage(excelData['重点项目建设'].dataList); let zdxmjsPackageData = keyValuePackage(excelData['重点项目建设'].dataList);
ret['zdxmjs'] = getKeyValueOut('重点项目建设', zdxmjsPackageData); ret['zdxmjs'] = getKeyValueOut('重点项目建设', zdxmjsPackageData);
...@@ -43,20 +46,20 @@ export function getData(req, res) { ...@@ -43,20 +46,20 @@ export function getData(req, res) {
let xmfxPackageData = keyValuePackage(excelData['项目分析'].dataList); let xmfxPackageData = keyValuePackage(excelData['项目分析'].dataList);
ret['xmfx'] = getKeyValueOut('项目分析', xmfxPackageData); ret['xmfx'] = getKeyValueOut('项目分析', xmfxPackageData);
let zjfwPackageData = keyValuePackage(excelData['专家服务'].dataList); // let zjfwPackageData = keyValuePackage(excelData['专家服务'].dataList);
ret['zjfw'] = getKeyValueOut('专家服务', zjfwPackageData); // ret['zjfw'] = getKeyValueOut('专家服务', zjfwPackageData);
let jsyjqkPackageData = keyValuePackage(excelData['技术创新引进情况'].dataList);
ret['jsyjqk'] = getKeyValueOut('技术创新引进情况', jsyjqkPackageData);
let cxjsjcsjPackageData = keyValuePackage(excelData['创新技术基础数据'].dataList); let cxjsjcsjPackageData = keyValuePackage(excelData['创新技术基础数据'].dataList);
ret['cxjsjcsj'] = getKeyValueOut('创新技术基础数据', cxjsjcsjPackageData); ret['cxjsjcsj'] = getKeyValueOut('创新技术基础数据', cxjsjcsjPackageData);
let jsyjqkPackageData = keyValuePackage(excelData['技术创新引进情况'].dataList);
ret['jsyjqk'] = getKeyValueOut('技术创新引进情况', jsyjqkPackageData);
let jscxqsPackageData = onceYBarChartPackage( excelData['技术创新趋势'], '',''); let jscxqsPackageData = onceYBarChartPackage( excelData['技术创新趋势'], '','');
ret['jscxqs'] = getOnceYBarChartOut('技术创新趋势', jscxqsPackageData); ret['jscxqs'] = getOnceYBarChartOut('技术创新趋势', jscxqsPackageData);
let yjjsyjqkPackageData = keyValuePackage(excelData['引进技术基础数据'].dataList); // let yjjsyjqkPackageData = keyValuePackage(excelData['引进技术基础数据'].dataList);
ret['yjjsyjqk'] = getKeyValueOut('引进技术基础数据', yjjsyjqkPackageData); // ret['yjjsyjqk'] = getKeyValueOut('引进技术基础数据', yjjsyjqkPackageData);
let yjjscxqsPackageData = onceYBarChartPackage( excelData['引进技术创新趋势'], '',''); let yjjscxqsPackageData = onceYBarChartPackage( excelData['引进技术创新趋势'], '','');
ret['yjjscxqs'] = getOnceYBarChartOut('引进技术创新趋势', yjjscxqsPackageData); ret['yjjscxqs'] = getOnceYBarChartOut('引进技术创新趋势', yjjscxqsPackageData);
......
src/data/interface/dataInterface.ts
...@@ -67,19 +67,19 @@ export async function getGuangFu() { ...@@ -67,19 +67,19 @@ export async function getGuangFu() {
end_date:nowYearAgo, end_date:nowYearAgo,
time_unit:"year", time_unit:"year",
} }
let pjzData:any = await get(dataCenterInterfaceConfig.hqmdzlsfdl, nhfxquery, header); // let pjzData:any = await get(dataCenterInterfaceConfig.hqmdzlsfdl, nhfxquery, header);
if (!pjzData.body) console.log("接口请求失败-获取某电站历史发电量：hqmdzlsfdl"); // if (!pjzData.body) console.log("接口请求失败-获取某电站历史发电量：hqmdzlsfdl");
let nowYear = moment(nowTime).format("YYYY"); // let nowYear = moment(nowTime).format("YYYY");
//平均值 // //平均值
if (pjzData.body) { // if (pjzData.body) {
pjzData.body.energys.forEach( info => { // pjzData.body.energys.forEach( info => {
let {date, energy} = info; // let {date, energy} = info;
let value = Math.round((energy/365)*100)/100; // let value = Math.round((energy/365)*100)/100;
result.nhfx.charData.push({key:date, value}); // result.nhfx.charData.push({key:date, value});
if (date == nowYear) nhfxData.年用电量 = energy; // if (date == nowYear) nhfxData.年用电量 = energy;
}) // })
} // }
//当天功率 //当天功率
...@@ -225,24 +225,24 @@ export async function getGuangFu() { ...@@ -225,24 +225,24 @@ export async function getGuangFu() {
//去年 //去年
/** todo 接口调用频率限制---------------------------------------------------------------------------------------- */ /** todo 接口调用频率限制---------------------------------------------------------------------------------------- */
// let yearAgo = moment().subtract(1, 'years'); let yearAgo = moment().subtract(1, 'years');
// let dayAgo = moment().subtract(7, 'days'); let dayAgo = moment().subtract(7, 'days');
// let startDate = `${yearAgo}-${moment(dayAgo).format("-MM-DD")}`; let startDate = `${yearAgo}-${moment(dayAgo).format("-MM-DD")}`;
// let endDate = `${yearAgo}-${moment(nowTime).format("MM-DD")}`; let endDate = `${yearAgo}-${moment(nowTime).format("MM-DD")}`;
// let xyfxquery = { let xyfxquery = {
// plant_id:systemConfig.plantId, plant_id:systemConfig.plantId,
// start_date:startDate, start_date:startDate,
// end_date:endDate, end_date:endDate,
// time_unit:"year", time_unit:"year",
// } }
// let hqmdzlsfdl:any = await get(dataCenterInterfaceConfig.hqmdzlsfdl, xyfxquery, header); let hqmdzlsfdl:any = await get(dataCenterInterfaceConfig.hqmdzlsfdl, xyfxquery, header);
// if (!hqmdzlsfdl) throw new BizError('数据未返回'); if (!hqmdzlsfdl) throw new BizError('数据未返回');
let lastyear = []; let lastyear = [];
// hqmdzlsfdl.body.energys.forEach( info => { hqmdzlsfdl.body.energys.forEach( info => {
// let {date, energy} = info; let {date, energy} = info;
// let thisPrice = energy * price; let thisPrice = energy * price;
// lastyear.push({key:date, value:thisPrice}); lastyear.push({key:date, value:thisPrice});
// }); });
result.xyfx.chartData["去年"] = lastyear; result.xyfx.chartData["去年"] = lastyear;
/** todo 接口调用频率限制---------------------------------------------------------------------------------------- */ /** todo 接口调用频率限制---------------------------------------------------------------------------------------- */
......
src/data/table/cyszhglData.ts
...@@ -32,7 +32,8 @@ export function cyszhglTableData() { ...@@ -32,7 +32,8 @@ export function cyszhglTableData() {
// let decollatePlanarList =["预警详情工单","种植种类", "种植分布","产品溯源信息"];//适配 表格 // let decollatePlanarList =["预警详情工单","种植种类", "种植分布","产品溯源信息"];//适配 表格
// let titltListConfig = {}; // let titltListConfig = {};
let keyValueOrTitleList = ["风险类型占比", "安全管理","示范基地概览","示范地投入品使用记录","风险预警","产业销量排行","数字产业", "数字化管理", "智能灌溉", "智能灌溉分析"];//适配 饼图 键值以及需要多个key的 let keyValueOrTitleList = ["风险类型占比", "安全管理","示范基地概览","示范地投入品使用记录","风险预警","产业销量排行","数字产业", "数字化管理", "智能灌溉", "智能灌溉分析",
"绿叶菜核心基地总面积"];//适配 饼图 键值以及需要多个key的
let barChartList = ["苗情检测","农产品安全质量检测","蔬菜效益分析","渔业效益分析","灌溉量趋势分析", "投入品使用情况", "绿色防控物资使用情况", "溉量趋势分析", "效益分析"]; //适配 柱状图 折线图 let barChartList = ["苗情检测","农产品安全质量检测","蔬菜效益分析","渔业效益分析","灌溉量趋势分析", "投入品使用情况", "绿色防控物资使用情况", "溉量趋势分析", "效益分析"]; //适配 柱状图 折线图
let stringList = []; let stringList = [];
let decollatePlanarList =["入驻企业情况", "预警详情工单","种植种类", "种植分布","产品溯源信息"];//适配 表格 let decollatePlanarList =["入驻企业情况", "预警详情工单","种植种类", "种植分布","产品溯源信息"];//适配 表格
......
src/data/table/hjszzlData.ts
...@@ -25,7 +25,7 @@ export function hjszzlTableData() { ...@@ -25,7 +25,7 @@ export function hjszzlTableData() {
let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '环境数字治理'); let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '环境数字治理');
let keyValueOrTitleList = ["天气检测","土壤检测","水质检测","环境基础分析","治理情况","灾害性应急管理", "病害虫治理", "虫害检测灯预警", "气象灾害列表"];//适配 饼图 键值以及需要多个key的 let keyValueOrTitleList = ["土壤检测","水质检测","环境基础分析","治理情况","灾害性应急管理", "病害虫治理", "虫害检测灯预警", "气象灾害列表"];//适配 饼图 键值以及需要多个key的
let barChartList = ["气温趋势","土壤微量元素监测","浊度趋势变化","温度趋势变化","PH值趋势变化",,"NH3-N趋势变化","溶解氧趋势变化","虫害治理成效"]; //适配 柱状图 折线图 // let barChartList = ["气温趋势","土壤微量元素监测","浊度趋势变化","温度趋势变化","PH值趋势变化",,"NH3-N趋势变化","溶解氧趋势变化","虫害治理成效"]; //适配 柱状图 折线图 //
let stringList = []; let stringList = [];
let decollatePlanarList =["天气检测表"];//适配 表格 let decollatePlanarList =["天气检测表"];//适配 表格
......
src/data/table/yzdqxdnyzlData.ts
...@@ -26,7 +26,8 @@ export function yzdqxdnyzlTableData() { ...@@ -26,7 +26,8 @@ export function yzdqxdnyzlTableData() {
let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '现代农业走廊'); let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '现代农业走廊');
let keyValueOrTitleList = ["张江镇自然资源","水资源利用率","企业情况","总体数据分布","专业员工类型","从业人员情况","产业结构","产业主体结构", let keyValueOrTitleList = ["张江镇自然资源","水资源利用率","企业情况","总体数据分布","专业员工类型","从业人员情况","产业结构","产业主体结构",
"重点项目建设","项目分析","专家服务","技术创新引进情况","创新技术基础数据","引进技术基础数据","经营管理情况"];//适配 饼图 键值以及需要多个key的 "重点项目建设","项目分析","专家服务","技术创新引进情况","创新技术基础数据","引进技术基础数据","经营管理情况",
"从业人员基本情况"];//适配 饼图 键值以及需要多个key的
let barChartList = ["技术创新趋势","引进技术创新趋势","农业生产产值趋势图"]; //适配 柱状图 折线图 let barChartList = ["技术创新趋势","引进技术创新趋势","农业生产产值趋势图"]; //适配 柱状图 折线图
let stringList = []; let stringList = [];
......
src/main.ts
...@@ -2,17 +2,19 @@ ...@@ -2,17 +2,19 @@
import { initInterfaceData } from "./data/interface/cronJob"; import { initInterfaceData } from "./data/interface/cronJob";
import { httpServer } from "./net/http_server"; import { httpServer } from "./net/http_server";
import { initConfig, systemConfig } from "./config/serverConfig"; import { initConfig, systemConfig } from "./config/serverConfig";
import { guangfuInit } from "./biz/getData";
async function lanuch() { async function lanuch() {
test(); test();
await initConfig(); await initConfig();
// initInterfaceData(); // initInterfaceData();
httpServer.createServer( systemConfig.port ); httpServer.createServer( systemConfig.port );
// await guangfuInit();
console.log('This indicates that the server is started successfully.'); console.log('This indicates that the server is started successfully.');
} }
function test() { function test() {
//
} }
lanuch(); lanuch();
src/routers/router.ts
...@@ -39,6 +39,7 @@ export function setRouter(httpServer){ ...@@ -39,6 +39,7 @@ export function setRouter(httpServer){
httpServer.post('/cyszhgl', asyncHandler(cyszhglBiz.getData)); httpServer.post('/cyszhgl', asyncHandler(cyszhglBiz.getData));
httpServer.post('/cyszhgl/zzzl', asyncHandler(cyszhglBiz.zzzl)); httpServer.post('/cyszhgl/zzzl', asyncHandler(cyszhglBiz.zzzl));
httpServer.post('/cyszhgl/zzfb', asyncHandler(cyszhglBiz.zzfb));
httpServer.post('/gfny', asyncHandler(gfnyBiz.getData)); httpServer.post('/gfny', asyncHandler(gfnyBiz.getData));
...@@ -60,6 +61,7 @@ export function setRouter(httpServer){ ...@@ -60,6 +61,7 @@ export function setRouter(httpServer){
httpServer.get('/cyszhgl', asyncHandler(cyszhglBiz.getData)); httpServer.get('/cyszhgl', asyncHandler(cyszhglBiz.getData));
httpServer.get('/cyszhgl/zzzl', asyncHandler(cyszhglBiz.zzzl)); httpServer.get('/cyszhgl/zzzl', asyncHandler(cyszhglBiz.zzzl));
httpServer.get('/cyszhgl/zzfb', asyncHandler(cyszhglBiz.zzfb));
httpServer.get('/gfny', asyncHandler(gfnyBiz.getData)); httpServer.get('/gfny', asyncHandler(gfnyBiz.getData));
......
src/util/request.ts
...@@ -11,7 +11,7 @@ export function get(url:string, query?, headers?, timeOut?) { ...@@ -11,7 +11,7 @@ export function get(url:string, query?, headers?, timeOut?) {
request.get(paramater, function (err, res, body) { request.get(paramater, function (err, res, body) {
const success = !err && res && res == 200; const success = !err && res && res == 200;
let message = err || res.statusCode || ""; let message = err || res.statusCode || "";
resolve({success, message, body}); resolve({success, message, body:body.data});
}) })
}) })
} }
......
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