Browse Source

代码修改错误修改

8 years ago
parent
commit
c4b2610628
2 changed files with 22 additions and 20 deletions
  1. 6 5
      src/server/models/sessions/sessions.js
  2. 16 15
      src/server/models/sessions/topics.js

+ 6 - 5
src/server/models/sessions/sessions.js

@ -360,7 +360,7 @@ class Sessions extends RedisModel {
        let messageId = mongoose.Types.ObjectId().toString();
        let sessionType = 0;
        let name = "";
        participants.existsParticipant(sessionId, message.senderId, function (err, res) {
        participants.existsParticipant(sessionId, message.sender_id, function (err, res) {
            //校验发送成员是都在讨论组
            if (res) {
                redis.hmgetAsync(session_key, ["type", "name"]).then(function (res) {
@ -372,15 +372,16 @@ class Sessions extends RedisModel {
                    }
                }).then(function (res) {
                    //更新消息相关
                    return messages.saveMessageForRedis(messageId, sessionId, message);
                    return messages.saveMessageToRedis(messageId,sessionType, sessionId, message);
                }).then(function (res) {
                    //更新session的最后一条聊天记录
                    return Messages.updateLastContent(session_key, sessionType, name, message);
                }).then(function (res) {
                    //操作mysql数据库
                    messages.saveMessageToMysql(sessionId, sessionType, messageId, message);
                    //返回数据给前端。
                    handler(null, messageId)
                    messages.saveMessageToMysql(sessionId, sessionType, messageId, message,function(err,res){
                        //返回数据给前端。
                        handler(null, messageId)
                    });
                    //消息推送
                }).catch(function (res) {
                    handler(res, messageId)

+ 16 - 15
src/server/models/sessions/topics.js

@ -17,6 +17,7 @@ let config = require('../../resources/config/' + configFile);
const REDIS_KEYS = require('../../include/commons').REDIS_KEYS;
const SESSION_USER_STATUS = require('../../include/commons').SESSION_USER_STATUS;
const SESSION_TYPES = require('../../include/commons').SESSION_TYPES;
class Topics extends RedisModel {
    constructor() {
@ -85,7 +86,7 @@ class Topics extends RedisModel {
                        for(var j in users){
                            pars.push(j+":"+users[j]);
                        }
                        sessions.createSession(sessionId, messages.patientName, config.sessionConfig.MUC, pars, function (res) {
                        sessions.createSession(sessionId, messages.patientName, SESSION_TYPES.MUC, pars, function (res) {
                            if (res) {
                                callbegin();
                            }
@ -100,9 +101,9 @@ class Topics extends RedisModel {
         */
        function callbegin() {
            let msg = {};
            msg.senderId = messages.patient;
            msg.senderName = messages.patientName;
            msg.contentType = 6;
            msg.sender_id = messages.patient;
            msg.sender_name = messages.patientName;
            msg.content_type = 6;
            msg.content = "开始咨询"
            msg.timestamp = date;
            sessions.saveMessageByTopic(msg, sessionId, function (err, msgId) {
@ -110,7 +111,7 @@ class Topics extends RedisModel {
                    ModelUtil.emitOK(self.eventEmitter, err);
                } else {
                    self.saveTopicsToSql(topicName, topicId, sessionId, msgId, date);
                    callBeginMsg(startMsgId);
                    callBeginMsg(msgId);
                }
            })
        }
@ -120,12 +121,12 @@ class Topics extends RedisModel {
         */
        function callBeginMsg(startMsgId) {
            let msg = {};
            msg.senderId = messages.patient;
            msg.senderName = messages.patientName;
            msg.contentType = 1;
            msg.sender_id = messages.patient;
            msg.sender_name = messages.patientName;
            msg.content_type = 1;
            msg.content = messages.description;
            msg.timestamp = new Date();
            sessions.saveMessageByTopic(msg, patient, function (err, msgId) {
            msg.timestamp = new Date().getTime();
            sessions.saveMessageByTopic(msg,  messages.patient, function (err, msgId) {
                log.info("begin send" + messages.description);
            });
            
@ -133,12 +134,12 @@ class Topics extends RedisModel {
                let imgs = messages.img.split(",");
                for (var j in imgs) {
                    let msgimg = {};
                    msgimg.senderId = messages.patient;
                    msgimg.senderName = messages.patientName;
                    msgimg.contentType = 2;
                    msgimg.sender_id = messages.patient;
                    msgimg.sender_name = messages.patientName;
                    msgimg.content_type = 2;
                    msgimg.content = imgs[j];
                    msgimg.timestamp = new Date();
                    sessions.saveMessageByTopic(msgimg, patient, function (err, msgId) {
                    msgimg.timestamp = new Date().getTime();
                    sessions.saveMessageByTopic(msgimg, messages.patient, function (err, msgId) {
                        log.info("begin send" + imgs[j]);
                    })
                }