Skip to content

M
motorCity
Commit 42264469 by 孙香冬
Options

no message

parent 9e0a5868
Showing with 62 additions and 109 deletions
src/biz/jgfwnl/data.ts
...@@ -221,68 +221,62 @@ export async function mapData(req, res) { ...@@ -221,68 +221,62 @@ export async function mapData(req, res) {
let 基础数据data = {"摄像头":"57", "OBU":"68", "激光雷达":"48", "RSU":"76", "SIBOX":"89" }; let 基础数据data = {"摄像头":"57", "OBU":"68", "激光雷达":"48", "RSU":"76", "SIBOX":"89" };
ret["base"] = getKeyValueNumberOutData("计算云资源", 基础数据data ); ret["base"] = getKeyValueNumberOutData("计算云资源", 基础数据data );
ret["map"] = { ret["map"] = [
rlList:[
{ {
latitude:123.1, name: "camera",
longitude:123.1, value: [
state:0,
},
{ {
latitude:123.1, lng:121.611986,
longitude:123.1, lat:31.177747,
state:1, state:1,
} }
], ]
LIDARList:[
{
latitude:123.1,
longitude:123.1,
state:0,
}, },
{ {
latitude:123.1, name: "lidar",
longitude:123.1, value: [
state:1,
}
],
MMWList:[
{ {
latitude:123.1, lng:121.612492,
longitude:123.1, lat:31.178296,
state:0, state:0,
}
]
}, },
{ {
latitude:123.1, name: "waveRadar",
longitude:123.1, value: [
state:1,
}
],
RSUList:[
{ {
latitude:123.1, lng:121.612766,
longitude:123.1, lat:31.177573,
state:0, state:0,
}
]
}, },
{ {
latitude:123.1, name: "RSU",
longitude:123.1, value:[
state:1,
}
],
SIBOXList:[
{ {
latitude:123.1, lng:121.611057,
longitude:123.1, lat:31.176785,
state:0, state:0,
}
]
}, },
{ {
latitude:123.1, name: "SIBOX",
longitude:123.1, value:[
state:1, {
lng:121.61072,
lat:31.177508,
state:0,
}
]
} }
] ]
};
ret["mapCenter"] = {lng: 121.6122399, lat: 31.177585};
ret["zoom"] = {key: "缩放比例", value: 20};
res.send(ret); res.send(ret);
} }
\ No newline at end of file
src/config/serverConfig.ts
...@@ -4,7 +4,8 @@ import { BizError } from "../util/bizError"; ...@@ -4,7 +4,8 @@ import { BizError } from "../util/bizError";
import { analysisXml } from "../util/myXML"; import { analysisXml } from "../util/myXML";
export let port = Number(process.env.PORT) || Number(process.argv[3]) || 30002; //如果xml里面没有配置 就会使用到这里的端口 export let port = Number(process.env.PORT) || Number(process.argv[3]) || 30002; //如果xml里面没有配置 就会使用到这里的端口
export let cloudResource = "http://10.51.50.140:8080/api/static/PrivateCloudUsageStatics";
export let physicalResource = "http://10.51.50.140:8080/api/v1/PrivateCloudCurrentUsages";
export let dbConfig; export let dbConfig;
export let appConfig; export let appConfig;
...@@ -12,8 +13,6 @@ export let mongoServerConstVal; ...@@ -12,8 +13,6 @@ export let mongoServerConstVal;
export let systemLogPath; export let systemLogPath;
export let mySqlConfig; export let mySqlConfig;
export let leftRequestUrl = {physicalResource:""};
const ConfigName = "serverConfig.xml"; const ConfigName = "serverConfig.xml";
export async function initConfig() { export async function initConfig() {
try { try {
...@@ -24,6 +23,10 @@ export async function initConfig() { ...@@ -24,6 +23,10 @@ export async function initConfig() {
else { else {
let config = configInfo.config; let config = configInfo.config;
port = config.port[0] || port; port = config.port[0] || port;
let leftView = config.leftView[0];
cloudResource = leftView.cloudResource[0] || cloudResource;
physicalResource = leftView.physicalResource[0] || physicalResource;
} }
console.log("config init success"); console.log("config init success");
......
src/data/interface/hardwareData.ts
import { leftRequestUrl } from "../../config/serverConfig"; import { cloudResource, physicalResource } from "../../config/serverConfig";
import { get } from "../../util/request"; import { get } from "../../util/request";
//虚拟机上的数据 //虚拟机上的数据
export async function getHardware() { export async function getHardware() {
let url = "http://10.51.50.140:8080/api/static/PrivateCloudUsageStatics"; let 云资源result:any = await get(cloudResource);
let 使用率result:any = await get(physicalResource);
let result:any = await get(leftRequestUrl.physicalResource, {}, {});
let 计算云资源; let 计算云资源;
let 物理资源; let 物理资源;
let 使用率; let 使用率;
let 云资源result = {
"content":[
{
"id":1,
"cpu":"3568 core",
"mem":"24430 GB",
"localDisk":"17707 GB",
"cloudDisk":"214368 GB",
"server":"100", //物理机
"network":"34", //网络设备
"security":"4", //安全设备
"rack":"16" //机柜
}
],
"pageable":{
"sort":{
"empty":true,
"sorted":false,
"unsorted":true
},
"offset":0,
"pageNumber":0,
"pageSize":20,
"paged":true,
"unpaged":false
},
"totalPages":1,
"totalElements":1,
"last":true,
"size":20,
"number":0,
"sort":{
"empty":true,
"sorted":false,
"unsorted":true
},
"numberOfElements":1,
"first":true,
"empty":false
};
if (云资源result.content && 云资源result.content[0]) { if (云资源result.content && 云资源result.content[0]) {
let contentInfo = 云资源result.content[0]; let contentInfo = 云资源result.content[0];
let {id, cpu, mem, localDisk, cloudDisk, network, rack, security, server} = contentInfo; let {id, cpu, mem, localDisk, cloudDisk, network, rack, security, server} = contentInfo;
...@@ -69,20 +28,6 @@ export async function getHardware() { ...@@ -69,20 +28,6 @@ export async function getHardware() {
}; };
} }
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) { if (使用率result) {
使用率 = { 使用率 = {
"cpu":使用率result.vcpuUsed, "cpu":使用率result.vcpuUsed,
......
src/data/interface/wsData.ts
import * as WebSocket from "ws" import * as WebSocket from "ws"
//在线车辆
let vehicleList:any = [];
//连接锁 //连接锁
let lockReconnect = false; let lockReconnect = false;
...@@ -94,12 +95,19 @@ export async function initWSData() { ...@@ -94,12 +95,19 @@ export async function initWSData() {
console.log(); console.log();
} }
export function stats(data) {
let count = 0;
let vehicleQueue = {}; vehicleList.push(data);
function stats(data) {
//记录车辆 //记录车辆
let map = new Map();
for(let item of vehicleList) {
if (!map.has(item.vehicleid)) {
map.set(item.vehicleid, item);
count++;
}
}
// let vehicleQueue = [...map.values()];
return count;
} }
/* data 数据长这样 /* data 数据长这样
......
src/routers/router.ts
...@@ -33,6 +33,7 @@ export function setRouter(httpServer){ ...@@ -33,6 +33,7 @@ export function setRouter(httpServer){
httpServer.post('/csgk', asyncHandler(jgfwnlBiz.getCSGK)); httpServer.post('/csgk', asyncHandler(jgfwnlBiz.getCSGK));
httpServer.post('/csfx', asyncHandler(jgfwnlBiz.getCSFX)); httpServer.post('/csfx', asyncHandler(jgfwnlBiz.getCSFX));
httpServer.get('/mapdata', asyncHandler(jgfwnlBiz.mapData));
httpServer.post('/mapdata', asyncHandler(jgfwnlBiz.mapData)); httpServer.post('/mapdata', asyncHandler(jgfwnlBiz.mapData));
} }
\ 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