明树Git Lab

Commit 2dff0b6c authored by zfp1's avatar zfp1

update

parent 97fb7507
async function batchCreate(req, res, next) {
try {
let metals = req.body.metals;
let ret = await DB.HeavyMetal.insertMany(metals);
return res.sendData(ret);
} catch (error) {
res.sendError(error);
}
}
module.exports = {
batchCreate
}
\ No newline at end of file
...@@ -72,7 +72,7 @@ const collectIQI = require('./models/collectIQI'); // 工业-质量 ...@@ -72,7 +72,7 @@ const collectIQI = require('./models/collectIQI'); // 工业-质量
const RequestLog = require('./models/systemRequestLog'); const RequestLog = require('./models/systemRequestLog');
const HeavyMetal = require('./models/letianHeavyMetal');
const IndRawMatIn = require('./models/letianIndRawMatIn'); //工业-原料品投入 const IndRawMatIn = require('./models/letianIndRawMatIn'); //工业-原料品投入
global.DB = { global.DB = {
...@@ -121,6 +121,7 @@ global.DB = { ...@@ -121,6 +121,7 @@ global.DB = {
RequestLog, RequestLog,
IndRawMatIn, IndRawMatIn,
HeavyMetal,
} }
......
const mongoose = require('mongoose');
const Schema = mongoose.Schema;
const moment = require('moment');
/**
* 农资管理-农资库存信息表
*/
const letianHeavyMetalSchema = new Schema({
proHaveMetal: {
type: Boolean,
comment: "产品有无金属"
},
proWeight: {
type: Number,
comment: "产品重量"
},
proWeightStatus: {
type: String,
comment: "产品重量状态"
},
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 HeavyMetal = mongoose.model('HeavyMetal', letianHeavyMetalSchema, 'letianHeavyMetal');
module.exports = HeavyMetal;
\ No newline at end of file
const createError = require('http-errors');
const requestLogModule = require("../module/requestLogModule");
const mongoose = require('mongoose');
//
module.exports = async (req, res, next) => {
req.reqId = new mongoose.Types.ObjectId();
/* --------------3. 记录所有进来的日志,是否记录响应的值有待 */
requestLogModule.createRequestLog({
url: req.baseUrl + req.path,
params: JSON.stringify({
...req.body,
...req.query,
...req.params,
}),
reqId: req.reqId,
user: req.user,
method: req.method,
headers: JSON.stringify(req.headers),
});
next();
}
const express = require('express');
const router = express.Router();
const multer = require('multer');
const path = require('path');
const fs = require('fs');
const moment = require('moment');
const mongoose = require('mongoose');
const heavyMetalController = require('../controller/heavyMetalController.js');
router.post('/hm/batch/create', heavyMetalController.batchCreate);
module.exports = router;
\ No newline at end of file
...@@ -21,6 +21,7 @@ const statisticsRouter = require('./statisticsRouter'); ...@@ -21,6 +21,7 @@ const statisticsRouter = require('./statisticsRouter');
const flowRouter = require('./flowRouter'); const flowRouter = require('./flowRouter');
const excelrecordRouter = require('./excelrecordRouter'); const excelrecordRouter = require('./excelrecordRouter');
const inductryRouter = require('./inductryRouter'); const inductryRouter = require('./inductryRouter');
const heavyMetalRouter = require('./externalRouter');
router.use('/user', userRouter); // 用户 角色 router.use('/user', userRouter); // 用户 角色
...@@ -52,8 +53,4 @@ router.use('/ind', inductryRouter); ...@@ -52,8 +53,4 @@ router.use('/ind', inductryRouter);
module.exports = router; module.exports = router;
\ No newline at end of file
...@@ -36,7 +36,6 @@ app.all('*', function (req, res, next) { ...@@ -36,7 +36,6 @@ app.all('*', function (req, res, next) {
app.use(compress()); app.use(compress());
app.use(express.json()); app.use(express.json());
app.use(express.urlencoded({ extended: false })); app.use(express.urlencoded({ extended: false }));
console.log(__dirname)
app.use(`/${sysConfig.file.storagePath}`, express.static(sysConfig.file.storagePath)); //保证 local:3000 + path app.use(`/${sysConfig.file.storagePath}`, express.static(sysConfig.file.storagePath)); //保证 local:3000 + path
app.use(express.static('public')); app.use(express.static('public'));
app.use(logger('dev')); app.use(logger('dev'));
...@@ -44,6 +43,8 @@ app.use(logger('dev')); ...@@ -44,6 +43,8 @@ app.use(logger('dev'));
app.use('/api', request, response, router); app.use('/api', request, response, router);
const externalRouter = require('./router/externalRouter.js')
app.use('/external', response, externalRouter);
// catch 404 and forward to error handler // catch 404 and forward to error handler
......
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