fix: 日志数据调整

center-manage/app/base/controller/impl/log/logCtl.js

@@ -20,12 +20,23 @@ class logCtl extends CtlBase {
                         let { opTitle, identifyCode, messageBody, resultInfo, errorInfo, requestId, created_at } = item;
                         let { opTitle, identifyCode, messageBody, resultInfo, errorInfo, requestId, created_at } = item;
                         messageBody = messageBody ? JSON.parse(messageBody) : {}
                         messageBody = messageBody ? JSON.parse(messageBody) : {}
                         resultInfo = resultInfo ? JSON.parse(resultInfo) : {}
                         resultInfo = resultInfo ? JSON.parse(resultInfo) : {}
+                        let status;
+                        if (resultInfo && resultInfo.status === 0) {
+                            status = "SUCCESS"
+                        } else {
+                            status = "FAIL"
+                        }
+                        if (errorInfo && errorInfo !== "null") {
+                            status = "FAIL"
+                        }
                         return {
                         return {
-                            opTitle: opTitle.split("，").length > 1 ? opTitle.split("，")[1] : opTitle,
+                            opTitle: opTitle,
                             url: `${messageBody.gname}/${messageBody.qname}/${messageBody.method}`,
                             url: `${messageBody.gname}/${messageBody.qname}/${messageBody.method}`,
                             user: messageBody.param && messageBody.param.username || '',
                             user: messageBody.param && messageBody.param.username || '',
                             ip: messageBody.param && messageBody.param.clientIp,
                             ip: messageBody.param && messageBody.param.clientIp,
                             created_at,
                             created_at,
+                            requestId,
+                            status,
                             info: {
                             info: {
                                 opTitle, identifyCode, messageBody, resultInfo, errorInfo, requestId, created_at
                                 opTitle, identifyCode, messageBody, resultInfo, errorInfo, requestId, created_at
                             }
                             }

center-manage/app/base/utils/logClient.js

@@ -32,16 +32,32 @@ class LogClient {
 
 
   async logList(pobj) {
   async logList(pobj) {
     let { search, pageInfo, company_id } = pobj;
     let { search, pageInfo, company_id } = pobj;
+    let { userName, errorInfo, messageBody, resultInfo, created_at, opTitle, requestId } = search;
     let query = {
     let query = {
       indexName: `logs-sytxpublic-msgq-${settings.logindex}`,
       indexName: `logs-sytxpublic-msgq-${settings.logindex}`,
       pageSize: pageInfo.pageSize,
       pageSize: pageInfo.pageSize,
       currentPage: pageInfo.pageNo
       currentPage: pageInfo.pageNo
     };
     };
     if (company_id && company_id != 1) {
     if (company_id && company_id != 1) {
-      query.identifyCode = `_${company_id}_`
+      query.identifyCode = `_${company_id}_`;
     }
     }
-    if (search.opTitle) {
-      query.opTitle = search.opTitle
+    if (opTitle) {
+      query.opTitle = opTitle;
+    }
+    if (requestId) {
+      query.requestId = requestId;
+    }
+    if (userName) {
+      query.messageBody = userName;
+    }
+    if (errorInfo) {
+      query.errorInfo = errorInfo;
+    }
+    if (messageBody) {
+      query.messageBody = messageBody;
+    }
+    if (resultInfo) {
+      query.resultInfo = resultInfo;
     }
     }
     // {
     // {
     //   "opTitle": "",// N 操作的业务标题
     //   "opTitle": "",// N 操作的业务标题
@@ -55,6 +71,29 @@ class LogClient {
     console.log("请求--------日志");
     console.log("请求--------日志");
     console.log(settings.logUrl());
     console.log(settings.logUrl());
     console.log(query);
     console.log(query);
+    // return {
+    //   "totalCount": 1,
+    //   "pageSize": 20,
+    //   "currentPage": 0,
+    //   "list": [
+    //     {
+    //       "opTitle": "center_manage_首页",
+    //       "identifyCode": "10_",
+    //       "messageBody": "{\"gname\":\"msg\",\"qname\":\"msgCtl\",\"method\":\"findUnreadCount\",\"param\":{\"clientIp\":\"9.223.9.138\",\"agent\":\"Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.157 Safari/537.36\",\"classname\":\"msg.msgCtl\",\"app_id\":1,\"company_id\":\"10\",\"userid\":\"15\",\"username\":\"j2\",\"bizpath\":\"/home\",\"is_read\":false},\"actionType\":\"\",\"pushUrl\":\"\"}",
+    //       "resultInfo": "{\"status\":0}",
+    //       "errorInfo": "null",
+    //       "requestId": "19a258474e384a0db939270580f01407",
+    //       "created_at": "2020-07-16T05:18:48.454Z"
+    //     }, {
+    //       "opTitle": "center_manage_消息中心",
+    //       "identifyCode": "10_",
+    //       "messageBody": "{\"gname\":\"msg\",\"qname\":\"msgCtl\",\"method\":\"findUnreadCount\",\"param\":{\"clientIp\":\"9.223.9.138\",\"agent\":\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.116 Safari/537.36\",\"classname\":\"msg.msgCtl\",\"app_id\":1,\"company_id\":\"10\",\"userid\":\"15\",\"username\":\"j2\",\"bizpath\":\"/message/message_page\",\"is_read\":false},\"actionType\":\"\",\"pushUrl\":\"\"}",
+    //       "resultInfo": "{\"status\":-1}",
+    //       "errorInfo": "null",
+    //       "requestId": "06d94fbcd05b44a1ae292a21f5931f41",
+    //       "created_at": "2020-07-16T05:51:54.888Z"
+    //     }]
+    // }
     let rtn = await system.postJsonTypeReq(settings.logUrl(), {
     let rtn = await system.postJsonTypeReq(settings.logUrl(), {
       "actionType": "queryLogsData",// Y 功能名称
       "actionType": "queryLogsData",// Y 功能名称
       "actionBody": query
       "actionBody": query