From 1b4726a488742c482e5786197f6c9e83a25a502d Mon Sep 17 00:00:00 2001
From: master <master@163.com>
Date: 星期二, 22 三月 2022 17:29:45 +0800
Subject: [PATCH] 删除测试时创建的类
---
src/app/modules/business/controller/admin/basedeviceinfo.ts | 10 +++++++++-
src/app/modules/base/middleware/authority.ts | 6 +++++-
public/uploads/20220322/b727cf90-a9bf-11ec-acb4-a3b8bbe5799b.gif | 0
src/app/modules/business/entity/doutrubine.ts | 10 +++++-----
4 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/public/uploads/20220322/b727cf90-a9bf-11ec-acb4-a3b8bbe5799b.gif b/public/uploads/20220322/b727cf90-a9bf-11ec-acb4-a3b8bbe5799b.gif
new file mode 100644
index 0000000..d0f6891
--- /dev/null
+++ b/public/uploads/20220322/b727cf90-a9bf-11ec-acb4-a3b8bbe5799b.gif
Binary files differ
diff --git a/src/app/modules/base/middleware/authority.ts b/src/app/modules/base/middleware/authority.ts
index 2de76cd..d2620a8 100644
--- a/src/app/modules/base/middleware/authority.ts
+++ b/src/app/modules/base/middleware/authority.ts
@@ -37,12 +37,16 @@
if (_.startsWith(url, adminUrl)) {
try {
ctx.admin = jwt.verify(token, this.jwtConfig.jwt.secret);
- } catch (err) {}
+ } catch (err) { }
// 涓嶉渶瑕佺櫥褰� 鏃犻渶鏉冮檺鏍￠獙
if (new RegExp(`^${adminUrl}?.*/open/`).test(url)) {
await next();
return;
}
+ if (new RegExp(`^${adminUrl}?.*/business/basedeviceinfo/`).test(url)) {
+ await next();
+ return;
+ }
if (ctx.admin) {
// 瓒呯鎷ユ湁鎵�鏈夋潈闄�
if (ctx.admin.username == 'admin' && !ctx.admin.isRefresh) {
diff --git a/src/app/modules/business/controller/admin/basedeviceinfo.ts b/src/app/modules/business/controller/admin/basedeviceinfo.ts
index 0f43129..20ba60a 100644
--- a/src/app/modules/business/controller/admin/basedeviceinfo.ts
+++ b/src/app/modules/business/controller/admin/basedeviceinfo.ts
@@ -1,4 +1,4 @@
-import { Provide, Inject, } from '@midwayjs/decorator';
+import { Provide, Inject, Get, Query, ALL } from '@midwayjs/decorator';
import { CoolController, BaseController } from '@cool-midway/core';
import { BasedeviceinfoEntity } from '../../entity/basedeviceinfo';
@@ -14,4 +14,12 @@
entity: BasedeviceinfoEntity
})
export class AdminBasedeviceinfoController extends DataController {
+ /**
+ * 鑾峰緱鏁版嵁
+ */
+ @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ async getData(@Query(ALL) params: any) {
+ console.log(params);
+ return this.ok(await this.dataService.getData(params));
+ }
}
diff --git a/src/app/modules/business/entity/doutrubine.ts b/src/app/modules/business/entity/doutrubine.ts
index ff5b85c..669129a 100644
--- a/src/app/modules/business/entity/doutrubine.ts
+++ b/src/app/modules/business/entity/doutrubine.ts
@@ -6,8 +6,8 @@
*/
@EntityModel('t_base_dou_trubine')
export class Doutrubine extends BaseEntity {
- @Column({ comment: '鐘舵��', type: 'tinyint', default: 1, width: 0 })
- status: number;
+ @Column({ comment: '鏃嬭浆鐩村緞', type: 'varchar', default: 'null', length: 255 })
+ diameter_wheel: string;
@Column({ comment: 'dou_wheel_volumn', type: 'varchar', default: 'null', length: 255 })
dou_wheel_volumn: string;
@@ -17,9 +17,6 @@
@Column({ comment: '鐓ゅ爢2', type: 'varchar', default: 'null', length: 255 })
max_windrow: string;
-
- @Column({ comment: '鏃嬭浆鐩村緞', type: 'varchar', default: 'null', length: 255 })
- diameter_wheel: string;
@Column({ comment: 'petch_angle', type: 'varchar', default: 'null', length: 255 })
petch_angle: string;
@@ -39,6 +36,9 @@
@Column({ comment: '澶囨敞', type: 'varchar', default: 'null', length: 255 })
remark: string;
+ @Column({ comment: '鐘舵��', type: 'tinyint', default: 1, width: 0 })
+ status: number;
+
@Column({ comment: '鏂楄疆鏈哄悕绉�', type: 'varchar', default: 'null', length: 255 })
trubine_name: string;
--
Gitblit v1.9.1