diff --git a/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl b/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl
index 375d1ec56..57168fb3d 100644
--- a/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl
+++ b/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl
@@ -406,10 +406,10 @@
const month = now.getMonth() + 1; // 月
let divElement = document.getElementById("date");
- divElement.innerHTML = ""+year+"年"+month+"月"+"";
+ $("#date").html(""+year+"年"+month+"月"+"")
let divElement2 = document.getElementById("date2");
- divElement2.innerHTML = ""+year+"年"+month+"月"+"";
+ $("#date2").html(""+year+"年"+month+"月"+"")
$(function(){
$('.td04').each(function(i){
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/MinglujiData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/MinglujiData.groovy
index 2624d025c..bbe36b024 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/MinglujiData.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/MinglujiData.groovy
@@ -16,7 +16,8 @@ class MinglujiData {
DBCollection mlj_COLL = MongoUtils.getCollectionByName("crawl", "kfq_mingluji_com", "192.168.0.206",27020)
def MONGO100_URL = "mongodb://admin:G00MONGOADMIN@192.168.0.100:30009";
- DBCollection development_zone_CONN = MongoUtils.getCollectionByName2("fangjia", "development_zone", MONGO100_URL)
+
+ DBCollection development_zone_CONN = MongoUtils.getCollectionByName("fangjia_base", "development_zone", "mongo.db.fangjia.com")
DBCollection dev_mapping_CONN = MongoUtils.getCollectionByName2("fangjia", "dev_mapping", MONGO100_URL)
DBCollection community_100_CONN = MongoUtils.getCollectionByName2("fangjia", "community", MONGO100_URL)
@@ -30,16 +31,19 @@ class MinglujiData {
}
def run(){
- def prov = "Õã½Ê¡"
- def city = "¼ÎÐË"
+ def prov = "ºÓ±±Ê¡"
+ def city = "ʯ¼ÒׯÊÐ"
// exportDatas(city)
matchDev(prov, city)
matchCommunity(city)
-
+ fiveLevelSplit(city)
+ nineLevelSplit(city)
// tempMatchDev(prov)
+
+// checkDev()
// saveMljData()
- fiveLevelSplit(city)
+
}
def exportDatas(city){
def datas = findMinglujiDatas(city)
@@ -84,9 +88,9 @@ class MinglujiData {
if (d['E'] && !d['N']) {
- def obj = findDevByName(d['E'])
+ def obj = findDevByName(null, d['E'])
if (!obj) {
- obj = findDevByAlias(d['E'])
+ obj = findDevByAlias(null, d['E'])
if (!obj) {
obj = findDebBySimlar(devs, d['E'], d['B'])
if (!obj) {
@@ -122,9 +126,9 @@ class MinglujiData {
def devs = loadAllDevs(prov)
ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\Êý¾Ý½¨Éè\\Ãû¼¼¯\\ºþÖÝ-¿ª·¢Çø-µÈ¼¶.xlsx",{d->
if(d['U'] && !d['W'] ){
- def obj = findDevByName(d['U'])
+ def obj = findDevByName(null, d['U'])
if(!obj){
- obj = findDevByAlias(d['U'])
+ obj = findDevByAlias(null, d['U'])
if(!obj){
obj = findDebBySimlar(devs, d['U'], d['B'])
if(!obj){
@@ -202,34 +206,157 @@ class MinglujiData {
}
}
+ def nineLevelSplit(city){
+ def i = 1;
+ while(i<20) {
+ def fileName = "/home/goojia/gj/mlj_${i}.xlsx"
+ if (CommonDatautils.isWindow()) {
+ fileName = "D:\\Êý¾Ý\\Êý¾Ý½¨Éè\\Ãû¼¼¯\\${city}_${i}.xlsx"
+ }
+
+ File file = new File(fileName);
+ if (file.exists()) {
+ ExcelUtils.multiThreadingModify(fileName,{d->
+ if(d['E'] && !d['Z']){
+ def jsonObject1 = com.fangjia.script.gj.district.FangjiaClientUtils.formatNinelevel(d['B'], d['E'])
+ if(jsonObject1) {
+ if (jsonObject1.get("dev") && jsonObject1.get("dev") != "null") {
+ def devName = jsonObject1.get("dev")
+ def obj = findDev(jsonObject1.get("city"), devName)
+ d['AD'] = devName
+ if(jsonObject1.containsKey("detail") && jsonObject1.detail.dev_confi!='null'){
+ d['AJ'] = jsonObject1.detail.dev_confi
+ }
+ if (obj) {
+ d['AG'] = obj._id.toString()
+ d['AF'] = obj.name
+ }
+ }
+ }
+ }
+
+ if(d['E'] && !d['M']) {
+ def jsonObject = com.fangjia.script.gj.district.FangjiaClientUtils.formatNinelevel(d['B'], d['J'])
+ def street = jsonObject.get("street")
+ def streetNumber = jsonObject.get("streetNumber")
+ if (jsonObject.get("province") && jsonObject.get("province") != "null") {
+ d['W'] = jsonObject.get("province")
+ }
+
+ if (jsonObject.get("city") && jsonObject.get("city") != "null") {
+ d['X'] = jsonObject.get("city")
+ }
+
+ if (jsonObject.get("district") && jsonObject.get("district") != "null") {
+ d['Y'] = jsonObject.get("district")
+ }
+
+ if (jsonObject.get("township") && jsonObject.get("township") != "null") {
+ d['Z'] = jsonObject.get("township")
+ }
+
+ if (jsonObject && street && streetNumber && street != "null") {
+ d['AA'] = jsonObject.get("street")
+ def road = jsonObject.get("street")
+ if (streetNumber != 'null') {
+ d['AB'] = jsonObject.get("streetNumber")
+ road = road + jsonObject.get("streetNumber")
+ } else {
+ d['AC'] = "ÐÅÏ¢²»ÍêÕû"
+ }
+
+ if (!d['AC'] && !d['J'].contains(road)) {
+ d['AC'] = "ÔµØÖ·²»º¬Â·"
+ }
+
+ if (!d['AC']) {
+ def flag = road.matches('^[\u4e00-\u9fa5]+?(·|´óµÀ|Ïï|ºúͬ|½Ö).+[ŪºÅ]$')
+ if (!flag) {
+ d['AC'] = "··Ç·¨"
+ }
+ def roadsize = jsonObject.get("street").size()
+ if (!d['AC'] && (roadsize < 3 || roadsize > 7)) {
+ d['AC'] = "·̫³¤|·̫¶Ì"
+ }
+ }
+ }else{
+ d['AC'] = "ÎÞµØÖ·"
+ }
+
+ if (jsonObject.get("dev") && jsonObject.get("dev") != "null") {
+ def devName = jsonObject.get("dev")
+ def obj = findDev(jsonObject.get("city"), devName)
+ d['AE'] = devName
+ if (obj) {
+ d['AI'] = obj._id.toString()
+ d['AH'] = obj.name
+ }
+ if(jsonObject.containsKey("detail") && jsonObject.detail.dev_confi!='null'){
+ d['AK'] = jsonObject.detail.dev_confi
+ }
+ }
+ }
+ },0)
+ println fileName +" ¾Å¼¶²ð·ÖÍê³É"
+ }
+ i++
+ }
+ }
+
+
+ def findDev( city, name){
+ def obj = findDevByName(city, name)
+ if(!obj){
+ obj = findDevByAlias(city, name)
+ if(obj){
+ obj.match_way = "±ðÃû"
+ }
+ }else{
+ obj.match_way = "Ïàͬ"
+ }
+ return obj
+ }
def fiveLevelSplit(city){
def i = 1;
while(i<20) {
def fileName = "/home/goojia/gj/mlj_${i}.xlsx"
if (CommonDatautils.isWindow()) {
- fileName = "D:\\Êý¾Ý\\Êý¾Ý½¨Éè\\Ãû¼¼¯\\mlj_${i}.xlsx"
+ fileName = "D:\\Êý¾Ý\\Êý¾Ý½¨Éè\\Ãû¼¼¯\\${city}_${i}.xlsx"
}
File file = new File(fileName);
if (file.exists()) {
ExcelUtils.multiThreadingModify(fileName, { d ->
- if(d['J'] && !d['X']){
+ if(d['J'] && !d['AN']){
def jsonObject = com.fangjia.script.gj.district.FangjiaClientUtils.formatFivelevel(d['B'], d['J'])
if(jsonObject) {
if (jsonObject.get("address") && jsonObject.get("address") != "null") {
- d['X'] = jsonObject.get("address")
+ d['AN'] = jsonObject.get("address")
}
}
}
})
}
i++
+ println fileName +" Îå¼¶²ð·ÖÍê³É"
}
}
+ def checkDev(){
+ ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\Êý¾Ý½¨Éè\\Ãû¼¼¯\\¼ÎÐËÈë¿âÊý¾Ý.xlsx",{d->
+ if(d['F']){
+ def obj = findDevByName(null, d['F'])
+ if(obj){
+ d['I'] = "¿âÖÐ"
+ }else{
+ d['I'] = "·Ç¿âÖÐ"
+ }
+ }
+ })
+ }
def saveMljData(){
- ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\Êý¾Ý½¨Éè\\Ãû¼¼¯\\ºþÖÝÈë¿â2.xlsx",{d->
+ ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\Êý¾Ý½¨Éè\\Ãû¼¼¯\\¼ÎÐËÈë¿âÊý¾Ý.xlsx",{d->
def obj = new BasicDBObject()
obj.put("province", d['A'])
obj.put("city", d['B'])
@@ -281,14 +408,20 @@ class MinglujiData {
}
return last
}
- def findDevByName(name){
+ def findDevByName(city, name){
def q = new BasicDBObject()
+ if(city){
+ q.put("city", city)
+ }
q.put("name", name)
return development_zone_CONN.findOne(q)
}
- def findDevByAlias(name){
+ def findDevByAlias(city, name){
def q = new BasicDBObject()
+ if(city){
+ q.put("city", city)
+ }
q.put('alias', new BasicDBObject('$in',[name]))
return development_zone_CONN.findOne(q)
}