Commit 8b6af49d by 宋毅

tj

parent a667e52f
...@@ -38,8 +38,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -38,8 +38,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -87,8 +89,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -87,8 +89,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -136,8 +140,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -136,8 +140,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -184,7 +190,11 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -184,7 +190,11 @@ class CPatentAggregationsApi extends ApiBase {
} }
}; };
if (obj && obj.length > 0) { if (obj && obj.length > 0) {
params.query.bool.must = obj; for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]);
}
}
} else { } else {
return rtn = { return rtn = {
status: -100, status: -100,
...@@ -245,8 +255,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -245,8 +255,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -294,8 +306,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -294,8 +306,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -343,8 +357,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -343,8 +357,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -392,8 +408,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -392,8 +408,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -441,8 +459,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -441,8 +459,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -490,8 +510,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -490,8 +510,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -521,7 +543,7 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -521,7 +543,7 @@ class CPatentAggregationsApi extends ApiBase {
"query": { "query": {
"bool": { "bool": {
"must": [ "must": [
{"bool": {"must_not":{"exists" : { "field" : "gr_no" }}}} { "bool": { "must_not": { "exists": { "field": "gr_no" } } } }
] ]
} }
}, },
...@@ -541,8 +563,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -541,8 +563,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -590,12 +614,12 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -590,12 +614,12 @@ class CPatentAggregationsApi extends ApiBase {
} }
}; };
obj.push({ "exists": { "field": "gr_no" } }); obj.push({ "exists": { "field": "gr_no" } });
params.query.bool.must = obj;
// for (var x in obj) { for (var x in obj) {
// if (obj[x]) { if (obj[x]) {
// params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
// } }
// } }
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -644,8 +668,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -644,8 +668,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -694,8 +720,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -694,8 +720,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -752,7 +780,11 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -752,7 +780,11 @@ class CPatentAggregationsApi extends ApiBase {
// clientIp: "" // clientIp: ""
// }); // });
if (obj && obj.length > 0) { if (obj && obj.length > 0) {
params.query.bool.must = obj; for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]);
}
}
} }
else { else {
return rtn = { return rtn = {
...@@ -762,11 +794,6 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -762,11 +794,6 @@ class CPatentAggregationsApi extends ApiBase {
buckets: null buckets: null
}; };
} }
// for (var x in obj) {
// if (obj[x] && obj[x] != null && obj[x] != "undefined") {
// params.query.bool.must = obj;
// }
// }
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -822,8 +849,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -822,8 +849,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -872,8 +901,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -872,8 +901,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -922,8 +953,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -922,8 +953,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -972,8 +1005,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -972,8 +1005,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1022,8 +1057,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -1022,8 +1057,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1071,8 +1108,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -1071,8 +1108,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1131,8 +1170,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -1131,8 +1170,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1180,8 +1221,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -1180,8 +1221,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1240,8 +1283,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -1240,8 +1283,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1289,8 +1334,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -1289,8 +1334,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1349,8 +1396,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -1349,8 +1396,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1398,8 +1447,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -1398,8 +1447,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1458,8 +1509,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -1458,8 +1509,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1519,7 +1572,7 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -1519,7 +1572,7 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if(obj[x]){ if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
} }
...@@ -1581,8 +1634,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -1581,8 +1634,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1641,8 +1696,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -1641,8 +1696,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1672,7 +1729,7 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -1672,7 +1729,7 @@ class CPatentAggregationsApi extends ApiBase {
"query": { "query": {
"bool": { "bool": {
"must": [ "must": [
{"exists" : { "field" : "gr_no" }} { "exists": { "field": "gr_no" } }
] ]
} }
}, },
...@@ -1692,8 +1749,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -1692,8 +1749,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1740,8 +1799,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -1740,8 +1799,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1799,8 +1860,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -1799,8 +1860,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1858,8 +1921,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -1858,8 +1921,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1917,8 +1982,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -1917,8 +1982,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1976,8 +2043,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -1976,8 +2043,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -2035,8 +2104,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -2035,8 +2104,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -2065,7 +2136,7 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -2065,7 +2136,7 @@ class CPatentAggregationsApi extends ApiBase {
"query": { "query": {
"bool": { "bool": {
"must": [ "must": [
{"exists" : { "field" : "province_name" }} { "exists": { "field": "province_name" } }
] ]
} }
}, },
...@@ -2085,8 +2156,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -2085,8 +2156,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -2116,7 +2189,7 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -2116,7 +2189,7 @@ class CPatentAggregationsApi extends ApiBase {
"query": { "query": {
"bool": { "bool": {
"must": [ "must": [
{"exists" : { "field" : "city_name" }} { "exists": { "field": "city_name" } }
] ]
} }
}, },
...@@ -2136,8 +2209,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -2136,8 +2209,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -2166,7 +2241,7 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -2166,7 +2241,7 @@ class CPatentAggregationsApi extends ApiBase {
"query": { "query": {
"bool": { "bool": {
"must": [ "must": [
{"exists" : { "field" : "county_name" }} { "exists": { "field": "county_name" } }
] ]
} }
}, },
...@@ -2186,8 +2261,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -2186,8 +2261,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -2244,8 +2321,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -2244,8 +2321,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -2313,8 +2392,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -2313,8 +2392,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -2382,8 +2463,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -2382,8 +2463,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -2451,8 +2534,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -2451,8 +2534,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -2520,8 +2605,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -2520,8 +2605,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -2580,8 +2667,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -2580,8 +2667,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -2640,8 +2729,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -2640,8 +2729,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -2700,8 +2791,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -2700,8 +2791,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -2760,8 +2853,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -2760,8 +2853,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -2820,8 +2915,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -2820,8 +2915,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -2880,8 +2977,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -2880,8 +2977,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -2940,8 +3039,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -2940,8 +3039,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -3000,8 +3101,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -3000,8 +3101,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -3060,8 +3163,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -3060,8 +3163,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -3120,8 +3225,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -3120,8 +3225,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -3180,8 +3287,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -3180,8 +3287,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -3209,7 +3318,7 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -3209,7 +3318,7 @@ class CPatentAggregationsApi extends ApiBase {
"query": { "query": {
"bool": { "bool": {
"must": [ "must": [
{"exists" : { "field" : "gr_no" }} { "exists": { "field": "gr_no" } }
] ]
} }
}, },
...@@ -3229,8 +3338,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -3229,8 +3338,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -3289,8 +3400,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -3289,8 +3400,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -3349,8 +3462,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -3349,8 +3462,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -3409,8 +3524,10 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -3409,8 +3524,10 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -3434,7 +3551,7 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -3434,7 +3551,7 @@ class CPatentAggregationsApi extends ApiBase {
} }
}; };
async provincePubstatusAggs(obj,areaname,type) {//根据传的省|市|县信息不同类型聚合 async provincePubstatusAggs(obj, areaname, type) {//根据传的省|市|县信息不同类型聚合
var params = { var params = {
"query": { "query": {
"bool": { "bool": {
...@@ -3457,19 +3574,20 @@ class CPatentAggregationsApi extends ApiBase { ...@@ -3457,19 +3574,20 @@ class CPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
if(type==2){
if(areaname=='北京市' || areaname=='天津市' ||areaname=='重庆市' ||areaname=='上海市')
{
params.aggregations.group_by_country.terms.field="county_name";
} }
else{ if (type == 2) {
params.aggregations.group_by_country.terms.field="city_name"; if (areaname == '北京市' || areaname == '天津市' || areaname == '重庆市' || areaname == '上海市') {
params.aggregations.group_by_country.terms.field = "county_name";
}
else {
params.aggregations.group_by_country.terms.field = "city_name";
} }
} }
else if (type ==3 || type == 4){ else if (type == 3 || type == 4) {
params.aggregations.group_by_country.terms.field="county_name"; params.aggregations.group_by_country.terms.field = "county_name";
} }
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
......
...@@ -32,8 +32,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -32,8 +32,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -81,8 +83,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -81,8 +83,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -130,8 +134,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -130,8 +134,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -179,8 +185,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -179,8 +185,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -228,8 +236,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -228,8 +236,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -287,8 +297,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -287,8 +297,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -357,8 +369,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -357,8 +369,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -427,8 +441,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -427,8 +441,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -486,8 +502,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -486,8 +502,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -556,8 +574,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -556,8 +574,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -626,8 +646,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -626,8 +646,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -685,8 +707,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -685,8 +707,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -755,8 +779,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -755,8 +779,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -825,8 +851,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -825,8 +851,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -884,8 +912,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -884,8 +912,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -954,8 +984,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -954,8 +984,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1024,8 +1056,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -1024,8 +1056,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1084,8 +1118,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -1084,8 +1118,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1133,8 +1169,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -1133,8 +1169,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1202,8 +1240,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -1202,8 +1240,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1261,8 +1301,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -1261,8 +1301,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1320,8 +1362,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -1320,8 +1362,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1379,8 +1423,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -1379,8 +1423,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1448,8 +1494,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -1448,8 +1494,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1517,8 +1565,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -1517,8 +1565,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1586,8 +1636,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -1586,8 +1636,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
...@@ -1655,8 +1707,10 @@ class WPatentAggregationsApi extends ApiBase { ...@@ -1655,8 +1707,10 @@ class WPatentAggregationsApi extends ApiBase {
}; };
for (var x in obj) { for (var x in obj) {
if (obj[x]) {
params.query.bool.must.push(obj[x]); params.query.bool.must.push(obj[x]);
} }
}
var rc = System.getObject("util.execClient"); var rc = System.getObject("util.execClient");
var rtn = null; var rtn = null;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment