Skip to content

M
motorCity
Commit 120c000c by lixinming
Options

Merge branch 'master' of http://123.207.147.179:8888/node_server/motorCity

parents adf42db4 3ece0f4a
Showing with 352 additions and 45 deletions
src/biz/jgfwnl/data.ts
import { getChartOutData, getKeyValueNumberOutData, getListOutData } from "../../cal/out";
import { separateDataAndUint } from "../../cal/privateTools";
import { getHardware } from "../../data/interface/hardwareData";
import { getCsgkBasicData, getEnterpriseTest, getTestAnalysis, getTestLicense, getTestTotalTime } from "../../data/interface/interfaceService";
//云资源
export async function getYZY(req, res) {
let ret:any = {};
let {计算云资源, 使用率, 物理资源} = await getHardware();
let 计算云资源data = {"cpu":"3568核", "内存":"4000G", "本地磁盘":"1999G", "云磁盘总量":"848484G"};
ret["api1"] = getKeyValueNumberOutData("计算云资源", 计算云资源data );
ret["api1"] = getKeyValueNumberOutData("计算云资源", 计算云资源 );
let 计算云资源使用率data = {"CPU":"63.9%", "内存":"30.4%", "本地磁盘":"29.6%", "云磁盘cds ssd池":"23%", "云磁盘cds sata池":"73%", "对象存储":"73.83%"};
ret["api2"] = getKeyValueNumberOutData("计算云资源使用率", 计算云资源使用率data );
ret["api2"] = getKeyValueNumberOutData("计算云资源使用率", 使用率 );
let 物理资源data = {"物理机":"100台", "网络设备":"34台", "安全设备":"4台", "机柜":"16台"};
ret["api3"] = getKeyValueNumberOutData("物理资源", 物理资源data );
ret["api3"] = getKeyValueNumberOutData("物理资源", 物理资源 );
res.send(ret);
}
......@@ -30,10 +34,18 @@ export async function getCSGK(req, res) {
{key:"功能测试总里程", value:"3105km", icon:"http://192.168.0.117:30001/csgk/5.png"},
{key:"功能测试总时长", value:"5635h", icon:"http://192.168.0.117:30001/csgk/6.png"},
];
let 测试概况基础数据 = await getCsgkBasicData();
let 基础数据 = [];
for (let key in 测试概况基础数据) {
let index = 1;
基础数据.push({key, value: 测试概况基础数据[key], icon: `http://192.168.0.117:30001/csgk/${index}.png`});
index++;
}
let 基础数据Info = [];
基础数据data.forEach(info => {
基础数据.forEach(info => {
let {key, value, icon} = info;
let {dataNum, dataUnit} = separateDataAndUint(value);
基础数据Info.push({key, value:dataNum, icon, unit:dataUnit});
......@@ -50,20 +62,21 @@ export async function getCSGK(req, res) {
let 今日功能测试data = {"里程":"1478km", "时长":"421.3h"};
ret["api4"] = getKeyValueNumberOutData("今日功能测试", 今日功能测试data);
let 测试牌照分布data = {"http://192.168.0.117:30001/img/AutoX.png":"61辆", "http://192.168.0.117:30001/img/阿利昂斯.png":"45辆",
"http://192.168.0.117:30001/img/百度.png":"31辆", "http://192.168.0.117:30001/img/宝马.png":"47辆",
"http://192.168.0.117:30001/img/初速度.png":"65辆", "http://192.168.0.117:30001/img/滴滴.png":"71辆",
"http://192.168.0.117:30001/img/丰田.png":"18辆", "http://192.168.0.117:30001/img/华为.png":"23辆",
"http://192.168.0.117:30001/img/吉利汽车.png":"33辆", "http://192.168.0.117:30001/img/商汤.png":"16辆",
"http://192.168.0.117:30001/img/上汽大通.png":"22辆", "http://192.168.0.117:30001/img/上汽大众.png":"69辆",
"http://192.168.0.117:30001/img/上汽红岩.png":"11辆", "http://192.168.0.117:30001/img/上汽赛可.png":"36辆",
"http://192.168.0.117:30001/img/上汽通用.png":"16辆", "http://192.168.0.117:30001/img/上汽通用车.png":"73辆",
"http://192.168.0.117:30001/img/深兰.png":"51辆", "http://192.168.0.117:30001/img/通用中国.png":"56辆",
"http://192.168.0.117:30001/img/图森未来.png":"33辆", "http://192.168.0.117:30001/img/蔚来.png":"67辆",
"http://192.168.0.117:30001/img/仙途智能.png":"19辆", "http://192.168.0.117:30001/img/小马智行.png":"46辆",
"http://192.168.0.117:30001/img/依行科技.png":"30辆", "http://192.168.0.117:30001/img/中车.png":"71辆",
"http://192.168.0.117:30001/img/中智行.png":"21辆"};
// let 测试牌照分布data = {"http://192.168.0.117:30001/img/AutoX.png":"61辆", "http://192.168.0.117:30001/img/阿利昂斯.png":"45辆",
// "http://192.168.0.117:30001/img/百度.png":"31辆", "http://192.168.0.117:30001/img/宝马.png":"47辆",
// "http://192.168.0.117:30001/img/初速度.png":"65辆", "http://192.168.0.117:30001/img/滴滴.png":"71辆",
// "http://192.168.0.117:30001/img/丰田.png":"18辆", "http://192.168.0.117:30001/img/华为.png":"23辆",
// "http://192.168.0.117:30001/img/吉利汽车.png":"33辆", "http://192.168.0.117:30001/img/商汤.png":"16辆",
// "http://192.168.0.117:30001/img/上汽大通.png":"22辆", "http://192.168.0.117:30001/img/上汽大众.png":"69辆",
// "http://192.168.0.117:30001/img/上汽红岩.png":"11辆", "http://192.168.0.117:30001/img/上汽赛可.png":"36辆",
// "http://192.168.0.117:30001/img/上汽通用.png":"16辆", "http://192.168.0.117:30001/img/上汽通用车.png":"73辆",
// "http://192.168.0.117:30001/img/深兰.png":"51辆", "http://192.168.0.117:30001/img/通用中国.png":"56辆",
// "http://192.168.0.117:30001/img/图森未来.png":"33辆", "http://192.168.0.117:30001/img/蔚来.png":"67辆",
// "http://192.168.0.117:30001/img/仙途智能.png":"19辆", "http://192.168.0.117:30001/img/小马智行.png":"46辆",
// "http://192.168.0.117:30001/img/依行科技.png":"30辆", "http://192.168.0.117:30001/img/中车.png":"71辆",
// "http://192.168.0.117:30001/img/中智行.png":"21辆"};
let 测试牌照分布data = await getTestLicense();
ret["api5"] = getKeyValueNumberOutData("测试牌照分布", 测试牌照分布data);
let 路侧监控视频data = {"src":"http://10.51.50.53:8278/live/13060200882000000001@31011402601318800184@34020000001320000001.m3u8?vhost=bduv0utmss4c3nzidjn.a.e-web.com.cn", "type": 'application/x-mpegURL'};
......@@ -90,7 +103,9 @@ export async function getCSFX(req, res) {
{key:"2021.11", value:"310km"}, {key:"2021.12", value:"870km"}, {key:"2022.1", value:"860km"}, {key:"2022.2", value:"980km"}, {key:"2022.3", value:"103km"},
{key:"2022.4", value:"650km"}, {key:"2022.5", value:"560km"}, {key:"2022.6", value:"130km"}, {key:"2022.7", value:"606km"}, {key:"2022.8", value:"171km"}
];
let 月度测试里程分布data = {测试: {unit:'km', dataInfo: 月度测试里程分布测试data}, 功能测试: {unit:'km', dataInfo: 月度测试里程分布功能测试data}};
let {testMileage, functionTestMileage} = await getTestAnalysis();
let 月度测试里程分布data = {测试: {unit:'km', dataInfo: testMileage}, 功能测试: {unit:'km', dataInfo: functionTestMileage}};
ret["api1"] = getChartOutData("月度测试里程分布", 月度测试里程分布data);
......@@ -108,7 +123,12 @@ export async function getCSFX(req, res) {
{key:"2021.11", value:"310h"}, {key:"2021.12", value:"870h"}, {key:"2022.1", value:"860h"}, {key:"2022.2", value:"980h"}, {key:"2022.3", value:"103h"},
{key:"2022.4", value:"650h"}, {key:"2022.5", value:"560h"}, {key:"2022.6", value:"130h"}, {key:"2022.7", value:"606h"}, {key:"2022.8", value:"171h"}
];
let 月度测试时长分布data = {测试: {unit:'h', dataInfo: 月度测试时长分布测试data}, 功能测试: {unit:'h', dataInfo: 月度测试时长分布功能测试data}};
let {月度测试时长data, 企业测试时长data} = await getTestTotalTime();
let {testTime, functionTestTime} = 月度测试时长data;
let 月度测试时长分布data = {测试: {unit:'h', dataInfo: testTime}, 功能测试: {unit:'h', dataInfo: functionTestTime}};
ret["api2"] = getChartOutData("月度测试时长分布", 月度测试时长分布data);
......@@ -122,7 +142,9 @@ export async function getCSFX(req, res) {
{key:"AutoX", value:"33km"}, {key:"小马易车", value:"26km"}, {key:"上汽红岩", value:"47km"}, {key:"阿利昂斯", value:"27km"}, {key:"宝马", value:"70km"},
{key:"吉利汽车", value:"75km"}, {key:"上汽通用", value:"67km"}, {key:"图森未来", value:"72km"}
];
let 企业测试里程分布data = {测试: {unit:'km', dataInfo: 企业测试里程测试分布data}, 功能测试: {unit:'km', dataInfo: 企业测试里程功能测试分布data}};
let {testMileageEnterprise, functionTestMileageEnterprise} = await getEnterpriseTest();
let 企业测试里程分布data = {测试: {unit:'km', dataInfo: testMileageEnterprise}, 功能测试: {unit:'km', dataInfo: functionTestMileageEnterprise}};
ret["api3"] = getChartOutData("企业测试里程分布", 企业测试里程分布data);
......@@ -136,7 +158,9 @@ export async function getCSFX(req, res) {
{key:"AutoX", value:"63h"}, {key:"小马易车", value:"26h"}, {key:"上汽红岩", value:"47h"}, {key:"阿利昂斯", value:"27km"}, {key:"宝马", value:"70km"},
{key:"吉利汽车", value:"75km"}, {key:"上汽通用", value:"67km"}, {key:"图森未来", value:"72km"}
];
let 企业测试时长分布data = {测试: {unit:'h', dataInfo: 企业测试时长测试分布data}, 功能测试: {unit:'h', dataInfo: 企业测试时长功能测试分布data}};
let {testTimeEnterprise, functionTestTimeEnterprise} = 企业测试时长data;
let 企业测试时长分布data = {测试: {unit:'h', dataInfo: testTimeEnterprise}, 功能测试: {unit:'h', dataInfo: functionTestTimeEnterprise}};
ret["api4"] = getChartOutData("企业测试时长分布", 企业测试时长分布data);
let 企业脱离自动驾驶比率data:any = [
......
src/data/interface/hardwareData.ts
......@@ -5,9 +5,12 @@ import { get } from "../../util/request";
export async function getHardware() {
let url = "http://10.51.50.140:8080/api/static/PrivateCloudUsageStatics";
let result:any = await get(url, {}, {});
// let result:any = await get(url, {}, {});
let 计算云资源;
let 物理资源;
let 使用率;
result = {
let 云资源result = {
"content":[
{
"id":1,
......@@ -15,10 +18,10 @@ export async function getHardware() {
"mem":"24430 GB",
"localDisk":"17707 GB",
"cloudDisk":"214368 GB",
"server":"100",
"network":"34",
"security":"4",
"rack":"16"
"server":"100", //物理机
"network":"34", //网络设备
"security":"4", //安全设备
"rack":"16" //机柜
}
],
"pageable":{
......@@ -47,22 +50,50 @@ export async function getHardware() {
"first":true,
"empty":false
};
console.log(result);
if (result.content && result.content[0]) {
let contentInfo = result.content[0];
let 计算云资源 = {
"cpu":"",
"内存":"",
"本地磁盘":"",
"云磁盘总量":""
if (云资源result.content && 云资源result.content[0]) {
let contentInfo = 云资源result.content[0];
let {id, cpu, mem, localDisk, cloudDisk, network, rack, security, server} = contentInfo;
计算云资源 = {
"cpu":cpu,
"内存":mem,
"本地磁盘":localDisk,
"云磁盘总量":cloudDisk
};
let 使用率 = {
"cpu":"",
物理资源 = {
"物理机":server,
"网络设备":network,
"安全设备":security,
"机柜":rack
};
}
console.log();
let 使用率result = {
"id":30,
"collectDate":"2022072710",
"ssdUsed":"24%",
"sataUsed":"74%",
"bosUsed":"73.83%",
"localDiskUsed":"30.00%",
"memoryUsed":"31.00%",
"vcpuUsed":"65.00%",
"hosts":"40",
"runningBcc":"251",
"errorDiskNum":"3"
}
if (使用率result) {
使用率 = {
"cpu":使用率result.vcpuUsed,
"内存":使用率result.memoryUsed,
"本地磁盘":使用率result.localDiskUsed,
"云磁盘cds ssd池":使用率result.ssdUsed,
"云磁盘cds sata池":使用率result.sataUsed,
"对象存储":使用率result.bosUsed
};
}
return {计算云资源, 使用率, 物理资源};
}
src/data/interface/wsData.ts
......@@ -95,7 +95,8 @@ export async function initWSData() {
let vehicleQueue = {};
let vehicleQueue = {};//结构：{vehicleid:{auto:0, }}
function stats(data) {
}
......
src/main.ts
import { initConfig, port } from "./config/serverConfig";
import { getTestAnalysis, initData } from "./data/interface/interfaceService";
import { getHardware } from "./data/interface/hardwareData";
import { getTestLicense, getCsgkDayData, initData } from "./data/interface/interfaceService";
import { initWSData } from "./data/interface/wsData";
import { httpServer } from "./net/http_server";
async function lanuch() {
// await initConfig();
httpServer.createServer(port);
// await initData();
console.log('This indicates that the server is started successfully.');
await getCsgkDayData();
// await getTestLicense();
console.log("初始化成功");
}
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