Merge branch 'script_gj' into 'master'
Script gj See merge request !146
This commit is contained in:
+4
-2
@@ -420,7 +420,8 @@ class BigdataDealBatch extends BaseBatch{
|
|||||||
// startDate = DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightByPattern("20210601", "yyyyMMdd"))//DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightByPattern(curDate.toString(), "yyyyMMdd"))
|
// startDate = DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightByPattern("20210601", "yyyyMMdd"))//DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightByPattern(curDate.toString(), "yyyyMMdd"))
|
||||||
// }
|
// }
|
||||||
|
|
||||||
def endDate = DateUtils.getLastDayOfMonth(DateUtils.parseFromTightByPattern(curDate.toString(), "yyyyMMdd"))//DateUtils.getFirstDayOfMonth(new Date())
|
// def endDate = DateUtils.getLastDayOfMonth(DateUtils.parseFromTightByPattern(curDate.toString(), "yyyyMMdd"))//DateUtils.getFirstDayOfMonth(new Date())
|
||||||
|
def endDate = DateUtils.getLastDayOfMonth(DateUtils.parseFromTightByPattern("20210801", "yyyyMMdd"))
|
||||||
for(def i=0;i<dists.size();i++){
|
for(def i=0;i<dists.size();i++){
|
||||||
final def dist = dists[i]
|
final def dist = dists[i]
|
||||||
fixedThreadPool.execute(new Runnable() {
|
fixedThreadPool.execute(new Runnable() {
|
||||||
@@ -474,7 +475,8 @@ class BigdataDealBatch extends BaseBatch{
|
|||||||
|
|
||||||
def getYouDaData(statMap){
|
def getYouDaData(statMap){
|
||||||
def startDate = DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightByPattern(curDate.toString(), "yyyyMMdd"))
|
def startDate = DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightByPattern(curDate.toString(), "yyyyMMdd"))
|
||||||
def endDate = DateUtils.getLastDayOfMonth(DateUtils.parseFromTightByPattern(curDate.toString(), "yyyyMMdd"))
|
//def endDate = DateUtils.getLastDayOfMonth(DateUtils.parseFromTightByPattern(curDate.toString(), "yyyyMMdd"))
|
||||||
|
def endDate = DateUtils.getLastDayOfMonth(DateUtils.parseFromTightByPattern("20210801", "yyyyMMdd"))
|
||||||
def q = new BasicDBObject()
|
def q = new BasicDBObject()
|
||||||
q.put("contractTime", new BasicDBObject('$gte', startDate).append('$lte', endDate));
|
q.put("contractTime", new BasicDBObject('$gte', startDate).append('$lte', endDate));
|
||||||
q.put("area", new BasicDBObject('$gte', 20))
|
q.put("area", new BasicDBObject('$gte', 20))
|
||||||
|
|||||||
+5
-2
@@ -55,7 +55,7 @@ class BigdataForsaleBatch extends BaseBatch{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static final String[] TAGS = ["独栋", "联排", "叠加", "双拼", "花园面积", "泳池", "别墅", "带花园", "洋房", "叠拼", "独院", "联体", "微墅", "大平墅"];
|
public static final String[] TAGS = ["独栋", "联排", "叠加", "双拼", "花园面积", "泳池", "别墅", "带花园", "洋房", "叠拼", "独院", "联体", "微墅", "大平墅"];
|
||||||
public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(80)
|
public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(60)
|
||||||
|
|
||||||
def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.100:31521:orcl",
|
def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.100:31521:orcl",
|
||||||
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
|
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
|
||||||
@@ -66,7 +66,7 @@ class BigdataForsaleBatch extends BaseBatch{
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void process(Object args) {
|
public void process(Object args) {
|
||||||
def citys = ["杭州"]//CcbCommonUtils.citys;
|
def citys = CcbCommonUtils.citys;
|
||||||
def index = 0
|
def index = 0
|
||||||
def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
|
def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
|
||||||
for(def city : citys){
|
for(def city : citys){
|
||||||
@@ -283,6 +283,7 @@ class BigdataForsaleBatch extends BaseBatch{
|
|||||||
|
|
||||||
def rets = []
|
def rets = []
|
||||||
def houses = ElasticUtils.executeSimpleQuery("192.168.0.206", "seawater-20*", queryBuilder);
|
def houses = ElasticUtils.executeSimpleQuery("192.168.0.206", "seawater-20*", queryBuilder);
|
||||||
|
|
||||||
if(houses){
|
if(houses){
|
||||||
for (int k=0;k<houses.size();k++) {
|
for (int k=0;k<houses.size();k++) {
|
||||||
def map = houses[k];
|
def map = houses[k];
|
||||||
@@ -412,6 +413,8 @@ class BigdataForsaleBatch extends BaseBatch{
|
|||||||
rets << rowMap
|
rets << rowMap
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
println name +" "+houses.size()+" last:"+rets.size()
|
||||||
return rets;
|
return rets;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
@@ -230,6 +230,7 @@ class CcbCommonUtils {
|
|||||||
q.put("visible",0)
|
q.put("visible",0)
|
||||||
q.put("cat", cat);
|
q.put("cat", cat);
|
||||||
q.put("city", city);
|
q.put("city", city);
|
||||||
|
// q.put("name","御海阳光")
|
||||||
// q.put("name_cat", 0);
|
// q.put("name_cat", 0);
|
||||||
// q.put("estate_type2", new BasicDBObject('$in', ["普通住宅","商住"]))
|
// q.put("estate_type2", new BasicDBObject('$in', ["普通住宅","商住"]))
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user