文件utf-8转GBK
This commit is contained in:
@@ -14,7 +14,7 @@ import com.mongodb.DBCollection
|
||||
//福州第三方均价统计,发送钉钉消息
|
||||
//def datas = ExcelUtils.read("d:\\数据\\福州\\福州4月2.xlsx",0,1)
|
||||
//def datas = CsvUtils.read("d:\\数据\\福州\\FJW_THIRD_PARTY_AVG_PRICE_202105.csv");
|
||||
def datas = readTxt("d:\\数据\\福州\\FJW_THIRD_PARTY_AVG_PRICE_202105.csv")
|
||||
def datas = readTxt("d:\\数据\\福州\\FJW_THIRD_PARTY_AVG_PRICE_202106.csv")
|
||||
def count0 = 0
|
||||
def count1 = 0
|
||||
def count2 = 0
|
||||
|
||||
+95
-4
@@ -55,7 +55,9 @@ class ZsPersonProcess {
|
||||
// task.matchDb2()
|
||||
// task.matchDb3()
|
||||
|
||||
task.saveOrUpdate()
|
||||
// task.saveOrUpdate()
|
||||
// task.addAlias()
|
||||
task.updateLocation()
|
||||
}
|
||||
|
||||
def matchMap(){
|
||||
@@ -1048,8 +1050,8 @@ class ZsPersonProcess {
|
||||
obj = CommonDatautils.findDistrictByAlias(row[0], row[1], row[2], "district")
|
||||
}
|
||||
if(!obj){
|
||||
//saveData(row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7], row[8], row[9])
|
||||
//FangjiaClientUtils.sendDistrictPriceCalculate(row[0], row[1], row[2], 4);
|
||||
saveData(row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7], row[8], row[9])
|
||||
FangjiaClientUtils.sendDistrictPriceCalculate(row[0], row[1], row[2], 4);
|
||||
println "【新增】 ${row[0]} ${row[1]} ${row[2]}"
|
||||
}else{
|
||||
println "【已存在】 ${row[0]} ${row[1]} ${row[2]}"
|
||||
@@ -1064,6 +1066,95 @@ class ZsPersonProcess {
|
||||
|
||||
}
|
||||
|
||||
def updateLocation(){
|
||||
def keys = []
|
||||
ExcelUtils.modify("d:\\数据\\浙商\\测试.xlsx", { d ->
|
||||
if (d['Y'] && d['S'] && d['S'].toString().toDouble().toInteger() == 6) {
|
||||
if (d['AQ'] && d['AQ'].contains("已存在[距离远]")) {
|
||||
if (d['U'] && d['Z'] && d['AA']) {
|
||||
def obj = findData(d['AL'], d['AM'], d['AN'])
|
||||
if(obj){
|
||||
def lat2 = null
|
||||
def lng2 = null
|
||||
def lat = null
|
||||
def lng = null
|
||||
if(d['Y']=="高德"){
|
||||
lng = (d['AC'].toDouble()*10000000000).longValue()
|
||||
lat = (d['AD'].toDouble()*10000000000).longValue()
|
||||
def gmap = GeocodeUtils.getGaodeToBaidu(d['AC'].toDouble(), d['AD'].toDouble())
|
||||
if(gmap){
|
||||
lng2 = (gmap.get("lng")*10000000000).longValue()
|
||||
lat2 = (gmap.get("lat")*10000000000).longValue()
|
||||
}
|
||||
}else if(d['Y']=="百度"){
|
||||
lng2 = (d['AC'].toDouble()*10000000000).longValue()
|
||||
lat2 = (d['AD'].toDouble()*10000000000).longValue()
|
||||
def gmap = GeocodeUtils.geoconvBaiduToGoogle(d['AC'].toDouble(), d['AD'].toDouble())
|
||||
if(gmap){
|
||||
lng = (gmap.get("lng")*10000000000).longValue()
|
||||
lat = (gmap.get("lat")*10000000000).longValue()
|
||||
}
|
||||
}
|
||||
|
||||
def key = d['AL']+"##"+d['AM']+"##"+d['AN']
|
||||
if(!keys.contains(key)){
|
||||
keys << key
|
||||
def q = new BasicDBObject()
|
||||
q.put("_id", obj._id)
|
||||
|
||||
def udata = new BasicDBObject()
|
||||
udata.put("lng", lng)
|
||||
udata.put("lat", lat)
|
||||
udata.put("lng2", lng2)
|
||||
udata.put("lat2", lat2)
|
||||
udata.put("m_date", new Date())
|
||||
DbUtils.seaweed.update(q, new BasicDBObject('$set', udata))
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},0)
|
||||
}
|
||||
|
||||
def addAlias(){
|
||||
ExcelUtils.modify("d:\\数据\\浙商\\测试.xlsx", { d ->
|
||||
if (d['Y'] && d['S'] && d['S'].toString().toDouble().toInteger() == 6) {
|
||||
if (d['AQ'] && d['AQ'].contains("别名") && !d['AQ'].contains("分期")) {
|
||||
if (d['U'] && d['Z'] && d['AA']) {
|
||||
def obj = findData(d['AL'], d['AM'], d['AN'])
|
||||
if(obj){
|
||||
def aliasName = d['AA'].replace("(建设中)","")
|
||||
if(d['AN']!=aliasName){
|
||||
def alias = obj.alias
|
||||
|
||||
def q = new BasicDBObject()
|
||||
q.put("_id", obj._id)
|
||||
|
||||
if(!alias){
|
||||
alias = []
|
||||
}
|
||||
|
||||
if(!alias.contains(aliasName)){
|
||||
alias << aliasName
|
||||
def udata = new BasicDBObject()
|
||||
|
||||
udata.put("alias", alias)
|
||||
udata.put("m_date", new Date())
|
||||
DbUtils.seaweed.update(q, new BasicDBObject('$set', udata))
|
||||
println d['AN'] +" "+d['AA']
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
},0)
|
||||
}
|
||||
|
||||
def findData(city, region, newName){
|
||||
def q = new BasicDBObject()
|
||||
q.put("city", city)
|
||||
@@ -1074,7 +1165,7 @@ class ZsPersonProcess {
|
||||
return DbUtils.seaweed.findOne(q)
|
||||
}
|
||||
|
||||
def saveData(city, region, newName, newAddress, estateType, lng2, lat2, lng, lat, alias){
|
||||
def saveData(city, region, newName, newAddress, estateType, lng, lat, lng2, lat2, alias){
|
||||
def d = new BasicDBObject()
|
||||
d.put("city", city)
|
||||
d.put("region", region)
|
||||
|
||||
+61
-61
@@ -12,7 +12,7 @@ import com.mongodb.DBObject
|
||||
import com.mongodb.QueryOperators
|
||||
|
||||
/**
|
||||
* 浙商本地化部署同步脚本
|
||||
* 浙商本地化部署同步脚本
|
||||
*/
|
||||
@BatchOwner(Watcher.GaoJuan)
|
||||
class BasicInfoDataSynch extends BaseBatch{
|
||||
@@ -52,14 +52,14 @@ class BasicInfoDataSynch extends BaseBatch{
|
||||
zsCitysMap.put(zsCitys._id.toString(), zsCitys)
|
||||
zsDatas << zsCitys
|
||||
}
|
||||
//数据存在则修改,不存在则保存
|
||||
//数据存在则修改,不存在则保存
|
||||
if(fangjiaCitys){
|
||||
for(def fjCity : fangjiaCitys){
|
||||
if(fjCity.display!="全国"){
|
||||
if(fjCity.display!="全国"){
|
||||
fjCitysMap.put(fjCity._id.toString(), fjCity)
|
||||
}
|
||||
def zsCity = zsCitysMap.get(fjCity._id.toString())
|
||||
if(zsCity){//修改
|
||||
if(zsCity){//修改
|
||||
if(zsCity.province != fjCity.province || zsCity.alias!=fjCity.alias){
|
||||
def udata = new BasicDBObject()
|
||||
udata.put("province",fjCity.province)
|
||||
@@ -68,7 +68,7 @@ class BasicInfoDataSynch extends BaseBatch{
|
||||
udata.put("update_date",new Date().getTime())
|
||||
ZS_CITYS_CONN.update(new BasicDBObject("_id",zsCity._id), new BasicDBObject('$set',udata))
|
||||
}
|
||||
}else{//保存
|
||||
}else{//保存
|
||||
def addUata = new BasicDBObject()
|
||||
addUata.put("_id",fjCity._id)
|
||||
addUata.put("display",fjCity.display)
|
||||
@@ -81,7 +81,7 @@ class BasicInfoDataSynch extends BaseBatch{
|
||||
}
|
||||
}
|
||||
|
||||
//老数据不在新数据中,被删除时,状态修改为1
|
||||
//老数据不在新数据中,被删除时,状态修改为1
|
||||
if(zsDatas){
|
||||
for(def zsCity : zsDatas){
|
||||
def fjCity = fjCitysMap.get(zsCity._id.toString())
|
||||
@@ -94,7 +94,7 @@ class BasicInfoDataSynch extends BaseBatch{
|
||||
}
|
||||
}
|
||||
|
||||
println "[${fangjiaCitys.size()}]个城市同步完成"
|
||||
println "[${fangjiaCitys.size()}]个城市同步完成"
|
||||
|
||||
}
|
||||
def synchRegion(){
|
||||
@@ -139,7 +139,7 @@ class BasicInfoDataSynch extends BaseBatch{
|
||||
}
|
||||
}
|
||||
}
|
||||
println "[${fjRegions.size()}]个行政区域同步完成"
|
||||
println "[${fjRegions.size()}]个行政区域同步完成"
|
||||
}
|
||||
|
||||
def synchTown(){
|
||||
@@ -185,7 +185,7 @@ class BasicInfoDataSynch extends BaseBatch{
|
||||
}
|
||||
}
|
||||
}
|
||||
println "[${fjTowns.size()}]个乡镇同步完成"
|
||||
println "[${fjTowns.size()}]个乡镇同步完成"
|
||||
}
|
||||
def synchDict(){
|
||||
def dbcursor = ZS_DICT_CONN.find(new BasicDBObject()).sort(new BasicDBObject("version",-1)).limit(1)
|
||||
@@ -238,57 +238,57 @@ class BasicInfoDataSynch extends BaseBatch{
|
||||
|
||||
|
||||
|
||||
/* def zsDictCursor = ZS_DICT_CONN.find(new BasicDBObject())
|
||||
def zsDicts = []
|
||||
def zsDictMap = [:]
|
||||
def fjDictMap = [:]
|
||||
for(def obj : zsDictCursor){
|
||||
zsDictMap.put(obj._id.toString(), obj)
|
||||
zsDicts << obj;
|
||||
}
|
||||
if(fjDicts){
|
||||
def addDatas = []
|
||||
for(def fjDict : fjDicts){
|
||||
fjDictMap.put(fjDict._id.toString(), fjDict)
|
||||
def zsDictObj = zsDictMap.get(fjDict._id.toString())
|
||||
def udata = new BasicDBObject()
|
||||
udata.put("cat",fjDict.cat)
|
||||
udata.put("name",fjDict.name)
|
||||
udata.put("status",0)
|
||||
udata.put("update_date",new Date().getTime())
|
||||
udata.put("version", version)
|
||||
if(zsDictObj){
|
||||
if(fjDict.cat!=zsDictObj.cat||fjDict.name!=zsDictObj.name||zsDictObj.status!=0){
|
||||
ZS_DICT_CONN.update(new BasicDBObject("_id",zsDictObj._id), new BasicDBObject('$set',udata))
|
||||
}
|
||||
}else{
|
||||
udata.put("_id",fjDict._id)
|
||||
addDatas << udata
|
||||
if(addDatas.size()%10000==0){
|
||||
println addDatas.size()/10000 +" 10000"
|
||||
ZS_DICT_CONN.insert(addDatas);
|
||||
addDatas = [];
|
||||
}
|
||||
}
|
||||
}
|
||||
if(addDatas.size()>0){
|
||||
ZS_DICT_CONN.insert(addDatas);
|
||||
addDatas = [];
|
||||
}
|
||||
}
|
||||
/* def zsDictCursor = ZS_DICT_CONN.find(new BasicDBObject())
|
||||
def zsDicts = []
|
||||
def zsDictMap = [:]
|
||||
def fjDictMap = [:]
|
||||
for(def obj : zsDictCursor){
|
||||
zsDictMap.put(obj._id.toString(), obj)
|
||||
zsDicts << obj;
|
||||
}
|
||||
if(fjDicts){
|
||||
def addDatas = []
|
||||
for(def fjDict : fjDicts){
|
||||
fjDictMap.put(fjDict._id.toString(), fjDict)
|
||||
def zsDictObj = zsDictMap.get(fjDict._id.toString())
|
||||
def udata = new BasicDBObject()
|
||||
udata.put("cat",fjDict.cat)
|
||||
udata.put("name",fjDict.name)
|
||||
udata.put("status",0)
|
||||
udata.put("update_date",new Date().getTime())
|
||||
udata.put("version", version)
|
||||
if(zsDictObj){
|
||||
if(fjDict.cat!=zsDictObj.cat||fjDict.name!=zsDictObj.name||zsDictObj.status!=0){
|
||||
ZS_DICT_CONN.update(new BasicDBObject("_id",zsDictObj._id), new BasicDBObject('$set',udata))
|
||||
}
|
||||
}else{
|
||||
udata.put("_id",fjDict._id)
|
||||
addDatas << udata
|
||||
if(addDatas.size()%10000==0){
|
||||
println addDatas.size()/10000 +" 10000"
|
||||
ZS_DICT_CONN.insert(addDatas);
|
||||
addDatas = [];
|
||||
}
|
||||
}
|
||||
}
|
||||
if(addDatas.size()>0){
|
||||
ZS_DICT_CONN.insert(addDatas);
|
||||
addDatas = [];
|
||||
}
|
||||
}
|
||||
|
||||
if(zsDicts){
|
||||
for(def zsDict : zsDicts){
|
||||
def fjDict = fjDictMap.get(zsDict._id.toString())
|
||||
if(!fjDict){
|
||||
def udata = new BasicDBObject()
|
||||
udata.put("status",1)
|
||||
udata.put("update_date",new Date().getTime())
|
||||
ZS_DICT_CONN.update(new BasicDBObject("_id",zsDict._id), new BasicDBObject('$set',udata))
|
||||
}
|
||||
}
|
||||
}*/
|
||||
println "[${fjDicts.size()}]个字典数据同步完成"
|
||||
if(zsDicts){
|
||||
for(def zsDict : zsDicts){
|
||||
def fjDict = fjDictMap.get(zsDict._id.toString())
|
||||
if(!fjDict){
|
||||
def udata = new BasicDBObject()
|
||||
udata.put("status",1)
|
||||
udata.put("update_date",new Date().getTime())
|
||||
ZS_DICT_CONN.update(new BasicDBObject("_id",zsDict._id), new BasicDBObject('$set',udata))
|
||||
}
|
||||
}
|
||||
}*/
|
||||
println "[${fjDicts.size()}]个字典数据同步完成"
|
||||
}
|
||||
def synchDistrict(cat){
|
||||
def fangjiaCitys = CommonDatautils.findAllCity()
|
||||
@@ -367,10 +367,10 @@ class BasicInfoDataSynch extends BaseBatch{
|
||||
def udata = new BasicDBObject()
|
||||
udata.put("status",1)
|
||||
udata.put("update_date",new Date().getTime())
|
||||
ZS_SEAWEED_CONN.update(new BasicDBObject("_id",fjDistrict._id), new BasicDBObject('$set',udata))
|
||||
ZS_SEAWEED_CONN.update(new BasicDBObject("_id",zsDistrict._id), new BasicDBObject('$set',udata))
|
||||
}
|
||||
}
|
||||
}
|
||||
println "[${fjCity}-${cat}][${districts.size()}]个小区数据同步完成"
|
||||
println "[${fjCity}-${cat}][${districts.size()}]个小区数据同步完成"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user