Merge branch 'master' of http://git.cc-lotus.info/live/service-live

app/schedule/patentearly.js

@@ -4,7 +4,7 @@ module.exports = {
     // interval: '30s', // 1 分钟间隔
     // cron: '0 0 10 * * *',//每天上午十点
     // cron: '0 10 10 ? * *', // 每天上午十点十分
-    cron: '0 0 23 * * *', // 每天晚上十一点
+    cron: '30 * * * * ?', // 30s
     type: 'worker', // 指定所有的 worker 都需要执行
   },
   async task(ctx) {

app/service/patent/patentearly.js

@@ -17,7 +17,8 @@ class PatentearlyService extends CrudService {
   }
   async query(query, { skip = 0, limit = 0 }) {
     const newquery = await this.resetCode(query);
-    const res = await this.model.find(newquery).skip(parseInt(skip)).limit(parseInt(limit)).sort({ 'meta.createdAt': -1 });
+    const res = await this.model.find(newquery).skip(parseInt(skip)).limit(parseInt(limit))
+      .sort({ 'meta.createdAt': -1 });
     return res;
   }
   async count(query) {
@@ -33,13 +34,13 @@ class PatentearlyService extends CrudService {
     let ids = [];
     if (code) {
       const plist = await this.personalModel.find({ code });
-      ids = plist.map((i) => i._id);
+      ids = plist.map(i => i._id);
       if (ids.length > 0) {
         newquery.user_id = { $elemMatch: { $in: ids } };
         delete newquery.code;
       }
     } else if (user_id) {
-      newquery.user_id = { $elemMatch: { $in: [ObjectId(user_id)] } };
+      newquery.user_id = { $elemMatch: { $in: [ ObjectId(user_id) ] } };
     }
 
     return newquery;
@@ -49,9 +50,10 @@ class PatentearlyService extends CrudService {
     assert(code, '缺少机构信息');
     let pids = await this.personalModel.find({ code }, { _id: 1 });
     if (pids.length <= 0) return { data: [], total: 0 };
-    pids = pids.map((i) => i._id);
+    pids = pids.map(i => i._id);
     const query = { user_id: { $elemMatch: { $in: pids } } };
-    const data = await this.model.find(query).skip(parseInt(skip)).limit(parseInt(limit)).sort({ 'meta.createdAt': -1 });
+    const data = await this.model.find(query).skip(parseInt(skip)).limit(parseInt(limit))
+      .sort({ 'meta.createdAt': -1 });
     const total = await this.model.count(query);
     return { data, total };
   }

app/service/patent/patentinfo.js

@@ -38,7 +38,8 @@ class PatentinfoService extends CrudService {
 
   async query(query, { skip = 0, limit = 0 }) {
     const newquery = await this.resetCode(query);
-    const res = await this.model.find(newquery).skip(parseInt(skip)).limit(parseInt(limit)).sort({ 'meta.createdAt': -1 });
+    const res = await this.model.find(newquery).skip(parseInt(skip)).limit(parseInt(limit))
+      .sort({ 'meta.createdAt': -1 });
     return res;
   }
   async count(query) {
@@ -75,7 +76,7 @@ class PatentinfoService extends CrudService {
     let ids = [];
     if (code) {
       const plist = await this.personalModel.find({ code });
-      ids = plist.map((i) => i._id);
+      ids = plist.map(i => i._id);
       if (ids.length > 0) {
         newquery['inventor.user_id'] = { $in: ids };
         delete newquery.code;
@@ -91,11 +92,12 @@ class PatentinfoService extends CrudService {
     assert(code, '缺少机构信息');
     let pids = await this.personalModel.find({ code }, { _id: 1 });
     if (pids.length <= 0) return { data: [], total: 0 };
-    pids = pids.map((i) => i._id);
+    pids = pids.map(i => i._id);
     const query = { 'inventor.user_id': { $in: pids } };
     if (status) query.status = status;
     if (term) query.term = term;
-    const data = await this.model.find(query).skip(parseInt(skip)).limit(parseInt(limit)).sort({ 'meta.createdAt': -1 });
+    const data = await this.model.find(query).skip(parseInt(skip)).limit(parseInt(limit))
+      .sort({ 'meta.createdAt': -1 });
     const total = await this.model.count(query);
     return { data, total };
   }
@@ -113,7 +115,7 @@ class PatentinfoService extends CrudService {
     const allNotice = [];
     const sheetImageInfo = sheet.getImages();
     const imgids = _.compact(
-      sheetImageInfo.map((i) => {
+      sheetImageInfo.map(i => {
         const { imageId, range } = i;
         const row = _.get(range, 'tl.nativeRow');
         if (row) return { row, imageId };
@@ -123,7 +125,7 @@ class PatentinfoService extends CrudService {
       if (rindex !== 1) {
         // 组织数据,图片的索引和行索引不一致,准确的说是:图片索引比行索引少1
         // 原因:图片在工作簿中获取,按照1,2,3...顺序排序,但是行的第一行是表头(当前文件),所以当前行数需要减掉表头那一行
-        const imgid = imgids.find((f) => f.row === rindex - 1);
+        const imgid = imgids.find(f => f.row === rindex - 1);
         const img_url = [];
         if (imgid) {
           img_url.push({
@@ -210,21 +212,21 @@ class PatentinfoService extends CrudService {
     for (const i of arr) {
       const { inventor } = i;
       const midList = inventor.split(/[,;/]/);
-      nameList = [...nameList, ...midList];
+      nameList = [ ...nameList, ...midList ];
     }
-    nameList = nameList.map((i) => _.trim(i));
+    nameList = nameList.map(i => _.trim(i));
     const l1 = await this.personalModel.find({ name: nameList });
     const l2 = await this.organizationModel.find({ name: nameList });
     // 查出来的所有人
-    const nList = [...l1, ...l2];
+    const nList = [ ...l1, ...l2 ];
     for (const i of arr) {
       const { inventor } = i;
       let midNameList = inventor.split(/[,;/]/);
-      midNameList = midNameList.map((i) => _.trim(i));
+      midNameList = midNameList.map(i => _.trim(i));
       const iList = [];
       if (!_.isArray(i.user_id)) i.inventor = iList;
       for (const name of midNameList) {
-        const rList = nList.filter((f) => f.name === name);
+        const rList = nList.filter(f => f.name === name);
         if (rList && rList.length > 0) {
           for (const r of rList) {
             iList.push({ user_id: r._id, name: r.name });
@@ -447,7 +449,8 @@ class PatentinfoService extends CrudService {
     if (empower_sort === '0') {
       sort = 'asc';
     }
-    const data = await this.model.find(newQuery).sort({ empower_date: sort }).skip(parseInt(skip)).limit(parseInt(limit));
+    const data = await this.model.find(newQuery).sort({ empower_date: sort }).skip(parseInt(skip))
+      .limit(parseInt(limit));
     const total = await this.model.count(newQuery);
     return { data, total };
   }
@@ -494,7 +497,7 @@ class PatentinfoService extends CrudService {
   async dealCode(code) {
     let pids = await this.personalModel.find({ code }, { _id: 1 });
     if (pids.length <= 0) return { data: [], total: 0 };
-    pids = pids.map((i) => i._id);
+    pids = pids.map(i => i._id);
     const query = { user_id: { $elemMatch: { $in: pids } } };
     return query;
   }