From adc0a1df2d5bc0842b5d4b950380a5b7ce469711 Mon Sep 17 00:00:00 2001
From: master <master@163.com>
Date: 星期五, 25 三月 2022 10:22:59 +0800
Subject: [PATCH] 2022-03-25 10:22:00
---
src/app/modules/business/entity/devicegroup.ts | 4
src/app/modules/business/controller/admin/taskimmediately.ts | 34
src/app/modules/business/controller/admin/modelcombination.ts | 34
src/app/modules/business/entity/colletdata.ts | 6
src/app/modules/business/controller/admin/planinventory.ts | 34
src/app/modules/business/controller/admin/periodicsetting.ts | 34
src/app/modules/business/entity/basedevicestatus.ts | 8
src/app/modules/business/entity/pointmodel.ts | 12
src/app/modules/business/controller/admin/basedevicestatus.ts | 34
src/app/modules/business/controller/admin/basedeviceinfo.ts | 34
src/app/modules/business/controller/admin/pointmodel.ts | 34
src/app/modules/business/entity/pointcloud.ts | 2
src/app/modules/business/entity/interfacerecord.ts | 12
src/app/modules/business/entity/doutrubine.ts | 28
src/app/modules/business/controller/admin/deviceattachment.ts | 34
src/app/modules/business/controller/admin/doutrubine.ts | 34
src/app/modules/base/utils/createEntity.ts | 340 ++++++------
src/app/modules/business/controller/admin/tuser.ts | 34
src/app/modules/business/entity/interfacelist.ts | 24
src/app/modules/business/controller/admin/interfacelist.ts | 34
src/app/modules/business/controller/admin/metadata.ts | 34
src/app/modules/business/entity/metadata.ts | 10
src/app/modules/business/controller/admin/devicegroup.ts | 6
src/app/modules/business/controller/admin/execrecord.ts | 34
src/app/modules/business/entity/deviceattachment.ts | 16
src/app/modules/business/entity/planinventory.ts | 10
src/app/modules/business/entity/basedeviceinfo.ts | 36
src/app/modules/business/controller/admin/interfacerecord.ts | 34
src/app/modules/business/controller/admin/pointcloud.ts | 34
src/app/modules/business/entity/trubinelocation.ts | 12
src/app/modules/business/controller/admin/colletmeta.ts | 34
src/app/modules/business/controller/admin/statdata.ts | 34
src/app/modules/business/controller/admin/basedevicesection.ts | 34
src/app/modules/business/entity/statdata.ts | 2
src/app/modules/business/entity/periodicsetting.ts | 48
src/app/modules/business/entity/taskmonitor.ts | 14
src/app/modules/business/controller/admin/taskmonitor.ts | 34
src/app/modules/business/controller/admin/basedeviceparams.ts | 34
src/app/modules/business/controller/admin/trubinelocation.ts | 34
src/app/modules/business/controller/admin/messagerecord.ts | 34
src/app/modules/business/controller/admin/modelstatic.ts | 34
src/app/modules/business/entity/messagerecord.ts | 8
src/app/modules/business/entity/modelcombination.ts | 6
src/app/modules/business/entity/execrecord.ts | 14
src/app/modules/business/controller/admin/comconfig.ts | 34
src/app/modules/business/entity/taskimmediately.ts | 14
src/app/modules/business/controller/admin/colletdata.ts | 34
src/app/modules/business/entity/basedeviceparams.ts | 12
src/app/modules/base/middleware/authority.ts | 2
src/app/modules/business/entity/colletmeta.ts | 2
src/app/modules/business/entity/comconfig.ts | 4
src/app/modules/business/controller/admin/deviceopreraterecord.ts | 34
src/app/modules/business/entity/modelstatic.ts | 10
src/app/modules/business/entity/basedevicesection.ts | 10
src/app/modules/business/entity/deviceopreraterecord.ts | 14
55 files changed, 785 insertions(+), 785 deletions(-)
diff --git a/src/app/modules/base/middleware/authority.ts b/src/app/modules/base/middleware/authority.ts
index b2e8d64..875c55a 100644
--- a/src/app/modules/base/middleware/authority.ts
+++ b/src/app/modules/base/middleware/authority.ts
@@ -44,7 +44,7 @@
return;
}
// 涓嶉渶瑕佺櫥褰� 鏃犻渶鏉冮檺鏍￠獙
- if (new RegExp(`^${adminUrl}?.*/basedeviceinfo/`).test(url)) {
+ if (new RegExp(`^${adminUrl}?.*/business/devicegroup/`).test(url)) {
await next();
return;
}
diff --git a/src/app/modules/base/utils/createEntity.ts b/src/app/modules/base/utils/createEntity.ts
index fd9f42d..ed271dc 100644
--- a/src/app/modules/base/utils/createEntity.ts
+++ b/src/app/modules/base/utils/createEntity.ts
@@ -2,191 +2,191 @@
import * as fs from 'fs';
/**
-聽* 涓嶉渶瑕佺櫥褰曠殑鍚庡彴鎺ュ彛
-聽*/
+ * 涓嶉渶瑕佺櫥褰曠殑鍚庡彴鎺ュ彛
+ */
@Provide()
export class CreateEntityUtil {
-聽 聽 createEntity(table) {
-聽 聽 聽 聽 console.log('鐢熸垚缁煎悎瀹炰綋绫讳换鍔″紑濮嬫墽琛�');
-聽 聽 聽 聽 let EntityName = this.firstToUpper3(table.entityName)
-聽 聽 聽 聽 let columnstr = [];
-聽 聽 聽 聽 columnstr.push(`import { EntityModel } from '@midwayjs/orm';\n`)
-聽 聽 聽 聽 columnstr.push(`import { BaseEntity } from '@cool-midway/core';\n`)
-聽 聽 聽 聽 columnstr.push(`import { Column, Double } from 'typeorm';\n`)
-聽 聽 聽 聽 columnstr.push(`/**
+ createEntity(table) {
+ console.log('鐢熸垚缁煎悎瀹炰綋绫讳换鍔″紑濮嬫墽琛�');
+ let EntityName = this.firstToUpper3(table.entityName)
+ let columnstr = [];
+ columnstr.push(`import { EntityModel } from '@midwayjs/orm';\n`)
+ columnstr.push(`import { BaseEntity } from '@cool-midway/core';\n`)
+ columnstr.push(`import { Column, Double } from 'typeorm';\n`)
+ columnstr.push(`/**
聽 聽 聽 聽 * ${table.comment}
聽 聽 聽 聽 */\n`)
-聽 聽 聽 聽 columnstr.push(`@EntityModel('${table.name}') \n`)
-聽 聽 聽 聽 columnstr.push(`export class ${EntityName} extends BaseEntity { \n`)
-聽 聽 聽 聽 table.tbcolumn.forEach(item => {
-聽 聽 聽 聽 聽 聽 if (item?.table_name == table.name) {
-聽 聽 聽 聽 聽 聽 聽 聽 let fieldType = 'string'; 聽//nullable length 聽primary 聽enum 聽 enumName 聽width
-聽 聽 聽 聽 聽 聽 聽 聽 let matResult = item.column_type.match(/\(([^)]*)\)/);
-聽 聽 聽 聽 聽 聽 聽 聽 let length = 0;
-聽 聽 聽 聽 聽 聽 聽 聽 if (matResult) {
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 length = matResult[1];
-聽 聽 聽 聽 聽 聽 聽 聽 }
-聽 聽 聽 聽 聽 聽 聽 聽 switch (item.data_type) {
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 case 'varchar':
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 fieldType = 'string'
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 item.column_default = !isNaN(item.column_default) ? item.column_default : '';
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 columnstr.push(`@Column({ comment:'${item.column_comment}', type:'${item.data_type}', default:'${item.column_default}', length:${length}})\n`)
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 break;
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 case 'text':
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 fieldType = 'string'
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 item.column_default = !isNaN(item.column_default) ? item.column_default : '';
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 columnstr.push(`@Column({ comment:'${item.column_comment}', type:'${item.data_type}', default:'${item.column_default}'})\n`)
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 break;
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 case 'int':
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 fieldType = 'number'
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 item.column_default = !isNaN(Number(item.column_default)) ? item.column_default : 0;
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 columnstr.push(`@Column({ comment:'${item.column_comment}', type:'${item.data_type}', default:${item.column_default}, width:${length}})\n`)
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 break;
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 case 'bigint':
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 fieldType = 'number'
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 item.column_default = !isNaN(Number(item.column_default)) ? item.column_default : 0;
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 columnstr.push(`@Column({ comment:'${item.column_comment}', type:'${item.data_type}', default:${item.column_default}}, width:${length})\n`)
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 break;
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 case 'tinyint':
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 fieldType = 'number'
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 item.column_default = !isNaN(Number(item.column_default)) ? item.column_default : 0;
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 columnstr.push(`@Column({ comment:'${item.column_comment}', type:'${item.data_type}', default:${item.column_default}, width:${length}})\n`)
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 break;
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 case 'datetime':
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 fieldType = 'Date'
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 item.column_default = item.column_default != 'null' ? item.column_default : `${new Date()}`;
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 columnstr.push(`@Column({ comment:'${item.column_comment}', type:'${item.data_type}'})\n`)
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 break;
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 case 'double':
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 item.column_default = !isNaN(Number(item.column_default)) ? item.column_default : 0;
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 fieldType = 'Double'
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 columnstr.push(`@Column({ comment:'${item.column_comment}', type:'${item.data_type}', default:${item.column_default}})\n`)
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 break;
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 case 'decimal':
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 item.column_default = !isNaN(Number(item.column_default)) ? item.column_default : 0;
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 fieldType = 'Double'
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 columnstr.push(`@Column({ comment:'${item.column_comment}', type:'${item.data_type}', default:${item.column_default}})\n`)
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 break;
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 default:
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 break;
-聽 聽 聽 聽 聽 聽 聽 聽 }
+ columnstr.push(`@EntityModel('${table.name}') \n`)
+ columnstr.push(`export class ${EntityName} extends BaseEntity { \n`)
+ table.tbcolumn.forEach(item => {
+ if (item?.table_name == table.name) {
+ let fieldType = 'string'; 聽//nullable length 聽primary 聽enum 聽 enumName 聽width
+ let matResult = item.column_type.match(/\(([^)]*)\)/);
+ let length = 0;
+ if (matResult) {
+ length = matResult[1];
+ }
+ switch (item.data_type) {
+ case 'varchar':
+ fieldType = 'string'
+ item.column_default = !isNaN(item.column_default) ? item.column_default : '';
+ columnstr.push(`@Column({ comment:'${item.column_comment}', type:'${item.data_type}', default:'${item.column_default}', length:${length}})\n`)
+ break;
+ case 'text':
+ fieldType = 'string'
+ item.column_default = !isNaN(item.column_default) ? item.column_default : '';
+ columnstr.push(`@Column({ comment:'${item.column_comment}', type:'${item.data_type}', default:'${item.column_default}'})\n`)
+ break;
+ case 'int':
+ fieldType = 'number'
+ item.column_default = !isNaN(Number(item.column_default)) ? item.column_default : 0;
+ columnstr.push(`@Column({ comment:'${item.column_comment}', type:'${item.data_type}', default:${item.column_default}, width:${length}})\n`)
+ break;
+ case 'bigint':
+ fieldType = 'number'
+ item.column_default = !isNaN(Number(item.column_default)) ? item.column_default : 0;
+ columnstr.push(`@Column({ comment:'${item.column_comment}', type:'${item.data_type}', default:${item.column_default}}, width:${length})\n`)
+ break;
+ case 'tinyint':
+ fieldType = 'number'
+ item.column_default = !isNaN(Number(item.column_default)) ? item.column_default : 0;
+ columnstr.push(`@Column({ comment:'${item.column_comment}', type:'${item.data_type}', default:${item.column_default}, width:${length}})\n`)
+ break;
+ case 'datetime':
+ fieldType = 'Date'
+ item.column_default = item.column_default != 'null' ? item.column_default : `${new Date()}`;
+ columnstr.push(`@Column({ comment:'${item.column_comment}', type:'${item.data_type}'})\n`)
+ break;
+ case 'double':
+ item.column_default = !isNaN(Number(item.column_default)) ? item.column_default : 0;
+ fieldType = 'Double'
+ columnstr.push(`@Column({ comment:'${item.column_comment}', type:'${item.data_type}', default:${item.column_default}})\n`)
+ break;
+ case 'decimal':
+ item.column_default = !isNaN(Number(item.column_default)) ? item.column_default : 0;
+ fieldType = 'Double'
+ columnstr.push(`@Column({ comment:'${item.column_comment}', type:'${item.data_type}', default:${item.column_default}})\n`)
+ break;
+ default:
+ break;
+ }
-聽 聽 聽 聽 聽 聽 聽 聽 // let fieldType = item.data_type=='varchar' ? 'string' : item.data_type=='int' ? 'number' : item.data_type=='bigint' ? 'number' : item.data_type=='tinyint' ? 'number'
-聽 聽 聽 聽 聽 聽 聽 聽 columnstr.push(`${item.column_name}: ${fieldType};\n`)
-聽 聽 聽 聽 聽 聽 聽 聽 columnstr.push(`\n`)
-聽 聽 聽 聽 聽 聽 }
+ // let fieldType = item.data_type=='varchar' ? 'string' : item.data_type=='int' ? 'number' : item.data_type=='bigint' ? 'number' : item.data_type=='tinyint' ? 'number'
+ columnstr.push(`${item.column_name}: ${fieldType};\n`)
+ columnstr.push(`\n`)
+ }
-聽 聽 聽 聽 });
-聽 聽 聽 聽 columnstr.push(`}`)
-聽 聽 聽 聽 if (fs.existsSync(`../../business/entity/${table.entityName}.ts`)) {
-聽 聽 聽 聽 聽 聽 console.log(' file is exists')
-聽 聽 聽 聽 } else {
-聽 聽 聽 聽 聽 聽 console.log(' file is not exists')
-聽 聽 聽 聽 聽 聽 // API
-聽 聽 聽 聽 聽 聽 fs.writeFile(`./src/app/modules/business/entity/${table.entityName}.ts`,
-聽 聽 聽 聽 聽 聽 聽 聽 columnstr.join(''), (error) => {
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 // 鍒涘缓澶辫触
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 if (error) {
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 console.log(`鍒涘缓澶辫触锛�${error}`)
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 }
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 // 鍒涘缓鎴愬姛
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 console.log(`鍒涘缓鎴愬姛锛乣)
-聽 聽 聽 聽 聽 聽 聽 聽 })
-聽 聽 聽 聽 }
-聽 聽 聽 聽 console.log(`--------------------鐢熸垚瀹炰綋绫荤粨鏉�${table.entityName}Service--------------------`);
-聽 聽 }
+ });
+ columnstr.push(`}`)
+ if (fs.existsSync(`../../business/entity/${table.entityName}.ts`)) {
+ console.log(' file is exists')
+ } else {
+ console.log(' file is not exists')
+ // API
+ fs.writeFile(`./src/app/modules/business/entity/${table.entityName}.ts`,
+ columnstr.join(''), (error) => {
+ // 鍒涘缓澶辫触
+ if (error) {
+ console.log(`鍒涘缓澶辫触锛�${error}`)
+ }
+ // 鍒涘缓鎴愬姛
+ console.log(`鍒涘缓鎴愬姛锛乣)
+ })
+ }
+ console.log(`--------------------鐢熸垚瀹炰綋绫荤粨鏉�${table.entityName}Service--------------------`);
+ }
-聽 聽 createService(table) {
-聽 聽 聽 聽 console.log('鐢熸垚鏈嶅姟绫诲紑濮嬫墽琛�');
-聽 聽 聽 聽 let EntityName = this.firstToUpper3(table.entityName)
-聽 聽 聽 聽 let columnstr = [];
-聽 聽 聽 聽 columnstr.push(`import { Provide } from '@midwayjs/decorator';\n`)
-聽 聽 聽 聽 columnstr.push(`import { BaseService } from '@cool-midway/core';\n`)
-聽 聽 聽 聽 columnstr.push(`import { InjectEntityModel } from '@midwayjs/orm';\n`)
-聽 聽 聽 聽 columnstr.push(`import { Repository } from 'typeorm';\n`)
-聽 聽 聽 聽 columnstr.push(`import { DataService } from '../../base/service/dataapi/dataapi';\n`)
-聽 聽 聽 聽 columnstr.push(`import { ${EntityName} } from '../entity/${table.entityName}';\n`)
-聽 聽 聽 聽 columnstr.push(`/**
+ createService(table) {
+ console.log('鐢熸垚鏈嶅姟绫诲紑濮嬫墽琛�');
+ let EntityName = this.firstToUpper3(table.entityName)
+ let columnstr = [];
+ columnstr.push(`import { Provide } from '@midwayjs/decorator';\n`)
+ columnstr.push(`import { BaseService } from '@cool-midway/core';\n`)
+ columnstr.push(`import { InjectEntityModel } from '@midwayjs/orm';\n`)
+ columnstr.push(`import { Repository } from 'typeorm';\n`)
+ columnstr.push(`import { DataService } from '../../base/service/dataapi/dataapi';\n`)
+ columnstr.push(`import { ${EntityName} } from '../entity/${table.entityName}';\n`)
+ columnstr.push(`/**
聽 聽 聽 聽 * ${table.comment}
聽 聽 聽 聽 */\n`)
-聽 聽 聽 聽 columnstr.push(`@Provide()\n`)
-聽 聽 聽 聽 columnstr.push(`export class ${EntityName}Service extends DataService { \n`)
-聽 聽 聽 聽 columnstr.push(` 聽 聽@InjectEntityModel(${EntityName}) \n`)
-聽 聽 聽 聽 columnstr.push(` 聽 聽${table.entityName}: Repository<${EntityName}> \n`);
-聽 聽 聽 聽 columnstr.push(`}`)
-聽 聽 聽 聽 if (fs.existsSync(`../../business/service/${table.entityName}.ts`)) {
-聽 聽 聽 聽 聽 聽 console.log(' file is exists')
-聽 聽 聽 聽 } else {
-聽 聽 聽 聽 聽 聽 console.log(' file is not exists')
-聽 聽 聽 聽 聽 聽 // API
-聽 聽 聽 聽 聽 聽 fs.writeFile(`./src/app/modules/business/service/${table.entityName}.ts`,
-聽 聽 聽 聽 聽 聽 聽 聽 columnstr.join(''), (error) => {
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 // 鍒涘缓澶辫触
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 if (error) {
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 console.log(`鍒涘缓澶辫触锛�${error}`)
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 }
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 // 鍒涘缓鎴愬姛
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 console.log(`鍒涘缓鎴愬姛锛乣)
-聽 聽 聽 聽 聽 聽 聽 聽 })
-聽 聽 聽 聽 }
-聽 聽 聽 聽 console.log(`--------------------鐢熸垚鏈嶅姟绫荤粨鏉�${EntityName}Service--------------------`);
-聽 聽 }
+ columnstr.push(`@Provide()\n`)
+ columnstr.push(`export class ${EntityName}Service extends DataService { \n`)
+ columnstr.push(` 聽 聽@InjectEntityModel(${EntityName}) \n`)
+ columnstr.push(` 聽 聽${table.entityName}: Repository<${EntityName}> \n`);
+ columnstr.push(`}`)
+ if (fs.existsSync(`../../business/service/${table.entityName}.ts`)) {
+ console.log(' file is exists')
+ } else {
+ console.log(' file is not exists')
+ // API
+ fs.writeFile(`./src/app/modules/business/service/${table.entityName}.ts`,
+ columnstr.join(''), (error) => {
+ // 鍒涘缓澶辫触
+ if (error) {
+ console.log(`鍒涘缓澶辫触锛�${error}`)
+ }
+ // 鍒涘缓鎴愬姛
+ console.log(`鍒涘缓鎴愬姛锛乣)
+ })
+ }
+ console.log(`--------------------鐢熸垚鏈嶅姟绫荤粨鏉�${EntityName}Service--------------------`);
+ }
-聽 聽 createController(table) {
-聽 聽 聽 聽 console.log('鐢熸垚鎺у埗绫诲紑濮嬫墽琛�');
-聽 聽 聽 聽 let EntityName = this.firstToUpper3(table.entityName)
-聽 聽 聽 聽 let columnstr = [];
-聽 聽 聽 聽 columnstr.push(`import { ALL, Body, Get, Inject, Post, Provide, Query } from '@midwayjs/decorator';\n`)
-聽 聽 聽 聽 columnstr.push(`import { CoolController, BaseController } from '@cool-midway/core';\n`)
-聽 聽 聽 聽 columnstr.push(`import { ${EntityName} } from '../../entity/${table.entityName}';\n`)
-聽 聽 聽 聽 columnstr.push(`import { ${EntityName}Service } from '../../service/${table.entityName}';\n`)
-聽 聽 聽 聽 columnstr.push(`import { DataController } from '../../../base/controller/dataController';\n`)
-聽 聽 聽 聽 columnstr.push(`/**
+ createController(table) {
+ console.log('鐢熸垚鎺у埗绫诲紑濮嬫墽琛�');
+ let EntityName = this.firstToUpper3(table.entityName)
+ let columnstr = [];
+ columnstr.push(`import { ALL, Body, Get, Inject, Post, Provide, Query } from '@midwayjs/decorator';\n`)
+ columnstr.push(`import { CoolController, BaseController } from '@cool-midway/core';\n`)
+ columnstr.push(`import { ${EntityName} } from '../../entity/${table.entityName}';\n`)
+ columnstr.push(`import { ${EntityName}Service } from '../../service/${table.entityName}';\n`)
+ columnstr.push(`import { DataController } from '../../../base/controller/dataController';\n`)
+ columnstr.push(`/**
聽 聽 聽 聽 * ${table.comment}
聽 聽 聽 聽 */\n`)
-聽 聽 聽 聽 columnstr.push(`@Provide()\n`)
-聽 聽 聽 聽 columnstr.push(`@CoolController({ \n`)
-聽 聽 聽 聽 columnstr.push(` 聽api: ['add', 'delete', 'update', 'list'],\n`)
-聽 聽 聽 聽 columnstr.push(` 聽entity: ${EntityName},\n`)
-聽 聽 聽 聽 columnstr.push(` 聽service: ${EntityName}Service,\n`)
-聽 聽 聽 聽 columnstr.push(`})\n`)
-聽 聽 聽 聽 columnstr.push(`export class ${EntityName}Controller extends DataController {\n`)
-聽 聽 聽 聽 columnstr.push(` 聽@Inject()\n`)
-聽 聽 聽 聽 columnstr.push(` 聽${table.entityName}Service: ${EntityName}Service;\n`)
-聽 聽 聽 聽 columnstr.push(` 聽\n`)
-聽 聽 聽 聽 columnstr.push(` /**\n * 鑾峰緱鏁版嵁\n */\n`)
-聽 聽 聽 聽 columnstr.push(` 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })\n`)
-聽 聽 聽 聽 columnstr.push(` 聽 async getData(@Query(ALL) params: any) {\n`)
-聽 聽 聽 聽 columnstr.push(` 聽 聽 return this.ok(await this.dataService.getData(params));\n`)
-聽 聽 聽 聽 columnstr.push(` 聽 }\n`)
-聽 聽 聽 聽 columnstr.push(` /**\n * 鑾峰緱鏁版嵁\n */\n`)
-聽 聽 聽 聽 columnstr.push(` 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })\n`)
-聽 聽 聽 聽 columnstr.push(` 聽 async postData(@Query(ALL) params: any) {\n`)
-聽 聽 聽 聽 columnstr.push(` 聽 聽 return this.ok(await this.dataService.getData(params));\n`)
-聽 聽 聽 聽 columnstr.push(` 聽 }\n`)
-聽 聽 聽 聽 columnstr.push(`}`)
-聽 聽 聽 聽 if (fs.existsSync(`../../business/controller/admin/${table.entityName}.ts`)) {
-聽 聽 聽 聽 聽 聽 console.log(' file is exists')
-聽 聽 聽 聽 } else {
-聽 聽 聽 聽 聽 聽 console.log(' file is not exists')
-聽 聽 聽 聽 聽 聽 // API
-聽 聽 聽 聽 聽 聽 fs.writeFile(`./src/app/modules/business/controller/admin/${table.entityName}.ts`,
-聽 聽 聽 聽 聽 聽 聽 聽 columnstr.join(''), (error) => {
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 // 鍒涘缓澶辫触
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 if (error) {
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 console.log(`鍒涘缓澶辫触锛�${error}`)
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 }
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 // 鍒涘缓鎴愬姛
-聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 console.log(`鍒涘缓鎴愬姛锛乣)
-聽 聽 聽 聽 聽 聽 聽 聽 })
-聽 聽 聽 聽 }
-聽 聽 }
+ columnstr.push(`@Provide()\n`)
+ columnstr.push(`@CoolController({ \n`)
+ columnstr.push(` 聽api: ['add', 'delete', 'update', 'list','page','info'],\n`)
+ columnstr.push(` 聽entity: ${EntityName},\n`)
+ columnstr.push(` 聽service: ${EntityName}Service,\n`)
+ columnstr.push(`})\n`)
+ columnstr.push(`export class ${EntityName}Controller extends DataController {\n`)
+ columnstr.push(` 聽@Inject()\n`)
+ columnstr.push(` 聽${table.entityName}Service: ${EntityName}Service;\n`)
+ columnstr.push(` 聽\n`)
+ columnstr.push(` /**\n * 鑾峰緱鏁版嵁\n */\n`)
+ columnstr.push(` 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })\n`)
+ columnstr.push(` 聽 async getData(@Query(ALL) params: any) {\n`)
+ columnstr.push(` 聽 聽 return this.ok(await this.dataService.getData(params));\n`)
+ columnstr.push(` 聽 }\n`)
+ columnstr.push(` /**\n * 鑾峰緱鏁版嵁\n */\n`)
+ columnstr.push(` 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })\n`)
+ columnstr.push(` 聽 async postData(@Query(ALL) params: any) {\n`)
+ columnstr.push(` 聽 聽 return this.ok(await this.dataService.getData(params));\n`)
+ columnstr.push(` 聽 }\n`)
+ columnstr.push(`}`)
+ if (fs.existsSync(`../../business/controller/admin/${table.entityName}.ts`)) {
+ console.log(' file is exists')
+ } else {
+ console.log(' file is not exists')
+ // API
+ fs.writeFile(`./src/app/modules/business/controller/admin/${table.entityName}.ts`,
+ columnstr.join(''), (error) => {
+ // 鍒涘缓澶辫触
+ if (error) {
+ console.log(`鍒涘缓澶辫触锛�${error}`)
+ }
+ // 鍒涘缓鎴愬姛
+ console.log(`鍒涘缓鎴愬姛锛乣)
+ })
+ }
+ }
-聽 聽 firstToUpper3(str){
-聽 聽 聽 聽 return str.toLowerCase().replace(/( |^)[a-z]/g,(L)=>L.toUpperCase());
-聽 聽 }
+ firstToUpper3(str) {
+ return str.toLowerCase().replace(/( |^)[a-z]/g, (L) => L.toUpperCase());
+ }
}
diff --git a/src/app/modules/business/controller/admin/basedeviceinfo.ts b/src/app/modules/business/controller/admin/basedeviceinfo.ts
index e4b363f..48ab68d 100644
--- a/src/app/modules/business/controller/admin/basedeviceinfo.ts
+++ b/src/app/modules/business/controller/admin/basedeviceinfo.ts
@@ -4,30 +4,30 @@
import { BasedeviceinfoService } from '../../service/basedeviceinfo';
import { DataController } from '../../../base/controller/dataController';
/**
- * 璁惧淇℃伅
- */
+聽 聽 聽 聽 * 璁惧淇℃伅
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Basedeviceinfo,
- service: BasedeviceinfoService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Basedeviceinfo,
+ 聽service: BasedeviceinfoService,
})
export class BasedeviceinfoController extends DataController {
- @Inject()
- basedeviceinfoService: BasedeviceinfoService;
-
+ 聽@Inject()
+ 聽basedeviceinfoService: BasedeviceinfoService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/basedeviceparams.ts b/src/app/modules/business/controller/admin/basedeviceparams.ts
index 3052ea5..380dc5b 100644
--- a/src/app/modules/business/controller/admin/basedeviceparams.ts
+++ b/src/app/modules/business/controller/admin/basedeviceparams.ts
@@ -4,30 +4,30 @@
import { BasedeviceparamsService } from '../../service/basedeviceparams';
import { DataController } from '../../../base/controller/dataController';
/**
- * 璁惧鍙傛暟
- */
+聽 聽 聽 聽 * 璁惧鍙傛暟
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Basedeviceparams,
- service: BasedeviceparamsService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Basedeviceparams,
+ 聽service: BasedeviceparamsService,
})
export class BasedeviceparamsController extends DataController {
- @Inject()
- basedeviceparamsService: BasedeviceparamsService;
-
+ 聽@Inject()
+ 聽basedeviceparamsService: BasedeviceparamsService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/basedevicesection.ts b/src/app/modules/business/controller/admin/basedevicesection.ts
index 95750a0..92ef581 100644
--- a/src/app/modules/business/controller/admin/basedevicesection.ts
+++ b/src/app/modules/business/controller/admin/basedevicesection.ts
@@ -4,30 +4,30 @@
import { BasedevicesectionService } from '../../service/basedevicesection';
import { DataController } from '../../../base/controller/dataController';
/**
- * 璁惧缁勪欢
- */
+聽 聽 聽 聽 * 璁惧缁勪欢
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Basedevicesection,
- service: BasedevicesectionService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Basedevicesection,
+ 聽service: BasedevicesectionService,
})
export class BasedevicesectionController extends DataController {
- @Inject()
- basedevicesectionService: BasedevicesectionService;
-
+ 聽@Inject()
+ 聽basedevicesectionService: BasedevicesectionService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/basedevicestatus.ts b/src/app/modules/business/controller/admin/basedevicestatus.ts
index ab2168e..0fe153c 100644
--- a/src/app/modules/business/controller/admin/basedevicestatus.ts
+++ b/src/app/modules/business/controller/admin/basedevicestatus.ts
@@ -4,30 +4,30 @@
import { BasedevicestatusService } from '../../service/basedevicestatus';
import { DataController } from '../../../base/controller/dataController';
/**
- * 璁惧鐘舵��
- */
+聽 聽 聽 聽 * 璁惧鐘舵��
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Basedevicestatus,
- service: BasedevicestatusService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Basedevicestatus,
+ 聽service: BasedevicestatusService,
})
export class BasedevicestatusController extends DataController {
- @Inject()
- basedevicestatusService: BasedevicestatusService;
-
+ 聽@Inject()
+ 聽basedevicestatusService: BasedevicestatusService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/colletdata.ts b/src/app/modules/business/controller/admin/colletdata.ts
index 1d8db30..3730b42 100644
--- a/src/app/modules/business/controller/admin/colletdata.ts
+++ b/src/app/modules/business/controller/admin/colletdata.ts
@@ -4,30 +4,30 @@
import { ColletdataService } from '../../service/colletdata';
import { DataController } from '../../../base/controller/dataController';
/**
- * 鐩戞祴鍏冩暟鎹�
- */
+聽 聽 聽 聽 * 鐩戞祴鍏冩暟鎹�
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Colletdata,
- service: ColletdataService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Colletdata,
+ 聽service: ColletdataService,
})
export class ColletdataController extends DataController {
- @Inject()
- colletdataService: ColletdataService;
-
+ 聽@Inject()
+ 聽colletdataService: ColletdataService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/colletmeta.ts b/src/app/modules/business/controller/admin/colletmeta.ts
index 3fb6778..efb6d39 100644
--- a/src/app/modules/business/controller/admin/colletmeta.ts
+++ b/src/app/modules/business/controller/admin/colletmeta.ts
@@ -4,30 +4,30 @@
import { ColletmetaService } from '../../service/colletmeta';
import { DataController } from '../../../base/controller/dataController';
/**
- * 鐩戞祴鍏冩暟鎹�
- */
+聽 聽 聽 聽 * 鐩戞祴鍏冩暟鎹�
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Colletmeta,
- service: ColletmetaService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Colletmeta,
+ 聽service: ColletmetaService,
})
export class ColletmetaController extends DataController {
- @Inject()
- colletmetaService: ColletmetaService;
-
+ 聽@Inject()
+ 聽colletmetaService: ColletmetaService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/comconfig.ts b/src/app/modules/business/controller/admin/comconfig.ts
index adaa04a..5006956 100644
--- a/src/app/modules/business/controller/admin/comconfig.ts
+++ b/src/app/modules/business/controller/admin/comconfig.ts
@@ -4,30 +4,30 @@
import { ComconfigService } from '../../service/comconfig';
import { DataController } from '../../../base/controller/dataController';
/**
- * 鐩戞祴鍏冩暟鎹�
- */
+聽 聽 聽 聽 * 鐩戞祴鍏冩暟鎹�
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Comconfig,
- service: ComconfigService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Comconfig,
+ 聽service: ComconfigService,
})
export class ComconfigController extends DataController {
- @Inject()
- comconfigService: ComconfigService;
-
+ 聽@Inject()
+ 聽comconfigService: ComconfigService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/deviceattachment.ts b/src/app/modules/business/controller/admin/deviceattachment.ts
index 3be1e92..680fb47 100644
--- a/src/app/modules/business/controller/admin/deviceattachment.ts
+++ b/src/app/modules/business/controller/admin/deviceattachment.ts
@@ -4,30 +4,30 @@
import { DeviceattachmentService } from '../../service/deviceattachment';
import { DataController } from '../../../base/controller/dataController';
/**
- * 璁惧鐩稿叧鐨勯檮浠�
- */
+聽 聽 聽 聽 * 璁惧鐩稿叧鐨勯檮浠�
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Deviceattachment,
- service: DeviceattachmentService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Deviceattachment,
+ 聽service: DeviceattachmentService,
})
export class DeviceattachmentController extends DataController {
- @Inject()
- deviceattachmentService: DeviceattachmentService;
-
+ 聽@Inject()
+ 聽deviceattachmentService: DeviceattachmentService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/devicegroup.ts b/src/app/modules/business/controller/admin/devicegroup.ts
index 715f48f..7804576 100644
--- a/src/app/modules/business/controller/admin/devicegroup.ts
+++ b/src/app/modules/business/controller/admin/devicegroup.ts
@@ -21,13 +21,13 @@
*/
@Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
+ return this.ok(await this.devicegroupService.getData(params));
}
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ @Post('/postdata', { summary: '鏁版嵁鎺ュ彛' })
async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
+ return this.ok(await this.devicegroupService.getData(params));
}
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/deviceopreraterecord.ts b/src/app/modules/business/controller/admin/deviceopreraterecord.ts
index 35920c6..fdff492 100644
--- a/src/app/modules/business/controller/admin/deviceopreraterecord.ts
+++ b/src/app/modules/business/controller/admin/deviceopreraterecord.ts
@@ -4,30 +4,30 @@
import { DeviceopreraterecordService } from '../../service/deviceopreraterecord';
import { DataController } from '../../../base/controller/dataController';
/**
- * 璁惧杩愮淮璁板綍
- */
+聽 聽 聽 聽 * 璁惧杩愮淮璁板綍
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Deviceopreraterecord,
- service: DeviceopreraterecordService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Deviceopreraterecord,
+ 聽service: DeviceopreraterecordService,
})
export class DeviceopreraterecordController extends DataController {
- @Inject()
- deviceopreraterecordService: DeviceopreraterecordService;
-
+ 聽@Inject()
+ 聽deviceopreraterecordService: DeviceopreraterecordService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/doutrubine.ts b/src/app/modules/business/controller/admin/doutrubine.ts
index d3c10a9..bd8c11e 100644
--- a/src/app/modules/business/controller/admin/doutrubine.ts
+++ b/src/app/modules/business/controller/admin/doutrubine.ts
@@ -4,30 +4,30 @@
import { DoutrubineService } from '../../service/doutrubine';
import { DataController } from '../../../base/controller/dataController';
/**
- * 鏂楄疆鏈轰俊鎭�
- */
+聽 聽 聽 聽 * 鏂楄疆鏈轰俊鎭�
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Doutrubine,
- service: DoutrubineService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Doutrubine,
+ 聽service: DoutrubineService,
})
export class DoutrubineController extends DataController {
- @Inject()
- doutrubineService: DoutrubineService;
-
+ 聽@Inject()
+ 聽doutrubineService: DoutrubineService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/execrecord.ts b/src/app/modules/business/controller/admin/execrecord.ts
index c6b5249..d2ff074 100644
--- a/src/app/modules/business/controller/admin/execrecord.ts
+++ b/src/app/modules/business/controller/admin/execrecord.ts
@@ -4,30 +4,30 @@
import { ExecrecordService } from '../../service/execrecord';
import { DataController } from '../../../base/controller/dataController';
/**
- * 浠诲姟鎵ц璁板綍
- */
+聽 聽 聽 聽 * 浠诲姟鎵ц璁板綍
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Execrecord,
- service: ExecrecordService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Execrecord,
+ 聽service: ExecrecordService,
})
export class ExecrecordController extends DataController {
- @Inject()
- execrecordService: ExecrecordService;
-
+ 聽@Inject()
+ 聽execrecordService: ExecrecordService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/interfacelist.ts b/src/app/modules/business/controller/admin/interfacelist.ts
index 08b86b5..804e5f7 100644
--- a/src/app/modules/business/controller/admin/interfacelist.ts
+++ b/src/app/modules/business/controller/admin/interfacelist.ts
@@ -4,30 +4,30 @@
import { InterfacelistService } from '../../service/interfacelist';
import { DataController } from '../../../base/controller/dataController';
/**
- * 鎺ュ彛娓呭崟
- */
+聽 聽 聽 聽 * 鎺ュ彛娓呭崟
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Interfacelist,
- service: InterfacelistService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Interfacelist,
+ 聽service: InterfacelistService,
})
export class InterfacelistController extends DataController {
- @Inject()
- interfacelistService: InterfacelistService;
-
+ 聽@Inject()
+ 聽interfacelistService: InterfacelistService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/interfacerecord.ts b/src/app/modules/business/controller/admin/interfacerecord.ts
index a5e1c2c..03b5afb 100644
--- a/src/app/modules/business/controller/admin/interfacerecord.ts
+++ b/src/app/modules/business/controller/admin/interfacerecord.ts
@@ -4,30 +4,30 @@
import { InterfacerecordService } from '../../service/interfacerecord';
import { DataController } from '../../../base/controller/dataController';
/**
- * 缁勫悎妯″瀷
- */
+聽 聽 聽 聽 * 缁勫悎妯″瀷
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Interfacerecord,
- service: InterfacerecordService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Interfacerecord,
+ 聽service: InterfacerecordService,
})
export class InterfacerecordController extends DataController {
- @Inject()
- interfacerecordService: InterfacerecordService;
-
+ 聽@Inject()
+ 聽interfacerecordService: InterfacerecordService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/messagerecord.ts b/src/app/modules/business/controller/admin/messagerecord.ts
index 4d69cdb..bc19096 100644
--- a/src/app/modules/business/controller/admin/messagerecord.ts
+++ b/src/app/modules/business/controller/admin/messagerecord.ts
@@ -4,30 +4,30 @@
import { MessagerecordService } from '../../service/messagerecord';
import { DataController } from '../../../base/controller/dataController';
/**
- * 浠诲姟娑堟伅璁板綍
- */
+聽 聽 聽 聽 * 浠诲姟娑堟伅璁板綍
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Messagerecord,
- service: MessagerecordService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Messagerecord,
+ 聽service: MessagerecordService,
})
export class MessagerecordController extends DataController {
- @Inject()
- messagerecordService: MessagerecordService;
-
+ 聽@Inject()
+ 聽messagerecordService: MessagerecordService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/metadata.ts b/src/app/modules/business/controller/admin/metadata.ts
index ba0ea3f..d003d51 100644
--- a/src/app/modules/business/controller/admin/metadata.ts
+++ b/src/app/modules/business/controller/admin/metadata.ts
@@ -4,30 +4,30 @@
import { MetadataService } from '../../service/metadata';
import { DataController } from '../../../base/controller/dataController';
/**
- * 鐩戞祴閲囬泦鍘熸暟鎹�
- */
+聽 聽 聽 聽 * 鐩戞祴閲囬泦鍘熸暟鎹�
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Metadata,
- service: MetadataService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Metadata,
+ 聽service: MetadataService,
})
export class MetadataController extends DataController {
- @Inject()
- metadataService: MetadataService;
-
+ 聽@Inject()
+ 聽metadataService: MetadataService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/modelcombination.ts b/src/app/modules/business/controller/admin/modelcombination.ts
index c8bc772..fb02a57 100644
--- a/src/app/modules/business/controller/admin/modelcombination.ts
+++ b/src/app/modules/business/controller/admin/modelcombination.ts
@@ -4,30 +4,30 @@
import { ModelcombinationService } from '../../service/modelcombination';
import { DataController } from '../../../base/controller/dataController';
/**
- * 缁勫悎妯″瀷
- */
+聽 聽 聽 聽 * 缁勫悎妯″瀷
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Modelcombination,
- service: ModelcombinationService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Modelcombination,
+ 聽service: ModelcombinationService,
})
export class ModelcombinationController extends DataController {
- @Inject()
- modelcombinationService: ModelcombinationService;
-
+ 聽@Inject()
+ 聽modelcombinationService: ModelcombinationService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/modelstatic.ts b/src/app/modules/business/controller/admin/modelstatic.ts
index 1cfc626..c277daa 100644
--- a/src/app/modules/business/controller/admin/modelstatic.ts
+++ b/src/app/modules/business/controller/admin/modelstatic.ts
@@ -4,30 +4,30 @@
import { ModelstaticService } from '../../service/modelstatic';
import { DataController } from '../../../base/controller/dataController';
/**
- * 闈欐�佹ā鍨嬫暟鎹�
- */
+聽 聽 聽 聽 * 闈欐�佹ā鍨嬫暟鎹�
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Modelstatic,
- service: ModelstaticService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Modelstatic,
+ 聽service: ModelstaticService,
})
export class ModelstaticController extends DataController {
- @Inject()
- modelstaticService: ModelstaticService;
-
+ 聽@Inject()
+ 聽modelstaticService: ModelstaticService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/periodicsetting.ts b/src/app/modules/business/controller/admin/periodicsetting.ts
index 6daed16..28e2c92 100644
--- a/src/app/modules/business/controller/admin/periodicsetting.ts
+++ b/src/app/modules/business/controller/admin/periodicsetting.ts
@@ -4,30 +4,30 @@
import { PeriodicsettingService } from '../../service/periodicsetting';
import { DataController } from '../../../base/controller/dataController';
/**
- * 鍒嗙粍浠诲姟鍙傛暟璁剧疆
- */
+聽 聽 聽 聽 * 鍒嗙粍浠诲姟鍙傛暟璁剧疆
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Periodicsetting,
- service: PeriodicsettingService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Periodicsetting,
+ 聽service: PeriodicsettingService,
})
export class PeriodicsettingController extends DataController {
- @Inject()
- periodicsettingService: PeriodicsettingService;
-
+ 聽@Inject()
+ 聽periodicsettingService: PeriodicsettingService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/planinventory.ts b/src/app/modules/business/controller/admin/planinventory.ts
index 21a3bbc..f4d6a31 100644
--- a/src/app/modules/business/controller/admin/planinventory.ts
+++ b/src/app/modules/business/controller/admin/planinventory.ts
@@ -4,30 +4,30 @@
import { PlaninventoryService } from '../../service/planinventory';
import { DataController } from '../../../base/controller/dataController';
/**
- * 鐩樼叅璁″垝
- */
+聽 聽 聽 聽 * 鐩樼叅璁″垝
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Planinventory,
- service: PlaninventoryService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Planinventory,
+ 聽service: PlaninventoryService,
})
export class PlaninventoryController extends DataController {
- @Inject()
- planinventoryService: PlaninventoryService;
-
+ 聽@Inject()
+ 聽planinventoryService: PlaninventoryService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/pointcloud.ts b/src/app/modules/business/controller/admin/pointcloud.ts
index 73c6edd..d25b688 100644
--- a/src/app/modules/business/controller/admin/pointcloud.ts
+++ b/src/app/modules/business/controller/admin/pointcloud.ts
@@ -4,30 +4,30 @@
import { PointcloudService } from '../../service/pointcloud';
import { DataController } from '../../../base/controller/dataController';
/**
- * 鐩戞祴鍏冩暟鎹�
- */
+聽 聽 聽 聽 * 鐩戞祴鍏冩暟鎹�
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Pointcloud,
- service: PointcloudService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Pointcloud,
+ 聽service: PointcloudService,
})
export class PointcloudController extends DataController {
- @Inject()
- pointcloudService: PointcloudService;
-
+ 聽@Inject()
+ 聽pointcloudService: PointcloudService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/pointmodel.ts b/src/app/modules/business/controller/admin/pointmodel.ts
index 730624d..4e257a3 100644
--- a/src/app/modules/business/controller/admin/pointmodel.ts
+++ b/src/app/modules/business/controller/admin/pointmodel.ts
@@ -4,30 +4,30 @@
import { PointmodelService } from '../../service/pointmodel';
import { DataController } from '../../../base/controller/dataController';
/**
- * 鐐逛簯妯″瀷
- */
+聽 聽 聽 聽 * 鐐逛簯妯″瀷
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Pointmodel,
- service: PointmodelService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Pointmodel,
+ 聽service: PointmodelService,
})
export class PointmodelController extends DataController {
- @Inject()
- pointmodelService: PointmodelService;
-
+ 聽@Inject()
+ 聽pointmodelService: PointmodelService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/statdata.ts b/src/app/modules/business/controller/admin/statdata.ts
index 1f23be8..8c1dd8d 100644
--- a/src/app/modules/business/controller/admin/statdata.ts
+++ b/src/app/modules/business/controller/admin/statdata.ts
@@ -4,30 +4,30 @@
import { StatdataService } from '../../service/statdata';
import { DataController } from '../../../base/controller/dataController';
/**
- * 鐩戞祴缁熻
- */
+聽 聽 聽 聽 * 鐩戞祴缁熻
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Statdata,
- service: StatdataService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Statdata,
+ 聽service: StatdataService,
})
export class StatdataController extends DataController {
- @Inject()
- statdataService: StatdataService;
-
+ 聽@Inject()
+ 聽statdataService: StatdataService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/taskimmediately.ts b/src/app/modules/business/controller/admin/taskimmediately.ts
index 3ab1172..c2f5ee5 100644
--- a/src/app/modules/business/controller/admin/taskimmediately.ts
+++ b/src/app/modules/business/controller/admin/taskimmediately.ts
@@ -4,30 +4,30 @@
import { TaskimmediatelyService } from '../../service/taskimmediately';
import { DataController } from '../../../base/controller/dataController';
/**
- * 鍗虫椂浠诲姟璁板綍
- */
+聽 聽 聽 聽 * 鍗虫椂浠诲姟璁板綍
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Taskimmediately,
- service: TaskimmediatelyService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Taskimmediately,
+ 聽service: TaskimmediatelyService,
})
export class TaskimmediatelyController extends DataController {
- @Inject()
- taskimmediatelyService: TaskimmediatelyService;
-
+ 聽@Inject()
+ 聽taskimmediatelyService: TaskimmediatelyService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/taskmonitor.ts b/src/app/modules/business/controller/admin/taskmonitor.ts
index 351ffcb..fde0065 100644
--- a/src/app/modules/business/controller/admin/taskmonitor.ts
+++ b/src/app/modules/business/controller/admin/taskmonitor.ts
@@ -4,30 +4,30 @@
import { TaskmonitorService } from '../../service/taskmonitor';
import { DataController } from '../../../base/controller/dataController';
/**
- * 鐩戞祴浠诲姟
- */
+聽 聽 聽 聽 * 鐩戞祴浠诲姟
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Taskmonitor,
- service: TaskmonitorService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Taskmonitor,
+ 聽service: TaskmonitorService,
})
export class TaskmonitorController extends DataController {
- @Inject()
- taskmonitorService: TaskmonitorService;
-
+ 聽@Inject()
+ 聽taskmonitorService: TaskmonitorService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/trubinelocation.ts b/src/app/modules/business/controller/admin/trubinelocation.ts
index e969ded..e1eddca 100644
--- a/src/app/modules/business/controller/admin/trubinelocation.ts
+++ b/src/app/modules/business/controller/admin/trubinelocation.ts
@@ -4,30 +4,30 @@
import { TrubinelocationService } from '../../service/trubinelocation';
import { DataController } from '../../../base/controller/dataController';
/**
- * 鏂楄疆鏈轰俊鎭�
- */
+聽 聽 聽 聽 * 鏂楄疆鏈轰俊鎭�
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Trubinelocation,
- service: TrubinelocationService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Trubinelocation,
+ 聽service: TrubinelocationService,
})
export class TrubinelocationController extends DataController {
- @Inject()
- trubinelocationService: TrubinelocationService;
-
+ 聽@Inject()
+ 聽trubinelocationService: TrubinelocationService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/controller/admin/tuser.ts b/src/app/modules/business/controller/admin/tuser.ts
index 146c02f..13500d3 100644
--- a/src/app/modules/business/controller/admin/tuser.ts
+++ b/src/app/modules/business/controller/admin/tuser.ts
@@ -4,30 +4,30 @@
import { TuserService } from '../../service/tuser';
import { DataController } from '../../../base/controller/dataController';
/**
- *
- */
+聽 聽 聽 聽 *
+聽 聽 聽 聽 */
@Provide()
-@CoolController({
- api: ['add', 'delete', 'update', 'list', 'page', 'info'],
- entity: Tuser,
- service: TuserService,
+@CoolController({
+ 聽api: ['add', 'delete', 'update', 'list','page','info'],
+ 聽entity: Tuser,
+ 聽service: TuserService,
})
export class TuserController extends DataController {
- @Inject()
- tuserService: TuserService;
-
+ 聽@Inject()
+ 聽tuserService: TuserService;
+ 聽
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
- async getData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/getdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async getData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
/**
* 鑾峰緱鏁版嵁
*/
- @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
- async postData(@Query(ALL) params: any) {
- return this.ok(await this.dataService.getData(params));
- }
+ 聽 @Get('/postdata', { summary: '鏁版嵁鎺ュ彛' })
+ 聽 async postData(@Query(ALL) params: any) {
+ 聽 聽 return this.ok(await this.dataService.getData(params));
+ 聽 }
}
\ No newline at end of file
diff --git a/src/app/modules/business/entity/basedeviceinfo.ts b/src/app/modules/business/entity/basedeviceinfo.ts
index c056c41..53bba11 100644
--- a/src/app/modules/business/entity/basedeviceinfo.ts
+++ b/src/app/modules/business/entity/basedeviceinfo.ts
@@ -6,58 +6,58 @@
聽 聽 聽 聽 */
@EntityModel('t_base_deviceinfo')
export class Basedeviceinfo extends BaseEntity {
-@Column({ comment:'{name:"璁惧楂樺害",format:0.000001,tips:"绮剧‘鍒板皬鏁扮偣鍚�6浣�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"璁惧楂樺害",format:0.000001,tips:"绮剧‘鍒板皬鏁扮偣鍚�6浣�"}', type:'varchar', default:'', length:50})
altitude: string;
-@Column({ comment:'{name:"璐﹀彿",format:0.001,tips:""}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"璐﹀彿",format:0.001,tips:""}', type:'varchar', default:'', length:50})
device_account: string;
-@Column({ comment:'{name:"鐗╃悊搴忓垪鍙�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鐗╃悊搴忓垪鍙�"}', type:'varchar', default:'', length:50})
device_id: string;
-@Column({ comment:'{name:"绔彛",format:0.001,tips:""}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"绔彛",format:0.001,tips:""}', type:'varchar', default:'', length:50})
device_port: string;
-@Column({ comment:'{name:"瀵嗙爜",format:0.001,tips:""}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"瀵嗙爜",format:0.001,tips:""}', type:'varchar', default:'', length:50})
device_psw: string;
-@Column({ comment:'{name:"璁惧绮惧害",format:0.001,tips:"绮剧‘鍒板皬鏁扮偣鍚�3浣�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"璁惧绮惧害",format:0.001,tips:"绮剧‘鍒板皬鏁扮偣鍚�3浣�"}', type:'varchar', default:'', length:50})
dimension: string;
-@Column({ comment:'{name:"涓婂�捐",format:0.001,tips:"绮剧‘鍒板皬鏁扮偣鍚�3浣�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"涓婂�捐",format:0.001,tips:"绮剧‘鍒板皬鏁扮偣鍚�3浣�"}', type:'varchar', default:'', length:50})
heading_angle: string;
-@Column({ comment:'{name:"IP鍦板潃",format:0.001,tips:""}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"IP鍦板潃",format:0.001,tips:""}', type:'varchar', default:'', length:50})
ipaddres: string;
-@Column({ comment:'{name:"绾害",format:0.000001,tips:"绮剧‘鍒板皬鏁扮偣鍚�6浣�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"绾害",format:0.000001,tips:"绮剧‘鍒板皬鏁扮偣鍚�6浣�"}', type:'varchar', default:'', length:50})
latitude: string;
-@Column({ comment:'{name:"瀹夎浣嶇疆",format:"**鐪�**甯�**鍖�**璺�**鍙�**妤�**鏂逛綅"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"瀹夎浣嶇疆",format:"**鐪�**甯�**鍖�**璺�**鍙�**妤�**鏂逛綅"}', type:'varchar', default:'', length:50})
location: string;
-@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'', length:50})
logic_id: string;
-@Column({ comment:'{name:"缁忓害",format:0.00001,tips:"绮剧‘鍒板皬鏁扮偣鍚�6浣�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"缁忓害",format:0.00001,tips:"绮剧‘鍒板皬鏁扮偣鍚�6浣�"}', type:'varchar', default:'', length:50})
longitude: string;
-@Column({ comment:'{name:"璁惧鍚嶇О"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"璁惧鍚嶇О"}', type:'varchar', default:'', length:50})
name: string;
-@Column({ comment:'{name:"杩愮淮璐熻矗浜�",format:0.001,tips:""}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"杩愮淮璐熻矗浜�",format:0.001,tips:""}', type:'varchar', default:'', length:50})
opertator: string;
-@Column({ comment:'{name:"淇话瑙�",format:0.001,tips:"绮剧‘鍒板皬鏁扮偣鍚�3浣�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"淇话瑙�",format:0.001,tips:"绮剧‘鍒板皬鏁扮偣鍚�3浣�"}', type:'varchar', default:'', length:50})
petch_angle: string;
-@Column({ comment:'{name:"鑸悜瑙�",format:0.001,tips:"绮剧‘鍒板皬鏁扮偣鍚�3浣�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鑸悜瑙�",format:0.001,tips:"绮剧‘鍒板皬鏁扮偣鍚�3浣�"}', type:'varchar', default:'', length:50})
precision: string;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
-@Column({ comment:'{name:"妯粴瑙�",format:0.001,tips:"绮剧‘鍒板皬鏁扮偣鍚�3浣�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"妯粴瑙�",format:0.001,tips:"绮剧‘鍒板皬鏁扮偣鍚�3浣�"}', type:'varchar', default:'', length:50})
roll_angle: string;
@Column({ comment:'{name:"鐘舵��",dict:{"1":"鍚敤", "0":"鍋滅敤"}}', type:'int', default:1, width:0})
diff --git a/src/app/modules/business/entity/basedeviceparams.ts b/src/app/modules/business/entity/basedeviceparams.ts
index 6a006d0..984a2b0 100644
--- a/src/app/modules/business/entity/basedeviceparams.ts
+++ b/src/app/modules/business/entity/basedeviceparams.ts
@@ -6,25 +6,25 @@
聽 聽 聽 聽 */
@EntityModel('t_base_deviceparams')
export class Basedeviceparams extends BaseEntity {
-@Column({ comment:'{name:"閰嶇疆浜�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"閰嶇疆浜�"}', type:'varchar', default:'', length:50})
configurator: string;
-@Column({ comment:'{name:"鐗╃悊搴忓垪鍙�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鐗╃悊搴忓垪鍙�"}', type:'varchar', default:'', length:50})
device_id: string;
-@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'', length:50})
logic_id: string;
-@Column({ comment:'{name:"key"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"key"}', type:'varchar', default:'', length:50})
param_key: string;
@Column({ comment:'{name:"鍙傛暟绫诲瀷",dict:{"0":"绯荤粺鍙傛暟","1":"姘村钩瑙掑害","2":"鍨傜洿瑙掑害"}}', type:'int', default:null, width:0})
param_type: number;
-@Column({ comment:'{name:"鍙傛暟鍊�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鍙傛暟鍊�"}', type:'varchar', default:'', length:50})
param_value: string;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
@Column({ comment:'{name:"鐘舵��",dict:{"1":"鍚敤", "0":"鍋滅敤"}}', type:'int', default:1, width:0})
diff --git a/src/app/modules/business/entity/basedevicesection.ts b/src/app/modules/business/entity/basedevicesection.ts
index 0590fc8..a916db1 100644
--- a/src/app/modules/business/entity/basedevicesection.ts
+++ b/src/app/modules/business/entity/basedevicesection.ts
@@ -6,19 +6,19 @@
聽 聽 聽 聽 */
@EntityModel('t_base_devicesection')
export class Basedevicesection extends BaseEntity {
-@Column({ comment:'{name:"閰嶇疆浜�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"閰嶇疆浜�"}', type:'varchar', default:'', length:50})
configurator: string;
-@Column({ comment:'{name:"鐗╃悊搴忓垪鍙�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鐗╃悊搴忓垪鍙�"}', type:'varchar', default:'', length:50})
device_id: string;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
-@Column({ comment:'{name:"缁勪欢"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"缁勪欢"}', type:'varchar', default:'', length:50})
section_name: string;
-@Column({ comment:'{name:"椤哄簭"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"椤哄簭"}', type:'varchar', default:'', length:50})
section_sort: string;
@Column({ comment:'{name:"缁勪欢绫诲瀷",dict:{"1":"宸ユ帶鏈�","2":"缃戝崱","3":"鍙鍏夋帰澶�","4":"姣背娉㈤浄杈�"}}', type:'int', default:null, width:0})
diff --git a/src/app/modules/business/entity/basedevicestatus.ts b/src/app/modules/business/entity/basedevicestatus.ts
index c44577a..5b60202 100644
--- a/src/app/modules/business/entity/basedevicestatus.ts
+++ b/src/app/modules/business/entity/basedevicestatus.ts
@@ -9,16 +9,16 @@
@Column({ comment:'{name:"绫诲埆",dict:{"1":"蹇冭烦", "2":"鍛婅"}}', type:'int', default:null, width:0})
alarm_type: number;
-@Column({ comment:'{name:"鐗╃悊搴忓垪鍙�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鐗╃悊搴忓垪鍙�"}', type:'varchar', default:'', length:50})
device_id: string;
-@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'', length:50})
logic_id: string;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
-@Column({ comment:'{name:"涓婃姤鍐呭",tips:"鍙互鏄痡son鏍煎紡"}', type:'varchar', default:'null', length:200})
+@Column({ comment:'{name:"涓婃姤鍐呭",tips:"鍙互鏄痡son鏍煎紡"}', type:'varchar', default:'', length:200})
report_content: string;
@Column({ comment:'{name:"涓婃姤鏃堕棿"}', type:'datetime'})
diff --git a/src/app/modules/business/entity/colletdata.ts b/src/app/modules/business/entity/colletdata.ts
index f838fe1..232bfbb 100644
--- a/src/app/modules/business/entity/colletdata.ts
+++ b/src/app/modules/business/entity/colletdata.ts
@@ -6,16 +6,16 @@
聽 聽 聽 聽 */
@EntityModel('t_monitor_collet_data')
export class Colletdata extends BaseEntity {
-@Column({ comment:'{name:"鏁版嵁鍐呭"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鏁版嵁鍐呭"}', type:'varchar', default:'', length:50})
data_content: string;
-@Column({ comment:'{name:"鏁版嵁鏂囦欢璺緞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鏁版嵁鏂囦欢璺緞"}', type:'varchar', default:'', length:50})
data_path: string;
@Column({ comment:'{name:"鏄惁鍛ㄦ湡浠诲姟",dict:{"1":"鍛ㄦ湡浠诲姟","0":"鍗虫椂鎬т换鍔�"}}', type:'int', default:null, width:0})
is_periodic: number;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
@Column({ comment:'{name:"鐘舵��",dict:{"1":"鍚敤", "0":"鍋滅敤"}}', type:'int', default:1, width:0})
diff --git a/src/app/modules/business/entity/colletmeta.ts b/src/app/modules/business/entity/colletmeta.ts
index 2de6318..63b03d2 100644
--- a/src/app/modules/business/entity/colletmeta.ts
+++ b/src/app/modules/business/entity/colletmeta.ts
@@ -12,7 +12,7 @@
@Column({ comment:'{name:""}', type:'int', default:null, width:0})
meta_data_id: number;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
@Column({ comment:'{name:"鐘舵��",dict:{"1":"鍚敤", "0":"鍋滅敤"}}', type:'int', default:1, width:0})
diff --git a/src/app/modules/business/entity/comconfig.ts b/src/app/modules/business/entity/comconfig.ts
index 25083ca..113f66f 100644
--- a/src/app/modules/business/entity/comconfig.ts
+++ b/src/app/modules/business/entity/comconfig.ts
@@ -12,10 +12,10 @@
@Column({ comment:'{name:"妯″瀷ID"}', type:'int', default:null, width:0})
model_id: number;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
-@Column({ comment:'{name:""}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:""}', type:'varchar', default:'', length:50})
sortby: string;
@Column({ comment:'{name:"鐘舵��",dict:{"1":"鍚敤", "0":"鍋滅敤"}}', type:'int', default:1, width:0})
diff --git a/src/app/modules/business/entity/deviceattachment.ts b/src/app/modules/business/entity/deviceattachment.ts
index 4956d82..6e97f08 100644
--- a/src/app/modules/business/entity/deviceattachment.ts
+++ b/src/app/modules/business/entity/deviceattachment.ts
@@ -6,28 +6,28 @@
聽 聽 聽 聽 */
@EntityModel('t_base_device_attachment')
export class Deviceattachment extends BaseEntity {
-@Column({ comment:'{name:"闄勪欢鍚嶇О"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"闄勪欢鍚嶇О"}', type:'varchar', default:'', length:50})
attach_name: string;
-@Column({ comment:'{name:"椤哄簭缂栧彿"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"椤哄簭缂栧彿"}', type:'varchar', default:'', length:50})
attach_sort: string;
-@Column({ comment:'{name:"闄勪欢绫诲瀷", dict:{"1":"浣跨敤璇存槑","2":"瀹夎浣嶇疆鐓х墖"}}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"闄勪欢绫诲瀷", dict:{"1":"浣跨敤璇存槑","2":"瀹夎浣嶇疆鐓х墖"}}', type:'varchar', default:'', length:50})
attach_type: string;
-@Column({ comment:'{name:"闄勪欢璁块棶璺緞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"闄勪欢璁块棶璺緞"}', type:'varchar', default:'', length:50})
attach_url: string;
-@Column({ comment:'{name:"闄勪欢鎻愪緵浜�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"闄勪欢鎻愪緵浜�"}', type:'varchar', default:'', length:50})
configurator: string;
-@Column({ comment:'{name:"鐗╃悊ID"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鐗╃悊ID"}', type:'varchar', default:'', length:50})
device_id: string;
-@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'', length:50})
logic_id: string;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
@Column({ comment:'{name:"鐘舵��",dict:{"1":"鍚敤", "0":"鍋滅敤"}}', type:'int', default:1, width:0})
diff --git a/src/app/modules/business/entity/devicegroup.ts b/src/app/modules/business/entity/devicegroup.ts
index 222c818..4e90c15 100644
--- a/src/app/modules/business/entity/devicegroup.ts
+++ b/src/app/modules/business/entity/devicegroup.ts
@@ -6,10 +6,10 @@
聽 聽 聽 聽 */
@EntityModel('t_base_device_group')
export class Devicegroup extends BaseEntity {
-@Column({ comment:'鍒嗙粍璁剧疆浜哄憳', type:'varchar', default:'null', length:255})
+@Column({ comment:'鍒嗙粍璁剧疆浜哄憳', type:'varchar', default:'', length:255})
configurator: string;
-@Column({ comment:'閫昏緫ID', type:'varchar', default:'null', length:255})
+@Column({ comment:'閫昏緫ID', type:'varchar', default:'', length:255})
logic_id: string;
@Column({ comment:'澶囨敞', type:'varchar', default:'', length:255})
diff --git a/src/app/modules/business/entity/deviceopreraterecord.ts b/src/app/modules/business/entity/deviceopreraterecord.ts
index 001a84e..4171f5c 100644
--- a/src/app/modules/business/entity/deviceopreraterecord.ts
+++ b/src/app/modules/business/entity/deviceopreraterecord.ts
@@ -6,25 +6,25 @@
聽 聽 聽 聽 */
@EntityModel('t_base_device_opreraterecord')
export class Deviceopreraterecord extends BaseEntity {
-@Column({ comment:'{name:"鐗╃悊搴忓垪鍙�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鐗╃悊搴忓垪鍙�"}', type:'varchar', default:'', length:50})
device_id: string;
-@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'', length:50})
logic_id: string;
-@Column({ comment:'{name:"杩愮淮鍐呭"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"杩愮淮鍐呭"}', type:'varchar', default:'', length:50})
operate_content: string;
-@Column({ comment:'{name:"杩愮淮绫诲瀷",dict:{"1":"宸℃","2":"缁翠慨"}}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"杩愮淮绫诲瀷",dict:{"1":"宸℃","2":"缁翠慨"}}', type:'varchar', default:'', length:50})
operate_type: string;
-@Column({ comment:'{name:"杩愮淮浜哄憳"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"杩愮淮浜哄憳"}', type:'varchar', default:'', length:50})
operater: string;
-@Column({ comment:'{name:"鏂囦欢璺緞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鏂囦欢璺緞"}', type:'varchar', default:'', length:50})
pic_url: string;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
@Column({ comment:'{name:"鐘舵��",dict:{"1":"鍚敤", "0":"鍋滅敤"}}', type:'int', default:1, width:0})
diff --git a/src/app/modules/business/entity/doutrubine.ts b/src/app/modules/business/entity/doutrubine.ts
index 729b29d..cf47b1b 100644
--- a/src/app/modules/business/entity/doutrubine.ts
+++ b/src/app/modules/business/entity/doutrubine.ts
@@ -6,49 +6,49 @@
聽 聽 聽 聽 */
@EntityModel('t_base_dou_trubine')
export class Doutrubine extends BaseEntity {
-@Column({ comment:'鏃嬭浆鐩村緞', type:'varchar', default:'null', length:255})
+@Column({ comment:'鏃嬭浆鐩村緞', type:'varchar', default:'', length:255})
diameter_wheel: string;
-@Column({ comment:'dou_wheel_volumn', type:'varchar', default:'null', length:255})
+@Column({ comment:'dou_wheel_volumn', type:'varchar', default:'', length:255})
dou_wheel_volumn: string;
-@Column({ comment:'max_reclaiming', type:'varchar', default:'null', length:255})
+@Column({ comment:'max_reclaiming', type:'varchar', default:'', length:255})
max_reclaiming: string;
-@Column({ comment:'鐓ゅ爢2', type:'varchar', default:'null', length:255})
+@Column({ comment:'鐓ゅ爢2', type:'varchar', default:'', length:255})
max_windrow: string;
-@Column({ comment:'petch_angle', type:'varchar', default:'null', length:255})
+@Column({ comment:'petch_angle', type:'varchar', default:'', length:255})
petch_angle: string;
-@Column({ comment:'鏃嬭浆鐩村緞', type:'varchar', default:'null', length:255})
+@Column({ comment:'鏃嬭浆鐩村緞', type:'varchar', default:'', length:255})
pie_height_down: string;
-@Column({ comment:'鏃嬭浆鐩村緞', type:'varchar', default:'null', length:255})
+@Column({ comment:'鏃嬭浆鐩村緞', type:'varchar', default:'', length:255})
pie_height_up: string;
-@Column({ comment:'rated_reclaiming', type:'varchar', default:'null', length:255})
+@Column({ comment:'rated_reclaiming', type:'varchar', default:'', length:255})
rated_reclaiming: string;
-@Column({ comment:'鐓ゅ爢1', type:'varchar', default:'null', length:255})
+@Column({ comment:'鐓ゅ爢1', type:'varchar', default:'', length:255})
rated_windrow: string;
-@Column({ comment:'澶囨敞', type:'varchar', default:'null', length:255})
+@Column({ comment:'澶囨敞', type:'varchar', default:'', length:255})
remark: string;
@Column({ comment:'鐘舵��', type:'tinyint', default:1, width:0})
status: number;
-@Column({ comment:'鏂楄疆鏈哄悕绉�', type:'varchar', default:'null', length:255})
+@Column({ comment:'鏂楄疆鏈哄悕绉�', type:'varchar', default:'', length:255})
trubine_name: string;
-@Column({ comment:'鏂楄疆鏈虹紪鍙�', type:'varchar', default:'null', length:255})
+@Column({ comment:'鏂楄疆鏈虹紪鍙�', type:'varchar', default:'', length:255})
trubine_no: string;
-@Column({ comment:'鍨嬪彿灏哄', type:'varchar', default:'null', length:255})
+@Column({ comment:'鍨嬪彿灏哄', type:'varchar', default:'', length:255})
trubine_size: string;
-@Column({ comment:'鏂楄疆鏈虹被鍒�', type:'varchar', default:'null', length:255})
+@Column({ comment:'鏂楄疆鏈虹被鍒�', type:'varchar', default:'', length:255})
trubine_type: string;
}
\ No newline at end of file
diff --git a/src/app/modules/business/entity/execrecord.ts b/src/app/modules/business/entity/execrecord.ts
index 9b80c16..94ab8e4 100644
--- a/src/app/modules/business/entity/execrecord.ts
+++ b/src/app/modules/business/entity/execrecord.ts
@@ -6,31 +6,31 @@
聽 聽 聽 聽 */
@EntityModel('t_task_exec_record')
export class Execrecord extends BaseEntity {
-@Column({ comment:'{name:"鐗╃悊搴忓垪鍙�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鐗╃悊搴忓垪鍙�"}', type:'varchar', default:'', length:50})
device_id: string;
-@Column({ comment:'璁惧鎵ц浠诲姟鏃跺埢鐨勭浉鍏冲弬鏁帮紝json鏍煎紡銆�', type:'varchar', default:'null', length:200})
+@Column({ comment:'璁惧鎵ц浠诲姟鏃跺埢鐨勭浉鍏冲弬鏁帮紝json鏍煎紡銆�', type:'varchar', default:'', length:200})
device_params: string;
@Column({ comment:'{name:"缁熻鎴鏃堕棿"}', type:'datetime'})
end_time: Date;
-@Column({ comment:'{name:"鎵ц缁撴灉"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鎵ц缁撴灉"}', type:'varchar', default:'', length:50})
exec_result: string;
-@Column({ comment:'{name:"鎵ц鑰楁椂"}', type:'varchar', default:'null', length:0})
+@Column({ comment:'{name:"鎵ц鑰楁椂"}', type:'varchar', default:'', length:255})
exec_time: string;
@Column({ comment:'{name:"鏄惁鍛ㄦ湡浠诲姟",dict:{"1":"鍛ㄦ湡浠诲姟","0":"鍗虫椂鎬т换鍔�"}}', type:'int', default:null, width:0})
is_periodic: number;
-@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'', length:50})
logic_id: string;
@Column({ comment:'{name:"鏈嶅姟绔暟鎹帴鏀舵椂闂�"}', type:'datetime'})
receive_time: Date;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
@Column({ comment:'{name:"鏁版嵁鍥炰紶鏃堕棿"}', type:'datetime'})
@@ -42,7 +42,7 @@
@Column({ comment:'{name:"鐘舵��",dict:{"1":"鍚敤", "0":"鍋滅敤"}}', type:'int', default:1, width:0})
status: number;
-@Column({ comment:'{name:"浠诲姟鎸囦护}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"浠诲姟鎸囦护}', type:'varchar', default:'', length:50})
task_command: string;
@Column({ comment:'{name:"浠诲姟ID",tips:"鍛ㄦ湡浠诲姟琛ㄦ垨鑰呭嵆鏃朵换鍔¤〃涓婚敭"}', type:'int', default:null, width:0})
diff --git a/src/app/modules/business/entity/interfacelist.ts b/src/app/modules/business/entity/interfacelist.ts
index f37f089..9aa928a 100644
--- a/src/app/modules/business/entity/interfacelist.ts
+++ b/src/app/modules/business/entity/interfacelist.ts
@@ -6,40 +6,40 @@
聽 聽 聽 聽 */
@EntityModel('t_config_interface_list')
export class Interfacelist extends BaseEntity {
-@Column({ comment:'璐﹀彿', type:'varchar', default:'null', length:50})
+@Column({ comment:'璐﹀彿', type:'varchar', default:'', length:50})
auth_account: string;
-@Column({ comment:'瀵嗙爜', type:'varchar', default:'null', length:50})
+@Column({ comment:'瀵嗙爜', type:'varchar', default:'', length:50})
auth_psw: string;
-@Column({ comment:'璁よ瘉鏂瑰紡', type:'varchar', default:'null', length:50})
+@Column({ comment:'璁よ瘉鏂瑰紡', type:'varchar', default:'', length:50})
interface_auth: string;
-@Column({ comment:'鎺ュ彛IP', type:'varchar', default:'null', length:150})
+@Column({ comment:'鎺ュ彛IP', type:'varchar', default:'', length:150})
interface_ip: string;
-@Column({ comment:'鎺ュ彛鍚嶇О', type:'varchar', default:'null', length:50})
+@Column({ comment:'鎺ュ彛鍚嶇О', type:'varchar', default:'', length:50})
interface_name: string;
-@Column({ comment:'绔彛', type:'varchar', default:'null', length:50})
+@Column({ comment:'绔彛', type:'varchar', default:'', length:50})
interface_port: string;
-@Column({ comment:'鎺ュ彛鍗忚', type:'varchar', default:'null', length:50})
+@Column({ comment:'鎺ュ彛鍗忚', type:'varchar', default:'', length:50})
interface_protocal: string;
-@Column({ comment:'鎺ュ彛绫诲瀷', type:'varchar', default:'null', length:50})
+@Column({ comment:'鎺ュ彛绫诲瀷', type:'varchar', default:'', length:50})
interface_type: string;
-@Column({ comment:'鎺ュ彛鍦板潃', type:'varchar', default:'null', length:50})
+@Column({ comment:'鎺ュ彛鍦板潃', type:'varchar', default:'', length:50})
interface_url: string;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
-@Column({ comment:'', type:'varchar', default:'null', length:50})
+@Column({ comment:'', type:'varchar', default:'', length:50})
share_service: string;
-@Column({ comment:'', type:'varchar', default:'null', length:50})
+@Column({ comment:'', type:'varchar', default:'', length:50})
share_url: string;
@Column({ comment:'{name:"鐘舵��",dict:{"1":"鍚敤", "0":"鍋滅敤"}}', type:'int', default:1, width:0})
diff --git a/src/app/modules/business/entity/interfacerecord.ts b/src/app/modules/business/entity/interfacerecord.ts
index 3eba1bb..1022b8e 100644
--- a/src/app/modules/business/entity/interfacerecord.ts
+++ b/src/app/modules/business/entity/interfacerecord.ts
@@ -9,22 +9,22 @@
@Column({ comment:'{name:"璋冪敤缁撴潫"}', type:'datetime'})
end_time: Date;
-@Column({ comment:'{name:"鎺ュ彛璋冪敤鍦板潃"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鎺ュ彛璋冪敤鍦板潃"}', type:'varchar', default:'', length:50})
interface_direct: string;
-@Column({ comment:'{name:"鎺ュ彛娓呭崟ID"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鎺ュ彛娓呭崟ID"}', type:'varchar', default:'', length:50})
interface_id: string;
-@Column({ comment:'{name:"璋冪敤鍙傛暟",tips:"json鏍煎紡"}', type:'varchar', default:'null', length:150})
+@Column({ comment:'{name:"璋冪敤鍙傛暟",tips:"json鏍煎紡"}', type:'varchar', default:'', length:150})
params: string;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
-@Column({ comment:'璇锋眰绫诲瀷', type:'varchar', default:'null', length:50})
+@Column({ comment:'璇锋眰绫诲瀷', type:'varchar', default:'', length:50})
request_type: string;
-@Column({ comment:'{name:"璋冪敤缁撴灉"}', type:'varchar', default:'null', length:150})
+@Column({ comment:'{name:"璋冪敤缁撴灉"}', type:'varchar', default:'', length:150})
result: string;
@Column({ comment:'{name:"寮�濮嬫椂闂�"}', type:'datetime'})
diff --git a/src/app/modules/business/entity/messagerecord.ts b/src/app/modules/business/entity/messagerecord.ts
index 1cd822c..f97d8c2 100644
--- a/src/app/modules/business/entity/messagerecord.ts
+++ b/src/app/modules/business/entity/messagerecord.ts
@@ -9,16 +9,16 @@
@Column({ comment:'1-鍛ㄦ湡浠诲姟 0-鍗虫椂鎬т换鍔�', type:'int', default:null, width:0})
is_periodic: number;
-@Column({ comment:'娑堟伅', type:'varchar', default:'null', length:50})
+@Column({ comment:'娑堟伅', type:'varchar', default:'', length:50})
message: string;
-@Column({ comment:'鍙戦�佹簮 ', type:'varchar', default:'null', length:50})
+@Column({ comment:'鍙戦�佹簮 ', type:'varchar', default:'', length:50})
msg_source: string;
-@Column({ comment:'鍙戦�佺洰鏍�', type:'varchar', default:'null', length:50})
+@Column({ comment:'鍙戦�佺洰鏍�', type:'varchar', default:'', length:50})
msg_target: string;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
@Column({ comment:'鍙戦�佹椂闂�', type:'datetime'})
diff --git a/src/app/modules/business/entity/metadata.ts b/src/app/modules/business/entity/metadata.ts
index 56b0abf..03457bd 100644
--- a/src/app/modules/business/entity/metadata.ts
+++ b/src/app/modules/business/entity/metadata.ts
@@ -6,13 +6,13 @@
聽 聽 聽 聽 */
@EntityModel('t_monitor_meta_data')
export class Metadata extends BaseEntity {
-@Column({ comment:'{name:"鏁版嵁鏂囦欢鍐呭"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鏁版嵁鏂囦欢鍐呭"}', type:'varchar', default:'', length:50})
data_content: string;
-@Column({ comment:'{name:"鏁版嵁鏂囦欢璺緞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鏁版嵁鏂囦欢璺緞"}', type:'varchar', default:'', length:50})
data_path: string;
-@Column({ comment:'{name:"鐗╃悊搴忓垪鍙�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鐗╃悊搴忓垪鍙�"}', type:'varchar', default:'', length:50})
device_id: string;
@Column({ comment:'{name:"鎵ц璁板綍"}', type:'int', default:null, width:0})
@@ -21,10 +21,10 @@
@Column({ comment:'{name:"鏄惁鍛ㄦ湡浠诲姟",dict:{"1":"鍛ㄦ湡浠诲姟","0":"鍗虫椂鎬т换鍔�"}}', type:'int', default:null, width:0})
is_periodic: number;
-@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'', length:50})
logic_id: string;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
@Column({ comment:'{name:"鐘舵��",dict:{"1":"鍚敤", "0":"鍋滅敤"}}', type:'int', default:1, width:0})
diff --git a/src/app/modules/business/entity/modelcombination.ts b/src/app/modules/business/entity/modelcombination.ts
index 7421706..1cd303c 100644
--- a/src/app/modules/business/entity/modelcombination.ts
+++ b/src/app/modules/business/entity/modelcombination.ts
@@ -6,16 +6,16 @@
聽 聽 聽 聽 */
@EntityModel('t_model_combination')
export class Modelcombination extends BaseEntity {
-@Column({ comment:'{name:"鏁版嵁鍐呭"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鏁版嵁鍐呭"}', type:'varchar', default:'', length:50})
data_content: string;
-@Column({ comment:'{name:"鏁版嵁鏂囦欢璺緞",tips:"url鏍煎紡,鍩熷悕鍙敱鏈嶅姟绔垨鑰呭墠绔厤缃�"', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鏁版嵁鏂囦欢璺緞",tips:"url鏍煎紡,鍩熷悕鍙敱鏈嶅姟绔垨鑰呭墠绔厤缃�"', type:'varchar', default:'', length:50})
data_path: string;
@Column({ comment:'{name:"浠诲姟绫诲瀷",dict:{"1":"鍛ㄦ湡浠诲姟", "0":"鍗虫椂浠诲姟"}}', type:'int', default:null, width:0})
is_periodic: number;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
@Column({ comment:'{name:"鐘舵��",dict:{"1":"鍚敤", "0":"鍋滅敤"}}', type:'int', default:1, width:0})
diff --git a/src/app/modules/business/entity/modelstatic.ts b/src/app/modules/business/entity/modelstatic.ts
index 715cdd7..5024c85 100644
--- a/src/app/modules/business/entity/modelstatic.ts
+++ b/src/app/modules/business/entity/modelstatic.ts
@@ -6,19 +6,19 @@
聽 聽 聽 聽 */
@EntityModel('t_model_static')
export class Modelstatic extends BaseEntity {
-@Column({ comment:'{name:"鏁版嵁鍐呭"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鏁版嵁鍐呭"}', type:'varchar', default:'', length:50})
data_content: string;
-@Column({ comment:'{name:"鏁版嵁鏂囦欢璺緞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鏁版嵁鏂囦欢璺緞"}', type:'varchar', default:'', length:50})
data_path: string;
-@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'', length:50})
logic_id: string;
-@Column({ comment:'', type:'varchar', default:'null', length:50})
+@Column({ comment:'', type:'varchar', default:'', length:50})
name: string;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
@Column({ comment:'{name:"鐘舵��",dict:{"1":"鍚敤", "0":"鍋滅敤"}}', type:'int', default:1, width:0})
diff --git a/src/app/modules/business/entity/periodicsetting.ts b/src/app/modules/business/entity/periodicsetting.ts
index 4180468..dce098f 100644
--- a/src/app/modules/business/entity/periodicsetting.ts
+++ b/src/app/modules/business/entity/periodicsetting.ts
@@ -2,38 +2,38 @@
import { BaseEntity } from '@cool-midway/core';
import { Column, Double } from 'typeorm';
/**
-聽 聽 聽 聽 * 鍒嗙粍浠诲姟鍙傛暟璁剧疆
-聽 聽 聽 聽 */
-@EntityModel('t_task_periodic_setting')
-export class Periodicsetting extends BaseEntity {
-@Column({ comment:'鍛ㄦ湡浠诲姟', type:'varchar', default:'null', length:255})
-crontab_rule: string;
+ * 鍒嗙粍浠诲姟鍙傛暟璁剧疆
+ */
+@EntityModel('t_task_periodic_setting')
+export class Periodicsetting extends BaseEntity {
+ @Column({ comment: '鍛ㄦ湡浠诲姟', type: 'varchar', default: '', length: 255 })
+ crontab_rule: string;
-@Column({ comment:'浠诲姟缁撴潫鏃堕棿', type:'datetime'})
-end_time: Date;
+ @Column({ comment: '浠诲姟缁撴潫鏃堕棿', type: 'datetime' })
+ end_time: Date;
-@Column({ comment:'璁惧鍒嗙粍ID', type:'int', default:null, width:0})
-group_id: number;
+ @Column({ comment: '璁惧鍒嗙粍ID', type: 'int', default: null, width: 0 })
+ group_id: number;
-@Column({ comment:'璁剧疆浜�', type:'varchar', default:'null', length:255})
-operator: string;
+ @Column({ comment: '璁剧疆浜�', type: 'varchar', default: '', length: 255 })
+ operator: string;
-@Column({ comment:'澶囨敞', type:'varchar', default:'null', length:255})
-remark: string;
+ @Column({ comment: '澶囨敞', type: 'varchar', default: '', length: 255 })
+ remark: string;
-@Column({ comment:'鐘舵��', type:'tinyint', default:1, width:0})
-status: number;
+ @Column({ comment: '鐘舵��', type: 'tinyint', default: 1, width: 0 })
+ status: number;
-@Column({ comment:'浠诲姟鍛戒护鏍煎紡', type:'varchar', default:'null', length:255})
-task_command: string;
+ @Column({ comment: '浠诲姟鍛戒护鏍煎紡', type: 'varchar', default: '', length: 255 })
+ task_command: string;
-@Column({ comment:'浠诲姟鍐呭鎻忚堪', type:'varchar', default:'null', length:255})
-task_content: string;
+ @Column({ comment: '浠诲姟鍐呭鎻忚堪', type: 'varchar', default: '', length: 255 })
+ task_content: string;
-@Column({ comment:'浠诲姟鍙傛暟', type:'varchar', default:'null', length:255})
-task_params: string;
+ @Column({ comment: '浠诲姟鍙傛暟', type: 'varchar', default: '', length: 255 })
+ task_params: string;
-@Column({ comment:'浠诲姟绫诲瀷', type:'int', default:null, width:0})
-task_type: number;
+ @Column({ comment: '浠诲姟绫诲瀷', type: 'int', default: null, width: 0 })
+ task_type: number;
}
\ No newline at end of file
diff --git a/src/app/modules/business/entity/planinventory.ts b/src/app/modules/business/entity/planinventory.ts
index b5c7878..8511a9f 100644
--- a/src/app/modules/business/entity/planinventory.ts
+++ b/src/app/modules/business/entity/planinventory.ts
@@ -6,13 +6,13 @@
聽 聽 聽 聽 */
@EntityModel('t_plan_inventory')
export class Planinventory extends BaseEntity {
-@Column({ comment:'{name:"鐓ょ鏍囪"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鐓ょ鏍囪"}', type:'varchar', default:'', length:50})
coal_marker: string;
-@Column({ comment:'{name:"鐓ゅ爢浣撶Н"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鐓ゅ爢浣撶Н"}', type:'varchar', default:'', length:50})
coal_volume: string;
-@Column({ comment:'{name:"鐓ゅ爢閲嶉噺",tips:"鍗曚綅鍚�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鐓ゅ爢閲嶉噺",tips:"鍗曚綅鍚�"}', type:'varchar', default:'', length:50})
coal_weight: string;
@Column({ comment:'{name:"缁勫悎鐐逛簯ID"}', type:'int', default:null, width:0})
@@ -21,10 +21,10 @@
@Column({ comment:'{name:"鐩樼叅璁″垝ID"}', type:'int', default:null, width:0})
plan_id: number;
-@Column({ comment:'{name:"鐩樼叅鍚嶇О"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鐩樼叅鍚嶇О"}', type:'varchar', default:'', length:50})
plan_name: string;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
@Column({ comment:'{name:"鐘舵��",dict:{"1":"鍚敤", "0":"鍋滅敤"}}', type:'int', default:1, width:0})
diff --git a/src/app/modules/business/entity/pointcloud.ts b/src/app/modules/business/entity/pointcloud.ts
index 1269979..96a04c1 100644
--- a/src/app/modules/business/entity/pointcloud.ts
+++ b/src/app/modules/business/entity/pointcloud.ts
@@ -6,7 +6,7 @@
聽 聽 聽 聽 */
@EntityModel('t_model_point_cloud')
export class Pointcloud extends BaseEntity {
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
@Column({ comment:'{name:"鐘舵��",dict:{"1":"鍚敤", "0":"鍋滅敤"}}', type:'int', default:1, width:0})
diff --git a/src/app/modules/business/entity/pointmodel.ts b/src/app/modules/business/entity/pointmodel.ts
index 462d9c9..37e801c 100644
--- a/src/app/modules/business/entity/pointmodel.ts
+++ b/src/app/modules/business/entity/pointmodel.ts
@@ -6,25 +6,25 @@
聽 聽 聽 聽 */
@EntityModel('t_model_point_model')
export class Pointmodel extends BaseEntity {
-@Column({ comment:'{name:"鏁版嵁鍐呭"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鏁版嵁鍐呭"}', type:'varchar', default:'', length:50})
data_content: string;
-@Column({ comment:'{name:"鏁版嵁鏂囦欢璺緞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鏁版嵁鏂囦欢璺緞"}', type:'varchar', default:'', length:50})
data_path: string;
-@Column({ comment:'{name:"鐗╃悊搴忓垪鍙�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鐗╃悊搴忓垪鍙�"}', type:'varchar', default:'', length:50})
device_id: string;
@Column({ comment:'{name:"鏄惁鍛ㄦ湡浠诲姟",dict:{"1":"鍛ㄦ湡浠诲姟","0":"鍗虫椂鎬т换鍔�"}}', type:'int', default:null, width:0})
is_periodic: number;
-@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'', length:50})
logic_id: string;
-@Column({ comment:'{name:"鐐逛簯鍚嶇О"format:"浠�${logic_id#YYYYMMDDHHMMSS}"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鐐逛簯鍚嶇О"format:"浠�${logic_id#YYYYMMDDHHMMSS}"}', type:'varchar', default:'', length:50})
name: string;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
@Column({ comment:'{name:"鐘舵��",dict:{"1":"鍚敤", "0":"鍋滅敤"}}', type:'int', default:1, width:0})
diff --git a/src/app/modules/business/entity/statdata.ts b/src/app/modules/business/entity/statdata.ts
index 0e29b7a..d82a8eb 100644
--- a/src/app/modules/business/entity/statdata.ts
+++ b/src/app/modules/business/entity/statdata.ts
@@ -27,7 +27,7 @@
@Column({ comment:'{name:"鍐呭瓨"}', type:'int', default:null, width:0})
memory: number;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
@Column({ comment:'{name:"缁熻璧峰鏃堕棿"}', type:'datetime'})
diff --git a/src/app/modules/business/entity/taskimmediately.ts b/src/app/modules/business/entity/taskimmediately.ts
index f59d779..28c96a9 100644
--- a/src/app/modules/business/entity/taskimmediately.ts
+++ b/src/app/modules/business/entity/taskimmediately.ts
@@ -6,28 +6,28 @@
聽 聽 聽 聽 */
@EntityModel('t_task_immediately')
export class Taskimmediately extends BaseEntity {
-@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'', length:50})
logic_ids: string;
-@Column({ comment:'{name:"璁剧疆鏃堕棿"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"璁剧疆鏃堕棿"}', type:'varchar', default:'', length:50})
operate_time: string;
-@Column({ comment:'{name:"鎿嶄綔浜�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鎿嶄綔浜�"}', type:'varchar', default:'', length:50})
operator: string;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
@Column({ comment:'{name:"鐘舵��",dict:{"1":"鎵ц涓�", "0":"鏈墽琛�", "2":"宸叉墽琛�"}}', type:'int', default:1, width:0})
status: number;
-@Column({ comment:'{name:"浠诲姟鎸囦护"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"浠诲姟鎸囦护"}', type:'varchar', default:'', length:50})
task_command: string;
-@Column({ comment:'{name:"浠诲姟鍐呭鎻忚堪"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"浠诲姟鍐呭鎻忚堪"}', type:'varchar', default:'', length:50})
task_content: string;
-@Column({ comment:'{name:"浠诲姟鍙傛暟",tips:"濡傜偣浜戝弬鏁�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"浠诲姟鍙傛暟",tips:"濡傜偣浜戝弬鏁�"}', type:'varchar', default:'', length:50})
task_params: string;
@Column({ comment:'{name:"浠诲姟绫诲瀷",dict:{"1":"鎶撳浘","2":"闆疯揪鎵弿","3":"闄ゅ皹"}}', type:'int', default:null, width:0})
diff --git a/src/app/modules/business/entity/taskmonitor.ts b/src/app/modules/business/entity/taskmonitor.ts
index a89c0f9..cf82bf6 100644
--- a/src/app/modules/business/entity/taskmonitor.ts
+++ b/src/app/modules/business/entity/taskmonitor.ts
@@ -6,37 +6,37 @@
聽 聽 聽 聽 */
@EntityModel('t_task_monitor')
export class Taskmonitor extends BaseEntity {
-@Column({ comment:'{name:"鍛ㄦ湡浠诲姟鍛ㄦ湡璁剧疆",tips:"璋冨害琛ㄨ揪寮�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鍛ㄦ湡浠诲姟鍛ㄦ湡璁剧疆",tips:"璋冨害琛ㄨ揪寮�"}', type:'varchar', default:'', length:50})
crontab_rule: string;
@Column({ comment:'{name:"鏄惁鍛ㄦ湡浠诲姟",dict:{"1":"鍛ㄦ湡浠诲姟","0":"鍗虫椂鎬т换鍔�"}}', type:'int', default:null, width:0})
is_periodic: number;
-@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"璁惧閫昏緫ID"}', type:'varchar', default:'', length:50})
logic_ids: string;
-@Column({ comment:'{name:"鎿嶄綔鑰�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鎿嶄綔鑰�"}', type:'varchar', default:'', length:50})
operator: string;
@Column({ comment:'{name:"鎿嶄綔鏃堕棿"}', type:'datetime'})
opertate_time: Date;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
@Column({ comment:'{name:"鐘舵��",dict:{"1":"宸插彂閫�", "0":"鏈彂閫�"}}', type:'int', default:0, width:0})
status: number;
-@Column({ comment:'{name:"浠诲姟鎸囦护"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"浠诲姟鎸囦护"}', type:'varchar', default:'', length:50})
task_command: string;
-@Column({ comment:'{name:"浠诲姟鍐呭"}', type:'varchar', default:'null', length:100})
+@Column({ comment:'{name:"浠诲姟鍐呭"}', type:'varchar', default:'', length:100})
task_content: string;
@Column({ comment:'{name:"浠诲姟鏉ユ簮ID"}', type:'int', default:null, width:0})
task_id: number;
-@Column({ comment:'{name:"浠诲姟鍙傛暟"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"浠诲姟鍙傛暟"}', type:'varchar', default:'', length:50})
task_params: string;
@Column({ comment:'{name:"浠诲姟绫诲瀷",dict:{"1":"鎶撳浘","2":"闆疯揪鎵弿","3":"闄ゅ皹"}}', type:'int', default:null, width:0})
diff --git a/src/app/modules/business/entity/trubinelocation.ts b/src/app/modules/business/entity/trubinelocation.ts
index c03af76..cbcf2c4 100644
--- a/src/app/modules/business/entity/trubinelocation.ts
+++ b/src/app/modules/business/entity/trubinelocation.ts
@@ -6,22 +6,22 @@
聽 聽 聽 聽 */
@EntityModel('t_base_dou_trubine_location')
export class Trubinelocation extends BaseEntity {
-@Column({ comment:'{name:"楂樺害",format:0.00001,tips:"绮剧‘鍒板皬鏁扮偣鍚�6浣�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"楂樺害",format:0.00001,tips:"绮剧‘鍒板皬鏁扮偣鍚�6浣�"}', type:'varchar', default:'', length:50})
elevation: string;
-@Column({ comment:'{name:"鏂逛綅瑙�",format:0.00001,tips:"绮剧‘鍒板皬鏁扮偣鍚�6浣�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"鏂逛綅瑙�",format:0.00001,tips:"绮剧‘鍒板皬鏁扮偣鍚�6浣�"}', type:'varchar', default:'', length:50})
heading_angle: string;
-@Column({ comment:'{name:"绾害",format:0.00001,tips:"绮剧‘鍒板皬鏁扮偣鍚�6浣�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"绾害",format:0.00001,tips:"绮剧‘鍒板皬鏁扮偣鍚�6浣�"}', type:'varchar', default:'', length:50})
latitude: string;
-@Column({ comment:'{name:"缁忓害",format:0.00001,tips:"绮剧‘鍒板皬鏁扮偣鍚�6浣�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"缁忓害",format:0.00001,tips:"绮剧‘鍒板皬鏁扮偣鍚�6浣�"}', type:'varchar', default:'', length:50})
longitude: string;
-@Column({ comment:'{name:"绮惧害",format:0.00001,tips:"绮剧‘鍒板皬鏁扮偣鍚�6浣�"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"绮惧害",format:0.00001,tips:"绮剧‘鍒板皬鏁扮偣鍚�6浣�"}', type:'varchar', default:'', length:50})
precision: string;
-@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'null', length:50})
+@Column({ comment:'{name:"澶囨敞"}', type:'varchar', default:'', length:50})
remark: string;
@Column({ comment:'{name:"鐘舵��",dict:{"1":"鍚敤", "0":"鍋滅敤"}}', type:'int', default:1, width:0})
--
Gitblit v1.9.1