From 9f6e099c39b61027cc96df77200b98388d48d348 Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期四, 16 七月 2026 22:59:49 +0800
Subject: [PATCH] bug fix
---
src/modules/push/controller/admin/siteweight.ts | 4 ++--
src/modules/push/entity/vehiclegps.ts | 4 ++--
src/modules/push/entity/cameragps.ts | 4 ++--
src/modules/basicdata/entity/wastetype.ts | 2 +-
src/modules/push/service/open.ts | 2 +-
src/modules/basicdata/controller/admin/wastetype.ts | 8 ++++++++
src/modules/push/controller/admin/auditlog.ts | 3 ++-
src/modules/push/controller/app/open.ts | 22 ++++++++++++++--------
src/modules/push/entity/siteweight.ts | 2 ++
9 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/src/modules/basicdata/controller/admin/wastetype.ts b/src/modules/basicdata/controller/admin/wastetype.ts
index 9f3f569..9c70412 100644
--- a/src/modules/basicdata/controller/admin/wastetype.ts
+++ b/src/modules/basicdata/controller/admin/wastetype.ts
@@ -9,9 +9,17 @@
api: ['add', 'delete', 'update', 'info', 'list', 'page'],
entity: BasicdataWastetypeEntity,
service: BasicdataWastetypeService,
+ listQueryOp: {
+ addOrderBy: {
+ 'a.code': 'ASC',
+ },
+ },
pageQueryOp: {
keyWordLikeFields: ['a.name', 'a.code'],
fieldEq: ['a.isRecyclable', 'a.status'],
+ addOrderBy: {
+ 'a.code': 'ASC',
+ },
},
})
export class AdminBasicdataWastetypeController extends BaseController {}
diff --git a/src/modules/basicdata/entity/wastetype.ts b/src/modules/basicdata/entity/wastetype.ts
index b624947..bc5d88c 100644
--- a/src/modules/basicdata/entity/wastetype.ts
+++ b/src/modules/basicdata/entity/wastetype.ts
@@ -39,7 +39,7 @@
comment: '纰冲噺鍥犳暟',
type: 'decimal',
precision: 10,
- scale: 5,
+ scale: 2,
default: 0.0,
})
carbonFactor: number;
diff --git a/src/modules/push/controller/admin/auditlog.ts b/src/modules/push/controller/admin/auditlog.ts
index 2628068..ac87059 100644
--- a/src/modules/push/controller/admin/auditlog.ts
+++ b/src/modules/push/controller/admin/auditlog.ts
@@ -11,7 +11,8 @@
service: PushAuditlogService,
pageQueryOp: {
select: ['a.*'],
- fieldEq: ['a.clientId', 'a.pushType'],
+ keyWordLikeFields: ['a.errorMessage'],
+ fieldEq: ['a.deviceNo', 'a.pushType'],
where: async ctx => {
const { startTime, endTime } = ctx.request.body;
const conditions = [];
diff --git a/src/modules/push/controller/admin/siteweight.ts b/src/modules/push/controller/admin/siteweight.ts
index efefbf7..4176185 100644
--- a/src/modules/push/controller/admin/siteweight.ts
+++ b/src/modules/push/controller/admin/siteweight.ts
@@ -16,10 +16,10 @@
'a.*',
'b.name AS departmentName',
'c.name AS garbageName', // 鍨冨溇鍚嶇О
- 'd.businessName AS businessName', // 鍨冨溇鍚嶇О
+ 'd.businessName AS businessName', 'd.siteType AS siteType', // 鍨冨溇鍚嶇О
],
- fieldEq: ['a.deviceNo'],
+ fieldEq: ['a.deviceNo','d.siteType'],
fieldLike: ['a.deviceNo'],
join: [
{
diff --git a/src/modules/push/controller/app/open.ts b/src/modules/push/controller/app/open.ts
index 878a3bd..4e03d09 100644
--- a/src/modules/push/controller/app/open.ts
+++ b/src/modules/push/controller/app/open.ts
@@ -3,16 +3,13 @@
import { PushOpenService } from '../../service/open';
import { WeightUploadDto } from '../../dto/weight.dto';
import * as crypto from 'crypto';
+import { BaseSysParamService } from '../../../base/service/sys/param';
-const CLIENT_ID = '10001';
-const SECRET = '9001ac9676b8';
/**
* 寮�鏀炬棤闇�楠岃瘉鐨勪笂鎶ユ暟鎹帴鍙�
*/
-
-
@CoolController({
prefix: '/open/push',
})
@@ -20,17 +17,26 @@
@Inject()
pushOpenService: PushOpenService;
+ @Inject()
+ baseSysParamService: BaseSysParamService;
+
+
@Post('/weight', { summary: '鍘熷绉伴噸涓婃姤鎺ュ彛' })
async uploadWeight(
@Headers() headers: any,
@Body() data: WeightUploadDto,
) {
+
+ const CLIENT_ID = String(await this.baseSysParamService.dataByKey('YAOHUA.WEIGHT.CLIENTID')); //'10001';
+ const SECRET = String(await this.baseSysParamService.dataByKey('YAOHUA.WEIGHT.SECRET')); '9001ac9676b8';
+
+
const clientId = headers['clientid'];
const sign = headers['sign'];
// 1. clientId 鏍￠獙
if (clientId !== CLIENT_ID) {
- await this.pushOpenService.writePushAuditLog("weight",{ "deviceNo": clientId, "requestContent": data, "errorMessage": "闈炴硶 clientId" });
+ await this.pushOpenService.writePushAuditLog("weight", { "deviceNo": clientId, "requestContent": data, "errorMessage": "闈炴硶 clientId" });
return {
code: 1001,
msg: '闈炴硶 clientId',
@@ -56,7 +62,7 @@
.toLowerCase();
if (realSign !== sign?.toLowerCase()) {
- await this.pushOpenService.writePushAuditLog("weight",{ "deviceNo": data.deviceNo, "requestContent": data, "errorMessage": "绛惧悕楠岃瘉澶辫触" });
+ await this.pushOpenService.writePushAuditLog("weight", { "deviceNo": data.deviceNo, "requestContent": data, "errorMessage": "绛惧悕楠岃瘉澶辫触" });
return {
code: 1002,
@@ -72,7 +78,7 @@
data: 'success',
};
} catch (err) {
- await this.pushOpenService.writePushAuditLog("weight",{ "deviceNo": data.deviceNo, "requestContent": data, "errorMessage": "绯荤粺寮傚父,鍐欏叆澶辫触." });
+ await this.pushOpenService.writePushAuditLog("weight", { "deviceNo": data.deviceNo, "requestContent": data, "errorMessage": "绯荤粺寮傚父,鍐欏叆澶辫触." });
return {
code: 500,
@@ -91,7 +97,7 @@
const result = await this.pushOpenService.receiveCameraGpsMessage(body);
//return this.ok(result);
- return {"messageId":result}
+ return { "messageId": result }
}
}
diff --git a/src/modules/push/entity/cameragps.ts b/src/modules/push/entity/cameragps.ts
index df6580c..ab00a0a 100644
--- a/src/modules/push/entity/cameragps.ts
+++ b/src/modules/push/entity/cameragps.ts
@@ -35,6 +35,6 @@
@Column({ comment: '娴锋嫈楂樺害', type: 'decimal', precision: 6, scale: 2, nullable: true })
elevation: number;
- @Column({ comment: '瀹氫綅鐘舵��', dict: ['鏈夋晥瀹氫綅', '鏃犳晥瀹氫綅'], default: 0 })
- status: number;
+ @Column({ comment: '瀹氫綅绮惧害' })
+ status: string;
}
\ No newline at end of file
diff --git a/src/modules/push/entity/siteweight.ts b/src/modules/push/entity/siteweight.ts
index 479876d..edbcb9d 100644
--- a/src/modules/push/entity/siteweight.ts
+++ b/src/modules/push/entity/siteweight.ts
@@ -12,6 +12,8 @@
businessName: string;
+ siteType:string;
+
@Index()
@Column({ comment: '褰掑睘鍗曚綅' })
departmentId: number;
diff --git a/src/modules/push/entity/vehiclegps.ts b/src/modules/push/entity/vehiclegps.ts
index 5744925..5874af6 100644
--- a/src/modules/push/entity/vehiclegps.ts
+++ b/src/modules/push/entity/vehiclegps.ts
@@ -39,6 +39,6 @@
@Column({ comment: '娴锋嫈楂樺害', type: 'decimal', precision: 6, scale: 2, nullable: true })
elevation: number;
- @Column({ comment: '瀹氫綅鐘舵��', dict: ['鏈夋晥瀹氫綅', '鏃犳晥瀹氫綅'], default: 0 })
- status: number;
+ @Column({ comment: '瀹氫綅绮惧害' })
+ status: string;
}
\ No newline at end of file
diff --git a/src/modules/push/service/open.ts b/src/modules/push/service/open.ts
index 1fdbda2..9750669 100644
--- a/src/modules/push/service/open.ts
+++ b/src/modules/push/service/open.ts
@@ -110,7 +110,7 @@
if (body.sn) {
const gpsData = body.data || {};
- const statusVal = gpsData.status === 'A' ? 0 : 1;
+ const statusVal = gpsData.status === 'A' ? 'A' : 'B';
await this.pushCameraGpsEntity.save({
sn: body.sn,
--
Gitblit v1.9.1