guhongwei 3 年之前
父节点
当前提交
d1212e2aab

app/controller/patent/.patent_info.js → app/controller/patent/.patentinfo.js


app/controller/patent/.patent_trans.js → app/controller/patent/.patenttrans.js


+ 2 - 2
app/controller/patent/patent_info.js

@@ -1,5 +1,5 @@
 'use strict';
-const meta = require('./.patent_info.js');
+const meta = require('./.patentinfo.js');
 const Controller = require('egg').Controller;
 const { CrudController } = require('naf-framework-mongoose/lib/controller');
 
@@ -7,7 +7,7 @@ const { CrudController } = require('naf-framework-mongoose/lib/controller');
 class PatentinfoController extends Controller {
   constructor(ctx) {
     super(ctx);
-    this.service = this.ctx.service.patent.patentInfo;
+    this.service = this.ctx.service.patent.patentinfo;
   }
 }
 module.exports = CrudController(PatentinfoController, meta);

+ 2 - 2
app/controller/patent/patent_trans.js

@@ -1,5 +1,5 @@
 'use strict';
-const meta = require('./.patent_trans.js');
+const meta = require('./.patenttrans.js');
 const Controller = require('egg').Controller;
 const { CrudController } = require('naf-framework-mongoose/lib/controller');
 
@@ -7,7 +7,7 @@ const { CrudController } = require('naf-framework-mongoose/lib/controller');
 class Patent_transController extends Controller {
   constructor(ctx) {
     super(ctx);
-    this.service = this.ctx.service.patent.patentTrans;
+    this.service = this.ctx.service.patent.patenttrans;
   }
 }
 module.exports = CrudController(Patent_transController, meta);

+ 1 - 1
app/model/patent/patent_info.js

@@ -38,5 +38,5 @@ schema.index({ 'meta.createdAt': 1 });
 schema.plugin(metaPlugin);
 module.exports = app => {
   const { mongoose } = app;
-  return mongoose.model('Patent_info', schema, 'patent_info');
+  return mongoose.model('Patentinfo', schema, 'patent_info');
 };

+ 3 - 3
app/model/patent/patent_trans.js

@@ -4,7 +4,7 @@ const moment = require('moment');
 const metaPlugin = require('naf-framework-mongoose/lib/model/meta-plugin');
 const { ObjectId } = require('mongoose').Types;
 // 专利交易表
-const patent_trans = {
+const patenttrans = {
   user_id: { type: ObjectId },
   patent_id: { type: ObjectId }, // 专利id
   patent_name: { type: String }, // 专利名
@@ -19,7 +19,7 @@ const patent_trans = {
   condition: { type: String }, // 合作条件及要求
   status: { type: String }, // 状态 0:未交易 1:已交易
 };
-const schema = new Schema(patent_trans, { toJSON: { virtuals: true } });
+const schema = new Schema(patenttrans, { toJSON: { virtuals: true } });
 schema.index({ id: 1 });
 schema.index({ patent_id: 1 });
 schema.index({ patent_name: 1 });
@@ -33,5 +33,5 @@ schema.index({ 'meta.createdAt': 1 });
 schema.plugin(metaPlugin);
 module.exports = app => {
   const { mongoose } = app;
-  return mongoose.model('Patent_trans', schema, 'patent_trans');
+  return mongoose.model('Patenttrans', schema, 'patent_trans');
 };

+ 2 - 2
app/router.js

@@ -85,6 +85,6 @@ module.exports = app => {
   require('./router/patent/patentapply')(app); // 专利申请表-审批单
   require('./router/patent/patentanalysis')(app); // 专利分析表-交底单
   require('./router/patent/patentassess')(app); // 专利评估表
-  require('./router/patent/patent_info')(app); // 专利信息表
-  require('./router/patent/patent_trans')(app); // 专利交易表
+  require('./router/patent/patentinfo')(app); // 专利信息表
+  require('./router/patent/patenttrans')(app); // 专利交易表
 };

+ 1 - 1
app/router/patent/patent_info.js

@@ -6,7 +6,7 @@ module.exports = app => {
   const profix = '/api/live/';
   const vision = 'v0';
   const index = 'patent';
-  const target = 'patentInfo';
+  const target = 'patentinfo';
   const metaTime = app.middleware.createTime();
   router.resources(target, `${profix}${vision}/${index}/${target}`, metaTime, controller[index][target]); // index、create、show、destroy
   router.post(target, `${profix}${vision}/${index}/${target}/update/:id`, controller[index][target].update);

+ 1 - 1
app/router/patent/patent_trans.js

@@ -6,7 +6,7 @@ module.exports = app => {
   const profix = '/api/live/';
   const vision = 'v0';
   const index = 'patent';
-  const target = 'patentTrans';
+  const target = 'patenttrans';
   const metaTime = app.middleware.createTime();
   router.resources(target, `${profix}${vision}/${index}/${target}`, metaTime, controller[index][target]); // index、create、show、destroy
   router.post(target, `${profix}${vision}/${index}/${target}/update/:id`, controller[index][target].update);

+ 1 - 1
app/service/patent/patent_info.js

@@ -8,7 +8,7 @@ const assert = require('assert');
 class PatentinfoService extends CrudService {
   constructor(ctx) {
     super(ctx, 'patentinfo');
-    this.model = this.ctx.model.Patent.PatentInfo;
+    this.model = this.ctx.model.Patent.Patentinfo;
   }
 }
 

+ 2 - 2
app/service/patent/patent_trans.js

@@ -7,8 +7,8 @@ const assert = require('assert');
 // 专利信息
 class Patent_transService extends CrudService {
   constructor(ctx) {
-    super(ctx, 'patent_trans');
-    this.model = this.ctx.model.Patent.PatentTrans;
+    super(ctx, 'patenttrans');
+    this.model = this.ctx.model.Patent.Patenttrans;
   }
 }