owl-cli 5.28.0 → 5.31.0

package/defaultTemplate/api/src/handlers/list.jsx

@@ -193,6 +193,13 @@ var spec = @spec;
 
   var objs = hits.map(function(hit){return hit._source});
 
+
+  var countUrl = elasticSearchUrl+"/@projectCode/_count";
+
+  var ss = HttpUtils.postRaw( countUrl, sndTxt, headers);
+  var cr = JSON.parse(ss);
+
+  var count = result.count;
 //这里重新从pigeon取了一次数据，做了删除的判断
 // var ids = hits.map(function(hit){return hit._source.id});
 // var list = @projectCodeService.getObjects(ids);
@@ -202,7 +209,8 @@ var spec = @spec;
   var ret = {
     state:'ok',
     list:objs,
-    total:total
+    total:total,
+    count : count
   }
   out.print(JSON.stringify(ret));
 

package/defaultTemplate/api/src/services/modelService.jsx

@@ -871,28 +871,47 @@ var @projectCodeService = (function (pigeon) {
             }
             return filters;
         },
-        search: function(m, searchArgs, keyword,from, pageSize, sort, dataSource){
-            //生成filters
+
+        buildQuery:function(m,searchArgs,keyword){
             delete searchArgs.keyword;
             var filters = [];
+            var must_not = [{
+                term:{
+                    del:'T'
+                }
+            }];
             for(var k in searchArgs){
+                var isNotClause = false;
+                if(k.indexOf("!")===0){
+                    isNotClause = true;
+                    k = k.substring(1);
+                }
                 var v = searchArgs[k];
                 if(typeof v === 'object' && v.type === 'or'){
                     var shouldClauses = [];
                     if(Array.isArray(v.args)){
-                       v.args.forEach(function(q){
-                           var shouldQueries = f.createQuery(q);
-                           if(shouldQueries.length>0){
-                               shouldClauses.push({bool:{filter:shouldQueries}});
-                           }
-
-                       });
-                       filters.push({bool:{should:shouldClauses}});
+                        v.args.forEach(function(q){
+                            var shouldQueries = f.createQuery(q);
+                            if(shouldQueries.length>0){
+                                shouldClauses.push({bool:{filter:shouldQueries}});
+                            }
+
+                        });
+                        if(isNotClause){
+                            must_not.push({bool:{should:shouldClauses}});
+                        }else{
+                            filters.push({bool:{should:shouldClauses}});
+                        }
+
                     }
                     else{
                         if(v.args && typeof(v.args)==='object'){
                             var shouldQueries = f.createQuery(v);
-                            filters.push({bool:{filter:shouldQueries}});
+                            if(isNotClause){
+                                must_not.push({bool:{should:shouldClauses}});
+                            }else{
+                                filters.push({bool:{should:shouldClauses}});
+                            }
                         }
                     }
                 }
@@ -902,13 +921,21 @@ var @projectCodeService = (function (pigeon) {
                         'gte':v[0],
                         'lte':v[1]
                     }
-                    filters.push({range:range});
+                    if(isNotClause){
+                        must_not.push({range:range});
+                    }else{
+                        filters.push({range:range});
+                    }
                 }
                 else if(typeof(v)=='object' && v.type==='terms'){
                     var terms = {};
                     if(v.values){
                         terms[k + ".keyword"] = v.values;
-                        filters.push({terms:terms});
+                        if(isNotClause){
+                            must_not.push({terms:terms});
+                        }else{
+                            filters.push({terms:terms});
+                        }
                     }
                 }
                 else{
@@ -916,12 +943,21 @@ var @projectCodeService = (function (pigeon) {
                     if(typeof v == 'string' ){
                         if(v){
                             term[k+".keyword"] = trim('' + v)
-                            filters.push({term:term})
+                            if(isNotClause){
+                                must_not.push({term:term});
+                            }else{
+                                filters.push({term:term});
+                            }
+
                         }
                     }
                     else if (typeof v == 'number'){
                         term[k] = trim('' + v)
-                        filters.push({term:term})
+                        if(isNotClause){
+                            must_not.push({term:term});
+                        }else{
+                            filters.push({term:term});
+                        }
                     }
                 }
             }
@@ -945,12 +981,6 @@ var @projectCodeService = (function (pigeon) {
             else{
                 keywordQuery = "*"
             }
-
-            var effectiveSort = [{owl_createTime:{order:"desc"}}];
-            if(sort){
-                effectiveSort = sort;
-            }
-
             var query = {
                 "query": {
                     "bool": {
@@ -959,17 +989,51 @@ var @projectCodeService = (function (pigeon) {
                                 "query":keywordQuery
                             }
                         },
-                        "must_not": {
-                            "match": {
-                                "del": "T"
-                            }
-                        },
+                        "must_not": must_not,
                         "filter": filters
                     }
-                },
-                "from" : from, "size" : pageSize,
-                sort:effectiveSort
+                }
+            }
+            return query;
+        },
+
+        count:function(m,searchArgs,keyword,dataSource){
+            var query = f.buildQuery(m,searchArgs,keyword);
+            var elasticSearchUrl = $.getEnv( "elasticSearchUrl" );
+
+            var headers = { "Content-Type": "application/json;charset=utf-8" };
+            var elasticSearchUser = $.getEnv("elasticSearchUser");
+            var elasticSearchPass = $.getEnv("elasticSearchPass");
+            if(elasticSearchUser && elasticSearchPass){
+                var auth =Base64.encode(elasticSearchUser + ":" + elasticSearchPass);
+                var basicAuth = "Basic " + auth;
+                headers["Authorization"] = basicAuth;
+            }
+            var searchUrl = elasticSearchUrl+"/@projectCode/_count";
+            if(dataSource){
+                searchUrl = elasticSearchUrl + "/" + dataSource + "/_count";
+            }
+
+            var sndTxt = JSON.stringify(query);
+            var s = HttpUtils.postRaw( searchUrl, sndTxt, headers);
+            var result = JSON.parse(s);
+            if(result.count){
+                return result.count;
+            }
+            return 0;
+        },
+        search: function(m, searchArgs, keyword,from, pageSize, sort, dataSource){
+            var query = f.buildQuery(m,searchArgs,keyword);
+            var effectiveSort = [{owl_createTime:{order:"desc"}}];
+            if(sort){
+                effectiveSort = sort;
+            } var effectiveSort = [{owl_createTime:{order:"desc"}}];
+            if(sort){
+                effectiveSort = sort;
             }
+            query.from = from;
+            query.size = pageSize;
+            query.sort = effectiveSort;
 
             var elasticSearchUrl = $.getEnv( "elasticSearchUrl" );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "owl-cli",
-  "version": "5.28.0",
+  "version": "5.31.0",
   "main": "index.js",
   "preferGlobal": true,
   "bin": {