Commit 17748cb1 by 孙香冬

no message

parent f95b745e
......@@ -3,7 +3,7 @@ import * as fs from "fs";
import { BizError } from "../util/bizError";
import { analysisXml } from "../util/myXML";
export let port = Number(process.env.PORT) || Number(process.argv[3]) || 30001; //如果xml里面没有配置 就会使用到这里的端口
export let port = Number(process.env.PORT) || Number(process.argv[3]) || 30002; //如果xml里面没有配置 就会使用到这里的端口
export let dbConfig;
......
......@@ -8,40 +8,41 @@ let lastMonths = "";
//数据库源数据接口
export async function getTestAnalysis() {
//在月里程数据集合中 从后往前拿20个月份的数据,动态的拿本月的数据 拼接好返回 不要改变源数据
let {newDateArr, whereDateArr} = getPreMonthDay(20);
let monthMileage = [];
let testMileage = []; //测试里程
let functionTestMileage = []; //功能测试里程
for (let i = 0; i < newDateArr.length; i++) {
let months = newDateArr[i];
月里程数据.forEach(item => {
let {key, count, autoCount} = item;
if (months == key) {
testMileage.push({key, value:count});
functionTestMileage.push({key, value:autoCount});
}
})
}
let months = moment().format('YYYY.MM');
let startTime = moment().format("YYMM") + "01";
let endTime = moment().format("YYMM") + "31";
let testList = await getInterfaceData(startTime, endTime, 1);
let testCount = 0;
testList.forEach(info => {
let {time_day, enterprise, total_mileage} = info;
testCount += total_mileage;
let {timeDay, enterprise, totalMileage} = info;
testCount += parseInt(totalMileage);
});
let functionList = await getInterfaceData(startTime, endTime, 2);
let functionCount = 0;
functionList.forEach(info => {
let {time_day, enterprise, auto_mileage} = info;
functionCount += auto_mileage;
let {timeDay, enterprise, autoMileage} = info;
functionCount += parseInt(autoMileage);
});
testMileage.push({key:months, value:testCount});
functionTestMileage.push({key:months, value:functionCount});
let {newDateArr, whereDateArr} = getPreMonthDay(20);
for (let i = 0; i < newDateArr.length; i++) {
let months = newDateArr[i];
月里程数据.forEach(item => {
let {key, count, autoCount} = item;
if (months == key) {
testMileage.push({key, value:count});
functionTestMileage.push({key, value:autoCount});
}
})
}
return {testMileage, functionTestMileage}
}
......@@ -61,11 +62,11 @@ export async function initData() {
let count = 0;
list.forEach(info => {
let {time_day, enterprise, total_mileage} = info;
count += total_mileage;
let {timeDay, enterprise, totalMileage} = info;
count += parseInt(totalMileage);
if (!企业日里程数据[enterprise]) 企业日里程数据[enterprise] = {count:0, autoCount:0};
企业日里程数据[enterprise].count += total_mileage;
企业日里程数据[enterprise].count += parseInt(totalMileage);
});
......@@ -73,11 +74,11 @@ export async function initData() {
let testCount = 0;
testList.forEach(info => {
let {time_day, enterprise, auto_mileage} = info;
testCount += auto_mileage;
let {timeDay, enterprise, autoMileage} = info;
testCount += parseInt(autoMileage);
if (!企业日里程数据[enterprise]) 企业日里程数据[enterprise] = {count:0, autoCount:0};
企业日里程数据[enterprise].autoCount += auto_mileage;
企业日里程数据[enterprise].autoCount += parseInt(autoMileage);
});
let addItem = {count, autoCount:testCount, key};
......@@ -103,11 +104,11 @@ async function historyData() {
let count = 0;
list.forEach(info => {
let {time_day, enterprise, total_mileage} = info;
count += total_mileage;
let {timeDay, enterprise, totalMileage} = info;
count += parseInt(totalMileage);
if (!企业日里程数据[enterprise]) 企业日里程数据[enterprise] = {count:0, autoCount:0};
企业日里程数据[enterprise].count += total_mileage;
企业日里程数据[enterprise].count += parseInt(totalMileage);
});
......@@ -115,11 +116,11 @@ async function historyData() {
let testCount = 0;
testList.forEach(info => {
let {time_day, enterprise, auto_mileage} = info;
testCount += auto_mileage;
let {timeDay, enterprise, autoMileage} = info;
testCount += parseInt(autoMileage);
if (!企业日里程数据[enterprise]) 企业日里程数据[enterprise] = {count:0, autoCount:0};
企业日里程数据[enterprise].autoCount += auto_mileage;
企业日里程数据[enterprise].autoCount += parseInt(autoMileage);
});
月里程数据.push( {count, autoCount:testCount, key} );
......@@ -132,14 +133,14 @@ async function historyData() {
let {time_day, enterprise, total_mileage} = info;
if (!企业日里程数据[enterprise]) 企业日里程数据[enterprise] = {count:0, autoCount:0};
企业日里程数据[enterprise].count += total_mileage;
企业日里程数据[enterprise].count += parseInt(total_mileage);
});
let testList = await getInterfaceData("", lastEt, 2);
testList.forEach(info => {
let {time_day, enterprise, auto_mileage} = info;
if (!企业日里程数据[enterprise]) 企业日里程数据[enterprise] = {count:0, autoCount:0};
企业日里程数据[enterprise].autoCount += auto_mileage;
企业日里程数据[enterprise].autoCount += parseInt(auto_mileage);
});
lastMonths = moment().format("YYYY.MM")+'.01';
......@@ -155,7 +156,7 @@ const interfaceUrl = 'http://10.51.50.136:8090/sql/execute';
async function getInterfaceData(st, et, index) {
let result:any = await get(interfaceUrl, {st, et, index});
if (result && result.success) {
return result.result[0];
return result.result[0].result;
} else {
//报错
console.log();
......
import { initConfig, port } from "./config/serverConfig";
import { getTestAnalysis } from "./data/interface/interfaceService";
import { getTestAnalysis, initData } from "./data/interface/interfaceService";
import { httpServer } from "./net/http_server";
async function lanuch() {
// await initConfig();
httpServer.createServer(port);
console.log('This indicates that the server is started successfully.');
await getTestAnalysis();
}
lanuch();
\ 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