add

app/controller/.code.js

@@ -0,0 +1,53 @@
+module.exports = {
+  create: {
+    requestBody: ["code", "name", "category", "sort"],
+  },
+  destroy: {
+    params: ["!id"],
+    service: "delete",
+  },
+  update: {
+    params: ["!id"],
+    requestBody: ["code", "name", "category", "sort"],
+  },
+  show: {
+    parameters: {
+      params: ["!id"],
+    },
+    service: "fetch",
+  },
+  index: {
+    parameters: {
+      query: {
+        code: "code",
+        name: "name",
+        category: "category",
+        "create_time@start": "create_time@start",
+        "create_time@end": "create_time@end",
+      },
+      // options: {
+      //   "meta.state": 0 // 默认条件
+      // },
+    },
+    service: "query",
+    options: {
+      query: ["skip", "limit"],
+      sort: ["meta.createdAt"],
+      desc: true,
+      count: true,
+    },
+  },
+
+  xzqh: {
+    parameters: {
+      query: {
+        code: "code",
+      },
+    },
+    service: "xzqh",
+  },
+  codeName: {
+    requestBody: ["code"],
+    service: "codeName",
+  },
+};

app/controller/.online.js

@@ -0,0 +1,70 @@
+module.exports = {
+  create: {
+    requestBody: [
+      "column_name",
+      "title",
+      "image",
+      "organizers",
+      "contacts",
+      "phone",
+      "province",
+      "city",
+      "start_time",
+      "end_time",
+      "brief",
+      "video",
+      "status",
+    ],
+  },
+  destroy: {
+    params: ["!id"],
+    service: "delete",
+  },
+  update: {
+    params: ["!id"],
+    requestBody: [
+      "column_name",
+      "title",
+      "image",
+      "organizers",
+      "contacts",
+      "phone",
+      "province",
+      "city",
+      "start_time",
+      "end_time",
+      "brief",
+      "video",
+      "status",
+    ],
+  },
+  show: {
+    parameters: {
+      params: ["!id"],
+    },
+    service: "fetch",
+  },
+  index: {
+    parameters: {
+      query: {
+        column_name: "column_name",
+        title: "title",
+        start_time: "start_time",
+        end_time: "end_time",
+        status: "status",
+        "create_time@start": "create_time@start",
+        "create_time@end": "create_time@end",
+      },
+      // options: {
+      //   "meta.state": 0 // 默认条件
+      // },
+    },
+    service: "query",
+    options: {
+      query: ["skip", "limit"],
+      sort: ["meta.createdAt"],
+      desc: true,
+      count: true,
+    },
+  },
+};

app/controller/code.js

@@ -0,0 +1,13 @@
+'use strict';
+const meta = require('./.code.js');
+const Controller = require('egg').Controller;
+const { CrudController } = require('naf-framework-mongoose/lib/controller');
+
+// 字典表
+class CodeController extends Controller {
+  constructor(ctx) {
+    super(ctx);
+    this.service = this.ctx.service.code;
+  }
+}
+module.exports = CrudController(CodeController, meta);

app/controller/home.js

@@ -1,5 +1,5 @@
 'use strict';
-
+const _ = require('lodash');
 const Controller = require('egg').Controller;
 
 class HomeController extends Controller {
@@ -9,9 +9,23 @@ class HomeController extends Controller {
   }
 
   async utilMethod() {
-    const res = await this.ctx.model.Expert.find();
+    const res = await this.ctx.model.RoadShow.find();
     for (const i of res) {
-      i.passwd = { secret: '111111' };
+      const { picture, filepath } = i;
+      if (_.isArray(picture) && picture.length > 0) {
+        const arr = [];
+        for (let i = 0; i < picture.length; i++) {
+          if (_.isString(picture[i])) arr.push({ name: `img${i + 1}`, url: picture[i] });
+        }
+        i.picture = arr;
+      }
+      if (_.isArray(filepath) && filepath.length > 0) {
+        const arr = [];
+        for (let i = 0; i < filepath.length; i++) {
+          if (_.isString(filepath[i])) arr.push({ name: `file${i + 1}`, url: filepath[i] });
+        }
+        i.filepath = arr;
+      }
       await i.save();
     }
     this.ctx.ok();

app/controller/online.js

@@ -0,0 +1,13 @@
+'use strict';
+const meta = require('./.online.js');
+const Controller = require('egg').Controller;
+const { CrudController } = require('naf-framework-mongoose/lib/controller');
+
+// 在线
+class OnlineController extends Controller {
+  constructor(ctx) {
+    super(ctx);
+    this.service = this.ctx.service.online;
+  }
+}
+module.exports = CrudController(OnlineController, meta);

app/model/code.js

@@ -0,0 +1,22 @@
+'use strict';
+const Schema = require('mongoose').Schema;
+const moment = require('moment');
+const metaPlugin = require('naf-framework-mongoose/lib/model/meta-plugin');
+const { Secret } = require('naf-framework-mongoose/lib/model/schema');
+// 字典表
+const code = {
+  code: { type: String, required: true, maxLength: 500 }, // code
+  name: { type: String, required: true, maxLength: 500 }, // 名称
+  category: { type: String, required: true, maxLength: 500 }, // 类别code
+  sort: { type: Number, required: false, maxLength: 500 }, // 排序
+  remark: { type: String, maxLength: 200 },
+  create_time: { type: String, default: moment().format('YYYY-MM-DD HH:mm:ss') },
+};
+const schema = new Schema(code, { toJSON: { virtuals: true } });
+schema.index({ id: 1 });
+schema.index({ 'meta.createdAt': 1 });
+schema.plugin(metaPlugin);
+module.exports = app => {
+  const { mongoose } = app;
+  return mongoose.model('Code', schema, 'code');
+};

app/model/online.js

@@ -0,0 +1,36 @@
+'use strict';
+const Schema = require('mongoose').Schema;
+const moment = require('moment');
+const metaPlugin = require('naf-framework-mongoose/lib/model/meta-plugin');
+const { ObjectId } = require('mongoose').Types;
+// 在线表
+const online = {
+  column_name: { type: String }, // 栏目名
+  title: { type: String }, // 标题
+  image: { type: Array }, // 封面
+  organizers: { type: String }, // 举办方
+  contacts: { type: String }, // 联系人
+  phone: { type: String }, // 联系电话
+  province: { type: String }, // 省
+  city: { type: String }, // 市
+  start_time: { type: String }, // 举办开始时间
+  end_time: { type: String }, // 举办结束时间
+  brief: { type: String }, // 信息简介
+  video: { type: Array }, // 视频
+  status: { type: String, default: '0' }, // 0:准备中;1:开始;2:结束
+  remark: { type: String },
+  create_time: { type: String, default: moment(new Date()).format('YYYY-MM-DD HH:mm:ss') },
+};
+const schema = new Schema(online, { toJSON: { virtuals: true } });
+schema.index({ id: 1 });
+schema.index({ column_name: 1 });
+schema.index({ title: 1 });
+schema.index({ start_time: 1 });
+schema.index({ end_time: 1 });
+schema.index({ status: 1 });
+schema.index({ 'meta.createdAt': 1 });
+schema.plugin(metaPlugin);
+module.exports = app => {
+  const { mongoose } = app;
+  return mongoose.model('Online', schema, 'online');
+};

app/router.js

@@ -15,4 +15,6 @@ module.exports = app => {
   require('./router/admin')(app); // 管理员
   require('./router/organization')(app); // 企业
   require('./router/mechanism')(app); // 机构
+  require('./router/online')(app); // 在线
+  require('./router/code')(app); // 字典表
 };

app/router/code.js

@@ -0,0 +1,11 @@
+'use strict';
+
+
+module.exports = app => {
+  const { router, controller } = app;
+  const prefix = 'code';
+  router.post(prefix, `/${prefix}/name`, controller[prefix].codeName);
+  router.get(prefix, `/${prefix}/xzqh`, controller[prefix].xzqh);
+  router.resources(prefix, `/${prefix}`, controller[prefix]); // index、create、show、destroy
+  router.post(prefix, `/${prefix}/update/:id`, controller[prefix].update);
+};

app/router/news.js

@@ -3,7 +3,7 @@
 
 module.exports = app => {
   const { router, controller } = app;
-  const prefix = 'news';
+  const prefix = 'online';
   router.resources(prefix, `/${prefix}`, controller[prefix]); // index、create、show、destroy
   router.post(prefix, `/${prefix}/update/:id`, controller[prefix].update);
 };

app/router/online.js

@@ -0,0 +1,9 @@
+'use strict';
+
+
+module.exports = app => {
+  const { router, controller } = app;
+  const prefix = 'news';
+  router.resources(prefix, `/${prefix}`, controller[prefix]); // index、create、show、destroy
+  router.post(prefix, `/${prefix}/update/:id`, controller[prefix].update);
+};

app/service/code.js

@@ -0,0 +1,38 @@
+'use strict';
+const { CrudService } = require('naf-framework-mongoose/lib/service');
+const { BusinessError, ErrorCode } = require('naf-core').Error;
+const { ObjectId } = require('mongoose').Types;
+const { isNullOrUndefined, trimData } = require('naf-core').Util;
+const _ = require('lodash');
+const assert = require('assert');
+
+// 字典表
+class CodeService extends CrudService {
+  constructor(ctx) {
+    super(ctx, 'code');
+    this.model = this.ctx.model.Code;
+  }
+
+  /**
+   * 行政区划
+   * @param {Object} {code} 代码
+   */
+  async xzqh({ code }) {
+    const filter = { category: '31' };
+    if (!code) {
+      filter.code = { $regex: /0000/ };
+    } else {
+      const prefix = code.substr(0, 2);
+      filter.code = { $regex: `${prefix}\\d{2}(?<!00)00` };
+    }
+    const res = await this.model.find(filter);
+    return res.map(p => ({ code: p.code, name: p.name }));
+  }
+
+  async codeName({ code }) {
+    const res = await this.model.find({ code });
+    return res.map(p => ({ code: p.code, name: p.name }));
+  }
+}
+
+module.exports = CodeService;

app/service/online.js

@@ -0,0 +1,15 @@
+'use strict';
+const { CrudService } = require('naf-framework-mongoose/lib/service');
+const { BusinessError, ErrorCode } = require('naf-core').Error;
+const _ = require('lodash');
+const assert = require('assert');
+
+// 在线
+class OnlineService extends CrudService {
+  constructor(ctx) {
+    super(ctx, 'online');
+    this.model = this.ctx.model.Online;
+  }
+}
+
+module.exports = OnlineService;