tj

brg-queue-center/app/base/db/consumer.base.js

@@ -50,6 +50,8 @@ class ConsumerBase {
         execResult = await this.subDoConsumer(queuedName, actionBody);
         if (notifyQueuedName != queuedName) {
           actionBody.resultInfo = execResult;
+        } else {
+          actionBody.pushAgainResultInfo = execResult;
         }
         if (execResult.status === 1) {
           if (notifyQueuedName != queuedName) {
@@ -76,7 +78,6 @@ class ConsumerBase {
         delete actionBody["pushAgainResultInfo"];
       }
       execResult = await this.subDoConsumer(queuedName, actionBody);
-      actionBody.pushAgainResultInfo = execResult;
     } catch (error) {
       var stackStr = error.stack ? error.stack : JSON.stringify(error);
       this.errorLogDao.addOpErrorLogs("队列执行execSubDoConsumer存在异常", actionBody, execResult, stackStr, 3);

brg-queue-center/app/base/db/impl/opLogs/pushFailureLogDao.js

 const system = require("../../../system");
 const Dao = require("../../dao.base");
+const settings = require("../../../../config/settings");
 class PushFailureLogDao extends Dao {
   constructor() {
     super(Dao.getModelName(PushFailureLogDao));
@@ -12,6 +13,7 @@ class PushFailureLogDao extends Dao {
    */
   async addOpFailureLogs(opTitle, actionBody, execResult) {
     var params = {
+      queued_name: settings.queuedName,
       identify_code: actionBody.identifyCode,
       op_title: opTitle,
       push_content: actionBody,

brg-queue-center/app/base/db/impl/opLogs/pushSuccessLogDao.js

 const system = require("../../../system");
 const Dao = require("../../dao.base");
+const settings = require("../../../../config/settings");
 class PushSuccessLogDao extends Dao {
   constructor() {
     super(Dao.getModelName(PushSuccessLogDao));
@@ -13,6 +14,7 @@ class PushSuccessLogDao extends Dao {
    */
   async addOpSuccessLogs(opTitle, actionBody, execResult) {
     var params = {
+      queued_name: settings.queuedName,
       identify_code: actionBody.identifyCode,
       op_title: opTitle,
       push_content: actionBody,

brg-queue-center/app/base/db/models/opLogs/pushFailureLog.js

 const system = require("../../../system");
 module.exports = (db, DataTypes) => {
   return db.define("pushFailureLog", {
+    queued_name: DataTypes.STRING(512),	//队列名称
     identify_code: DataTypes.STRING(100),	//标识code
     op_title: DataTypes.STRING(100),	//	操作标题
     push_content: DataTypes.JSON,	//推送的内容

brg-queue-center/app/base/db/models/opLogs/pushSuccessLog.js

 const system = require("../../../system");
 module.exports = (db, DataTypes) => {
   return db.define("pushSuccessLog", {
+    queued_name: DataTypes.STRING(512),	//队列名称
     identify_code: DataTypes.STRING(100),	//标识code
     op_title: DataTypes.STRING(100),	//	操作标题
     push_content: DataTypes.JSON,	//推送的内容