Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -406,10 +406,10 @@
|
|||||||
const month = now.getMonth() + 1; // 月
|
const month = now.getMonth() + 1; // 月
|
||||||
|
|
||||||
let divElement = document.getElementById("date");
|
let divElement = document.getElementById("date");
|
||||||
divElement.innerHTML = "<span>"+year+"年"+month+"月"+"</span>";
|
$("#date").html("<span>"+year+"年"+month+"月"+"</span>")
|
||||||
|
|
||||||
let divElement2 = document.getElementById("date2");
|
let divElement2 = document.getElementById("date2");
|
||||||
divElement2.innerHTML = "<span>"+year+"年"+month+"月"+"</span>";
|
$("#date2").html("<span>"+year+"年"+month+"月"+"</span>")
|
||||||
|
|
||||||
$(function(){
|
$(function(){
|
||||||
$('.td04').each(function(i){
|
$('.td04').each(function(i){
|
||||||
|
|||||||
+148
-15
@@ -16,7 +16,8 @@ class MinglujiData {
|
|||||||
|
|
||||||
DBCollection mlj_COLL = MongoUtils.getCollectionByName("crawl", "kfq_mingluji_com", "192.168.0.206",27020)
|
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";
|
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 dev_mapping_CONN = MongoUtils.getCollectionByName2("fangjia", "dev_mapping", MONGO100_URL)
|
||||||
DBCollection community_100_CONN = MongoUtils.getCollectionByName2("fangjia", "community", MONGO100_URL)
|
DBCollection community_100_CONN = MongoUtils.getCollectionByName2("fangjia", "community", MONGO100_URL)
|
||||||
@@ -30,16 +31,19 @@ class MinglujiData {
|
|||||||
}
|
}
|
||||||
|
|
||||||
def run(){
|
def run(){
|
||||||
def prov = "浙江省"
|
def prov = "河北省"
|
||||||
def city = "嘉兴"
|
def city = "石家庄市"
|
||||||
// exportDatas(city)
|
// exportDatas(city)
|
||||||
matchDev(prov, city)
|
matchDev(prov, city)
|
||||||
matchCommunity(city)
|
matchCommunity(city)
|
||||||
|
fiveLevelSplit(city)
|
||||||
|
nineLevelSplit(city)
|
||||||
// tempMatchDev(prov)
|
// tempMatchDev(prov)
|
||||||
|
|
||||||
|
// checkDev()
|
||||||
// saveMljData()
|
// saveMljData()
|
||||||
|
|
||||||
fiveLevelSplit(city)
|
|
||||||
}
|
}
|
||||||
def exportDatas(city){
|
def exportDatas(city){
|
||||||
def datas = findMinglujiDatas(city)
|
def datas = findMinglujiDatas(city)
|
||||||
@@ -84,9 +88,9 @@ class MinglujiData {
|
|||||||
|
|
||||||
|
|
||||||
if (d['E'] && !d['N']) {
|
if (d['E'] && !d['N']) {
|
||||||
def obj = findDevByName(d['E'])
|
def obj = findDevByName(null, d['E'])
|
||||||
if (!obj) {
|
if (!obj) {
|
||||||
obj = findDevByAlias(d['E'])
|
obj = findDevByAlias(null, d['E'])
|
||||||
if (!obj) {
|
if (!obj) {
|
||||||
obj = findDebBySimlar(devs, d['E'], d['B'])
|
obj = findDebBySimlar(devs, d['E'], d['B'])
|
||||||
if (!obj) {
|
if (!obj) {
|
||||||
@@ -122,9 +126,9 @@ class MinglujiData {
|
|||||||
def devs = loadAllDevs(prov)
|
def devs = loadAllDevs(prov)
|
||||||
ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\名录集\\湖州-开发区-等级.xlsx",{d->
|
ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\名录集\\湖州-开发区-等级.xlsx",{d->
|
||||||
if(d['U'] && !d['W'] ){
|
if(d['U'] && !d['W'] ){
|
||||||
def obj = findDevByName(d['U'])
|
def obj = findDevByName(null, d['U'])
|
||||||
if(!obj){
|
if(!obj){
|
||||||
obj = findDevByAlias(d['U'])
|
obj = findDevByAlias(null, d['U'])
|
||||||
if(!obj){
|
if(!obj){
|
||||||
obj = findDebBySimlar(devs, d['U'], d['B'])
|
obj = findDebBySimlar(devs, d['U'], d['B'])
|
||||||
if(!obj){
|
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 fiveLevelSplit(city){
|
||||||
def i = 1;
|
def i = 1;
|
||||||
while(i<20) {
|
while(i<20) {
|
||||||
def fileName = "/home/goojia/gj/mlj_${i}.xlsx"
|
def fileName = "/home/goojia/gj/mlj_${i}.xlsx"
|
||||||
if (CommonDatautils.isWindow()) {
|
if (CommonDatautils.isWindow()) {
|
||||||
fileName = "D:\\数据\\数据建设\\名录集\\mlj_${i}.xlsx"
|
fileName = "D:\\数据\\数据建设\\名录集\\${city}_${i}.xlsx"
|
||||||
}
|
}
|
||||||
|
|
||||||
File file = new File(fileName);
|
File file = new File(fileName);
|
||||||
if (file.exists()) {
|
if (file.exists()) {
|
||||||
ExcelUtils.multiThreadingModify(fileName, { d ->
|
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'])
|
def jsonObject = com.fangjia.script.gj.district.FangjiaClientUtils.formatFivelevel(d['B'], d['J'])
|
||||||
if(jsonObject) {
|
if(jsonObject) {
|
||||||
if (jsonObject.get("address") && jsonObject.get("address") != "null") {
|
if (jsonObject.get("address") && jsonObject.get("address") != "null") {
|
||||||
d['X'] = jsonObject.get("address")
|
d['AN'] = jsonObject.get("address")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
i++
|
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(){
|
def saveMljData(){
|
||||||
ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\名录集\\湖州入库2.xlsx",{d->
|
ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\名录集\\嘉兴入库数据.xlsx",{d->
|
||||||
def obj = new BasicDBObject()
|
def obj = new BasicDBObject()
|
||||||
obj.put("province", d['A'])
|
obj.put("province", d['A'])
|
||||||
obj.put("city", d['B'])
|
obj.put("city", d['B'])
|
||||||
@@ -281,14 +408,20 @@ class MinglujiData {
|
|||||||
}
|
}
|
||||||
return last
|
return last
|
||||||
}
|
}
|
||||||
def findDevByName(name){
|
def findDevByName(city, name){
|
||||||
def q = new BasicDBObject()
|
def q = new BasicDBObject()
|
||||||
|
if(city){
|
||||||
|
q.put("city", city)
|
||||||
|
}
|
||||||
q.put("name", name)
|
q.put("name", name)
|
||||||
return development_zone_CONN.findOne(q)
|
return development_zone_CONN.findOne(q)
|
||||||
}
|
}
|
||||||
|
|
||||||
def findDevByAlias(name){
|
def findDevByAlias(city, name){
|
||||||
def q = new BasicDBObject()
|
def q = new BasicDBObject()
|
||||||
|
if(city){
|
||||||
|
q.put("city", city)
|
||||||
|
}
|
||||||
q.put('alias', new BasicDBObject('$in',[name]))
|
q.put('alias', new BasicDBObject('$in',[name]))
|
||||||
return development_zone_CONN.findOne(q)
|
return development_zone_CONN.findOne(q)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user