wuhan/digiHome-SP-NestJs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

驾驶舱用户数据接口改动

Browse Source
This commit is contained in:
lingwentao 2023-07-31 18:27:36 +08:00
parent 263180142a
commit 603b69c236
2 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/open-data/open-data.mapper.ts
View File

@ -130,15 +130,15 @@ class OpenDataMapper {
let sql
switch (type) {
case 0:
sql='SELECT a.create_time as time,COUNT(*) as num from szja_active_info a WHERE a.address_code = ? AND TIMESTAMPDIFF(HOUR,a.create_time,now()) <= 10 GROUP BY a.create_time'
sql='SELECT a.stat_time AS time,a.`value` from szja_live_stat_hour a LEFT JOIN szja_user_home b ON b.user_id=a.user_id LEFT JOIN szja_hcc_info c ON c.id=b.hcc_id WHERE c.address_code = ? AND TIMESTAMPDIFF(HOUR,a.create_time,now()) <= 10'
break;
case 1:
sql='SELECT a.create_time as time,COUNT(*) as num from szja_active_info a WHERE a.address_code = ? AND DATE_SUB(CURDATE(), INTERVAL 10 DAY) <= date(a.create_time) GROUP BY a.create_time'
sql='SELECT a.stat_time AS time,a.`value` from szja_live_stat_day a LEFT JOIN szja_user_home b ON b.user_id=a.user_id LEFT JOIN szja_hcc_info c ON c.id=b.hcc_id WHERE c.address_code = ? AND TIMESTAMPDIFF(DAY,a.create_time,now()) <= 10'
break;
case 2:
sql='SELECT a.create_time as time,COUNT(*) as num from szja_active_info a WHERE a.address_code = ? AND PERIOD_DIFF( date_format( now( ) , \'%Y%m\' ) , date_format(a.create_time, \'%Y%m\' ) ) <=10 GROUP BY a.create_time'
sql='SELECT a.stat_time AS time,a.`value` from szja_live_stat_month a LEFT JOIN szja_user_home b ON b.user_id=a.user_id LEFT JOIN szja_hcc_info c ON c.id=b.hcc_id WHERE c.address_code = ? AND TIMESTAMPDIFF(MONTH,a.create_time,now()) <= 10'
break;
}
return await db(

37
src/open-data/open-data.service.ts
View File

@ -119,42 +119,13 @@ export class OpenDataService {
'totalNum':totalNum[0].num,
'dataList':[]
}
let dateMap=new Map()
for (const val of userActiveInfor) {
switch (Number(type)) {
case 0:
if (!dateMap.has(dayjs(val.time).format('YYYYMMDDHH'))){
dateMap.set(dayjs(val.time).format('YYYYMMDDHH'),null)
}
break
case 1:
if (!dateMap.has(dayjs(val.time).format('YYYYMMDD'))){
dateMap.set(dayjs(val.time).format('YYYYMMDD'),null)
}
break
case 2:
if (!dateMap.has(dayjs(val.time).format('YYYYMM'))){
dateMap.set(dayjs(val.time).format('YYYYMM'),null)
}
break
}
}
for(let key of dateMap.keys()){
let liveNum
let userLiveNumber =await OpenDataMapper.getUserLiveNumber(key,Number(type))
if (!userLiveNumber.length){
liveNum=0
}else {
liveNum=userLiveNumber[0].value
}
userActiveInfor.forEach((val) =>{
data.dataList.push({
'date':key,
'liveNum':liveNum
'date':val.time,
'liveNum':val.value
})
}
})
return Base.success(data)
}