tj

brg-queue-center/app/base/service/impl/utilsSve/utilsLogsSve.js

@@ -63,42 +63,43 @@ class UtilsLogsService extends AppServiceBase {
       ]
     }
     if (actionBody.opTitle) {
+      // params.query.bool.must.push({
+      //   "query_string": {
+      //     "default_field": "opTitle",
+      //     "query": '\"' + actionBody.opTitle + '\"'
+      //   }
+      // });
       params.query.bool.must.push({
-        "query_string": {
-          "default_field": "opTitle",
-          "query": '\"' + actionBody.opTitle + '\"'
+        "wildcard": {
+          "opTitle": "*" + actionBody.opTitle + "*"
         }
       });
     }
     if (actionBody.identifyCode) {
       params.query.bool.must.push({
-        "query_string": {
-          "default_field": "identifyCode",
-          "query": '\"' + actionBody.identifyCode + '\"'
+        "wildcard": {
+          "identifyCode": "*" + actionBody.identifyCode + "*"
         }
       });
     }
     if (actionBody.messageBody) {
       params.query.bool.must.push({
-        "query_string": {
-          "default_field": "messageBody",
-          "query": '\"' + actionBody.messageBody + '\"'
+        "wildcard": {
+          "messageBody": "*" + actionBody.messageBody + "*"
         }
       });
     }
     if (actionBody.errorInfo) {
       params.query.bool.must.push({
-        "query_string": {
-          "default_field": "errorInfo",
-          "query": '\"' + actionBody.errorInfo + '\"'
+        "wildcard": {
+          "errorInfo": "*" + actionBody.errorInfo + "*"
         }
       });
     }
     if (actionBody.requestId) {
       params.query.bool.must.push({
-        "query_string": {
-          "default_field": "requestId",
-          "query": '\"' + actionBody.requestId + '\"'
+        "wildcard": {
+          "requestId": "*" + actionBody.requestId + "*"
         }
       });
     }
@@ -107,7 +108,7 @@ class UtilsLogsService extends AppServiceBase {
       resultData = await this.esUtils.execPostEs(settings.queuedName, params, esIndexName);
       var sources = [];
       var data = {
-        "totalCount": resultData.data && resultData.data.hits ? resultData.data.hits.total : 0,
+        "totalCount": 0,
         "pageSize": pageSize,
         "currentPage": from === 0 ? from : (from - 1),
         "list": sources
@@ -121,6 +122,7 @@ class UtilsLogsService extends AppServiceBase {
       if (!resultData.data.hits.hits || resultData.data.hits.hits.length === 0) {
         return system.getResult(null, "data is empty!");
       }
+      data.totalCount = typeof resultData.data.hits.total === "object" ? resultData.data.hits.total.value : resultData.data.hits.total;
       resultData.data.hits.hits.forEach(function (c) {
         var source = {
           "opTitle": c._source.opTitle,