From c5da4f46d2f81db8e0c45a35b29a72f0b227e60e Mon Sep 17 00:00:00 2001
From: master <master@163.com>
Date: 星期三, 13 四月 2022 17:04:16 +0800
Subject: [PATCH] 添加devicegroup接口
---
src/app/modules/business/controller/admin/devicegroup.ts | 30 +++++++++++++++---------------
src/app/modules/business/service/deviceinfo.ts | 2 +-
src/app/modules/business/service/devicegroup.ts | 14 ++++++++++++++
3 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/src/app/modules/business/controller/admin/devicegroup.ts b/src/app/modules/business/controller/admin/devicegroup.ts
index 43d4573..7804576 100644
--- a/src/app/modules/business/controller/admin/devicegroup.ts
+++ b/src/app/modules/business/controller/admin/devicegroup.ts
@@ -1,7 +1,7 @@
import { ALL, Body, Get, Inject, Post, Provide, Query } from '@midwayjs/decorator';
import { CoolController, BaseController } from '@cool-midway/core';
import { Devicegroup } from '../../entity/devicegroup';
-// import { DevicegroupService } from '../../service/devicegroup';
+import { DevicegroupService } from '../../service/devicegroup';
import { DataController } from '../../../base/controller/dataController';
/**
* 璁惧鍒嗙粍
@@ -10,24 +10,24 @@
@CoolController({
api: ['add', 'delete', 'update', 'list', 'page', 'info'],
entity: Devicegroup,
- // service: DevicegroupService,
+ service: DevicegroupService,
})
export class DevicegroupController extends DataController {
- // @Inject()
- // devicegroupService: DevicegroupService;
+ @Inject()
+ devicegroupService: DevicegroupService;
/**
* 鑾峰緱鏁版嵁
*/
- // @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- // async getData(@Query(ALL) params: any) {
- // return this.ok(await this.devicegroupService.getData(params));
- // }
- // /**
- // * 鑾峰緱鏁版嵁
- // */
- // @Post('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- // async postData(@Query(ALL) params: any) {
- // return this.ok(await this.devicegroupService.getData(params));
- // }
+ @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ async getData(@Query(ALL) params: any) {
+ return this.ok(await this.devicegroupService.getData(params));
+ }
+ /**
+ * 鑾峰緱鏁版嵁
+ */
+ @Post('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ async postData(@Query(ALL) params: any) {
+ return this.ok(await this.devicegroupService.getData(params));
+ }
}
\ No newline at end of file
diff --git a/src/app/modules/business/service/devicegroup.ts b/src/app/modules/business/service/devicegroup.ts
new file mode 100644
index 0000000..e7ab972
--- /dev/null
+++ b/src/app/modules/business/service/devicegroup.ts
@@ -0,0 +1,14 @@
+import { Provide } from '@midwayjs/decorator';
+import { BaseService } from '@cool-midway/core';
+import { InjectEntityModel } from '@midwayjs/orm';
+import { Repository } from 'typeorm';
+import { DataService } from '../../base/service/dataapi/dataapi';
+import { Devicegroup } from '../entity/devicegroup';
+/**
+ * 璁惧鍒嗙粍
+ */
+@Provide()
+export class DevicegroupService extends DataService {
+ @InjectEntityModel(Devicegroup)
+ devicegroup: Repository<Devicegroup>
+}
\ No newline at end of file
diff --git a/src/app/modules/business/service/deviceinfo.ts b/src/app/modules/business/service/deviceinfo.ts
index 819ef2b..5f54180 100644
--- a/src/app/modules/business/service/deviceinfo.ts
+++ b/src/app/modules/business/service/deviceinfo.ts
@@ -39,7 +39,7 @@
async page(query) {
- console.log(query)
+
// const { keyWord, status, departmentIds = [] } = query;
// const permsDepartmentArr = await this.Basedeviceinfo.id(
// this.ctx.admin.userId
--
Gitblit v1.9.1