付智勇 / koa2_Sequelize_project

转到一个项目
Toggle navigation Toggle navigation pinning
付智勇
31d66400 1 parent defa507b master ... 20171113 nows revert-2a1f6481

no message

内嵌 并排对比
正在显示 10 个修改的文件 包含 62 行增加 和 277 行删除
... ... @@ -67,4 +67,13 @@ recordInfoController.prototype.stopRecording = async(ctx,next)=>{
throw error;
}
}
recordInfoController.prototype.tencentRecordInfo = async(ctx,next)=>{
try {
const channel = ctx.request.body.streamId;
let recordInfo = await recordInfoService.tencentRecordInfo(streamId)
} catch (error) {
console.error(error);
throw error;
}
}
module.exports = new recordInfoController()
\ No newline at end of file
... ...
var sequelize = require('../config');
var Sequelize = require('sequelize');
var uuid = require('../util/UuidUtil')
var recordInfo = sequelize.define('3m_record_info', {
id: {
type: Sequelize.STRING(32),
defaultValue:uuid.db32(),
allowNull: false,
unique: true,
primaryKey: true,
field: "id"
},
appId: {
allowNull: false,
type:Sequelize.STRING(50),
field: "app_id"
},
channel: {
allowNull: false,
type:Sequelize.STRING(50),
field: "channel"
},
channelKey:{
type:Sequelize.STRING(50),
field: "channel_key"
},
uid:{
type:Sequelize.STRING(50),
field: "uid"
},
userId:{
type:Sequelize.STRING(50),
field: "user_id"
},
userRole:{
type:Sequelize.STRING(50),
field: "user_role"
},
userName:{
type:Sequelize.STRING(50),
field: "user_name"
},
timestamp:{
type:Sequelize.STRING(50),
field: "timestamp"
},
recordTimestamp:{
type:Sequelize.STRING(50),
field: "recordTimestamp"
},
createTime:{
type:Sequelize.STRING(50),
field: "create_time"
},
status:{
type:Sequelize.INTEGER(1),
field:'status',
},
type:{
type:Sequelize.INTEGER(1),
field:'type',
}
}, {
timestamps: false,
freezeTableName: true
});
module.exports = recordInfo;
\ No newline at end of file
var sequelize = require('../config');
var Sequelize = require('sequelize');
const uuid = require('../util/UuidUtil')
var site = sequelize.define('3m_site', {
id: {
type: Sequelize.STRING(32),
defaultValue:uuid.db32(),
allowNull: false,
unique: true,
primaryKey: true,
field: "id"
},
siteId: {
type:Sequelize.STRING(32),
field: "siteid"
},
siteKey: {
type:Sequelize.STRING(128),
field: "site_key"
},
startDate:{
type:Sequelize.TEXT(0),
field: "startdate"
},
endDate:{
type:Sequelize.STRING(1024),
field: "enddate"
},
aseKey:{
type:Sequelize.STRING(128),
field: "ase_key"
},
mcuList:{
type:Sequelize.INTEGER(1),
field: "mcu_list"
},
msList:{
type:Sequelize.INTEGER(1),
field: "ms_list"
},
rsList:{
type:Sequelize.INTEGER(1),
field: "rs_list"
},
docList:{
type:Sequelize.STRING(32),
field: "doc_list"
}
}, {
timestamps: false,
freezeTableName: true
});
module.exports = site;
\ No newline at end of file
var sequelize = require('../config');
var Sequelize = require('sequelize');
const uuid = require('../util/UuidUtil')
var studentMeeting = sequelize.define('3m_student_meeting', {
id: {
type: Sequelize.STRING(32),
defaultValue:uuid.db32(),
allowNull: false,
unique: true,
primaryKey: true,
field: "id"
},
studentId: {
allowNull: false,
type:Sequelize.STRING(32),
field: "student_id"
},
meetingId: {
allowNull: false,
type:Sequelize.STRING(32),
field: "meeting_id"
},
siteId: {
allowNull: false,
type:Sequelize.STRING(32),
field: "site_id"
},
status: {
allowNull: false,
type:Sequelize.STRING(32),
field: "status"
},
createTime: {
allowNull: false,
type:Sequelize.STRING(32),
field: "create_time"
}
},{
timestamps: false,
freezeTableName: true
});
module.exports = studentMeeting;
\ No newline at end of file
var sequelize = require('../config');
var Sequelize = require('sequelize');
var uuid = require('../util/UuidUtil')
var user = sequelize.define('3m_user', {
id: {
type: Sequelize.STRING(32),
defaultValue:uuid.db32(),
allowNull: false,
unique: true,
primaryKey: true,
field: "id"
},
loginName: {
allowNull: false,
type:Sequelize.STRING(100),
field: "login_name"
},
// IDcard: {
// allowNull: false,
// type:Sequelize.STRING(50),
// field: "IDcard"
// },
password: {
allowNull: false,
type:Sequelize.STRING(100),
field: "password"
},
// salt:{
// type:Sequelize.INTEGER(2),
// field: "salt"
// },
companyName:{
type:Sequelize.STRING(1024),
field: "company_name"
},
userName:{
type:Sequelize.STRING(64),
field: "user_name"
},
userType:{
type:Sequelize.INTEGER(1),
field: "user_type"
},
userRole:{
type:Sequelize.INTEGER(1),
field: "user_role"
},
userEmail:{
type:Sequelize.INTEGER(1),
field: "user_email"
},
userMobile:{
type:Sequelize.STRING(32),
field: "user_mobile"
},
createTime:{
type:Sequelize.DATE,
defaultValue:Sequelize.NOW,
field: "create_time"
},
endTime:{
type:Sequelize.DATE,
field: "end_time"
},
content:{
type:Sequelize.TEXT(1024),
field: "content"
},
serialNo:{
type:Sequelize.INTEGER(11),
field: "serial_no"
},
siteId:{
type:Sequelize.STRING(32),
field: "site_id"
},
userStatus:{
type:Sequelize.INTEGER(11),
field: "user_status"
},
groupId:{
type:Sequelize.STRING(128),
field: "group_id"
},
}, {
timestamps: false,
freezeTableName: true
});
module.exports = user;
\ No newline at end of file
... ... @@ -3,26 +3,29 @@ var Sequelize = require('sequelize');
var uuid = require('../util/UuidUtil')
var recordStatus = sequelize.define('3m_record_status', {
var recordInfo = sequelize.define('3m_tencent_record_info', {
id: {
type: Sequelize.STRING(32),
defaultValue:uuid.db32(),
defaultValue:uuid.db32(),
allowNull: false,
unique: true,
primaryKey: true,
field: "id"
},
channel:{
streamId: {
allowNull: false,
type:Sequelize.STRING(50),
field: "channel"
},
status:{
type:Sequelize.INTEGER(1),
field:'status',
field: "stream_id"
},
recordInfo: {
allowNull: false,
type:Sequelize.STRING(50),
field: "record_info"
}
}, {
timestamps: false,
freezeTableName: true
});
timestamps: false,
freezeTableName: true
});
module.exports = recordStatus;
\ No newline at end of file
module.exports = recordInfo;
\ No newline at end of file
... ...
... ... @@ -44,4 +44,14 @@ router.put('/updaterecordInfo/:channel', async (ctx, next) => {
}
})
router.post('/tencentRecordInfo', async (ctx, next) => {
try{
var data = await meetingContoller.tencentRecordInfo(ctx, next);
status.successTemp(ctx,200,data);
}catch(e){
console.error(e)
status.catchError(ctx,400,e.message);
}
})
module.exports = router
\ No newline at end of file
... ...
... ... @@ -9,9 +9,13 @@ const multer = require('koa-multer');
const moment = require('moment')
var body = require('koa-better-body')
var formParse = require('co-busboy')
const uuid = require('../util/UuidUtil');
const applacation = require('../applacation');
const tencentRecordInfoModel =require( '../model/tencentRecordInfoModel')
... ... @@ -37,10 +41,22 @@ router.post('/tgpCallback', async (ctx, next) => {
//let s = await uploaddemo(ctx.req,ctx.res,next)
//let w = await fs.rename('/Users/fzy/project/koa2_Sequelize_project/uploads/'+'19543f72d9682d0bedf67fc98da4597b','/Users/fzy/project/koa2_Sequelize_project/uploads/'+'www.jpg')
try {
let f = await fs.appendFileSync(path.join(__dirname, 'tgp.txt'),JSON.stringify(ctx.request.body)+'/n')
//let f = await fs.appendFileSync(path.join(__dirname, 'tgp.txt'),JSON.stringify(ctx.request.body)+'/n')
var body = ctx.request.body
let id = uuid.db32()
let stream = body.stream_id.split('_');
let info = {
id:id,
streamId:stream[0]+'_'+stream[1],
recordInfo:JSON.stringify(body)
}
let tencentRecordInfo = await tencentRecordInfoModel.create(info)
ctx.response.status= 200;
ctx.body = { "code":0 }
} catch (error) {
console.log(error)
ctx.response.status= 400;
ctx.body = {}
... ...
... ... @@ -160,7 +160,7 @@ meetingService.prototype.getAllMeetingBySiteID = async(params,page = 1,pageno =1
return new Date(m2.beginTime).getTime() - new Date(m1.beginTime).getTime();
});
console.log((page-1)*pageno,(page-1)*pageno+10)
return {meeting:meetingdata.slice((page-1)*pageno,(page-1)*pageno+pageno)}
return {meeting:meetingdata.slice((page-1)*pageno,100)}
} catch (error) {
throw error
}
... ...
const recordInfo =require( '../model/RecordInfoModel')
const tencentRecordInfoModel =require( '../model/tencentRecordInfoModel')
function recordInfoService(){
... ... @@ -30,4 +32,12 @@ recordInfoService.prototype.getRecordInfo = async(channel) =>{
throw error;
}
}
recordInfoService.prototype.tencentRecordInfo = async(streamId)=>{
try {
let tencentRecordInfo = await tencentRecordInfoModel.findAll({where:{streamId:streamId}})
return tencentRecordInfo
} catch (error) {
throw error;
}
}
module.exports = new recordInfoService();
\ No newline at end of file
... ...