Merge branch 'script_gj' into 'master'

update

See merge request !221
This commit is contained in:
2021-12-10 14:23:50 +08:00
@@ -35,8 +35,8 @@ class EsHouseMatchDistrict {
def houseRun(){
def citys = ["ËÕÖÝ","º¼ÖÝ"]//CommonUtils.findAllCity();
for(def city : citys){
def endDate = DateUtils.truncateDay(new Date())
def startDate = DateUtils.parseFromTightByPattern("2020-12-01","yyyy-MM-dd")//DateUtils.truncateDay(new Date()-1)
def endDate = DateUtils.parseFromTightByPattern("2021-11-01","yyyy-MM-dd")//DateUtils.truncateDay(new Date())
def startDate = DateUtils.parseFromTightByPattern("2021-01-01","yyyy-MM-dd")//DateUtils.truncateDay(new Date()-1)
def houses = findHouseCounts(city, startDate, endDate);
match(city, houses);
}
@@ -86,7 +86,7 @@ class EsHouseMatchDistrict {
QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("city", city))
.must(QueryBuilders.termQuery("cat", "sell"))
.must(date_range).must(QueryBuilders.existsQuery("match_seaweed_id"))
.must(date_range).mustNot(QueryBuilders.existsQuery("match_seaweed_id"))
// BoolQueryBuilder inBuilder = QueryBuilders.boolQuery();
// for(def s : ["sell", "rent"]){
// inBuilder.should(QueryBuilders.matchQuery("cat", s));
@@ -94,6 +94,12 @@ class EsHouseMatchDistrict {
// queryBuilder.must(inBuilder)
def houses = ElasticUtils.executeSimpleQuery("192.168.0.206", "seawater-20*", queryBuilder);
def rets = []
for(def r : rets){
if(!r.match_seaweed_id){
rets << r
}
}
return houses
}