lanhee/Cockpit-RearEnd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改顺序问题

Browse Source
This commit is contained in:
wuhan 2024-04-18 16:00:00 +08:00
parent 636c7de658
commit fcf91f0011
1 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
src/client/client.service.ts
View File

@ -10,7 +10,7 @@ moment.locale('zh_CN');
@Injectable() @Injectable()
export class ClientService { export class ClientService {
constructor( constructor(
private readonly logger: AppLogger, private readonly logger: AppLogger,
) { ) {
this.logger.setContext(ClientService.name); this.logger.setContext(ClientService.name);
} }
@ -19,7 +19,7 @@ export class ClientService {
* 获取家庭统计信息 * 获取家庭统计信息
*/ */
async queryHccNum({ areaCode }) { async queryHccNum({ areaCode }) {
this.logger.info(null,'queryHccNum') this.logger.info(null, 'queryHccNum')
console.log('queryHccNum'); console.log('queryHccNum');
const [parent, child] = await Promise.all([ const [parent, child] = await Promise.all([
clientMapper.queryHccNum({ areaCode }), clientMapper.queryHccNum({ areaCode }),
@ -51,7 +51,7 @@ export class ClientService {
} }
async queryHccNumV2({ areaCode }) { async queryHccNumV2({ areaCode }) {
this.logger.info(null,`areaCode:${areaCode}`) this.logger.info(null, `areaCode:${areaCode}`)
const num = await clientMapper.queryHccNumV2({ areaCode }); const num = await clientMapper.queryHccNumV2({ areaCode });
const data = { const data = {
onlineNum: 0, onlineNum: 0,
@ -59,12 +59,12 @@ export class ClientService {
totalUserNum: 0, totalUserNum: 0,
childAreaList: num, childAreaList: num,
}; };
(num as UserNum[]).forEach((e)=>{ (num as UserNum[]).forEach((e) => {
data.onlineNum += e.onlineNum; data.onlineNum += e.onlineNum;
data.totalNum += e.totalNum; data.totalNum += e.totalNum;
data.totalUserNum += e.totalUserNum; data.totalUserNum += e.totalUserNum;
}) })
this.logger.info(null,`data:${data}`) this.logger.info(null, `data:${data}`)
return data; return data;
} }
@ -115,41 +115,41 @@ export class ClientService {
} }
async queryUserNumV2({ areaCode }) { async queryUserNumV2({ areaCode }) {
this.logger.info(null,'queryUserNum'); this.logger.info(null, 'queryUserNum');
const result = await clientMapper.queryUserNumV2({ areaCode }); const result = await clientMapper.queryUserNumV2({ areaCode });
const data={ const data = {
totalNum:0, totalNum: 0,
childAreaList:[] childAreaList: []
} }
const map=new Map() const map = new Map()
result.forEach((e)=>{ result.forEach((e) => {
if (map.has(e.areaCode)){ if (map.has(e.areaCode)) {
map.get(e.areaCode).push(e) map.get(e.areaCode).push(e)
}else { } else {
map.set(e.areaCode,[e]) map.set(e.areaCode, [e])
} }
}) })
let totalNum=0 let totalNum = 0
map.forEach((value,key)=>{ map.forEach((value, key) => {
let dataList=[] let dataList = []
let totalUserNum=0 let totalUserNum = 0
value.forEach((item)=>{ value.forEach((item) => {
totalNum+=item.userNum totalNum += item.userNum
totalUserNum+=item.userNum totalUserNum += item.userNum
dataList.push({ dataList.push({
userNum:item.userNum, userNum: item.userNum,
type:item.type type: item.type
}) })
}) })
data.childAreaList.push({ data.childAreaList.push({
areaCode:value[0].areaCode, areaCode: value[0].areaCode,
areaName:value[0].areaName, areaName: value[0].areaName,
totalUserNum:totalUserNum, totalUserNum: totalUserNum,
dataList:dataList dataList: dataList
}) })
}) })
data.totalNum=totalNum data.totalNum = totalNum
return data; return data;
} }
@ -216,10 +216,10 @@ export class ClientService {
return data; return data;
} }
async queryMpNumV2({ areaCode, topLimit = 6, type = 0 }) { async queryMpNumV2({ areaCode, topLimit = 6, type = 0 }) {
this.logger.info(null,`queryMpNum: areaCode:${areaCode}, topLimit:${topLimit}, type:${type}`); this.logger.info(null, `queryMpNum: areaCode:${areaCode}, topLimit:${topLimit}, type:${type}`);
const { startTime, endTime } = Time.dealTime(Number(type)); const { startTime, endTime } = Time.dealTime(Number(type));
//totalResult是前六的热门服务总数据，result是这前六个热门服务近7天的数据 //totalResult是前六的热门服务总数据，result是这前六个热门服务近7天的数据
const [totalResult,result] = await Promise.all([ const [totalResult, result] = await Promise.all([
clientMapper.queryMpTatol({ clientMapper.queryMpTatol({
areaCode, areaCode,
topLimit, topLimit,
@ -231,23 +231,23 @@ export class ClientService {
startTime: startTime ? moment(startTime).format('YYYY-MM-DD 00:00:00') : undefined, startTime: startTime ? moment(startTime).format('YYYY-MM-DD 00:00:00') : undefined,
}) })
]); ]);
const data={ const data = {
totalNum:0, totalNum: 0,
mpList:[] mpList: []
} }
const map=new Map() const map = new Map()
result.forEach((e)=>{ result.forEach((e) => {
if (e.totalNum){ if (e.totalNum) {
if (map.has(e.id)){ if (map.has(e.id)) {
map.get(e.id).push(e); map.get(e.id).push(e);
}else { } else {
map.set(e.id,[e]); map.set(e.id, [e]);
} }
} }
}) })
totalResult.forEach((value,key)=>{ totalResult.forEach((value, key) => {
const dayNumList = []; const dayNumList = [];
// 循环生成最近七天日期 // 循环生成最近七天日期
for (let i = 0; i < 7; i++) { for (let i = 0; i < 7; i++) {
@ -259,25 +259,25 @@ export class ClientService {
}); });
} }
if (map.has(value.id)){ if (map.has(value.id)) {
data.mpList.push({ data.mpList.push({
name:value.name, name: value.name,
icon:value.icon, icon: value.icon,
id:value.id, id: value.id,
liveNum:value.sum, liveNum: value.sum,
dayNumList:map.get(value.id) dayNumList: map.get(value.id).reverse()
}) })
}else { } else {
data.mpList.push({ data.mpList.push({
name:value.name, name: value.name,
icon:value.icon, icon: value.icon,
id:value.id, id: value.id,
liveNum:value.sum, liveNum: value.sum,
dayNumList:dayNumList dayNumList: dayNumList.reverse()
}) })
} }
}) })
data.totalNum=totalResult.length data.totalNum = totalResult.length
return data; return data;
} }
/** /**
@ -358,8 +358,8 @@ export class ClientService {
*/ */
async queryWarnData({ areaCode, timeRange }) { async queryWarnData({ areaCode, timeRange }) {
console.log('queryWarnData'); console.log('queryWarnData');
if (areaCode=='100000000000'){ if (areaCode == '100000000000') {
areaCode=null areaCode = null
} }
const tokenResult = await axios.post( const tokenResult = await axios.post(
`http://106.14.155.39:60036/api/v1/szjt/getToken`, `http://106.14.155.39:60036/api/v1/szjt/getToken`,
@ -374,7 +374,7 @@ export class ClientService {
const data = await axios.post( const data = await axios.post(
`http://106.14.155.39:60036/api/v1/szjt/user/queryWarnData`, `http://106.14.155.39:60036/api/v1/szjt/user/queryWarnData`,
{ {
areaCode: areaCode==null ? null : areaCode.substring(0,6), areaCode: areaCode == null ? null : areaCode.substring(0, 6),
timeRange, timeRange,
}, },
{ {
@ -392,8 +392,8 @@ export class ClientService {
*/ */
async queryWarnList({ code, type, time, page }) { async queryWarnList({ code, type, time, page }) {
console.log('queryWarnList'); console.log('queryWarnList');
if (code=='100000000000'){ if (code == '100000000000') {
code=null code = null
} }
if (!page) { if (!page) {
page = { page = {
@ -415,7 +415,7 @@ export class ClientService {
const data = await axios.post( const data = await axios.post(
`http://106.14.155.39:60036/api/v1/szjt/user/queryDataList`, `http://106.14.155.39:60036/api/v1/szjt/user/queryDataList`,
{ {
areaCode: code==null ? null : code.substring(0,6), areaCode: code == null ? null : code.substring(0, 6),
dataType: '04', dataType: '04',
timeLimit: time, timeLimit: time,
pageNo: pageIndex, pageNo: pageIndex,
@ -460,16 +460,16 @@ export class ClientService {
/** /**
* 4.9获取平台家庭数据使用记录 * 4.9获取平台家庭数据使用记录
*/ */
async queryDataUseNum({ areaCode= '100000000000', dateRange = '1', limit = 7 }) { async queryDataUseNum({ areaCode = '100000000000', dateRange = '1', limit = 7 }) {
console.log('queryDataUseNum'); console.log('queryDataUseNum');
if (!areaCode){ if (!areaCode) {
areaCode='100000000000' areaCode = '100000000000'
} }
if (!limit){ if (!limit) {
limit=7 limit = 7
} }
if (!dateRange){ if (!dateRange) {
dateRange='1' dateRange = '1'
} }
// const { startTime, endTime } = this.dealTime(dateRange); // const { startTime, endTime } = this.dealTime(dateRange);
//获取时间开始节点 //获取时间开始节点