Merge remote-tracking branch 'origin/master'

This commit is contained in:
2025-06-16 14:05:29 +08:00
26 changed files with 830 additions and 239 deletions
@@ -37,7 +37,9 @@ class SynchAdministrativeMappingDataBatch extends BaseBatch{
//删除旧的,再同步新的
ADMINISTRATIVE_MAPPING_COLL_100.remove(new BasicDBObject())
def dbcursor = ADMINISTRATIVE_MAPPING_COLL.find(new BasicDBObject()).batchSize(1000)
def q = new BasicDBObject()
// q.put("shape.type","MultiPolygon")
def dbcursor = ADMINISTRATIVE_MAPPING_COLL.find(q).batchSize(1000)
def datas = []
def retMap = [:]
for(def d : dbcursor){
@@ -59,6 +61,7 @@ class SynchAdministrativeMappingDataBatch extends BaseBatch{
def synchToEs(retMap, host, indexName){
QueryBuilder queryBuilder = QueryBuilders.boolQuery()
// queryBuilder.must(QueryBuilders.termQuery("street", "喀拉玛盖镇"))
def oldIds = new CopyOnWriteArrayList()
ElasticUtils89.queryUpdate(host, indexName, queryBuilder, { String id, doc->
@@ -69,11 +72,11 @@ class SynchAdministrativeMappingDataBatch extends BaseBatch{
if(!["id","_id","c_date","m_date","polyline_source","operator","city_simple_pinyin","prefecture_level_city"].contains(k)){
def val = doc.get(k)
if(val!=v){
if(k!="shape" || (k=="shape" && v.type!="MultiPolygon")){
// if(k!="shape" || (k=="shape" && v.type!="MultiPolygon")){
println k +" 修改 "+id
updateFieldCount++
doc.put(k,v)
}
// }
}
}
}
@@ -35,7 +35,8 @@ class SynchDevDataBatch extends BaseBatch{
}
def synchDevTo100(){
def dbcursor = DEVELOPMENT_ZONE_43_COLL.find()
def q = new BasicDBObject()
def dbcursor = DEVELOPMENT_ZONE_43_COLL.find(q)
def rets = []
def devMap = [:]
for(def r : dbcursor){
@@ -87,7 +88,7 @@ class SynchDevDataBatch extends BaseBatch{
QueryBuilder queryBuilder = QueryBuilders.boolQuery()
def oldIds = new CopyOnWriteArrayList()
ElasticUtils89.executeQuery(host, indexName, queryBuilder, { String id, doc->
ElasticUtils89.queryUpdate(host, indexName, queryBuilder, { String id, doc->
oldIds << id
def mongoObj = devMap.get(id)
def updateFieldCount = 0
@@ -343,7 +343,7 @@ class SeaweedDataSynch extends BaseBatch{
map.region = distData.district
area_code = distData.mca_district_code
}else{
if(["东莞市","中山市","济源市","仙桃市","潜江市","天门市","神农架林区","五指山市","琼海市","文昌市","万宁市","东方市","定安县","屯昌县","澄迈县","临高县","白沙黎族自治县","昌江黎族自治县","乐东黎族自治县","陵水黎族自治县","保亭黎族苗族自治县","琼中黎族苗族自治县","五指山市","琼海市","文昌市","万宁市","东方市","定安县","屯昌县","澄迈县","临高县","白沙黎族自治县","昌江黎族自治县","乐东黎族自治县","陵水黎族自治县","保亭黎族苗族自治县","琼中黎族苗族自治县","石河子市","阿拉尔市","图木舒克市","五家渠市","北屯市","铁门关市","双河市","可克达拉市","昆玉市","胡杨河市","新星市","白杨市","嘉峪关市"].contains(map.city)){
if(["东莞市","中山市","济源市","仙桃市","潜江市","天门市","神农架林区","五指山市","琼海市","文昌市","万宁市","东方市","定安县","屯昌县","澄迈县","临高县","白沙黎族自治县","昌江黎族自治县","乐东黎族自治县","陵水黎族自治县","保亭黎族苗族自治县","琼中黎族苗族自治县","五指山市","琼海市","文昌市","万宁市","东方市","定安县","屯昌县","澄迈县","临高县","白沙黎族自治县","昌江黎族自治县","乐东黎族自治县","陵水黎族自治县","保亭黎族苗族自治县","琼中黎族苗族自治县","石河子市","阿拉尔市","图木舒克市","五家渠市","北屯市","铁门关市","双河市","可克达拉市","昆玉市","胡杨河市","新星市","白杨市","嘉峪关市","儋州市"].contains(map.city)){
map.region = map.city
}
// map.region = dist.region
@@ -30,6 +30,28 @@ class DingDingMessageUtil {
}
}
static void sendTextMessageAndAt(String access_token, String msg, String atMobile) throws Exception {
HttpRequest request = new HttpRequest();
HttpPost httppost = new HttpPost("https://oapi.dingtalk.com/robot/send?access_token=" + access_token);
httppost.addHeader("Content-Type", "application/json; charset=utf-8");
// 创建消息体,只包含一个手机号
String textMsg = "{ " +
"\"msgtype\": \"text\", " +
"\"text\": {\"content\": \"" + msg + "\"}, " +
"\"at\": {\"atMobiles\": [\"" + atMobile + "\"]}" + // 只 @ 一个手机号
"}";
StringEntity se = new StringEntity(textMsg, "utf-8");
httppost.setEntity(se);
HttpResponse response = request.getHttpClient().execute(httppost);
if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
String result = EntityUtils.toString(response.getEntity(), "utf-8");
System.out.println("消息发送结果:" + result);
}
}
static void sendMarkdownMessage(String access_token, String title, String msg){
HttpRequest request = new HttpRequest()
JSONObject requestBody = new JSONObject()