update

controller/excelRecordController.js

+const _ = require('lodash');
+const moment = require('moment');
+const errorMessage = require('../utils/errorMessage');
+
+
+async function list(req, res, next) {
+    try {
+        let search = {del: 0};
+        if(req.body.startTime) {
+            search.time = search.time || {};
+            search.time.$gte = req.body.startTime;
+        }
+        if(req.body.endTime) {
+            search.time = search.time || {};
+            search.time.$lte = req.body.endTime
+        }
+        if(_.isArray(req.body.time) && req.body.time.length == 2) {
+            search.time = {
+                $lte: req.body.time[1],
+                $gte: req.body.time[0]
+            }
+        }
+        let page = req.body.page || 1;
+        let pageSize = req.body.pageSize || 10;
+        let skip = (page - 1) * pageSize;
+        let count = await DB.ExcelRecord.countDocuments(search);
+        let list = await DB.ExcelRecord.find(search).skip(skip).limit(pageSize).populate({path: 'creator', select: "mobile name"}).populate({path: 'excelUrl'}).lean().exec();
+        res.sendData({count, list})
+    } catch (error) {
+        next(error);
+    }
+}
+
+
+
+
+module.exports = {
+    list
+}
\ No newline at end of file

cron/excelCron.js

@@ -19,7 +19,7 @@ const ExcelJS = require('exceljs');
 const fs = require('fs');
 
 
-exportExcel()
+// exportExcel()
 
 async function exportExcel() {
     let info = await DB.ExcelRecord.findOne({ type: 2, status: 1 });
@@ -62,7 +62,7 @@ async function exportExcel() {
                     mimetype: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
                     filename: name + '.xlsx',
                     path: excelUrl,
-                    // size: req.file.size,
+                    nginxpath: _.last(String(req.file.path).split('/mnt/vdb1')),
                     type: 2,
                 });
                 // 3. 更新任务结果

cron/index.js

@@ -77,10 +77,10 @@ const cron = () => {
 
 
     // 获取设备上述设备 4 采集信息 
-    if (sysConfig && sysConfig.cron && sysConfig.cron.collectDeviceInfo4) {
+    if (sysConfig && sysConfig.cron && sysConfig.cron.collectDeviceInfo) {
         console.log("collectDeviceInfo4:", new Date());
 
-        new nodeCron.schedule('1 */1 * * * *', async () => {
+        new nodeCron.schedule('1 */3 * * * *', async () => {
             await ipsCron.collectDeviceInfo4({deviceHQType: 4});
         }, { timezone: "Asia/Shanghai" });
     }
@@ -89,10 +89,10 @@ const cron = () => {
     if (sysConfig && sysConfig.cron && sysConfig.cron.excel) {
         console.log("excel:", new Date());
 
-        // new nodeCron.schedule('1 */1 * * * *', async () => {
-        //     console.log(new Date().getTime())
-        //     await excelCron.exportExcel();
-        // }, { timezone: "Asia/Shanghai" });
+        new nodeCron.schedule('1 */1 * * * *', async () => {
+            console.log(new Date().getTime())
+            await excelCron.exportExcel();
+        }, { timezone: "Asia/Shanghai" });
     }
 
 }

router/excelrecordRouter.js

+
+const express = require('express');
+const router = express.Router();
+
+const excelRecordController = require('../controller/excelRecordController');
+
+router.post('/list', excelRecordController.list);
+
+
+
+
+
+module.exports = router;
\ No newline at end of file

router/index.js

@@ -18,6 +18,7 @@ const agrInputRouter = require('./agrRouter');
 const statisticsRouter = require('./statisticsRouter');
 
 const flowRouter = require('./flowRouter');
+const excelrecordRouter = require('./excelrecordRouter');
 
 
 router.use('/user', userRouter); // 用户 角色
@@ -41,6 +42,7 @@ router.use('/statistics', statisticsRouter); // 统计 大屏
 
 
 router.use('/flow', flowRouter);
+router.use('/excelrecord', excelrecordRouter);