明树Git Lab

Commit 2fa8ce2f authored by zengfanpei's avatar zengfanpei

update

parent 47580fc1
const path = require('path');
const fs = require('fs');
const _ = require('lodash');
const moment = require('moment');
async function exportExcel(req, res, next) {
let modelName = req.params.modelName;
let modelMap = {
'IPS': "CollectIPS",
'SMC': "CollectSMC",
'WS': "CollectWS",
}
}
module.exports = { exportExcel }
\ No newline at end of file
const mongoose = require('mongoose');
const Schema = mongoose.Schema;
const moment = require('moment');
/**
* 地块 --- 园区 ---- 乡镇(这个等级暂时不做)
*/
const ExcelSchema = new Schema({
creator: { type: mongoose.Types.ObjectId, ref: 'User' },
type: {type: Number, comment: "1. 导入 2, 导出"},
excelUrl: {type: mongoose.Types.ObjectId, ref: 'File'},
modleName: String,
search: {type: Object},
createdAt: {
type: Date,
default: Date.now,
get: v => moment(v).format("YYYY-MM-DD HH:mm:ss"),
},
updatedAt: {
type: Date,
default: Date.now,
get: v => moment(v).format("YYYY-MM-DD HH:mm:ss"),
},
del: {
type: Number,
default: 0,
comment: '默认0 , 1:表示删除,若有其他隐藏业务 不要混用此字段。'
}
}, {
toJSON: {
getters: true
}
});
const letianExcel = mongoose.model('letianExcel', ExcelSchema, 'letianExcel');
module.exports = letianExcel;
\ No newline at end of file
...@@ -36,7 +36,6 @@ async function insertHQData(data) { ...@@ -36,7 +36,6 @@ async function insertHQData(data) {
let check = await DB.CollectIPS.findOne({ newTime: data.newTime }); let check = await DB.CollectIPS.findOne({ newTime: data.newTime });
if (!check) { if (!check) {
let ret = await DB.CollectIPS.create(data); let ret = await DB.CollectIPS.create(data);
ret.results = '蚊子:1'
handleIPSResult(ret); handleIPSResult(ret);
} }
} }
......
...@@ -10,6 +10,7 @@ const moment = require('moment'); ...@@ -10,6 +10,7 @@ const moment = require('moment');
const mongoose = require('mongoose'); const mongoose = require('mongoose');
const fileController = require('../controller/fileController'); const fileController = require('../controller/fileController');
const excelController = require('../controller/excelController');
const storage = multer.diskStorage({ const storage = multer.diskStorage({
...@@ -50,8 +51,9 @@ router.post('/batch/upload', upload.array('files'), fileController.batchUpload); ...@@ -50,8 +51,9 @@ router.post('/batch/upload', upload.array('files'), fileController.batchUpload);
router.post('/:modelName/importExcel', upload.single('file'), async (req, res, next) =>{ router.post('/:modelName/importExcel', upload.single('file'), async (req, res, next) =>{
let modelName = req.params.modelName; let modelName = req.params.modelName;
let controller = require(`../controller/${modelName}Controller`); let controller = require(`../controller/${modelName}Controller`);
console.log(modelName,)
await controller.importExcel(req, res, next); await controller.importExcel(req, res, next);
}); });
router.post('/:modelName/exportExcel', excelController.exportExcel);
module.exports = router; module.exports = router;
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment