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-08-03 13:35:05 +08:00
parent 40a4619003
commit b6d0c69f30
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/open-data/open-data.controller.ts
View File

@ -18,6 +18,9 @@ export class OpenDataController {
@Post('/user/queryNum')
userData(@Body() { areaCode, type, limitSize }) {
if (!type){
return Base.error('type传参错误')
}
if (!limitSize) {
if (Number(type)) {
limitSize = 10;
@ -25,12 +28,12 @@ export class OpenDataController {
limitSize = 24;
}
}
return this.openDataService.userData(areaCode, type, limitSize);
return this.openDataService.userData(areaCode, Number(type), Number(limitSize));
}
@Post('/mp/queryNum')
serviceData(@Body() { topLimit }) {
return this.openDataService.serviceData(topLimit);
return this.openDataService.serviceData(Number(topLimit));
}
@Post('/user/queryArchiveList')
@ -44,7 +47,7 @@ export class OpenDataController {
if (!type) {
type = 0;
}
return this.openDataService.userFile(pageNo, pageSize, type);
return this.openDataService.userFile(Number(pageNo), Number(pageSize), Number(type));
}
@Post('/user/queryDataList')
@ -58,9 +61,9 @@ export class OpenDataController {
pageSize = 10;
}
return this.openDataService.userHealthFile(
pageNo,
pageSize,
archiveId,
Number(pageNo),
Number(pageSize),
Number(archiveId),
hccId,
dataType,
dataTypeSub,
@ -75,6 +78,6 @@ export class OpenDataController {
if (!pageSize) {
pageSize = 10;
}
return this.openDataService.homeList(pageNo, pageSize, areaCode);
return this.openDataService.homeList(Number(pageNo), Number(pageSize), areaCode);
}
}

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

@ -118,11 +118,11 @@ export class OpenDataService {
async userFile(pageNo, pageSize, type) {
//获取指定类型的所有用户档案信息
const userFile = await OpenDataMapper.getUserArchiveInfor(
Number(pageNo),
Number(pageSize),
Number(type),
pageNo,
pageSize,
type,
);
const number = await OpenDataMapper.getUserArchiveNumber(Number(type));
const number = await OpenDataMapper.getUserArchiveNumber(type);
if (number?.length) {
if (userFile?.length) {
//填充总数与页数相关的数据
@ -174,8 +174,8 @@ export class OpenDataService {
dataTypeSub,
) {
const userHealthFile = await OpenDataMapper.getUserHealthFile(
Number(pageNo),
Number(pageSize),
pageNo,
pageSize,
archiveId,
hccId,
dataType,
@ -196,7 +196,7 @@ export class OpenDataService {
};
//填充总数与页数相关的数据
data.totalNum = number[0].sum;
data.totalPage = Math.ceil(data.totalNum / Number(pageSize));
data.totalPage = Math.ceil(data.totalNum / pageSize);
if ((pageNo + 1) * pageSize < data.totalNum) {
data.hasNext = true;
}
@ -235,7 +235,7 @@ export class OpenDataService {
totalPage: 0,
homeList: [],
};
data.totalPage = Math.ceil(data.totalNum / Number(pageSize));
data.totalPage = Math.ceil(data.totalNum / pageSize);
if ((pageNo + 1) * pageSize < data.totalNum) {
data.hasNext = true;
}
@ -254,8 +254,8 @@ export class OpenDataService {
async userData(areaCode, type, limitSize) {
const userActiveInfor = await OpenDataMapper.getUserActiveInfor(
areaCode,
Number(type),
Number(limitSize),
type,
limitSize,
);
const number = await OpenDataMapper.getUseNumber(areaCode);
@ -283,7 +283,7 @@ export class OpenDataService {
}
async serviceData(topLimit) {
const serviceData = await OpenDataMapper.getServiceData(Number(topLimit));
const serviceData = await OpenDataMapper.getServiceData(topLimit);
const serviceNumber = await OpenDataMapper.getServiceNumber();
const data = {
totalNum: 0,