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