+20
-24
@@ -1,6 +1,6 @@
|
|||||||
package com.fangjia.script.ccbevaluation
|
package com.fangjia.script.ccbevaluation
|
||||||
|
|
||||||
import com.fangjia.core.util.DataUtil
|
|
||||||
import com.fangjia.core.util.GeoUtils
|
import com.fangjia.core.util.GeoUtils
|
||||||
import com.fangjia.script.BaseBatch
|
import com.fangjia.script.BaseBatch
|
||||||
import com.fangjia.script.BatchOwner
|
import com.fangjia.script.BatchOwner
|
||||||
@@ -10,8 +10,6 @@ import com.fangjia.script.gj.ccb.CcbCodeUtils
|
|||||||
import com.fangjia.script.gj.ccb.FileUtils
|
import com.fangjia.script.gj.ccb.FileUtils
|
||||||
import com.fangjia.script.gj.district.FangjiaClientUtils
|
import com.fangjia.script.gj.district.FangjiaClientUtils
|
||||||
import com.fangjia.script.util.DateUtils
|
import com.fangjia.script.util.DateUtils
|
||||||
import com.fangjia.script.util.ExcelUtils
|
|
||||||
import com.fangjia.script.util.OpenApiClient
|
|
||||||
import groovy.sql.Sql
|
import groovy.sql.Sql
|
||||||
|
|
||||||
import java.util.concurrent.CopyOnWriteArrayList
|
import java.util.concurrent.CopyOnWriteArrayList
|
||||||
@@ -19,8 +17,6 @@ import java.util.concurrent.CountDownLatch
|
|||||||
import java.util.concurrent.ExecutorService
|
import java.util.concurrent.ExecutorService
|
||||||
import java.util.concurrent.Executors
|
import java.util.concurrent.Executors
|
||||||
import java.util.concurrent.atomic.AtomicLong
|
import java.util.concurrent.atomic.AtomicLong
|
||||||
import java.util.regex.Pattern
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 建行模型估值项目
|
* 建行模型估值项目
|
||||||
* 小区数据同步
|
* 小区数据同步
|
||||||
@@ -213,25 +209,25 @@ class BigdataCommunityBatch extends BaseBatch{
|
|||||||
ret << ""
|
ret << ""
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
ret << ""
|
// ret << ""
|
||||||
ret << ""
|
// ret << ""
|
||||||
// def jsonObj = FangjiaClientUtils.addressStructure(dist.city, dist.address)
|
def jsonObj = FangjiaClientUtils.formatNinelevel(dist.city, dist.address)
|
||||||
// if(jsonObj && jsonObj.result && jsonObj.result.street){
|
if(jsonObj && jsonObj.street && jsonObj.streetNumber){
|
||||||
// if(jsonObj.result.street){
|
if(jsonObj.street){
|
||||||
// ret << jsonObj.result.street
|
ret << jsonObj.street
|
||||||
// }else{
|
}else{
|
||||||
// ret << ""
|
ret << ""
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// if(jsonObj.result.streetNumber){
|
if(jsonObj.streetNumber){
|
||||||
// ret << jsonObj.result.streetNumber
|
ret << jsonObj.streetNumber
|
||||||
// }else{
|
}else{
|
||||||
// ret << ""
|
ret << ""
|
||||||
// }
|
}
|
||||||
// }else{
|
}else{
|
||||||
// ret << ""
|
ret << ""
|
||||||
// ret << ""
|
ret << ""
|
||||||
// }
|
}
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
ret << ""
|
ret << ""
|
||||||
|
|||||||
+2
-5
@@ -3,8 +3,6 @@ package com.fangjia.script.ccbevaluation
|
|||||||
import com.fangjia.datastore.driver.DSCollection
|
import com.fangjia.datastore.driver.DSCollection
|
||||||
import com.fangjia.datastore.driver.DSCursor
|
import com.fangjia.datastore.driver.DSCursor
|
||||||
import com.fangjia.datastore.driver.DataStore
|
import com.fangjia.datastore.driver.DataStore
|
||||||
import com.fangjia.script.lixue.util.DBUtils
|
|
||||||
import com.fangjia.script.util.DataUtil
|
|
||||||
import com.fangjia.script.util.DateUtils
|
import com.fangjia.script.util.DateUtils
|
||||||
import com.fangjia.script.util.MongoUtils
|
import com.fangjia.script.util.MongoUtils
|
||||||
import com.google.common.hash.BloomFilter
|
import com.google.common.hash.BloomFilter
|
||||||
@@ -12,7 +10,6 @@ import com.google.common.hash.Funnels
|
|||||||
import com.mongodb.BasicDBObject
|
import com.mongodb.BasicDBObject
|
||||||
import com.mongodb.DBCollection
|
import com.mongodb.DBCollection
|
||||||
import com.mongodb.DBObject
|
import com.mongodb.DBObject
|
||||||
import com.rabbitmq.client.impl.AMQImpl
|
|
||||||
import groovy.sql.Sql
|
import groovy.sql.Sql
|
||||||
|
|
||||||
import java.nio.charset.StandardCharsets
|
import java.nio.charset.StandardCharsets
|
||||||
@@ -447,7 +444,7 @@ class CcbCommonUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// q.put("c_date", new BasicDBObject('$lt', DateUtils.parseFromTightYYYYMMDD("2023-05-01")))//因5月1日新增过多,所以暂且先去掉 此批数据改为name_cat=13
|
// q.put("c_date", new BasicDBObject('$lt', DateUtils.parseFromTightYYYYMMDD("2023-05-01")))//因5月1日新增过多,所以暂且先去掉 此批数据改为name_cat=13
|
||||||
// q.put("name","一米阳光一期")
|
// q.put("name","新泾三村")
|
||||||
// q.put("name_cat", 0);
|
// q.put("name_cat", 0);
|
||||||
// q.put("name", new BasicDBObject('$in', ["中信泰富又一城一期","中信泰富又一城"]))
|
// q.put("name", new BasicDBObject('$in', ["中信泰富又一城一期","中信泰富又一城"]))
|
||||||
|
|
||||||
@@ -549,7 +546,7 @@ class CcbCommonUtils {
|
|||||||
|
|
||||||
public static def findCcbDistrict(cityid){
|
public static def findCcbDistrict(cityid){
|
||||||
def sql = "select CITYID, DISTID, COMMID, DISTNAME, COMMNAME, ADDRESS, LATITUDE, LONGITUDE, LANDAREA, BUILDAREA, GREENINGRATE, PLOTRATIO, PARKINGCNT, BUILDYEAR, HOUSEUSE, ZTS, WORKDATE, UPDATEFLAG, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,COMMTYPE, \n" +
|
def sql = "select CITYID, DISTID, COMMID, DISTNAME, COMMNAME, ADDRESS, LATITUDE, LONGITUDE, LANDAREA, BUILDAREA, GREENINGRATE, PLOTRATIO, PARKINGCNT, BUILDYEAR, HOUSEUSE, ZTS, WORKDATE, UPDATEFLAG, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,COMMTYPE, \n" +
|
||||||
"\tCOMMALIAS, STREET, STREETNO, IFNEW, INTRODUCTION, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, SOURCECODE, XZJDB, LJXZQHDM, LJXZQH,STATUS from bigdata_community_gj where cityId=${cityid}";
|
"\tCOMMALIAS, STREET, STREETNO, IFNEW, INTRODUCTION, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, SOURCECODE, XZJDB, LJXZQHDM, LJXZQH,STATUS from bigdata_community_gj where cityId=${cityid} ";
|
||||||
def map = [:]
|
def map = [:]
|
||||||
sqlInstance.eachRow(sql,{r->
|
sqlInstance.eachRow(sql,{r->
|
||||||
def data = []
|
def data = []
|
||||||
|
|||||||
Reference in New Issue
Block a user