解决冲突

Merge branch 'dev3.2' of http://192.168.3.207:10080/qmx/jy-data-extract into dev3.2

# Conflicts:
#	src/jy/pretreated/analystep.go
#	src/jy/pretreated/analytable.go
#	src/jy/pretreated/tablev2.go

fullproject/src/city.json

@@ -0,0 +1,3239 @@
+{
+    "city": {
+        "金银川镇": "新疆",
+        "郑东新区": "河南",
+        "信阳客整所": "湖北",
+        "北屯": "新疆",
+        "鼓楼区": "江苏",
+        "辽河": "辽宁",
+        "南大港": "河北",
+        "北京": "北京",
+        "密云": "北京",
+        "延庆": "北京",
+        "天津": "天津",
+        "宁河": "天津",
+        "静海": "天津",
+        "蓟县": "天津",
+        "河北": "河北",
+        "石家庄": "河北",
+        "井陉": "河北",
+        "正定": "河北",
+        "栾城": "河北",
+        "行唐": "河北",
+        "灵寿": "河北",
+        "高邑": "河北",
+        "深泽": "河北",
+        "赞皇": "河北",
+        "无极县": "河北",
+        "平山县": "河北",
+        "元氏": "河北",
+        "赵县": "河北",
+        "辛集市": "河北",
+        "藁城": "河北",
+        "晋州": "河北",
+        "新乐": "河北",
+        "鹿泉": "河北",
+        "唐山": "河北",
+        "滦县": "河北",
+        "滦南": "河北",
+        "乐亭": "河北",
+        "迁西": "河北",
+        "玉田": "河北",
+        "唐海": "河北",
+        "遵化": "河北",
+        "迁安市": "河北",
+        "秦皇岛": "河北",
+        "青龙县": "河北",
+        "青龙满族自治县": "河北",
+        "昌黎": "河北",
+        "抚宁": "河北",
+        "卢龙": "河北",
+        "邯郸": "河北",
+        "临漳": "河北",
+        "成安": "河北",
+        "大名县": "河北",
+        "涉县": "河北",
+        "磁县": "河北",
+        "肥乡": "河北",
+        "永年": "河北",
+        "邱县": "河北",
+        "鸡泽": "河北",
+        "广平县": "河北",
+        "馆陶": "河北",
+        "魏县": "河北",
+        "曲周": "河北",
+        "武安": "河北",
+        "邢台": "河北",
+        "临城": "河北",
+        "内丘": "河北",
+        "柏乡县": "河北",
+        "隆尧": "河北",
+        "任县": "河北",
+        "南和": "河北",
+        "宁晋": "河北",
+        "巨鹿": "河北",
+        "新河县": "河北",
+        "广宗": "河北",
+        "平乡": "河北",
+        "威县": "河北",
+        "清河": "河北",
+        "临西": "河北",
+        "南宫": "河北",
+        "沙河市": "河北",
+        "保定": "河北",
+        "满城": "河北",
+        "清苑": "河北",
+        "涞水": "河北",
+        "阜平": "河北",
+        "徐水": "河北",
+        "定兴": "河北",
+        "唐县": "河北",
+        "高阳": "河北",
+        "容城": "河北",
+        "涞源": "河北",
+        "望都": "河北",
+        "安新": "河北",
+        "易县": "河北",
+        "曲阳": "河北",
+        "蠡县": "河北",
+        "顺平": "河北",
+        "博野": "河北",
+        "雄县": "河北",
+        "涿州": "河北",
+        "定州": "河北",
+        "安国": "河北",
+        "高碑店": "河北",
+        "张家口": "河北",
+        "宣化": "河北",
+        "张北": "河北",
+        "康保": "河北",
+        "沽源": "河北",
+        "尚义": "河北",
+        "蔚县": "河北",
+        "阳原": "河北",
+        "怀安": "河北",
+        "万全县": "河北",
+        "怀来": "河北",
+        "涿鹿": "河北",
+        "赤城": "河北",
+        "崇礼": "河北",
+        "承德": "河北",
+        "兴隆": "河北",
+        "平泉县": "河北",
+        "滦平": "河北",
+        "隆化": "河北",
+        "丰宁": "河北",
+        "宽城满族自治县": "河北",
+        "宽城县": "河北",
+        "围场": "河北",
+        "沧州": "河北",
+        "沧县": "河北",
+        "青县": "河北",
+        "东光县": "河北",
+        "海兴": "河北",
+        "盐山": "河北",
+        "肃宁": "河北",
+        "南皮": "河北",
+        "吴桥县": "河北",
+        "献县": "河北",
+        "孟村回族自治县": "河北",
+        "孟村县": "河北",
+        "泊头": "河北",
+        "任丘": "河北",
+        "黄骅": "河北",
+        "河间市": "河北",
+        "廊坊": "河北",
+        "固安": "河北",
+        "永清": "河北",
+        "香河": "河北",
+        "大城县": "河北",
+        "文安": "河北",
+        "大厂回族自治县": "河北",
+        "大厂县": "河北",
+        "霸州": "河北",
+        "三河": "河北",
+        "衡水": "河北",
+        "枣强": "河北",
+        "武邑": "河北",
+        "武强": "河北",
+        "饶阳": "河北",
+        "安平": "河北",
+        "故城县": "河北",
+        "景县": "河北",
+        "阜城县": "河北",
+        "冀州": "河北",
+        "深州": "河北",
+        "山西": "山西",
+        "太原": "山西",
+        "清徐": "山西",
+        "阳曲": "山西",
+        "娄烦": "山西",
+        "古交": "山西",
+        "大同市": "山西",
+        "阳高": "山西",
+        "天镇": "山西",
+        "广灵": "山西",
+        "灵丘": "山西",
+        "浑源": "山西",
+        "左云": "山西",
+        "阳泉": "山西",
+        "平定": "山西",
+        "盂县": "山西",
+        "长治": "山西",
+        "襄垣": "山西",
+        "屯留": "山西",
+        "平顺": "山西",
+        "黎城": "山西",
+        "壶关": "山西",
+        "长子": "山西",
+        "武乡": "山西",
+        "沁县": "山西",
+        "沁源": "山西",
+        "潞城": "山西",
+        "晋城": "山西",
+        "沁水": "山西",
+        "阳城": "山西",
+        "陵川": "山西",
+        "泽州": "山西",
+        "高平": "山西",
+        "朔州": "山西",
+        "山阴": "山西",
+        "应县": "山西",
+        "右玉": "山西",
+        "怀仁": "山西",
+        "晋中": "山西",
+        "榆社": "山西",
+        "左权县": "山西",
+        "和顺": "山西",
+        "昔阳": "山西",
+        "寿阳": "山西",
+        "太谷": "山西",
+        "祁县": "山西",
+        "平遥": "山西",
+        "灵石": "山西",
+        "介休": "山西",
+        "运城": "山西",
+        "临猗": "山西",
+        "万荣": "山西",
+        "闻喜": "山西",
+        "稷山": "山西",
+        "新绛": "山西",
+        "绛县": "山西",
+        "垣曲": "山西",
+        "夏县": "山西",
+        "平陆": "山西",
+        "芮城": "山西",
+        "永济": "山西",
+        "河津市": "山西",
+        "忻州": "山西",
+        "定襄": "山西",
+        "五台县": "山西",
+        "代县": "山西",
+        "繁峙": "山西",
+        "宁武": "山西",
+        "静乐": "山西",
+        "神池": "山西",
+        "五寨": "山西",
+        "岢岚": "山西",
+        "河曲": "山西",
+        "保德": "山西",
+        "偏关": "山西",
+        "原平": "山西",
+        "临汾": "山西",
+        "曲沃": "山西",
+        "翼城": "山西",
+        "襄汾": "山西",
+        "洪洞": "山西",
+        "古县": "山西",
+        "安泽": "山西",
+        "浮山": "山西",
+        "吉县": "山西",
+        "乡宁": "山西",
+        "大宁": "山西",
+        "隰县": "山西",
+        "永和": "山西",
+        "蒲县": "山西",
+        "汾西": "山西",
+        "侯马": "山西",
+        "霍州": "山西",
+        "吕梁": "山西",
+        "文水": "山西",
+        "交城": "山西",
+        "兴县": "山西",
+        "临县": "山西",
+        "柳林": "山西",
+        "石楼": "山西",
+        "岚县": "山西",
+        "方山县": "山西",
+        "中阳县": "山西",
+        "交口县": "山西",
+        "孝义市": "山西",
+        "汾阳": "山西",
+        "内蒙古": "内蒙古",
+        "呼和浩特": "内蒙古",
+        "土默特左旗": "内蒙古",
+        "托克托": "内蒙古",
+        "和林格尔": "内蒙古",
+        "清水河": "内蒙古",
+        "武川": "内蒙古",
+        "包头": "内蒙古",
+        "土默特右旗": "内蒙古",
+        "固阳": "内蒙古",
+        "达尔罕茂明安联合旗": "内蒙古",
+        "乌海": "内蒙古",
+        "赤峰": "内蒙古",
+        "阿鲁科尔沁旗": "内蒙古",
+        "巴林左旗": "内蒙古",
+        "巴林右旗": "内蒙古",
+        "林西": "内蒙古",
+        "克什克腾旗": "内蒙古",
+        "翁牛特旗": "内蒙古",
+        "喀喇沁旗": "内蒙古",
+        "宁城": "内蒙古",
+        "敖汉旗": "内蒙古",
+        "通辽": "内蒙古",
+        "科尔沁左翼中旗": "内蒙古",
+        "科尔沁左翼后旗": "内蒙古",
+        "开鲁": "内蒙古",
+        "库伦旗": "内蒙古",
+        "奈曼旗": "内蒙古",
+        "扎鲁特旗": "内蒙古",
+        "霍林郭勒": "内蒙古",
+        "鄂尔多斯": "内蒙古",
+        "达拉特旗": "内蒙古",
+        "准格尔旗": "内蒙古",
+        "鄂托克前旗": "内蒙古",
+        "鄂托克旗": "内蒙古",
+        "杭锦旗": "内蒙古",
+        "乌审旗": "内蒙古",
+        "伊金霍洛旗": "内蒙古",
+        "呼伦贝尔": "内蒙古",
+        "阿荣旗": "内蒙古",
+        "莫力达瓦达斡尔族自治旗": "内蒙古",
+        "鄂伦春自治旗": "内蒙古",
+        "鄂温克族自治旗": "内蒙古",
+        "陈巴尔虎旗": "内蒙古",
+        "新巴尔虎左旗": "内蒙古",
+        "新巴尔虎右旗": "内蒙古",
+        "满洲里": "内蒙古",
+        "牙克石": "内蒙古",
+        "扎兰屯": "内蒙古",
+        "额尔古纳": "内蒙古",
+        "根河": "内蒙古",
+        "巴彦淖尔": "内蒙古",
+        "五原": "内蒙古",
+        "磴口": "内蒙古",
+        "乌拉特前旗": "内蒙古",
+        "乌拉特中旗": "内蒙古",
+        "乌拉特后旗": "内蒙古",
+        "杭锦后旗": "内蒙古",
+        "乌兰察布": "内蒙古",
+        "卓资": "内蒙古",
+        "化德": "内蒙古",
+        "商都县": "内蒙古",
+        "兴和县": "内蒙古",
+        "凉城": "内蒙古",
+        "察哈尔右翼前旗": "内蒙古",
+        "察哈尔右翼中旗": "内蒙古",
+        "察哈尔右翼后旗": "内蒙古",
+        "四子王旗": "内蒙古",
+        "丰镇": "内蒙古",
+        "兴安盟": "内蒙古",
+        "乌兰浩特": "内蒙古",
+        "阿尔山": "内蒙古",
+        "科尔沁右翼前旗": "内蒙古",
+        "科尔沁右翼中旗": "内蒙古",
+        "扎赉特旗": "内蒙古",
+        "突泉": "内蒙古",
+        "锡林郭勒盟": "内蒙古",
+        "二连浩特": "内蒙古",
+        "锡林浩特": "内蒙古",
+        "阿巴嘎旗": "内蒙古",
+        "苏尼特左旗": "内蒙古",
+        "苏尼特右旗": "内蒙古",
+        "东乌珠穆沁旗": "内蒙古",
+        "西乌珠穆沁旗": "内蒙古",
+        "太仆寺旗": "内蒙古",
+        "镶黄旗": "内蒙古",
+        "正镶白旗": "内蒙古",
+        "正蓝旗": "内蒙古",
+        "多伦": "内蒙古",
+        "阿拉善盟": "内蒙古",
+        "阿拉善左旗": "内蒙古",
+        "阿拉善右旗": "内蒙古",
+        "额济纳旗": "内蒙古",
+        "辽宁": "辽宁",
+        "沈阳": "辽宁",
+        "辽中": "辽宁",
+        "康平": "辽宁",
+        "法库": "辽宁",
+        "新民市": "辽宁",
+        "大连": "辽宁",
+        "长海": "辽宁",
+        "瓦房店": "辽宁",
+        "普兰店": "辽宁",
+        "庄河": "辽宁",
+        "鞍山": "辽宁",
+        "台安县": "辽宁",
+        "岫岩": "辽宁",
+        "海城市": "辽宁",
+        "抚顺": "辽宁",
+        "新宾": "辽宁",
+        "清原": "辽宁",
+        "本溪": "辽宁",
+        "桓仁": "辽宁",
+        "丹东": "辽宁",
+        "宽甸": "辽宁",
+        "东港市": "辽宁",
+        "凤城": "辽宁",
+        "锦州": "辽宁",
+        "黑山县": "辽宁",
+        "义县": "辽宁",
+        "凌海": "辽宁",
+        "北镇": "辽宁",
+        "营口": "辽宁",
+        "盖州": "辽宁",
+        "大石桥市": "辽宁",
+        "阜新": "辽宁",
+        "彰武": "辽宁",
+        "辽阳": "辽宁",
+        "灯塔市": "辽宁",
+        "盘锦": "辽宁",
+        "大洼": "辽宁",
+        "盘山": "辽宁",
+        "铁岭": "辽宁",
+        "西丰": "辽宁",
+        "昌图": "辽宁",
+        "调兵山": "辽宁",
+        "开原": "辽宁",
+        "朝阳市": "辽宁",
+        "建平": "辽宁",
+        "喀喇沁": "辽宁",
+        "北票": "辽宁",
+        "凌源": "辽宁",
+        "葫芦岛": "辽宁",
+        "绥中": "辽宁",
+        "建昌": "辽宁",
+        "兴城": "辽宁",
+        "吉林": "吉林",
+        "长春": "吉林",
+        "农安": "吉林",
+        "九台": "吉林",
+        "榆树": "吉林",
+        "德惠": "吉林",
+        "吉林": "吉林",
+        "永吉": "吉林",
+        "蛟河": "吉林",
+        "桦甸": "吉林",
+        "舒兰": "吉林",
+        "磐石": "吉林",
+        "四平": "吉林",
+        "梨树县": "吉林",
+        "伊通": "吉林",
+        "公主岭": "吉林",
+        "双辽": "吉林",
+        "辽源": "吉林",
+        "东丰": "吉林",
+        "东辽": "吉林",
+        "通化": "吉林",
+        "辉南": "吉林",
+        "柳河": "吉林",
+        "梅河口": "吉林",
+        "集安": "吉林",
+        "白山市": "吉林",
+        "抚松": "吉林",
+        "靖宇": "吉林",
+        "长白": "吉林",
+        "临江": "吉林",
+        "松原": "吉林",
+        "前郭尔罗斯": "吉林",
+        "长岭": "吉林",
+        "乾安": "吉林",
+        "扶余": "吉林",
+        "白城": "吉林",
+        "镇赉": "吉林",
+        "通榆": "吉林",
+        "洮南": "吉林",
+        "大安市": "吉林",
+        "延边州": "吉林",
+        "延吉": "吉林",
+        "图们": "吉林",
+        "敦化": "吉林",
+        "珲春": "吉林",
+        "龙井市": "吉林",
+        "和龙": "吉林",
+        "汪清": "吉林",
+        "安图县": "吉林",
+        "黑龙江": "黑龙江",
+        "哈尔滨": "黑龙江",
+        "依兰县": "黑龙江",
+        "方正县": "黑龙江",
+        "宾县": "黑龙江",
+        "巴彦": "黑龙江",
+        "木兰县": "黑龙江",
+        "通河县": "黑龙江",
+        "延寿": "黑龙江",
+        "双城区": "黑龙江",
+        "尚志": "黑龙江",
+        "五常市": "黑龙江",
+        "齐齐哈尔": "黑龙江",
+        "龙江县": "黑龙江",
+        "依安": "黑龙江",
+        "泰来": "黑龙江",
+        "甘南": "黑龙江",
+        "富裕县": "黑龙江",
+        "克山县": "黑龙江",
+        "克东县": "黑龙江",
+        "拜泉": "黑龙江",
+        "讷河": "黑龙江",
+        "鸡西市": "黑龙江",
+        "鸡东县": "黑龙江",
+        "虎林": "黑龙江",
+        "密山": "黑龙江",
+        "鹤岗": "黑龙江",
+        "萝北": "黑龙江",
+        "绥滨": "黑龙江",
+        "双鸭山": "黑龙江",
+        "集贤": "黑龙江",
+        "友谊县": "黑龙江",
+        "宝清": "黑龙江",
+        "饶河": "黑龙江",
+        "大庆": "黑龙江",
+        "肇州": "黑龙江",
+        "肇源": "黑龙江",
+        "林甸": "黑龙江",
+        "杜尔伯特": "黑龙江",
+        "伊春市": "黑龙江",
+        "嘉荫": "黑龙江",
+        "铁力": "黑龙江",
+        "佳木斯": "黑龙江",
+        "桦南": "黑龙江",
+        "桦川": "黑龙江",
+        "汤原": "黑龙江",
+        "抚远": "黑龙江",
+        "同江市": "黑龙江",
+        "富锦": "黑龙江",
+        "七台河": "黑龙江",
+        "勃利": "黑龙江",
+        "牡丹江": "黑龙江",
+        "东宁": "黑龙江",
+        "林口": "黑龙江",
+        "绥芬河": "黑龙江",
+        "海林": "黑龙江",
+        "宁安": "黑龙江",
+        "穆棱": "黑龙江",
+        "黑河": "黑龙江",
+        "嫩江": "黑龙江",
+        "逊克": "黑龙江",
+        "孙吴": "黑龙江",
+        "北安": "黑龙江",
+        "五大连池": "黑龙江",
+        "绥化": "黑龙江",
+        "望奎": "黑龙江",
+        "兰西": "黑龙江",
+        "青冈": "黑龙江",
+        "庆安": "黑龙江",
+        "明水": "黑龙江",
+        "绥棱": "黑龙江",
+        "安达": "黑龙江",
+        "肇东": "黑龙江",
+        "海伦": "黑龙江",
+        "呼玛": "黑龙江",
+        "塔河": "黑龙江",
+        "漠河": "黑龙江",
+        "上海": "上海",
+        "崇明": "上海",
+        "江苏": "江苏",
+        "南京": "江苏",
+        "溧水": "江苏",
+        "高淳": "江苏",
+        "无锡": "江苏",
+        "江阴": "江苏",
+        "宜兴": "江苏",
+        "徐州": "江苏",
+        "丰县": "江苏",
+        "沛县": "江苏",
+        "铜山": "江苏",
+        "睢宁": "江苏",
+        "新沂": "江苏",
+        "邳州": "江苏",
+        "常州": "江苏",
+        "溧阳": "江苏",
+        "金坛": "江苏",
+        "苏州": "江苏",
+        "常熟": "江苏",
+        "张家港": "江苏",
+        "昆山": "江苏",
+        "吴江": "江苏",
+        "太仓": "江苏",
+        "南通": "江苏",
+        "海安": "江苏",
+        "如东": "江苏",
+        "启东": "江苏",
+        "如皋": "江苏",
+        "通州": "江苏",
+        "海门": "江苏",
+        "连云港": "江苏",
+        "赣榆": "江苏",
+        "东海": "江苏",
+        "灌云": "江苏",
+        "灌南": "江苏",
+        "淮安": "江苏",
+        "涟水": "江苏",
+        "洪泽区": "江苏",
+        "洪泽县": "江苏",
+        "盱眙": "江苏",
+        "金湖": "江苏",
+        "盐城": "江苏",
+        "响水": "江苏",
+        "滨海县": "江苏",
+        "阜宁": "江苏",
+        "射阳": "江苏",
+        "建湖": "江苏",
+        "东台": "江苏",
+        "大丰": "江苏",
+        "扬州": "江苏",
+        "宝应": "江苏",
+        "仪征": "江苏",
+        "高邮": "江苏",
+        "江都": "江苏",
+        "镇江": "江苏",
+        "丹阳": "江苏",
+        "扬中": "江苏",
+        "句容": "江苏",
+        "泰州": "江苏",
+        "兴化": "江苏",
+        "靖江": "江苏",
+        "泰兴市": "江苏",
+        "泰兴镇": "四川",
+        "姜堰": "江苏",
+        "宿迁": "江苏",
+        "沭阳": "江苏",
+        "泗阳": "江苏",
+        "泗洪": "江苏",
+        "浙江": "浙江",
+        "杭州": "浙江",
+        "桐庐": "浙江",
+        "淳安": "浙江",
+        "建德": "浙江",
+        "富阳区": "浙江",
+        "临安": "浙江",
+        "宁波": "浙江",
+        "象山": "浙江",
+        "宁海": "浙江",
+        "余姚": "浙江",
+        "慈溪": "浙江",
+        "奉化": "浙江",
+        "温州": "浙江",
+        "洞头": "浙江",
+        "永嘉": "浙江",
+        "平阳": "浙江",
+        "苍南": "浙江",
+        "文成县": "浙江",
+        "泰顺": "浙江",
+        "瑞安": "浙江",
+        "乐清": "浙江",
+        "嘉兴": "浙江",
+        "嘉善": "浙江",
+        "海盐": "浙江",
+        "海宁": "浙江",
+        "平湖": "浙江",
+        "桐乡": "浙江",
+        "湖州": "浙江",
+        "德清": "浙江",
+        "长兴": "浙江",
+        "安吉": "浙江",
+        "绍兴": "浙江",
+        "新昌": "浙江",
+        "诸暨": "浙江",
+        "上虞": "浙江",
+        "嵊州": "浙江",
+        "金华": "浙江",
+        "武义": "浙江",
+        "浦江": "浙江",
+        "磐安": "浙江",
+        "兰溪": "浙江",
+        "义乌": "浙江",
+        "东阳": "浙江",
+        "永康": "浙江",
+        "衢州": "浙江",
+        "常山": "浙江",
+        "开化": "浙江",
+        "龙游": "浙江",
+        "江山市": "浙江",
+        "舟山": "浙江",
+        "岱山": "浙江",
+        "嵊泗": "浙江",
+        "台州": "浙江",
+        "玉环": "浙江",
+        "三门县": "浙江",
+        "天台县": "浙江",
+        "仙居": "浙江",
+        "温岭": "浙江",
+        "临海": "浙江",
+        "丽水": "浙江",
+        "青田": "浙江",
+        "缙云": "浙江",
+        "遂昌": "浙江",
+        "松阳": "浙江",
+        "云和": "浙江",
+        "庆元": "浙江",
+        "景宁": "浙江",
+        "龙泉市": "浙江",
+        "安徽": "安徽",
+        "合肥": "安徽",
+        "长丰": "安徽",
+        "肥东": "安徽",
+        "肥西": "安徽",
+        "芜湖": "安徽",
+        "繁昌": "安徽",
+        "南陵": "安徽",
+        "蚌埠": "安徽",
+        "怀远": "安徽",
+        "五河": "安徽",
+        "固镇": "安徽",
+        "淮南": "安徽",
+        "凤台": "安徽",
+        "马鞍山": "安徽",
+        "当涂": "安徽",
+        "含山": "安徽",
+        "和县": "安徽",
+        "淮北": "安徽",
+        "濉溪": "安徽",
+        "铜陵": "安徽",
+        "安庆": "安徽",
+        "怀宁": "安徽",
+        "枞阳": "安徽",
+        "潜山": "安徽",
+        "太湖县": "安徽",
+        "宿松": "安徽",
+        "望江": "安徽",
+        "岳西": "安徽",
+        "桐城": "安徽",
+        "黄山": "安徽",
+        "歙县": "安徽",
+        "休宁": "安徽",
+        "黟县": "安徽",
+        "祁门": "安徽",
+        "滁州": "安徽",
+        "来安": "安徽",
+        "全椒": "安徽",
+        "定远": "安徽",
+        "凤阳": "安徽",
+        "天长市": "安徽",
+        "明光市": "安徽",
+        "阜阳": "安徽",
+        "临泉": "安徽",
+        "太和县": "安徽",
+        "阜南": "安徽",
+        "颍上": "安徽",
+        "界首": "安徽",
+        "宿州": "安徽",
+        "砀山": "安徽",
+        "萧县": "安徽",
+        "灵璧": "安徽",
+        "泗县": "安徽",
+        "巢湖": "安徽",
+        "庐江": "安徽",
+        "无为县": "安徽",
+        "六安": "安徽",
+        "寿县": "安徽",
+        "霍邱": "安徽",
+        "舒城": "安徽",
+        "金寨": "安徽",
+        "霍山": "安徽",
+        "亳州": "安徽",
+        "涡阳": "安徽",
+        "蒙城": "安徽",
+        "利辛": "安徽",
+        "池州": "安徽",
+        "东至县": "安徽",
+        "石台": "安徽",
+        "青阳": "安徽",
+        "宣城": "安徽",
+        "郎溪": "安徽",
+        "广德": "安徽",
+        "泾县": "安徽",
+        "绩溪": "安徽",
+        "旌德": "安徽",
+        "宁国市": "安徽",
+        "福建": "福建",
+        "福州": "福建",
+        "闽侯": "福建",
+        "连江": "福建",
+        "罗源": "福建",
+        "闽清": "福建",
+        "永泰县": "福建",
+        "平潭": "福建",
+        "福清": "福建",
+        "长乐": "福建",
+        "厦门": "福建",
+        "莆田": "福建",
+        "仙游": "福建",
+        "三明": "福建",
+        "明溪": "福建",
+        "清流": "福建",
+        "宁化": "福建",
+        "大田": "福建",
+        "尤溪": "福建",
+        "沙县": "福建",
+        "将乐": "福建",
+        "泰宁": "福建",
+        "建宁": "福建",
+        "永安": "福建",
+        "泉州": "福建",
+        "惠安县": "福建",
+        "安溪": "福建",
+        "永春": "福建",
+        "德化": "福建",
+        "金门": "福建",
+        "石狮": "福建",
+        "晋江": "福建",
+        "南安": "福建",
+        "漳州": "福建",
+        "云霄": "福建",
+        "漳浦": "福建",
+        "诏安": "福建",
+        "长泰": "福建",
+        "东山县": "福建",
+        "南靖": "福建",
+        "平和县": "福建",
+        "华安": "福建",
+        "龙海": "福建",
+        "南平": "福建",
+        "顺昌": "福建",
+        "浦城": "福建",
+        "光泽": "福建",
+        "松溪": "福建",
+        "政和县": "福建",
+        "邵武": "福建",
+        "武夷山": "福建",
+        "建瓯": "福建",
+        "建阳": "福建",
+        "龙岩": "福建",
+        "长汀": "福建",
+        "永定": "福建",
+        "上杭": "福建",
+        "武平": "福建",
+        "连城": "福建",
+        "漳平": "福建",
+        "宁德": "福建",
+        "霞浦": "福建",
+        "古田": "福建",
+        "屏南": "福建",
+        "寿宁": "福建",
+        "周宁": "福建",
+        "柘荣": "福建",
+        "福安": "福建",
+        "福鼎": "福建",
+        "江西": "江西",
+        "南昌": "江西",
+        "新建区": "江西",
+        "安义": "江西",
+        "进贤": "江西",
+        "景德镇": "江西",
+        "浮梁": "江西",
+        "乐平市": "江西",
+        "萍乡": "江西",
+        "莲花": "江西",
+        "上栗": "江西",
+        "芦溪": "江西",
+        "九江市": "江西",
+        "武宁": "江西",
+        "修水县": "江西",
+        "永修": "江西",
+        "德安": "江西",
+        "星子县": "江西",
+        "都昌": "江西",
+        "湖口县": "江西",
+        "彭泽": "江西",
+        "瑞昌": "江西",
+        "新余": "江西",
+        "分宜": "江西",
+        "鹰潭": "江西",
+        "余江": "江西",
+        "贵溪": "江西",
+        "赣州": "江西",
+        "赣县": "江西",
+        "信丰": "江西",
+        "大余": "江西",
+        "上犹": "江西",
+        "崇义": "江西",
+        "安远": "江西",
+        "龙南县": "江西",
+        "定南": "江西",
+        "全南": "江西",
+        "宁都": "江西",
+        "于都": "江西",
+        "兴国县": "江西",
+        "会昌": "江西",
+        "寻乌": "江西",
+        "石城": "江西",
+        "瑞金": "江西",
+        "南康": "江西",
+        "吉安": "江西",
+        "吉水": "江西",
+        "峡江": "江西",
+        "新干": "江西",
+        "永丰": "江西",
+        "泰和县": "江西",
+        "遂川": "江西",
+        "万安县": "江西",
+        "安福县": "江西",
+        "永新县": "江西",
+        "井冈山": "江西",
+        "宜春": "江西",
+        "奉新": "江西",
+        "万载县": "江西",
+        "上高": "江西",
+        "宜丰": "江西",
+        "靖安": "江西",
+        "铜鼓": "江西",
+        "丰城": "江西",
+        "樟树": "江西",
+        "高安": "江西",
+        "抚州": "江西",
+        "南城": "江西",
+        "黎川": "江西",
+        "南丰": "江西",
+        "崇仁": "江西",
+        "乐安": "江西",
+        "宜黄": "江西",
+        "金溪": "江西",
+        "资溪": "江西",
+        "东乡县": "江西",
+        "广昌": "江西",
+        "上饶": "江西",
+        "广丰": "江西",
+        "玉山": "江西",
+        "铅山": "江西",
+        "横峰": "江西",
+        "弋阳": "江西",
+        "余干": "江西",
+        "鄱阳": "江西",
+        "万年县": "江西",
+        "婺源": "江西",
+        "德兴": "江西",
+        "山东": "山东",
+        "济南": "山东",
+        "平阴": "山东",
+        "济阳": "山东",
+        "商河县": "山东",
+        "章丘": "山东",
+        "青岛": "山东",
+        "胶州": "山东",
+        "即墨": "山东",
+        "平度市": "山东",
+        "胶南": "山东",
+        "莱西": "山东",
+        "淄博": "山东",
+        "桓台": "山东",
+        "高青": "山东",
+        "沂源": "山东",
+        "枣庄": "山东",
+        "滕州": "山东",
+        "东营市": "山东",
+        "东营区": "山东",
+        "垦利": "山东",
+        "利津": "山东",
+        "广饶": "山东",
+        "烟台": "山东",
+        "长岛县": "山东",
+        "龙口市": "山东",
+        "莱阳": "山东",
+        "莱州": "山东",
+        "蓬莱": "山东",
+        "招远": "山东",
+        "栖霞市": "山东",
+        "海阳": "山东",
+        "潍坊": "山东",
+        "临朐": "山东",
+        "昌乐": "山东",
+        "青州": "山东",
+        "诸城": "山东",
+        "寿光": "山东",
+        "安丘": "山东",
+        "高密": "山东",
+        "昌邑市": "山东",
+        "济宁": "山东",
+        "微山": "山东",
+        "鱼台": "山东",
+        "金乡": "山东",
+        "嘉祥": "山东",
+        "汶上": "山东",
+        "泗水": "山东",
+        "梁山": "山东",
+        "曲阜": "山东",
+        "兖州": "山东",
+        "邹城": "山东",
+        "泰安": "山东",
+        "宁阳": "山东",
+        "东平": "山东",
+        "新泰": "山东",
+        "肥城": "山东",
+        "威海": "山东",
+        "文登": "山东",
+        "荣成": "山东",
+        "乳山": "山东",
+        "日照": "山东",
+        "五莲": "山东",
+        "莒县": "山东",
+        "莱芜": "山东",
+        "临沂": "山东",
+        "沂南": "山东",
+        "郯城": "山东",
+        "沂水": "山东",
+        "苍山": "山东",
+        "费县": "山东",
+        "平邑": "山东",
+        "莒南": "山东",
+        "蒙阴": "山东",
+        "临沭": "山东",
+        "德州": "山东",
+        "陵县": "山东",
+        "宁津": "山东",
+        "庆云": "山东",
+        "临邑": "山东",
+        "齐河": "山东",
+        "平原": "山东",
+        "夏津": "山东",
+        "武城": "山东",
+        "乐陵": "山东",
+        "禹城": "山东",
+        "聊城": "山东",
+        "阳谷": "山东",
+        "莘县": "山东",
+        "茌平": "山东",
+        "东阿": "山东",
+        "冠县": "山东",
+        "高唐": "山东",
+        "临清": "山东",
+        "滨州": "山东",
+        "惠民": "山东",
+        "阳信": "山东",
+        "无棣": "山东",
+        "沾化": "山东",
+        "博兴": "山东",
+        "邹平": "山东",
+        "菏泽": "山东",
+        "曹县": "山东",
+        "单县": "山东",
+        "成武": "山东",
+        "巨野": "山东",
+        "郓城": "山东",
+        "鄄城": "山东",
+        "定陶": "山东",
+        "东明县": "山东",
+        "河南": "河南",
+        "郑州": "河南",
+        "管城": "河南",
+        "中牟": "河南",
+        "巩义": "河南",
+        "荥阳": "河南",
+        "新密": "河南",
+        "新郑": "河南",
+        "登封": "河南",
+        "开封": "河南",
+        "杞县": "河南",
+        "通许": "河南",
+        "尉氏": "河南",
+        "兰考": "河南",
+        "洛阳": "河南",
+        "孟津": "河南",
+        "新安": "河南",
+        "栾川": "河南",
+        "嵩县": "河南",
+        "汝阳": "河南",
+        "宜阳": "河南",
+        "洛宁": "河南",
+        "伊川": "河南",
+        "偃师": "河南",
+        "平顶山": "河南",
+        "宝丰": "河南",
+        "叶县": "河南",
+        "鲁山": "河南",
+        "郏县": "河南",
+        "舞钢": "河南",
+        "汝州": "河南",
+        "安阳": "河南",
+        "汤阴": "河南",
+        "滑县": "河南",
+        "内黄": "河南",
+        "林州": "河南",
+        "鹤壁": "河南",
+        "浚县": "河南",
+        "淇县": "河南",
+        "新乡": "河南",
+        "获嘉": "河南",
+        "原阳": "河南",
+        "延津": "河南",
+        "封丘": "河南",
+        "长垣": "河南",
+        "卫辉": "河南",
+        "辉市": "河南",
+        "焦作": "河南",
+        "修武": "河南",
+        "博爱": "河南",
+        "武陟": "河南",
+        "温县": "河南",
+        "沁阳": "河南",
+        "孟州": "河南",
+        "濮阳": "河南",
+        "清丰": "河南",
+        "南乐": "河南",
+        "范县": "河南",
+        "台前": "河南",
+        "许昌": "河南",
+        "鄢陵": "河南",
+        "襄城县": "河南",
+        "禹州": "河南",
+        "长葛": "河南",
+        "漯河": "河南",
+        "舞阳": "河南",
+        "临颍": "河南",
+        "三门峡": "河南",
+        "渑池": "河南",
+        "陕县": "河南",
+        "卢氏": "河南",
+        "义马": "河南",
+        "灵宝": "河南",
+        "南阳": "河南",
+        "南召": "河南",
+        "方城": "河南",
+        "西峡": "河南",
+        "镇平县": "河南",
+        "内乡": "河南",
+        "淅川": "河南",
+        "社旗": "河南",
+        "唐河": "河南",
+        "新野": "河南",
+        "桐柏": "河南",
+        "邓州": "河南",
+        "商丘": "河南",
+        "民权": "河南",
+        "睢县": "河南",
+        "宁陵": "河南",
+        "柘城": "河南",
+        "虞城": "河南",
+        "夏邑": "河南",
+        "永城": "河南",
+        "信阳": "河南",
+        "罗山": "河南",
+        "光山": "河南",
+        "新县": "河南",
+        "商城": "河南",
+        "固始": "河南",
+        "潢川": "河南",
+        "淮滨": "河南",
+        "息县": "河南",
+        "周口": "河南",
+        "扶沟": "河南",
+        "西华": "河南",
+        "商水": "河南",
+        "沈丘": "河南",
+        "郸城": "河南",
+        "淮阳": "河南",
+        "太康": "河南",
+        "鹿邑": "河南",
+        "项城": "河南",
+        "驻马店": "河南",
+        "西平": "河南",
+        "上蔡": "河南",
+        "平舆": "河南",
+        "正阳": "河南",
+        "确山": "河南",
+        "泌阳": "河南",
+        "汝南": "河南",
+        "遂平": "河南",
+        "新蔡": "河南",
+        "济源": "河南",
+        "湖北": "湖北",
+        "武汉": "湖北",
+        "黄石市": "湖北",
+        "阳新县": "湖北",
+        "大冶": "湖北",
+        "十堰": "湖北",
+        "郧县": "湖北",
+        "郧西": "湖北",
+        "竹山": "湖北",
+        "竹溪": "湖北",
+        "房县": "湖北",
+        "丹江口": "湖北",
+        "宜昌": "湖北",
+        "远安": "湖北",
+        "兴山": "湖北",
+        "秭归": "湖北",
+        "长阳": "湖北",
+        "五峰": "湖北",
+        "宜都": "湖北",
+        "当阳": "湖北",
+        "枝江": "湖北",
+        "襄阳": "湖北",
+        "南漳": "湖北",
+        "谷城": "湖北",
+        "保康": "湖北",
+        "老河口": "湖北",
+        "枣阳": "湖北",
+        "宜城": "湖北",
+        "鄂州": "湖北",
+        "荆门": "湖北",
+        "京山县": "湖北",
+        "沙洋": "湖北",
+        "钟祥": "湖北",
+        "屈家岭": "湖北",
+        "孝感": "湖北",
+        "孝昌": "湖北",
+        "大悟": "湖北",
+        "云梦": "湖北",
+        "应城": "湖北",
+        "安陆": "湖北",
+        "汉川": "湖北",
+        "荆州": "湖北",
+        "公安县": "湖北",
+        "监利": "湖北",
+        "江陵": "湖北",
+        "石首": "湖北",
+        "洪湖": "湖北",
+        "松滋": "湖北",
+        "黄冈市": "湖北",
+        "团风县": "湖北",
+        "红安": "湖北",
+        "罗田": "湖北",
+        "英山": "湖北",
+        "浠水": "湖北",
+        "蕲春": "湖北",
+        "黄梅": "湖北",
+        "麻城": "湖北",
+        "武穴": "湖北",
+        "咸宁": "湖北",
+        "嘉鱼": "湖北",
+        "通城": "湖北",
+        "崇阳": "湖北",
+        "通山": "湖北",
+        "赤壁": "湖北",
+        "随州": "湖北",
+        "随县": "湖北",
+        "广水": "湖北",
+        "恩施州": "湖北",
+        "恩施": "湖北",
+        "利川": "湖北",
+        "建始县": "湖北",
+        "巴东": "湖北",
+        "宣恩": "湖北",
+        "咸丰": "湖北",
+        "来凤": "湖北",
+        "鹤峰": "湖北",
+        "仙桃": "湖北",
+        "潜江": "湖北",
+        "天门市": "湖北",
+        "神农架": "湖北",
+        "江汉油田": "湖北",
+        "湖南": "湖南",
+        "长沙": "湖南",
+        "望城": "湖南",
+        "宁乡": "湖南",
+        "浏阳": "湖南",
+        "株洲": "湖南",
+        "攸县": "湖南",
+        "茶陵": "湖南",
+        "炎陵": "湖南",
+        "醴陵": "湖南",
+        "湘潭": "湖南",
+        "湘乡": "湖南",
+        "韶山": "湖南",
+        "衡阳": "湖南",
+        "衡南": "湖南",
+        "衡山": "湖南",
+        "衡东": "湖南",
+        "祁东": "湖南",
+        "耒阳": "湖南",
+        "常宁": "湖南",
+        "邵阳": "湖南",
+        "邵东": "湖南",
+        "新邵": "湖南",
+        "隆回": "湖南",
+        "洞口县": "湖南",
+        "绥宁": "湖南",
+        "新宁县": "湖南",
+        "城步": "湖南",
+        "武冈": "湖南",
+        "岳阳": "湖南",
+        "华容县": "湖南",
+        "湘阴": "湖南",
+        "平江": "湖南",
+        "汨罗": "湖南",
+        "临湘": "湖南",
+        "常德": "湖南",
+        "安乡县": "湖南",
+        "汉寿": "湖南",
+        "澧县": "湖南",
+        "临澧": "湖南",
+        "桃源县": "湖南",
+        "石门": "湖南",
+        "津市市": "湖南",
+        "张家界": "湖南",
+        "慈利": "湖南",
+        "桑植": "湖南",
+        "益阳": "湖南",
+        "南县": "湖南",
+        "桃江": "湖南",
+        "安化": "湖南",
+        "沅江": "湖南",
+        "郴州": "湖南",
+        "桂阳": "湖南",
+        "宜章": "湖南",
+        "永兴": "湖南",
+        "嘉禾": "湖南",
+        "临武": "湖南",
+        "汝城": "湖南",
+        "桂东": "湖南",
+        "安仁": "湖南",
+        "资兴": "湖南",
+        "永州": "湖南",
+        "祁阳": "湖南",
+        "东安县": "湖南",
+        "双牌": "湖南",
+        "道县": "湖南",
+        "江永": "湖南",
+        "宁远": "湖南",
+        "蓝山": "湖南",
+        "新田": "湖南",
+        "江华": "湖南",
+        "怀化": "湖南",
+        "中方县": "湖南",
+        "沅陵": "湖南",
+        "辰溪": "湖南",
+        "溆浦": "湖南",
+        "会同": "湖南",
+        "麻阳": "湖南",
+        "新晃": "湖南",
+        "芷江": "湖南",
+        "靖州": "湖南",
+        "通道县": "湖南",
+        "通道侗族自治县": "湖南",
+        "洪江": "湖南",
+        "娄底": "湖南",
+        "双峰": "湖南",
+        "新化": "湖南",
+        "冷水江": "湖南",
+        "涟源": "湖南",
+        "湘西": "湖南",
+        "吉首": "湖南",
+        "泸溪": "湖南",
+        "凤凰县": "湖南",
+        "花垣": "湖南",
+        "保靖": "湖南",
+        "古丈": "湖南",
+        "永顺": "湖南",
+        "龙山县": "湖南",
+        "广东": "广东",
+        "广州": "广东",
+        "增城": "广东",
+        "从化": "广东",
+        "韶关": "广东",
+        "始兴": "广东",
+        "仁化": "广东",
+        "翁源": "广东",
+        "乳源": "广东",
+        "新丰": "广东",
+        "乐昌": "广东",
+        "南雄": "广东",
+        "深圳": "广东",
+        "珠海": "广东",
+        "汕头": "广东",
+        "南澳": "广东",
+        "佛山": "广东",
+        "江门市": "广东",
+        "台山市": "广东",
+        "开平市": "广东",
+        "鹤山市": "广东",
+        "恩平": "广东",
+        "湛江": "广东",
+        "遂溪": "广东",
+        "徐闻": "广东",
+        "廉江": "广东",
+        "雷州": "广东",
+        "吴川": "广东",
+        "茂名": "广东",
+        "电白": "广东",
+        "高州": "广东",
+        "化州": "广东",
+        "信宜": "广东",
+        "肇庆": "广东",
+        "广宁": "广东",
+        "怀集": "广东",
+        "封开": "广东",
+        "德庆": "广东",
+        "高要区": "广东",
+        "四会市": "广东",
+        "惠州": "广东",
+        "博罗": "广东",
+        "惠东": "广东",
+        "龙门县": "广东",
+        "梅州": "广东",
+        "梅县": "广东",
+        "大埔": "广东",
+        "丰顺": "广东",
+        "五华县": "广东",
+        "平远": "广东",
+        "蕉岭": "广东",
+        "兴宁市": "广东",
+        "汕尾": "广东",
+        "海丰": "广东",
+        "陆河": "广东",
+        "陆丰": "广东",
+        "河源": "广东",
+        "紫金县": "广东",
+        "龙川": "广东",
+        "连平": "广东",
+        "和平县": "广东",
+        "东源": "广东",
+        "阳江市": "广东",
+        "阳西": "广东",
+        "阳东": "广东",
+        "阳春": "广东",
+        "清远": "广东",
+        "佛冈": "广东",
+        "阳山": "广东",
+        "连山县": "广东",
+        "连山壮族瑶族自治县": "广东",
+        "连南": "广东",
+        "清新区": "广东",
+        "英德": "广东",
+        "连州": "广东",
+        "东莞": "广东",
+        "中山市": "广东",
+        "潮州": "广东",
+        "潮安": "广东",
+        "饶平": "广东",
+        "揭阳": "广东",
+        "揭东": "广东",
+        "揭西": "广东",
+        "惠来": "广东",
+        "普宁": "广东",
+        "云浮": "广东",
+        "新兴": "广东",
+        "郁南": "广东",
+        "云安": "广东",
+        "罗定": "广东",
+        "广西": "广西",
+        "南宁": "广西",
+        "武鸣": "广西",
+        "隆安": "广西",
+        "马山": "广西",
+        "上林": "广西",
+        "宾阳": "广西",
+        "横县": "广西",
+        "柳州": "广西",
+        "柳江": "广西",
+        "柳城": "广西",
+        "鹿寨": "广西",
+        "融安": "广西",
+        "融水": "广西",
+        "三江侗族自治县": "广西",
+        "三江县": "广西",
+        "桂林": "广西",
+        "阳朔": "广西",
+        "临桂": "广西",
+        "灵川": "广西",
+        "全州": "广西",
+        "兴安": "广西",
+        "永福": "广西",
+        "灌阳": "广西",
+        "龙胜": "广西",
+        "资源县": "广西",
+        "平乐": "广西",
+        "荔蒲": "广西",
+        "恭城": "广西",
+        "梧州": "广西",
+        "苍梧": "广西",
+        "藤县": "广西",
+        "蒙山": "广西",
+        "岑溪": "广西",
+        "北海市": "广西",
+        "北海经济开发区": "山东",
+        "合浦": "广西",
+        "防城港": "广西",
+        "上思": "广西",
+        "东兴市": "广西",
+        "钦州": "广西",
+        "灵山县": "广西",
+        "浦北": "广西",
+        "贵港": "广西",
+        "平南": "广西",
+        "桂平": "广西",
+        "玉林": "广西",
+        "容县": "广西",
+        "陆川": "广西",
+        "博白": "广西",
+        "兴业县": "广西",
+        "北流": "广西",
+        "百色": "广西",
+        "田阳": "广西",
+        "田东": "广西",
+        "平果县": "广西",
+        "德保": "广西",
+        "靖西": "广西",
+        "那坡": "广西",
+        "凌云县": "广西",
+        "乐业县": "广西",
+        "田林县": "广西",
+        "西林": "广西",
+        "隆林": "广西",
+        "贺州": "广西",
+        "昭平": "广西",
+        "钟山县": "广西",
+        "富川": "广西",
+        "河池": "广西",
+        "南丹": "广西",
+        "天峨": "广西",
+        "凤山": "广西",
+        "东兰": "广西",
+        "罗城": "广西",
+        "环江": "广西",
+        "巴马": "广西",
+        "都安": "广西",
+        "大化": "广西",
+        "宜州": "广西",
+        "来宾": "广西",
+        "忻城": "广西",
+        "象州": "广西",
+        "武宣": "广西",
+        "金秀": "广西",
+        "合山": "广西",
+        "崇左": "广西",
+        "扶绥": "广西",
+        "宁明": "广西",
+        "龙州": "广西",
+        "大新县": "广西",
+        "天等": "广西",
+        "凭祥": "广西",
+        "海南": "海南",
+        "三沙": "海南",
+        "海口": "海南",
+        "三亚": "海南",
+        "五指山": "海南",
+        "琼海": "海南",
+        "儋州": "海南",
+        "文昌": "海南",
+        "万宁": "海南",
+        "东方市": "海南",
+        "定安": "海南",
+        "屯昌": "海南",
+        "澄迈": "海南",
+        "临高": "海南",
+        "白沙县": "海南",
+        "白沙黎族自治县": "海南",
+        "昌江自治县": "海南",
+        "乐东": "海南",
+        "陵水": "海南",
+        "保亭": "海南",
+        "琼中": "海南",
+        "重庆": "重庆",
+        "綦江": "重庆",
+        "潼南": "重庆",
+        "铜梁": "重庆",
+        "大足": "重庆",
+        "荣昌": "重庆",
+        "璧山": "重庆",
+        "梁平": "重庆",
+        "城口县": "重庆",
+        "丰都": "重庆",
+        "垫江": "重庆",
+        "武隆": "重庆",
+        "忠县": "重庆",
+        "开县": "重庆",
+        "云阳": "重庆",
+        "奉节": "重庆",
+        "巫山": "重庆",
+        "巫溪": "重庆",
+        "石柱土家族自治": "重庆",
+        "秀山土家族苗族自治": "重庆",
+        "酉阳土家族苗族自治": "重庆",
+        "彭水苗族土家族自治": "重庆",
+        "四川": "四川",
+        "成都": "四川",
+        "金堂": "四川",
+        "双流": "四川",
+        "郫县": "四川",
+        "大邑": "四川",
+        "蒲江": "四川",
+        "新津": "四川",
+        "都江堰": "四川",
+        "彭州": "四川",
+        "邛崃": "四川",
+        "崇州": "四川",
+        "自贡": "四川",
+        "荣县": "四川",
+        "富顺": "四川",
+        "攀枝花": "四川",
+        "米易": "四川",
+        "盐边": "四川",
+        "泸州": "四川",
+        "泸县": "四川",
+        "合江": "四川",
+        "叙永": "四川",
+        "古蔺": "四川",
+        "南部县": "四川",
+        "德阳": "四川",
+        "中江": "四川",
+        "罗江": "四川",
+        "广汉": "四川",
+        "什邡": "四川",
+        "绵竹": "四川",
+        "绵阳": "四川",
+        "三台县": "四川",
+        "盐亭": "四川",
+        "安县": "四川",
+        "梓潼": "四川",
+        "北川羌族自治": "四川",
+        "平武": "四川",
+        "江油": "四川",
+        "广元": "四川",
+        "旺苍": "四川",
+        "青川": "四川",
+        "剑阁": "四川",
+        "苍溪": "四川",
+        "遂宁": "四川",
+        "蓬溪": "四川",
+        "射洪": "四川",
+        "大英": "四川",
+        "内江": "四川",
+        "威远": "四川",
+        "资中": "四川",
+        "隆昌": "四川",
+        "乐山": "四川",
+        "犍为": "四川",
+        "井研": "四川",
+        "夹江": "四川",
+        "沐川": "四川",
+        "峨边彝族自治": "四川",
+        "马边彝族自治": "四川",
+        "峨眉山": "四川",
+        "南充": "四川",
+        "营山": "四川",
+        "蓬安": "四川",
+        "仪陇": "四川",
+        "西充": "四川",
+        "阆中": "四川",
+        "眉山": "四川",
+        "仁寿": "四川",
+        "彭山": "四川",
+        "洪雅": "四川",
+        "丹棱": "四川",
+        "青神": "四川",
+        "宜宾": "四川",
+        "南溪": "四川",
+        "江安": "四川",
+        "长宁县": "四川",
+        "高县": "四川",
+        "珙县": "四川",
+        "筠连": "四川",
+        "兴文": "四川",
+        "屏山": "四川",
+        "广安": "四川",
+        "岳池": "四川",
+        "武胜": "四川",
+        "邻水": "四川",
+        "华蓥": "四川",
+        "达州": "四川",
+        "达县": "四川",
+        "宣汉": "四川",
+        "开江县": "四川",
+        "大竹县": "四川",
+        "渠县": "四川",
+        "万源市": "四川",
+        "雅安市": "四川",
+        "名山县": "四川",
+        "荥经": "四川",
+        "汉源": "四川",
+        "石棉县": "四川",
+        "天全": "四川",
+        "芦山": "四川",
+        "宝兴": "四川",
+        "巴中": "四川",
+        "通江": "四川",
+        "南江县": "四川",
+        "平昌": "四川",
+        "资阳": "四川",
+        "安岳": "四川",
+        "乐至县": "四川",
+        "简阳": "四川",
+        "阿坝州": "四川",
+        "汶川": "四川",
+        "理县": "四川",
+        "茂县": "四川",
+        "松潘": "四川",
+        "九寨沟": "四川",
+        "金川县": "四川",
+        "小金县": "四川",
+        "黑水县": "四川",
+        "马尔康": "四川",
+        "壤塘": "四川",
+        "阿坝": "四川",
+        "若尔盖": "四川",
+        "红原": "四川",
+        "甘孜": "四川",
+        "康定": "四川",
+        "泸定": "四川",
+        "丹巴": "四川",
+        "九龙县": "四川",
+        "雅江": "四川",
+        "道孚": "四川",
+        "炉霍": "四川",
+        "新龙": "四川",
+        "德格": "四川",
+        "白玉县": "四川",
+        "石渠": "四川",
+        "色达": "四川",
+        "理塘": "四川",
+        "巴塘": "四川",
+        "乡城县": "四川",
+        "稻城": "四川",
+        "得荣": "四川",
+        "凉山": "四川",
+        "西昌": "四川",
+        "木里": "四川",
+        "盐源": "四川",
+        "德昌": "四川",
+        "会理": "四川",
+        "会东": "四川",
+        "宁南": "四川",
+        "普格": "四川",
+        "布拖": "四川",
+        "金阳": "四川",
+        "昭觉": "四川",
+        "喜德": "四川",
+        "冕宁": "四川",
+        "越西": "四川",
+        "甘洛": "四川",
+        "美姑": "四川",
+        "雷波": "四川",
+        "贵州": "贵州",
+        "贵阳": "贵州",
+        "开阳": "贵州",
+        "息烽": "贵州",
+        "修文": "贵州",
+        "清镇": "贵州",
+        "六盘水": "贵州",
+        "水城": "贵州",
+        "盘县": "贵州",
+        "遵义": "贵州",
+        "桐梓": "贵州",
+        "绥阳": "贵州",
+        "正安": "贵州",
+        "道真": "贵州",
+        "务川": "贵州",
+        "凤冈": "贵州",
+        "湄潭": "贵州",
+        "余庆": "贵州",
+        "习水": "贵州",
+        "赤水": "贵州",
+        "仁怀": "贵州",
+        "安顺": "贵州",
+        "平坝": "贵州",
+        "普定": "贵州",
+        "镇宁": "贵州",
+        "关岭": "贵州",
+        "紫云县": "贵州",
+        "紫云苗族布依族自治县": "贵州",
+        "毕节": "贵州",
+        "大方县": "贵州",
+        "黔西": "贵州",
+        "金沙县": "贵州",
+        "织金": "贵州",
+        "纳雍": "贵州",
+        "威宁": "贵州",
+        "赫章": "贵州",
+        "铜仁": "贵州",
+        "江口县": "贵州",
+        "玉屏": "贵州",
+        "石阡": "贵州",
+        "思南": "贵州",
+        "印江": "贵州",
+        "德江": "贵州",
+        "沿河": "贵州",
+        "松桃": "贵州",
+        "黔西南": "贵州",
+        "兴义": "贵州",
+        "兴仁": "贵州",
+        "普安": "贵州",
+        "晴隆": "贵州",
+        "贞丰": "贵州",
+        "望谟": "贵州",
+        "册亨": "贵州",
+        "安龙县": "贵州",
+        "黔东南": "贵州",
+        "凯里市": "贵州",
+        "黄平县": "贵州",
+        "施秉": "贵州",
+        "三穗": "贵州",
+        "镇远县": "贵州",
+        "岑巩": "贵州",
+        "天柱": "贵州",
+        "锦屏": "贵州",
+        "剑河": "贵州",
+        "台江县": "贵州",
+        "台江区": "福建",
+        "黎平": "贵州",
+        "榕江": "贵州",
+        "从江": "贵州",
+        "雷山": "贵州",
+        "麻江": "贵州",
+        "丹寨": "贵州",
+        "黔南布": "贵州",
+        "都匀": "贵州",
+        "福泉": "贵州",
+        "荔波": "贵州",
+        "贵定": "贵州",
+        "瓮安": "贵州",
+        "独山县": "贵州",
+        "平塘": "贵州",
+        "罗甸": "贵州",
+        "长顺": "贵州",
+        "龙里": "贵州",
+        "惠水": "贵州",
+        "三都": "贵州",
+        "云南": "云南",
+        "昆明": "云南",
+        "呈贡": "云南",
+        "晋宁": "云南",
+        "富民县": "云南",
+        "宜良": "云南",
+        "石林": "云南",
+        "嵩明": "云南",
+        "禄劝": "云南",
+        "寻甸": "云南",
+        "安宁": "云南",
+        "曲靖": "云南",
+        "马龙": "云南",
+        "陆良": "云南",
+        "师宗": "云南",
+        "罗平县": "云南",
+        "富源": "云南",
+        "会泽": "云南",
+        "沾益": "云南",
+        "宣威": "云南",
+        "玉溪": "云南",
+        "江川": "云南",
+        "澄江": "云南",
+        "通海": "云南",
+        "华宁": "云南",
+        "易门": "云南",
+        "峨山": "云南",
+        "新平": "云南",
+        "元江": "云南",
+        "保山": "云南",
+        "施甸": "云南",
+        "腾冲": "云南",
+        "龙陵": "云南",
+        "昌宁": "云南",
+        "昭通": "云南",
+        "鲁甸": "云南",
+        "巧家": "云南",
+        "盐津": "云南",
+        "大关县": "云南",
+        "永善": "云南",
+        "绥江": "云南",
+        "镇雄": "云南",
+        "彝良": "云南",
+        "威信": "云南",
+        "水富": "云南",
+        "丽江": "云南",
+        "玉龙县": "云南",
+        "玉龙纳西族自治县": "云南",
+        "永胜": "云南",
+        "华坪": "云南",
+        "宁蒗": "云南",
+        "普洱": "云南",
+        "宁洱": "云南",
+        "墨江": "云南",
+        "景东县": "云南",
+        "景东彝族自治县": "云南",
+        "景谷": "云南",
+        "镇沅": "云南",
+        "江城自治县": "云南",
+        "江城县": "云南",
+        "孟连": "云南",
+        "澜沧": "云南",
+        "西盟": "云南",
+        "临沧": "云南",
+        "凤庆": "云南",
+        "云县": "云南",
+        "永德": "云南",
+        "镇康": "云南",
+        "双江": "云南",
+        "耿马": "云南",
+        "沧源": "云南",
+        "楚雄": "云南",
+        "双柏": "云南",
+        "牟定": "云南",
+        "南华": "云南",
+        "姚安": "云南",
+        "大姚": "云南",
+        "永仁": "云南",
+        "元谋": "云南",
+        "武定": "云南",
+        "禄丰": "云南",
+        "红河": "云南",
+        "个旧": "云南",
+        "开远": "云南",
+        "蒙自": "云南",
+        "屏边": "云南",
+        "建水": "云南",
+        "石屏": "云南",
+        "弥勒": "云南",
+        "泸西": "云南",
+        "元阳": "云南",
+        "金平自治县": "云南",
+        "金平县": "云南",
+        "绿春": "云南",
+        "河口自治县": "云南",
+        "文山": "云南",
+        "砚山": "云南",
+        "西畴": "云南",
+        "麻栗坡": "云南",
+        "马关县": "云南",
+        "丘北县": "云南",
+        "广南": "云南",
+        "富宁": "云南",
+        "西双版纳": "云南",
+        "景洪": "云南",
+        "勐海": "云南",
+        "勐腊": "云南",
+        "大理白族自治州": "云南",
+        "大理州": "云南",
+        "大理市": "云南",
+        "漾濞": "云南",
+        "祥云": "云南",
+        "宾川": "云南",
+        "弥渡": "云南",
+        "南涧": "云南",
+        "巍山": "云南",
+        "永平": "云南",
+        "云龙": "云南",
+        "洱源": "云南",
+        "剑川": "云南",
+        "鹤庆": "云南",
+        "德宏": "云南",
+        "瑞丽": "云南",
+        "潞西": "云南",
+        "梁河": "云南",
+        "盈江": "云南",
+        "陇川": "云南",
+        "怒江": "云南",
+        "泸水": "云南",
+        "福贡": "云南",
+        "贡山": "云南",
+        "兰坪": "云南",
+        "迪庆": "云南",
+        "香格里拉": "云南",
+        "德钦": "云南",
+        "维西": "云南",
+        "西藏": "西藏",
+        "拉萨": "西藏",
+        "林周": "西藏",
+        "当雄": "西藏",
+        "尼木": "西藏",
+        "曲水": "西藏",
+        "堆龙德庆": "西藏",
+        "达孜": "西藏",
+        "墨竹工卡": "西藏",
+        "昌都": "西藏",
+        "江达": "西藏",
+        "贡觉": "西藏",
+        "类乌齐": "西藏",
+        "丁青": "西藏",
+        "察雅": "西藏",
+        "八宿": "西藏",
+        "左贡": "西藏",
+        "芒康": "西藏",
+        "洛隆": "西藏",
+        "边坝": "西藏",
+        "乃东": "西藏",
+        "扎囊": "西藏",
+        "贡嘎": "西藏",
+        "桑日": "西藏",
+        "琼结": "西藏",
+        "曲松": "西藏",
+        "措美": "西藏",
+        "洛扎": "西藏",
+        "加查": "西藏",
+        "隆子": "西藏",
+        "错那": "西藏",
+        "浪卡子": "西藏",
+        "日喀则": "西藏",
+        "南木林": "西藏",
+        "江孜": "西藏",
+        "定日": "西藏",
+        "萨迦": "西藏",
+        "拉孜": "西藏",
+        "昂仁": "西藏",
+        "谢通门": "西藏",
+        "白朗": "西藏",
+        "仁布": "西藏",
+        "康马": "西藏",
+        "定结": "西藏",
+        "仲巴": "西藏",
+        "亚东": "西藏",
+        "吉隆": "西藏",
+        "聂拉木": "西藏",
+        "萨嘎": "西藏",
+        "岗巴": "西藏",
+        "那曲": "西藏",
+        "嘉黎": "西藏",
+        "比如县": "西藏",
+        "聂荣县": "西藏",
+        "安多县": "西藏",
+        "申扎": "西藏",
+        "索县": "西藏",
+        "班戈": "西藏",
+        "巴青": "西藏",
+        "尼玛": "西藏",
+        "普兰": "西藏",
+        "札达": "西藏",
+        "噶尔": "西藏",
+        "日土": "西藏",
+        "革吉": "西藏",
+        "改则": "西藏",
+        "措勤": "西藏",
+        "林芝市": "西藏",
+        "林芝县": "西藏",
+        "工布江达": "西藏",
+        "米林": "西藏",
+        "墨脱": "西藏",
+        "波密": "西藏",
+        "察隅": "西藏",
+        "朗县": "西藏",
+        "陕西": "陕西",
+        "西安": "陕西",
+        "蓝田": "陕西",
+        "周至": "陕西",
+        "户县": "陕西",
+        "高陵": "陕西",
+        "铜川": "陕西",
+        "宜君": "陕西",
+        "宝鸡": "陕西",
+        "凤翔县": "陕西",
+        "岐山": "陕西",
+        "扶风": "陕西",
+        "眉县": "陕西",
+        "陇县": "陕西",
+        "千阳": "陕西",
+        "麟游": "陕西",
+        "凤县": "陕西",
+        "太白县": "陕西",
+        "咸阳": "陕西",
+        "三原县": "陕西",
+        "泾阳": "陕西",
+        "乾县": "陕西",
+        "礼泉": "陕西",
+        "永寿": "陕西",
+        "彬县": "陕西",
+        "长武": "陕西",
+        "旬邑": "陕西",
+        "淳化": "陕西",
+        "武功县": "陕西",
+        "兴平": "陕西",
+        "渭南": "陕西",
+        "潼关": "陕西",
+        "大荔": "陕西",
+        "合阳": "陕西",
+        "澄城": "陕西",
+        "蒲城": "陕西",
+        "白水": "陕西",
+        "富平": "陕西",
+        "韩城": "陕西",
+        "华阴": "陕西",
+        "延安": "陕西",
+        "延长县": "陕西",
+        "延川": "陕西",
+        "子长": "陕西",
+        "安塞": "陕西",
+        "志丹": "陕西",
+        "吴起": "陕西",
+        "甘泉": "陕西",
+        "富县": "陕西",
+        "洛川": "陕西",
+        "宜川": "陕西",
+        "黄龙": "陕西",
+        "黄陵": "陕西",
+        "汉中": "陕西",
+        "南郑县": "陕西",
+        "城固": "陕西",
+        "洋县": "陕西",
+        "西乡": "陕西",
+        "勉县": "陕西",
+        "宁强": "陕西",
+        "略阳": "陕西",
+        "镇巴": "陕西",
+        "留坝": "陕西",
+        "佛坪": "陕西",
+        "榆林": "陕西",
+        "神木": "陕西",
+        "府谷": "陕西",
+        "横山": "陕西",
+        "靖边": "陕西",
+        "定边": "陕西",
+        "绥德": "陕西",
+        "米脂": "陕西",
+        "佳县": "陕西",
+        "吴堡": "陕西",
+        "清涧": "陕西",
+        "子洲": "陕西",
+        "安康": "陕西",
+        "汉阴": "陕西",
+        "石泉": "陕西",
+        "宁陕": "陕西",
+        "紫阳": "陕西",
+        "岚皋": "陕西",
+        "平利": "陕西",
+        "镇坪": "陕西",
+        "旬阳": "陕西",
+        "白河县": "陕西",
+        "商洛": "陕西",
+        "洛南": "陕西",
+        "丹凤": "陕西",
+        "商南": "陕西",
+        "山阳": "陕西",
+        "镇安县": "陕西",
+        "柞水": "陕西",
+        "甘肃": "甘肃",
+        "兰州": "甘肃",
+        "东乡自治县": "甘肃",
+        "永登": "甘肃",
+        "皋兰": "甘肃",
+        "榆中": "甘肃",
+        "嘉峪关": "甘肃",
+        "金昌": "甘肃",
+        "永昌": "甘肃",
+        "白银市": "甘肃",
+        "靖远": "甘肃",
+        "会宁": "甘肃",
+        "景泰县": "甘肃",
+        "天水": "甘肃",
+        "清水县": "甘肃",
+        "秦安": "甘肃",
+        "甘谷": "甘肃",
+        "武山": "甘肃",
+        "张家川": "甘肃",
+        "武威": "甘肃",
+        "民勤": "甘肃",
+        "古浪": "甘肃",
+        "天祝": "甘肃",
+        "张掖": "甘肃",
+        "肃南": "甘肃",
+        "民乐县": "甘肃",
+        "临泽": "甘肃",
+        "高台": "甘肃",
+        "山丹": "甘肃",
+        "平凉": "甘肃",
+        "泾川": "甘肃",
+        "灵台": "甘肃",
+        "崇信": "甘肃",
+        "华亭": "甘肃",
+        "庄浪": "甘肃",
+        "静宁": "甘肃",
+        "酒泉": "甘肃",
+        "金塔": "甘肃",
+        "瓜州": "甘肃",
+        "肃北": "甘肃",
+        "阿克塞": "甘肃",
+        "玉门": "甘肃",
+        "敦煌": "甘肃",
+        "庆阳": "甘肃",
+        "庆城": "甘肃",
+        "环县": "甘肃",
+        "华池": "甘肃",
+        "合水县": "甘肃",
+        "正宁": "甘肃",
+        "宁县": "甘肃",
+        "镇原县": "甘肃",
+        "定西": "甘肃",
+        "通渭": "甘肃",
+        "陇西": "甘肃",
+        "渭源": "甘肃",
+        "临洮": "甘肃",
+        "漳县": "甘肃",
+        "岷县": "甘肃",
+        "陇南": "甘肃",
+        "成县": "甘肃",
+        "文县": "甘肃",
+        "宕昌": "甘肃",
+        "康县": "甘肃",
+        "西和": "甘肃",
+        "礼县": "甘肃",
+        "徽县": "甘肃",
+        "两当县": "甘肃",
+        "临夏": "甘肃",
+        "康乐县": "甘肃",
+        "永靖": "甘肃",
+        "广河": "甘肃",
+        "和政": "甘肃",
+        "积石山": "甘肃",
+        "合作市": "甘肃",
+        "临潭": "甘肃",
+        "卓尼": "甘肃",
+        "舟曲": "甘肃",
+        "迭部": "甘肃",
+        "玛曲": "甘肃",
+        "碌曲": "甘肃",
+        "夏河": "甘肃",
+        "青海": "青海",
+        "共和县": "青海",
+        "西宁": "青海",
+        "大通自治县": "青海",
+        "大通县": "青海",
+        "湟中": "青海",
+        "湟源": "青海",
+        "平安县": "青海",
+        "民和": "青海",
+        "乐都": "青海",
+        "河南蒙古族自治县": "青海",
+        "互助土族自治县": "青海",
+        "互助县": "青海",
+        "化隆": "青海",
+        "循化": "青海",
+        "海北州": "青海",
+        "海北藏族自治州": "青海",
+        "门源": "青海",
+        "祁连": "青海",
+        "海晏": "青海",
+        "刚察": "青海",
+        "黄南": "青海",
+        "同仁": "青海",
+        "尖扎": "青海",
+        "泽库": "青海",
+        "同德": "青海",
+        "贵德": "青海",
+        "兴海": "青海",
+        "贵南": "青海",
+        "果洛": "青海",
+        "玛沁": "青海",
+        "班玛": "青海",
+        "甘德": "青海",
+        "达日": "青海",
+        "久治": "青海",
+        "玛多": "青海",
+        "玉树": "青海",
+        "杂多": "青海",
+        "称多": "青海",
+        "治多": "青海",
+        "囊谦": "青海",
+        "曲麻莱": "青海",
+        "海西州": "青海",
+        "海西蒙古族藏族自治州": "青海",
+        "格尔木": "青海",
+        "德令哈": "青海",
+        "乌兰": "青海",
+        "都兰": "青海",
+        "天峻": "青海",
+        "宁夏": "宁夏",
+        "银川": "宁夏",
+        "永宁": "宁夏",
+        "贺兰": "宁夏",
+        "灵武": "宁夏",
+        "石嘴山": "宁夏",
+        "平罗": "宁夏",
+        "吴忠": "宁夏",
+        "盐池": "宁夏",
+        "同心县": "宁夏",
+        "青铜峡": "宁夏",
+        "固原": "宁夏",
+        "西吉": "宁夏",
+        "隆德": "宁夏",
+        "泾源": "宁夏",
+        "彭阳": "宁夏",
+        "中卫": "宁夏",
+        "中宁": "宁夏",
+        "海原": "宁夏",
+        "新疆": "新疆",
+        "乌鲁木齐": "新疆",
+        "克拉玛依": "新疆",
+        "吐鲁番": "新疆",
+        "鄯善": "新疆",
+        "托克逊": "新疆",
+        "哈密": "新疆",
+        "巴里坤": "新疆",
+        "伊吾": "新疆",
+        "昌吉": "新疆",
+        "阜康": "新疆",
+        "呼图壁": "新疆",
+        "玛纳斯": "新疆",
+        "奇台": "新疆",
+        "吉木萨尔": "新疆",
+        "木垒哈萨克": "新疆",
+        "博尔塔拉": "新疆",
+        "博乐": "新疆",
+        "精河": "新疆",
+        "温泉县": "新疆",
+        "巴音郭楞": "新疆",
+        "库尔勒": "新疆",
+        "轮台": "新疆",
+        "尉犁": "新疆",
+        "若羌": "新疆",
+        "且末": "新疆",
+        "焉耆": "新疆",
+        "和静": "新疆",
+        "和硕": "新疆",
+        "博湖": "新疆",
+        "阿克苏": "新疆",
+        "温宿": "新疆",
+        "库车": "新疆",
+        "沙雅": "新疆",
+        "新和县": "新疆",
+        "拜城": "新疆",
+        "乌什": "新疆",
+        "阿瓦提": "新疆",
+        "柯坪": "新疆",
+        "克孜勒": "新疆",
+        "阿图什": "新疆",
+        "阿克陶": "新疆",
+        "阿合奇": "新疆",
+        "乌恰": "新疆",
+        "喀什": "新疆",
+        "疏附": "新疆",
+        "疏勒": "新疆",
+        "英吉沙": "新疆",
+        "泽普": "新疆",
+        "莎车": "新疆",
+        "叶城": "新疆",
+        "麦盖提": "新疆",
+        "岳普湖": "新疆",
+        "伽师": "新疆",
+        "巴楚": "新疆",
+        "塔什": "新疆",
+        "和田": "新疆",
+        "墨玉": "新疆",
+        "皮山": "新疆",
+        "洛浦": "新疆",
+        "策勒": "新疆",
+        "于田县": "新疆",
+        "民丰": "新疆",
+        "伊犁": "新疆",
+        "伊宁": "新疆",
+        "奎屯": "新疆",
+        "察布查尔锡伯": "新疆",
+        "霍城": "新疆",
+        "巩留": "新疆",
+        "新源": "新疆",
+        "昭苏": "新疆",
+        "特克斯": "新疆",
+        "尼勒克": "新疆",
+        "塔城": "新疆",
+        "乌苏": "新疆",
+        "额敏": "新疆",
+        "沙湾": "新疆",
+        "托里": "新疆",
+        "裕民": "新疆",
+        "和布克赛尔": "新疆",
+        "阿勒泰": "新疆",
+        "布尔津": "新疆",
+        "富蕴": "新疆",
+        "福海": "新疆",
+        "哈巴河": "新疆",
+        "青河": "新疆",
+        "吉木乃": "新疆",
+        "石河子": "新疆",
+        "阿拉尔": "新疆",
+        "图木舒克": "新疆",
+        "五家渠": "新疆",
+        "台湾": "台湾",
+        "台北": "台湾",
+        "高雄": "台湾",
+        "基隆": "台湾",
+        "台中市": "台湾",
+        "台南": "台湾",
+        "新竹": "台湾",
+        "嘉义": "台湾",
+        "宜兰": "台湾",
+        "桃园市": "台湾",
+        "苗栗": "台湾",
+        "彰化": "台湾",
+        "南投": "台湾",
+        "云林": "台湾",
+        "屏东": "台湾",
+        "台东": "台湾",
+        "花莲": "台湾",
+        "澎湖": "台湾",
+        "香港": "香港",
+        "澳门": "澳门",
+        "东城区": "北京",
+        "西城区": "北京",
+        "崇文": "北京",
+        "宣武": "北京",
+        "丰台": "北京",
+        "石景山": "北京",
+        "海淀": "北京",
+        "门头沟": "北京",
+        "房山": "北京",
+        "顺义": "北京",
+        "昌平": "北京",
+        "大兴区": "北京",
+        "怀柔": "北京",
+        "平谷": "北京",
+        "河西区": "天津",
+        "滨海新区": "天津",
+        "南开区": "天津",
+        "红桥区": "天津",
+        "塘沽": "天津",
+        "汉沽": "天津",
+        "大港": "天津",
+        "东丽": "天津",
+        "西青": "天津",
+        "津南": "天津",
+        "北辰": "天津",
+        "武清": "天津",
+        "宝坻": "天津",
+        "井陉矿": "河北",
+        "裕华": "河北",
+        "路南区": "河北",
+        "路北区": "河北",
+        "古冶": "河北",
+        "丰南": "河北",
+        "丰润": "河北",
+        "海港区": "河北",
+        "山海关": "河北",
+        "北戴河": "河北",
+        "邯山": "河北",
+        "丛台": "河北",
+        "复兴区": "河北",
+        "峰峰矿": "河北",
+        "北市区": "河北",
+        "南市区": "河北",
+        "下花园": "河北",
+        "双滦": "河北",
+        "鹰手营子矿": "河北",
+        "运河区": "河北",
+        "安次": "河北",
+        "广阳": "河北",
+        "桃城": "河北",
+        "小店区": "山西",
+        "迎泽": "山西",
+        "杏花岭": "山西",
+        "尖草坪": "山西",
+        "万柏林": "山西",
+        "晋源": "山西",
+        "南郊区": "山西",
+        "新荣": "山西",
+        "朔城": "山西",
+        "平鲁": "山西",
+        "榆次": "山西",
+        "盐湖": "山西",
+        "忻府": "山西",
+        "尧都": "山西",
+        "离石": "山西",
+        "玉泉": "内蒙古",
+        "赛罕": "内蒙古",
+        "东河区": "内蒙古",
+        "昆都仑": "内蒙古",
+        "石拐": "内蒙古",
+        "白云矿": "内蒙古",
+        "九原": "内蒙古",
+        "海勃湾": "内蒙古",
+        "乌达": "内蒙古",
+        "红山区": "内蒙古",
+        "元宝山": "内蒙古",
+        "松山": "内蒙古",
+        "科尔沁": "内蒙古",
+        "东胜": "内蒙古",
+        "海拉尔": "内蒙古",
+        "临河": "内蒙古",
+        "集宁": "内蒙古",
+        "沈河": "辽宁",
+        "大东区": "辽宁",
+        "皇姑区": "辽宁",
+        "苏家屯": "辽宁",
+        "东陵区": "辽宁",
+        "沈北新": "辽宁",
+        "于洪": "辽宁",
+        "西岗区": "辽宁",
+        "沙河口": "辽宁",
+        "甘井子": "辽宁",
+        "旅顺口": "辽宁",
+        "金州": "辽宁",
+        "立山": "辽宁",
+        "千山": "辽宁",
+        "新抚": "辽宁",
+        "东洲": "辽宁",
+        "望花": "辽宁",
+        "顺城": "辽宁",
+        "溪湖": "辽宁",
+        "明山区": "辽宁",
+        "南芬": "辽宁",
+        "元宝区": "辽宁",
+        "振兴区": "辽宁",
+        "振安": "辽宁",
+        "古塔区": "辽宁",
+        "凌河": "辽宁",
+        "站前区": "辽宁",
+        "西市区": "辽宁",
+        "鲅鱼圈": "辽宁",
+        "老边": "辽宁",
+        "新邱": "辽宁",
+        "太平区": "辽宁",
+        "清河门": "辽宁",
+        "细河": "辽宁",
+        "白塔": "辽宁",
+        "文圣区": "辽宁",
+        "宏伟区": "辽宁",
+        "弓长岭": "辽宁",
+        "太子河": "辽宁",
+        "双台子": "辽宁",
+        "兴隆台": "辽宁",
+        "银州": "辽宁",
+        "双塔区": "辽宁",
+        "龙城区": "辽宁",
+        "龙港区": "辽宁",
+        "南票区": "辽宁",
+        "杨家杖子开发": "辽宁",
+        "南关区": "吉林",
+        "二道区": "吉林",
+        "绿园区": "吉林",
+        "双阳区": "吉林",
+        "龙潭区": "吉林",
+        "船营": "吉林",
+        "丰满区": "吉林",
+        "东昌区": "吉林",
+        "东昌府区": "山东",
+        "二道江": "吉林",
+        "八道江": "吉林",
+        "江源区": "吉林",
+        "宁江": "吉林",
+        "洮北": "吉林",
+        "道里": "黑龙江",
+        "南岗区": "黑龙江",
+        "道外区": "黑龙江",
+        "平房区": "黑龙江",
+        "松北": "黑龙江",
+        "香坊": "黑龙江",
+        "呼兰": "黑龙江",
+        "阿城": "黑龙江",
+        "龙沙": "黑龙江",
+        "建华区": "黑龙江",
+        "铁锋": "黑龙江",
+        "昂昂溪": "黑龙江",
+        "富拉尔基": "黑龙江",
+        "碾子山": "黑龙江",
+        "梅里斯达斡尔族": "黑龙江",
+        "鸡冠区": "黑龙江",
+        "恒山": "黑龙江",
+        "滴道": "黑龙江",
+        "城子河": "黑龙江",
+        "麻山": "黑龙江",
+        "工农区": "黑龙江",
+        "尖山": "黑龙江",
+        "岭东": "黑龙江",
+        "四方台区": "黑龙江",
+        "萨尔图": "黑龙江",
+        "龙凤区": "黑龙江",
+        "让胡路": "黑龙江",
+        "红岗区": "黑龙江",
+        "南岔": "黑龙江",
+        "友好区": "黑龙江",
+        "翠峦": "黑龙江",
+        "新青区": "黑龙江",
+        "美溪": "黑龙江",
+        "金山屯": "黑龙江",
+        "五营区": "黑龙江",
+        "乌马河": "黑龙江",
+        "汤旺河": "黑龙江",
+        "带岭": "黑龙江",
+        "乌伊岭": "黑龙江",
+        "上甘岭": "黑龙江",
+        "东风区": "黑龙江",
+        "桃山": "黑龙江",
+        "茄子河": "黑龙江",
+        "阳明区": "黑龙江",
+        "爱民区": "黑龙江",
+        "爱辉区": "黑龙江",
+        "北林区": "黑龙江",
+        "大兴安岭": "黑龙江",
+        "加格达奇": "黑龙江",
+        "松岭区": "黑龙江",
+        "新林区": "黑龙江",
+        "呼中": "黑龙江",
+        "黄浦": "上海",
+        "徐汇": "上海",
+        "静安": "上海",
+        "闸北": "上海",
+        "虹口": "上海",
+        "杨浦": "上海",
+        "闵行": "上海",
+        "嘉定": "上海",
+        "浦东新": "上海",
+        "金山区 ": "上海",
+        "松江": "上海",
+        "青浦": "上海",
+        "奉贤": "上海",
+        "玄武": "江苏",
+        "白下": "江苏",
+        "秦淮": "江苏",
+        "建邺": "江苏",
+        "下关区": "江苏",
+        "浦口区": "江苏",
+        "雨花台": "江苏",
+        "江宁": "江苏",
+        "六合": "江苏",
+        "崇安": "江苏",
+        "南长": "江苏",
+        "北塘": "江苏",
+        "锡山": "江苏",
+        "惠山": "江苏",
+        "滨湖": "江苏",
+        "九里": "江苏",
+        "贾汪": "江苏",
+        "泉山": "江苏",
+        "天宁": "江苏",
+        "钟楼": "江苏",
+        "戚墅堰": "江苏",
+        "新北": "江苏",
+        "武进": "江苏",
+        "沧浪": "江苏",
+        "金阊": "江苏",
+        "虎丘": "江苏",
+        "吴中": "江苏",
+        "相城": "江苏",
+        "崇川": "江苏",
+        "港闸": "江苏",
+        "新浦": "江苏",
+        "楚州": "江苏",
+        "淮阴区": "江苏",
+        "清浦": "江苏",
+        "亭湖": "江苏",
+        "盐都": "江苏",
+        "广陵": "江苏",
+        "邗江": "江苏",
+        "维扬": "江苏",
+        "京口": "江苏",
+        "润州": "江苏",
+        "丹徒": "江苏",
+        "海陵": "江苏",
+        "高港": "江苏",
+        "宿城": "江苏",
+        "宿豫": "江苏",
+        "上城区": "浙江",
+        "下城区": "浙江",
+        "江干区": "浙江",
+        "拱墅": "浙江",
+        "滨江区": "浙江",
+        "萧山": "浙江",
+        "余杭": "浙江",
+        "海曙": "浙江",
+        "江东区": "浙江",
+        "北仑": "浙江",
+        "镇海": "浙江",
+        "鄞州": "浙江",
+        "鹿城": "浙江",
+        "龙湾区": "浙江",
+        "瓯海": "浙江",
+        "南湖区": "浙江",
+        "秀洲": "浙江",
+        "吴兴": "浙江",
+        "南浔": "浙江",
+        "越城": "浙江",
+        "婺城": "浙江",
+        "金东": "浙江",
+        "柯城": "浙江",
+        "衢江": "浙江",
+        "定海": "浙江",
+        "椒江": "浙江",
+        "黄岩": "浙江",
+        "路桥区": "浙江",
+        "莲都": "浙江",
+        "瑶海": "安徽",
+        "庐阳": "安徽",
+        "蜀山": "安徽",
+        "新站": "安徽",
+        "包河": "安徽",
+        "镜湖区": "安徽",
+        "镜湖新区": "浙江",
+        "弋江": "安徽",
+        "鸠江": "安徽",
+        "三山区": "安徽",
+        "蚌山": "安徽",
+        "禹会": "安徽",
+        "淮上": "安徽",
+        "田家庵": "安徽",
+        "谢家集": "安徽",
+        "八公山": "安徽",
+        "潘集": "安徽",
+        "金家庄": "安徽",
+        "花山区": "安徽",
+        "雨山": "安徽",
+        "博望新": "安徽",
+        "杜集区": "安徽",
+        "相山": "安徽",
+        "烈山": "安徽",
+        "铜官山": "安徽",
+        "狮子山": "安徽",
+        "迎江": "安徽",
+        "大观区": "安徽",
+        "宜秀": "安徽",
+        "屯溪": "安徽",
+        "徽州": "安徽",
+        "琅琊区": "安徽",
+        "南谯": "安徽",
+        "颍州": "安徽",
+        "颍东": "安徽",
+        "颍泉": "安徽",
+        "埇桥": "安徽",
+        "居巢区": "安徽",
+        "金安": "安徽",
+        "裕安": "安徽",
+        "谯城": "安徽",
+        "贵池": "安徽",
+        "宣州": "安徽",
+        "仓山": "福建",
+        "马尾": "福建",
+        "晋安": "福建",
+        "思明区": "福建",
+        "海沧": "福建",
+        "湖里": "福建",
+        "集美区": "福建",
+        "同安区": "福建",
+        "同安县": "福建",
+        "翔安区": "福建",
+        "城厢": "福建",
+        "涵江": "福建",
+        "荔城": "福建",
+        "秀屿区": "福建",
+        "梅列": "福建",
+        "三元区": "福建",
+        "鲤城": "福建",
+        "丰泽区": "福建",
+        "洛江": "福建",
+        "泉港": "福建",
+        "芗城": "福建",
+        "龙文": "福建",
+        "延平": "福建",
+        "新罗": "福建",
+        "蕉城": "福建",
+        "东湖区": "江西",
+        "青云谱": "江西",
+        "湾里区": "江西",
+        "青山湖": "江西",
+        "珠山": "江西",
+        "安源": "江西",
+        "湘东": "江西",
+        "庐山": "江西",
+        "浔阳": "江西",
+        "渝水": "江西",
+        "月湖区": "江西",
+        "章贡": "江西",
+        "吉州": "江西",
+        "青原区": "江西",
+        "袁州": "江西",
+        "临川": "江西",
+        "信州": "江西",
+        "历下": "山东",
+        "槐荫": "山东",
+        "天桥区": "山东",
+        "历城": "山东",
+        "长清": "山东",
+        "市南区": "山东",
+        "市北区": "山东",
+        "四方区": "山东",
+        "黄岛": "山东",
+        "崂山": "山东",
+        "李沧": "山东",
+        "城阳": "山东",
+        "淄川": "山东",
+        "张店": "山东",
+        "博山": "山东",
+        "临淄": "山东",
+        "周村": "山东",
+        "薛城": "山东",
+        "峄城": "山东",
+        "台儿庄": "山东",
+        "山亭": "山东",
+        "芝罘": "山东",
+        "福山": "山东",
+        "牟平": "山东",
+        "莱山": "山东",
+        "潍城": "山东",
+        "寒亭": "山东",
+        "坊子": "山东",
+        "奎文": "山东",
+        "任城": "山东",
+        "泰山区": "山东",
+        "岱岳": "山东",
+        "环翠": "山东",
+        "岚山": "山东",
+        "莱城": "山东",
+        "钢城区": "山东",
+        "兰山": "山东",
+        "罗庄区": "山东",
+        "德城区": "山东",
+        "东昌府": "山东",
+        "滨城区": "山东",
+        "牡丹区": "山东",
+        "中原区": "河南",
+        "二七区": "河南",
+        "金水区": "河南",
+        "上街": "河南",
+        "惠济区": "河南",
+        "龙亭区": "河南",
+        "顺河回族": "河南",
+        "禹王台": "河南",
+        "金明": "河南",
+        "西工区": "河南",
+        "瀍河回族": "河南",
+        "涧西": "河南",
+        "吉利区": "河南",
+        "洛龙": "河南",
+        "卫东区": "河南",
+        "石龙": "河南",
+        "湛河": "河南",
+        "文峰": "河南",
+        "北关区": "河南",
+        "殷都": "河南",
+        "龙安": "河南",
+        "山城区": "河南",
+        "淇滨": "河南",
+        "红旗区": "河南",
+        "卫滨": "河南",
+        "凤泉": "河南",
+        "牧野区": "河南",
+        "中站区": "河南",
+        "马村区": "河南",
+        "华龙区": "河南",
+        "魏都": "河南",
+        "源汇": "河南",
+        "郾城": "河南",
+        "召陵": "河南",
+        "湖滨": "河南",
+        "宛城": "河南",
+        "卧龙区": "河南",
+        "梁园": "河南",
+        "睢阳": "河南",
+        "浉河": "河南",
+        "平桥区": "河南",
+        "川汇": "河南",
+        "驿城": "河南",
+        "江岸区": "湖北",
+        "江汉区": "湖北",
+        "硚口": "湖北",
+        "汉阳": "湖北",
+        "武昌": "湖北",
+        "洪山": "湖北",
+        "东西湖": "湖北",
+        "汉南": "湖北",
+        "蔡甸": "湖北",
+        "江夏": "湖北",
+        "黄陂": "湖北",
+        "新洲区": "湖北",
+        "东湖开发": "湖北",
+        "武汉经济开发": "湖北",
+        "黄石港": "湖北",
+        "西塞山": "湖北",
+        "下陆": "湖北",
+        "铁山区": "湖北",
+        "黄石经济开发": "湖北",
+        "茅箭": "湖北",
+        "张湾": "湖北",
+        "十堰经济开发": "湖北",
+        "武当山旅游经济特": "湖北",
+        "西陵": "湖北",
+        "伍家岗": "湖北",
+        "点军": "湖北",
+        "猇亭": "湖北",
+        "夷陵": "湖北",
+        "樊城": "湖北",
+        "隆中风景": "湖北",
+        "高新开发": "湖北",
+        "鱼梁洲开发": "湖北",
+        "梁子湖": "湖北",
+        "鄂城": "湖北",
+        "葛店开发": "湖北",
+        "鄂州经济开发": "湖北",
+        "东宝": "湖北",
+        "掇刀": "湖北",
+        "荆门经济开发": "湖北",
+        "孝南": "湖北",
+        "沙市": "湖北",
+        "荆州经济开发": "湖北",
+        "黄州": "湖北",
+        "龙感湖管理": "湖北",
+        "咸安": "湖北",
+        "曾都": "湖北",
+        "芙蓉区": "湖南",
+        "天心区": "湖南",
+        "岳麓": "湖南",
+        "开福": "湖南",
+        "雨花区": "湖南",
+        "荷塘区": "湖南",
+        "芦淞": "湖南",
+        "石峰": "湖南",
+        "天元区": "湖南",
+        "雨湖": "湖南",
+        "岳塘": "湖南",
+        "珠晖": "湖南",
+        "雁峰": "湖南",
+        "石鼓": "湖南",
+        "蒸湘": "湖南",
+        "南岳": "湖南",
+        "双清": "湖南",
+        "大祥": "湖南",
+        "北塔区": "湖南",
+        "岳阳楼": "湖南",
+        "云溪": "湖南",
+        "君山": "湖南",
+        "武陵": "湖南",
+        "鼎城": "湖南",
+        "武陵源": "湖南",
+        "赫山": "湖南",
+        "北湖": "湖南",
+        "苏仙": "湖南",
+        "零陵": "湖南",
+        "冷水滩": "湖南",
+        "鹤城": "湖南",
+        "娄星": "湖南",
+        "荔湾": "广东",
+        "越秀": "广东",
+        "海珠": "广东",
+        "天河区": "广东",
+        "黄埔": "广东",
+        "番禺": "广东",
+        "花都区": "广东",
+        "南沙区": "广东",
+        "萝岗": "广东",
+        "武江": "广东",
+        "浈江": "广东",
+        "曲江": "广东",
+        "罗湖": "广东",
+        "福田": "广东",
+        "宝安": "广东",
+        "龙岗": "广东",
+        "盐田": "广东",
+        "香洲": "广东",
+        "斗门区": "广东",
+        "斗门镇": "广东",
+        "金湾区": "广东",
+        "龙湖区": "广东",
+        "濠江": "广东",
+        "潮阳": "广东",
+        "潮南": "广东",
+        "澄海": "广东",
+        "禅城": "广东",
+        "南海区": "广东",
+        "顺德": "广东",
+        "三水": "广东",
+        "高明区": "广东",
+        "蓬江": "广东",
+        "江海区": "广东",
+        "新会": "广东",
+        "赤坎": "广东",
+        "霞山": "广东",
+        "坡头区": "广东",
+        "麻章": "广东",
+        "茂南": "广东",
+        "茂港": "广东",
+        "端州": "广东",
+        "鼎湖": "广东",
+        "惠城": "广东",
+        "惠阳": "广东",
+        "梅江": "广东",
+        "源城": "广东",
+        "清城": "广东",
+        "枫溪": "广东",
+        "湘桥": "广东",
+        "榕城": "广东",
+        "云城": "广东",
+        "青秀": "广西",
+        "江南区": "广西",
+        "西乡塘": "广西",
+        "良庆": "广西",
+        "邕宁": "广西",
+        "鱼峰": "广西",
+        "柳南": "广西",
+        "柳北": "广西",
+        "秀峰区": "广西",
+        "叠彩": "广西",
+        "七星区": "广西",
+        "雁山区": "广西",
+        "万秀区": "广西",
+        "蝶山": "广西",
+        "长洲": "广西",
+        "银海": "广西",
+        "铁山港": "广西",
+        "港口区": "广西",
+        "防城": "广西",
+        "钦南": "广西",
+        "钦北": "广西",
+        "港北": "广西",
+        "港南": "广西",
+        "覃塘": "广西",
+        "玉州": "广西",
+        "右江区": "广西",
+        "八步": "广西",
+        "金城江": "广西",
+        "兴宾": "广西",
+        "江洲": "广西",
+        "秀英区": "海南",
+        "龙华区": "海南",
+        "琼山": "海南",
+        "美兰": "海南",
+        "洋浦经济开发": "海南",
+        "万州": "重庆",
+        "涪陵": "重庆",
+        "渝中": "重庆",
+        "大渡口区": "重庆",
+        "沙坪坝": "重庆",
+        "九龙坡": "重庆",
+        "南岸区": "重庆",
+        "北碚": "重庆",
+        "万盛区": "重庆",
+        "渝北": "重庆",
+        "巴南": "重庆",
+        "黔江": "重庆",
+        "长寿区": "重庆",
+        "江津区": "重庆",
+        "合川": "重庆",
+        "南川": "重庆",
+        "永川": "重庆",
+        "北部新": "重庆",
+        "锦江": "四川",
+        "青羊": "四川",
+        "金牛": "四川",
+        "武侯": "四川",
+        "成华": "四川",
+        "龙泉驿": "四川",
+        "青白江": "四川",
+        "新都区": "四川",
+        "温江区": "四川",
+        "自流井": "四川",
+        "贡井": "四川",
+        "沿滩区": "四川",
+        "仁和区": "四川",
+        "江阳区": "四川",
+        "纳溪": "四川",
+        "龙马潭": "四川",
+        "旌阳": "四川",
+        "涪城": "四川",
+        "游仙": "四川",
+        "元坝": "四川",
+        "朝天区": "四川",
+        "船山": "四川",
+        "安居区": "四川",
+        "五通桥": "四川",
+        "金口河": "四川",
+        "顺庆": "四川",
+        "高坪": "四川",
+        "嘉陵": "四川",
+        "东坡区": "四川",
+        "翠屏": "四川",
+        "通川": "四川",
+        "雨城": "四川",
+        "巴州": "四川",
+        "雁江": "四川",
+        "南明": "贵州",
+        "云岩": "贵州",
+        "花溪": "贵州",
+        "乌当": "贵州",
+        "小河区": "贵州",
+        "金阳新": "贵州",
+        "六枝特": "贵州",
+        "红花岗": "贵州",
+        "汇川": "贵州",
+        "新浦新": "贵州",
+        "西秀": "贵州",
+        "黄果树开发": "贵州",
+        "七星关": "贵州",
+        "碧江": "贵州",
+        "万山特": "贵州",
+        "凯里经济开发": "贵州",
+        "盘龙": "云南",
+        "官渡区": "云南",
+        "西山区": "云南",
+        "东川区": "云南",
+        "麒麟区": "云南",
+        "红塔区": "云南",
+        "隆阳": "云南",
+        "昭阳": "云南",
+        "古城区": "云南",
+        "思茅": "云南",
+        "临翔": "云南",
+        "山南市": "西藏",
+        "阿里地区": "西藏",
+        "碑林": "陕西",
+        "莲湖": "陕西",
+        "灞桥": "陕西",
+        "未央": "陕西",
+        "雁塔": "陕西",
+        "阎良": "陕西",
+        "临潼": "陕西",
+        "沣渭新": "陕西",
+        "王益": "陕西",
+        "印台": "陕西",
+        "耀州": "陕西",
+        "渭滨": "陕西",
+        "金台": "陕西",
+        "陈仓": "陕西",
+        "秦都": "陕西",
+        "渭城": "陕西",
+        "临渭": "陕西",
+        "宝塔区": "陕西",
+        "汉台": "陕西",
+        "榆阳": "陕西",
+        "汉滨": "陕西",
+        "商州": "陕西",
+        "杨凌示范": "陕西",
+        "七里河区": "甘肃",
+        "西固": "甘肃",
+        "红古": "甘肃",
+        "平川": "甘肃",
+        "秦州": "甘肃",
+        "麦积": "甘肃",
+        "凉州": "甘肃",
+        "甘州": "甘肃",
+        "崆峒": "甘肃",
+        "肃州": "甘肃",
+        "西峰": "甘肃",
+        "安定": "甘肃",
+        "武都": "甘肃",
+        "海东": "青海",
+        "兴庆": "宁夏",
+        "西夏区": "宁夏",
+        "金凤": "宁夏",
+        "大武口": "宁夏",
+        "惠农": "宁夏",
+        "利通": "宁夏",
+        "红寺堡": "宁夏",
+        "原州": "宁夏",
+        "沙坡头": "宁夏",
+        "天山区": "新疆",
+        "沙依巴克": "新疆",
+        "水磨沟": "新疆",
+        "头屯河": "新疆",
+        "达坂城": "新疆",
+        "米东": "新疆",
+        "独山子": "新疆",
+        "白碱滩": "新疆",
+        "乌尔禾": "新疆",
+        "中西区": "香港",
+        "九龙城": "香港",
+        "观塘": "香港",
+        "深水埗": "香港",
+        "湾仔区": "香港",
+        "黄大仙": "香港",
+        "油尖旺": "香港",
+        "离岛": "香港",
+        "葵青": "香港",
+        "西贡": "香港",
+        "沙田": "香港",
+        "屯门": "香港",
+        "荃湾": "香港",
+        "元朗": "香港",
+        "花地玛堂": "澳门",
+        "圣安多尼堂": "澳门",
+        "大堂": "澳门",
+        "望德堂": "澳门",
+        "风顺堂": "澳门",
+        "嘉模堂": "澳门",
+        "圣方济各堂": "澳门",
+        "大学": "大学",
+        "学院": "学院",
+        "医院": "医院",
+        "中学": "中学",
+        "小学": "小学",
+        "幼儿园": "幼儿园",
+        "中心": "中心",
+        "公司": "公司",
+        "集团": "集团",
+        "办事处": "办事处",
+        "研究院": "研究院",
+        "研究所": "研究所",
+        "移动": "移动",
+        "联通": "联通",
+        "电信": "电信",
+        "工商": "工商",
+        "公安": "公安",
+        "检察院": "检察院",
+        "检查院": "检查院",
+		"法院":"法院",
+		"司法":"司法",
+		"采购中心":"采购中心",
+		"办公室":"办公室",
+        "地税": "地税",
+        "国税": "国税",
+        "包钢": "包钢",
+        "镇": "镇",
+        "乡": "乡",
+        "市": "市",
+		"局":"局",
+		"厅":"厅",
+		"滇":"滇",
+		"辽":"辽",
+		"沪":"沪",
+		"浙":"浙",
+		"皖":"皖",
+		"闽":"闽",
+		"赣":"赣",
+		"鲁":"鲁",
+		"豫":"豫",
+		"鄂":"鄂",
+		"湘":"湘",
+		"粤":"粤",
+		"桂":"桂",
+		"琼":"琼",
+		"渝":"渝",
+		"川":"川",
+		"藏":"藏",
+		"陕":"陕",
+		"甘":"甘",
+		"黑":"黑",
+		"蒙":"蒙",
+		"吉":"吉",
+		"澳":"澳",
+		"湾":"湾",
+		"山":"山",
+		"河":"河",
+        "首钢": "首钢",
+        "太钢": "太钢",
+        "天钢": "天钢",
+        "国丰": "国丰",
+        "临钢": "临钢",
+        "文丰": "文丰",
+        "天铁": "天铁",
+        "普阳": "普阳",
+        "德龙": "德龙",
+        "港陆": "港陆",
+        "新金": "新金",
+        "宝钢": "宝钢",
+        "南钢": "南钢",
+        "梅钢": "梅钢",
+        "马钢": "马钢",
+        "济钢": "济钢",
+        "莱钢": "莱钢",
+        "沙钢": "沙钢",
+        "新钢": "新钢",
+        "泰钢": "泰钢",
+        "萍钢": "萍钢",
+        "华伟": "华伟",
+        "兆泰": "兆泰",
+        "西城": "西城",
+        "宁钢": "宁钢",
+        "春冶": "春冶",
+        "兆顺": "兆顺",
+        "长达": "长达",
+        "飞达": "飞达 ",
+        "武钢": "武钢",
+        "安钢": "安钢",
+        "涟钢": "涟钢",
+        "湘钢": "湘钢",
+        "鄂钢": "鄂钢",
+        "韶钢": "韶钢",
+        "柳钢": "柳钢",
+        "鞍钢": "鞍钢",
+        "本钢": "本钢",
+        "通钢": "通钢",
+        "北台": "北台",
+        "攀钢": "攀钢",
+        "重钢": "重钢",
+        "昆钢": "昆钢",
+        "包钢": "包钢",
+        "酒钢": "酒钢",
+        "八钢": "八钢"
+    }
+}

fullproject/src/cleareids.go

@@ -0,0 +1,110 @@
+// cleareids
+package main
+
+import (
+	"encoding/json"
+	"log"
+	"qfw/util"
+	"qfw/util/redis"
+	"sync"
+
+	"github.com/robfig/cron"
+)
+
+var (
+	c            *cron.Cron
+	projectcycle int64
+)
+
+func clearedis() {
+	if credis, ok := Sysconfig["clearedis"].(map[string]interface{}); ok {
+		clearcron := util.ObjToString(credis["clearcron"])
+		projectcycle = util.Int64All(credis["projectcycle"])
+		log.Println(credis)
+		if credis["open"].(bool) {
+			c = cron.New()
+			c.AddFunc(clearcron, clearPKey)
+			c.Start()
+		}
+	}
+}
+
+func clearPKey() {
+	log.Println("开始清理")
+	nowtime := currentMegerTime //time.Now().Unix() int64(1461204000)
+	wg := sync.WaitGroup{}
+	for _, pncb := range []*KeyMap{PNKey, PCKey, PBKey} {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			clearPNCBKey(pncb, nowtime)
+		}()
+	}
+	wg.Wait()
+	log.Println("清理结束")
+}
+
+func clearPNCBKey(pncb *KeyMap, nowtime int64) {
+	delkey := clearIdsKeys(pncb, nowtime)
+	pncb.Lock.Lock()
+	for _, k := range delkey {
+		delete(pncb.Map, k)
+	}
+	pncb.Lock.Unlock()
+}
+
+func clearIdsKeys(pKey *KeyMap, nowtime int64) []string {
+	defer util.Catch()
+	delkey := []string{}
+	pKey.Lock.Lock()
+	for k, ma := range pKey.Map {
+		ids := ma.Arr
+		delids := []interface{}{}
+		res := redis.Mget(REDISIDS, *ids)
+		for _, b1 := range res {
+			if b1 != nil {
+				var info ProjectInfo
+				err := json.Unmarshal(b1.([]byte), &info)
+				if err != nil {
+					log.Println(err)
+					continue
+				}
+				publistime := info.Publistime[len(info.Publistime)-1]
+				if projectcycle < (nowtime-publistime)/86400 { //项目周期超时
+					delids = append(delids, info.Id)
+				}
+			}
+		}
+		if len(delids) < 1 {
+			continue
+		}
+		//删除redis相关信息
+		b := redis.Del(REDISIDS, delids...)
+		if b {
+			for _, id := range delids {
+				ids = deleteSliceId(*ids, id.(string))
+			}
+			//log.Println(ids, *ma.Arr)
+			ma.Arr = ids
+			if len(*ma.Arr) < 1 {
+				redis.Del(REDISKEYS, k)
+				delkey = append(delkey, k)
+			} else {
+				//更新REDISKEYS
+				redis.Put(REDISKEYS, k, *ma.Arr, 0)
+			}
+		}
+	}
+	pKey.Lock.Unlock()
+	return delkey
+}
+
+func deleteSliceId(a []string, id string) *[]string {
+	ret := make([]string, 0, len(a))
+	for _, val := range a {
+		if val != id {
+			ret = append(ret, val)
+		}
+	}
+	return &ret
+}

fullproject/src/compare.go

@@ -0,0 +1,427 @@
+package main
+
+import (
+	"qfw/util"
+	"qfw/util/redis"
+	"regexp"
+	"sort"
+	"strings"
+	"time"
+
+	"gopkg.in/mgo.v2/bson"
+)
+
+/**
+发布时间（结合信息类型-->）
+信息类型（拟建、招标(变更)、结果(成交、中标、流标、废标、变更)、其他(合同、验收、违规、变更)）
+项目代码（长度）
+采购单位（结合省份）
+招标机构
+所属省份
+信息标题（含有二次、标段、包的情况，结合分包情况处理）
+是否分包：
+**/
+type ProjectInfo struct {
+	Id            string                 `json:"id"`
+	Publistime    []int64                `json:"publistime"` //多条信息的发布时间、跨度
+	InfoType      [][]string             `json:"infotype"`   //多条信息内的 toptype、subtype
+	Ids           []string               `json:"ids"`
+	Topscopeclass []string               `json:"topscopeclass"`
+	Subscopeclass []string               `json:"subscopeclass"`
+	Winners       []string               `json:"winners"`
+	ProjectName   string                 `json:"projectname"`
+	ProjectCode   string                 `json:"projectcode"` //项目代码唯一（纯数字的权重低）
+	Buyer         string                 `json:"buyer"`       //采购单位唯一
+	Buyerperson   string                 `json:"buyerperson"`
+	Buyertel      string                 `json:"buyertel"`
+	Agency        string                 `json:"agency"`     //代理机构唯一
+	Area          string                 `json:"area"`       //地区唯一
+	City          string                 `json:"city"`       //地市
+	HasPackage    bool                   `json:"haspackage"` //是否有分包
+	Package       map[string]interface{} `json:"package"`    //分包的对比对象
+
+	Buyerclass  string   `json:"buyerclass"`  //采购单位分类
+	Bidopentime int64    `json:"bidopentime"` //开标时间
+	District    string   `json:"district"`    //区县
+	Winnerorder []string //中标候选人
+}
+
+type CompareOne struct {
+	ProjectNameType string //项目名称对比结果分类 A相等 B包含 C不相等 Dthis存在对比不存在 Ethis不存在
+	ProjectCodeType string //同上
+	BuyerType       string //同上
+	AreaType        string //同上
+	AgencyType      string //同上
+	PublistimeType  int    //1在时间范围  2不在
+	PackageType     int    //1都是多包 2都不是多包 3招标 4新信息是结果
+	Score           int
+	Parent          *CompareInfo
+	Pinfo           *ProjectInfo
+	Pos             int
+
+	Cresult string //对比结果
+}
+
+type CompareInfo struct {
+	Field  string        //对比属性 pn/pc/pb
+	Key    string        //存放rediskey
+	Scores []*CompareOne //对比分值 pinfo索引对应分值
+	Bfind  bool          //是否查找到
+	IdArr  []string
+	K      *Key
+	KeyMap *KeyMap
+}
+
+func NewCompareInfo(field, key string, KeyMap *KeyMap) *CompareInfo {
+	return &CompareInfo{
+		Field:  field,
+		Key:    key,
+		Scores: []*CompareOne{},
+		KeyMap: KeyMap,
+	}
+
+}
+
+var numreg2 = regexp.MustCompile("^[0-9]+$")
+var TitleReg = regexp.MustCompile("([一二三四五六七八九十0-9A-Za-zⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩⅪⅫ、\\-~至]+(子|合同|分|施工|监理|标)?[包标段][号段]?[、]?)+|((子|合同|分|施工|监理|标)?[包标段][号段]?[一二三四五六七八九十0-9A-Za-zⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩⅪⅫ、\\-~至]+[、]?)+|(子|合同|分|施工|监理|标)?[包标段][号段]?[a-zA-Z0-9]+[\\-~－至、](子|合同|分|施工|监理|标)?[包标段][号段]?[a-zA-Z0-9]+")
+
+//没有在redis中查找到，新增项目
+func InsertProject(new_pn string, tmp, mess map[string]interface{}, pici int64, thisinfo *Info) string {
+	e := InitEL("")
+	set := map[string]interface{}{
+		"pici": pici,
+	}
+	set["s_projectname"] = new_pn
+	e.fieldpriority(&tmp, nil, &set)
+	set["extractpos"] = e.GetVal()
+	set["createtime"] = time.Now().Unix()
+	set["sourceinfoid"] = util.BsonIdToSId(tmp["_id"])
+	set["sourceinfourl"] = tmp["href"]
+	set["topscopeclass"] = thisinfo.Topscopeclass
+	set["subscopeclass"] = thisinfo.Subscopeclass
+	if thisinfo.Buyerperson != "" {
+		set["buyerperson"] = thisinfo.Buyerperson
+	}
+	if thisinfo.Buyertel != "" {
+		set["buyertel"] = thisinfo.Buyertel
+	}
+	if thisinfo.Buyerclass != "" {
+		set["buyertel"] = thisinfo.Buyerclass
+	}
+	if thisinfo.District != "" {
+		set["district"] = thisinfo.District
+	}
+	if thisinfo.Bidopentime > 0 {
+		set["bidopentime"] = thisinfo.Bidopentime
+	}
+	if len(thisinfo.Winnerorder) > 0 {
+		set["winnerorder"] = thisinfo.Winnerorder
+	}
+	s_subscopeclass := strings.Join(thisinfo.Subscopeclass, ",")
+	set["s_subscopeclass"] = s_subscopeclass
+	s_winner := strings.Join(thisinfo.Winners, ",")
+	set["s_winner"] = s_winner
+	if tmp["package"] != nil {
+		set["package"] = tmp["package"] //没定义优先级
+	}
+	push := NewPushInfo(tmp)
+	for tkey, _ := range extractpos {
+		if tmp[tkey] != nil {
+			push[tkey] = tmp[tkey]
+		}
+	}
+	set["list"] = []bson.M{
+		push,
+	}
+	if mess != nil { //项目标识
+		for k, v := range mess {
+			set[k] = v
+		}
+	}
+	return MQFW.Save(projectColl, set)
+}
+
+//生成存放在redis数组中的对象
+func NewPinfo(id string, thisinfo *Info) ProjectInfo {
+	p1 := ProjectInfo{
+		Publistime:    []int64{thisinfo.Publishtime},
+		InfoType:      [][]string{[]string{thisinfo.TopType, thisinfo.SubType}},
+		Id:            id,
+		Ids:           []string{thisinfo.Id},
+		Topscopeclass: thisinfo.Topscopeclass,
+		Subscopeclass: thisinfo.Subscopeclass,
+		Winners:       thisinfo.Winners,
+		ProjectName:   thisinfo.ProjectName,
+		ProjectCode:   thisinfo.ProjectCode,
+		Buyer:         thisinfo.Buyer,
+		Agency:        thisinfo.Agency,
+		Area:          thisinfo.Area,
+		HasPackage:    thisinfo.HasPackage,
+		Package:       map[string]interface{}{},
+		Buyerclass:    thisinfo.Buyerclass,
+		Bidopentime:   thisinfo.Bidopentime,
+		District:      thisinfo.District,
+		Winnerorder:   thisinfo.Winnerorder,
+	}
+	for k4, _ := range thisinfo.Package {
+		p1.Package[k4] = ""
+	}
+	return p1
+}
+
+//每一个字段的打分map,获取最高分
+func GetMaxScore(scoremap map[int]int) (find bool, index int) {
+	ks := []int{}
+	vs := []int{}
+	for k, v := range scoremap {
+		mk, mv := -1, -100
+		bf := false
+		for mk, mv = range vs {
+			if mv > v {
+				bf = true
+				break
+			}
+		}
+		if mk == -1 || !bf {
+			vs = append(vs, v)
+			ks = append(ks, k)
+		} else {
+			vs = append(append(vs[:mk], v), vs[mk:]...)
+			ks = append(append(ks[:mk], k), ks[mk:]...)
+		}
+	}
+	if len(ks) > 0 {
+		index = ks[len(ks)-1]
+		find = true
+	}
+	return
+}
+
+//往对应redis中更新信息
+func updateinfo(thisinfo *Info, tmp map[string]interface{}, pInfo *ProjectInfo, pici int64) string {
+	updateid := pInfo.Id
+	if BinarySearch(pInfo.Ids, thisinfo.Id) > -1 {
+		return updateid
+	}
+	set := map[string]interface{}{
+		"pici": pici,
+	}
+	res, bres := MQFW.FindById(projectColl, pInfo.Id, `{"list":0}`)
+	EqInfoUpdate(thisinfo, pInfo)
+	if bres && res != nil && *res != nil {
+		set["topscopeclass"] = pInfo.Topscopeclass
+		set["subscopeclass"] = pInfo.Subscopeclass
+		s_subscopeclass := strings.Join(pInfo.Subscopeclass, ",")
+		if len(s_subscopeclass) > 0 {
+			s_subscopeclass = "," + s_subscopeclass + ","
+		}
+		set["s_subscopeclass"] = s_subscopeclass
+		s_winner := strings.Join(pInfo.Winners, ",")
+		if len(s_winner) > 0 {
+			s_winner = "," + s_winner + ","
+		}
+		set["s_winner"] = s_winner
+		if pInfo.Buyerperson != "" && pInfo.Buyertel != "" {
+			set["buyerperson"] = pInfo.Buyerperson
+			set["buyertel"] = pInfo.Buyertel
+		}
+		if pInfo.Buyerclass != "" {
+			set["buyerclass"] = pInfo.Buyerclass
+		}
+		if pInfo.District != "" {
+			set["district"] = pInfo.District
+		}
+		if pInfo.Bidopentime > 0 {
+			set["bidopentime"] = pInfo.Bidopentime
+		}
+		if len(pInfo.Winnerorder) > 0 {
+			set["winnerorder"] = pInfo.Winnerorder
+		}
+		if thisinfo.HasPackage {
+			set["multipackage"] = 1
+		} else {
+			set["multipackage"] = 0
+		}
+		e := InitEL(util.ObjToString((*res)["extractpos"]))
+		if thisinfo.dealtype == 1 {
+			var sonpackage map[string]interface{}
+			for _, obj := range tmp["package"].(map[string]interface{}) {
+				sonpackage, _ = obj.(map[string]interface{})
+			}
+			for _, v2 := range []string{"budget", "budget_w", "winner", "winner_w", "bidstatus", "bidstatus_w"} {
+				if sonpackage[v2] != nil {
+					tmp[v2] = sonpackage[v2]
+				}
+			}
+		}
+		e.fieldpriority(&tmp, res, &set)
+		set["extractpos"] = e.GetVal()
+		if thisinfo.HasPackage { //多包处理
+			p1, _ := (*res)["package"].(map[string]interface{})
+			p2, _ := tmp["package"].(map[string]interface{})
+			if p2 != nil {
+				if p1 != nil {
+					for pk2, pv2 := range p2 {
+						if p1[pk2] != nil { //合并
+							item1, _ := p1[pk2].(map[string]interface{})
+							item2, _ := pv2.(map[string]interface{})
+							if item1 != nil && item2 != nil { //原始项
+								for ik1, iv1 := range item2 {
+									if item1[ik1] == nil {
+										item1[ik1] = iv1
+									}
+								}
+							}
+						} else {
+							p1[pk2] = pv2
+						}
+					}
+				} else {
+					p1 = p2
+				}
+			}
+			set["package"] = p1
+		}
+		//中标候选人合并
+
+		update := map[string]interface{}{}
+		if len(set) > 0 {
+			update["$set"] = set
+		}
+		//保留原数据吧
+		push := NewPushInfo(tmp)
+		for tkey, _ := range extractpos {
+			if tmp[tkey] != nil {
+				push[tkey] = tmp[tkey]
+			}
+		}
+		update["$push"] = map[string]interface{}{
+			"list": push,
+		}
+		if len(update) > 0 {
+			MQFW.Update(projectColl, map[string]interface{}{
+				"_id": util.StringTOBsonId(pInfo.Id),
+			}, &update, false, false)
+		}
+	}
+	//再往redis中放 index
+	//往队列中增加时间 -------------->start
+	redis.Put(REDISIDS, updateid, pInfo, 0)
+	return updateid
+}
+
+func EqInfoUpdate(thisinfo *Info, pInfo *ProjectInfo) {
+	var tk int
+	bf1 := false
+	for _k, tv := range pInfo.Publistime {
+		tk = _k
+		if tv > thisinfo.Publishtime {
+			bf1 = true
+			break
+		}
+	}
+	if bf1 {
+		pInfo.Publistime = append(append(pInfo.Publistime[:tk], thisinfo.Publishtime), pInfo.Publistime[tk:]...)
+		pInfo.InfoType = append(append(pInfo.InfoType[:tk], []string{thisinfo.TopType, thisinfo.SubType}), pInfo.InfoType[tk:]...)
+		pInfo.Ids = append(append(pInfo.Ids[:tk], thisinfo.Id), pInfo.Ids[tk:]...)
+	} else {
+		pInfo.Publistime = append(pInfo.Publistime, thisinfo.Publishtime)
+		pInfo.InfoType = append(pInfo.InfoType, []string{thisinfo.TopType, thisinfo.SubType})
+		pInfo.Ids = append(pInfo.Ids, thisinfo.Id)
+	}
+	//增加发布时间结束----------------->end
+
+	if (pInfo.Buyer == "" && thisinfo.Buyer != "") || (len([]rune(pInfo.Buyer)) < 5 && len([]rune(thisinfo.Buyer)) > 5) {
+		pInfo.Buyer = thisinfo.Buyer
+	}
+	if (pInfo.Agency == "" && thisinfo.Agency != "") || (len([]rune(pInfo.Agency)) < 5 && len([]rune(thisinfo.Agency)) > 5) {
+		pInfo.Agency = thisinfo.Agency
+	}
+	if (pInfo.ProjectCode == "" && thisinfo.ProjectCode != "") || (len([]rune(pInfo.ProjectCode)) < 6 && len([]rune(thisinfo.ProjectCode)) > 6) {
+		pInfo.ProjectCode = thisinfo.ProjectCode
+	}
+
+	if thisinfo.Buyerperson != "" && thisinfo.Buyertel != "" && len([]rune(thisinfo.Buyertel)) > 6 {
+		pInfo.Buyerperson = thisinfo.Buyerperson
+		pInfo.Buyertel = thisinfo.Buyertel
+	}
+	if thisinfo.Buyerclass != "" {
+		pInfo.Buyerclass = thisinfo.Buyerclass
+	}
+	if thisinfo.District != "" {
+		pInfo.District = thisinfo.District
+	}
+	if thisinfo.Bidopentime > 0 {
+		pInfo.Bidopentime = thisinfo.Bidopentime
+	}
+	if len(thisinfo.Topscopeclass) > 0 {
+		sort.Strings(pInfo.Topscopeclass)
+		for _, k := range thisinfo.Topscopeclass {
+			if BinarySearch(pInfo.Topscopeclass, k) == -1 {
+				pInfo.Topscopeclass = append(pInfo.Topscopeclass, k)
+				sort.Strings(pInfo.Topscopeclass)
+			}
+		}
+	}
+
+	if len(thisinfo.Subscopeclass) > 0 {
+		sort.Strings(pInfo.Subscopeclass)
+		for _, k := range thisinfo.Subscopeclass {
+			if BinarySearch(pInfo.Subscopeclass, k) == -1 {
+				pInfo.Subscopeclass = append(pInfo.Subscopeclass, k)
+				sort.Strings(pInfo.Subscopeclass)
+			}
+		}
+	}
+	//winner
+	if len(thisinfo.Winners) > 0 {
+		sort.Strings(pInfo.Winners)
+		for _, k := range thisinfo.Winners {
+			if BinarySearch(pInfo.Winners, k) == -1 {
+				pInfo.Winners = append(pInfo.Winners, k)
+				sort.Strings(pInfo.Winners)
+			}
+		}
+	}
+	//winnerorder
+	if len(thisinfo.Winnerorder) > 0 {
+		sort.Strings(pInfo.Winnerorder)
+		for _, k := range thisinfo.Winnerorder {
+			if BinarySearch(pInfo.Winnerorder, k) == -1 {
+				pInfo.Winnerorder = append(pInfo.Winnerorder, k)
+				sort.Strings(pInfo.Winnerorder)
+			}
+		}
+	}
+	//return pInfo
+}
+
+//二分字符串查找
+func BinarySearch(s []string, k string) int {
+	sort.Strings(s)
+	lo, hi := 0, len(s)-1
+	for lo <= hi {
+		m := (lo + hi) >> 1
+		if s[m] < k {
+			lo = m + 1
+		} else if s[m] > k {
+			hi = m - 1
+		} else {
+			return m
+		}
+	}
+	return -1
+}
+
+//移除数组中重复的元素
+func RemoveDup(arr []string) (newarr []string) {
+	m1 := map[string]bool{}
+	newarr = []string{}
+	for _, k := range arr {
+		if !m1[k] {
+			m1[k] = true
+			newarr = append(newarr, k)
+		}
+	}
+	return
+}

fullproject/src/config.json

@@ -0,0 +1,36 @@
+{
+    "mongodbServers": "192.168.3.207:27082",
+    "mongodbPoolSize": 10,
+    "mongodbName": "extract_v3",
+    "jkmail": {
+        "to": "zhangjinkun@topnet.net.cn",
+        "api": "http://10.171.112.160:19281/_send/_mail"
+    },
+    "thread": 1,
+    "extractColl": "bidding20190521",
+    "projectColl": "projectset",
+    "lenprojectname": 18,
+    "redisPoolSize": 60,
+    "redisaddrs": "ids=192.168.3.18:3379,keys=192.168.3.18:3379,info=192.168.3.18:3379",
+    "clearedis": {
+        "open": true,
+        "clearcron": "0 10 15 ? * 4",
+        "projectcycle": 180
+    },
+    "megerfields": {
+        "projectlen": 5,
+        "projectcodelen": 8
+    },
+    "taskstock": {
+        "open": true,
+        "endate": "2019-06-30"
+    },
+    "udpport": ":1482",
+    "nextNode": [
+        {
+            "addr": "127.0.0.1",
+            "port": 1483,
+            "memo": "创建项目索引"
+        }
+    ]
+}

fullproject/src/datamonitor.go

@@ -0,0 +1,50 @@
+package main
+
+import (
+	"sync"
+	"time"
+)
+
+/**
+增加数据监控服务，每15分钟保存一次抽取情况
+**/
+var IS = &InfoStatus{
+	time.Now().Unix(), 0, map[string]int{}, &sync.Mutex{}}
+
+func init() {
+	go IS.Save()
+}
+
+type InfoStatus struct {
+	Starttime int64
+	Endtime   int64
+	Val       map[string]int
+	Lock      *sync.Mutex
+}
+
+func (is *InfoStatus) Add(t string) {
+	is.Lock.Lock()
+	is.Val[t]++
+	is.Lock.Unlock()
+}
+
+func (is *InfoStatus) Save() {
+	is.Lock.Lock()
+	is.Endtime = time.Now().Unix()
+	save := map[string]interface{}{}
+	all := 0
+	for _, v := range is.Val {
+		all += v
+	}
+	if all > 0 {
+		save["receive"] = all
+		save["starttime"] = is.Starttime
+		save["endtime"] = is.Endtime
+		save["flag"] = "projectser"
+		is.Val = map[string]int{}
+		go MQFW.Save("datamonitor", save)
+	}
+	is.Starttime = is.Endtime
+	is.Lock.Unlock()
+	time.AfterFunc(15*time.Minute, is.Save)
+}

fullproject/src/extractarea.go

@@ -0,0 +1,79 @@
+package main
+
+import (
+	"qfw/util"
+)
+
+var CityConfig map[string]interface{}
+var AreaGet DFA //敏感词
+
+func initarea() {
+	util.ReadConfig("city.json", &CityConfig)
+	cp := CityConfig["city"].(map[string]interface{})
+	citys := []string{}
+	for k, _ := range cp {
+		citys = append(citys, k)
+	}
+	AreaGet = DFA{}
+	AreaGet.AddWord(citys...)
+}
+
+type DFA struct {
+	Link map[string]interface{}
+}
+
+func (d *DFA) AddWordAll(haskey bool, keys ...string) {
+	if d.Link == nil {
+		d.Link = make(map[string]interface{})
+	}
+	for _, key := range keys {
+		nowMap := &d.Link
+		for i := 0; i < len(key); i++ {
+			kc := key[i : i+1]
+			if v, ok := (*nowMap)[kc]; ok {
+				nowMap, _ = v.(*map[string]interface{})
+			} else {
+				newMap := map[string]interface{}{}
+				newMap["YN"] = "0"
+				(*nowMap)[kc] = &newMap
+				nowMap = &newMap
+			}
+			if i == len(key)-1 {
+				(*nowMap)["YN"] = "1"
+				if haskey {
+					(*nowMap)["K"] = key
+				}
+			}
+		}
+	}
+}
+
+func (d *DFA) AddWord(keys ...string) {
+	d.AddWordAll(false, keys...)
+}
+
+//适合一次查找
+func (d *DFA) CheckSensitiveWord(src string) (b bool) {
+	pos := 0
+	nowMap := &d.Link
+	for i := 0; i < len(src); i++ {
+		word := src[i : i+1]
+		nowMap, _ = (*nowMap)[word].(*map[string]interface{})
+		if nowMap != nil { // 存在，则判断是否为最后一个
+			if pos == 0 {
+				pos = i
+			}
+			if "1" == util.ObjToString((*nowMap)["YN"]) { // 如果为最后一个匹配规则,结束循环，返回匹配标识数
+				b = true
+				break
+			}
+		} else {
+			nowMap = &d.Link
+			if pos > 0 {
+				i = pos
+				pos = 0
+			}
+		}
+	}
+	return
+}

fullproject/src/fulldata.go

@@ -0,0 +1,240 @@
+package main
+
+import (
+	"log"
+	"strings"
+
+	"qfw/util"
+	"qfw/util/mongodb"
+
+	"qfw/util/redis"
+	"sync"
+	"time"
+)
+
+var FullCount = 0
+
+func RunFullData() {
+	defer util.Catch()
+	var wg = sync.WaitGroup{}
+	startTime := int64(1325347200) //2012-01-01
+	ps := 3
+	pool := make(chan *task, ps)
+	day := 0
+	endChan := make(chan bool, 1)
+	go func() {
+		now := time.Now().Unix()
+		bComplete := false
+		for {
+			if startTime > now || bComplete {
+				log.Println("任务结束")
+				endChan <- true
+				break
+			}
+			endTime := startTime + 86400
+			q := map[string]interface{}{
+				"publishtime": map[string]interface{}{
+					"$gt":  startTime,
+					"$lte": endTime,
+				},
+			}
+
+			//数据正序处理
+			sess := MQFW.GetMgoConn()
+			var result []map[string]interface{}
+			sess.DB(MQFW.DbName).C(extractColl).Find(q).All(&result)
+			MQFW.DestoryMongoConn(sess)
+			pool <- &task{result}
+			wg.Add(1)
+			startTime = endTime
+			day++
+			log.Println("day====", day)
+			if day > 0 && day%ps == 0 {
+				wg.Wait()
+				MQFW.Destory()
+				MQFW = mongodb.MongodbSim{
+					MongodbAddr: Sysconfig["mongodbServers"].(string),
+					Size:        2 * ps,
+					DbName:      Sysconfig["mongodbName"].(string),
+				}
+				MQFW.InitPool()
+			}
+
+		}
+	}()
+
+	for {
+		select {
+		case t := <-pool:
+			t.query()
+			t.result = nil
+			t = nil
+			wg.Done()
+		case <-endChan:
+			return
+		}
+	}
+
+}
+
+type task struct {
+	result []map[string]interface{}
+}
+
+func (t *task) query() {
+	index := 0
+	wg := &sync.WaitGroup{}
+	for _, tmp := range t.result {
+		if index%10000 == 0 {
+			log.Println(index, tmp["_id"])
+		}
+		index++
+		if util.IntAll(tmp["repeat"]) == 1 {
+			continue
+		}
+		pt := util.Int64All(tmp["publishtime"])
+		if pt > currentMegerTime {
+			currentMegerTime = pt
+		}
+		currentMegerCount++
+		if currentMegerCount > 300000 {
+			log.Println("执行清理", currentMegerTime)
+			clearPKey()
+			currentMegerCount = 0
+		}
+		wg.Add(1)
+		MultiThread <- true
+		go func(tmp map[string]interface{}) {
+			defer func() {
+				<-MultiThread
+				wg.Done()
+			}()
+			thisid := util.BsonIdToSId(tmp["_id"])
+			info := PreThisInfo(tmp)
+			if info != nil {
+				lockPNCBMap(info)
+				startProjectMerge(info, tmp)
+				redis.Put(INFOID, thisid, 1, INFOTIMEOUT)
+				currentMegerTime = info.Publishtime
+				unlockPNCBMap(info)
+			}
+		}(tmp)
+	}
+	wg.Wait()
+	FullCount += index
+
+	log.Println("currentFull", FullCount)
+
+}
+
+type KeyMapPC struct {
+	Lock sync.Mutex
+	Map  map[string]*KeyMap
+}
+
+type CompareInfoPC struct {
+	Field    string        //对比属性 pn/pc/pb
+	Key      string        //存放rediskey
+	Scores   []*CompareOne //对比分值 pinfo索引对应分值
+	Bfind    bool          //是否查找到
+	IdArr    []string
+	K        *Key
+	KeyMapPC *KeyMapPC
+}
+
+func NewCompareInfoPC(field, key string, KeyMapPC *KeyMapPC) *CompareInfoPC {
+	return &CompareInfoPC{
+		Field:    field,
+		Key:      key,
+		Scores:   []*CompareOne{},
+		KeyMapPC: KeyMapPC,
+	}
+
+}
+
+var PNIdMap, PCIdMap = &KeyMapPC{Map: map[string]*KeyMap{}}, &KeyMapPC{Map: map[string]*KeyMap{}}
+
+//获取对比项目数组
+func getComeperProjects2(p PCBV, thisinfo *Info) (res []interface{}, pncb []*CompareInfo) {
+	newarr := []string{}
+	repeatId := map[string]bool{}
+	if p.PnameLen > 0 {
+		pn := NewCompareInfoPC("pn", thisinfo.PNKey, PNIdMap)
+		//对比全国和本省
+		PNIdMap.Lock.Lock()
+		km := PNIdMap.Map[thisinfo.Area]
+		if km == nil {
+			km = &KeyMap{Map: map[string]*Key{}}
+			PNIdMap.Map[thisinfo.Area] = km
+		}
+
+		PNIdMap.Lock.Unlock()
+
+		thisinfo.AllRelatePNKeyMap = map[string]*Key{}
+		pn.KeyMap.Lock.Lock()
+		for k, v := range pn.KeyMap.Map {
+			if strings.Contains(k, pn.Key) || strings.Contains(pn.Key, k) {
+				thisinfo.AllRelatePNKeyMap[k] = v
+				for _, id := range *v.Arr {
+					if !repeatId[id] {
+						newarr = append(newarr, id)
+						repeatId[id] = true
+					}
+				}
+			}
+		}
+		if thisinfo.AllRelatePNKeyMap[pn.Key] == nil {
+			K := &Key{&[]string{}, &sync.Mutex{}}
+			thisinfo.AllRelatePNKeyMap[pn.Key] = K
+			pn.KeyMap.Map[pn.Key] = K
+		}
+		pn.KeyMap.Lock.Unlock()
+	}
+	if p.PcodeLen > 0 {
+		pc := NewCompareInfo("pc", thisinfo.PCKey, PCKey)
+		pncb = append(pncb, pc)
+		thisinfo.AllRelatePCKeyMap = map[string]*Key{}
+		pc.KeyMap.Lock.Lock()
+		for k, v := range pc.KeyMap.Map {
+			if strings.Contains(k, pc.Key) || strings.Contains(pc.Key, k) {
+				thisinfo.AllRelatePCKeyMap[k] = v
+				for _, id := range *v.Arr {
+					if !repeatId[id] {
+						newarr = append(newarr, id)
+						repeatId[id] = true
+					}
+				}
+			}
+		}
+		if thisinfo.AllRelatePCKeyMap[pc.Key] == nil {
+			K := &Key{&[]string{}, &sync.Mutex{}}
+			thisinfo.AllRelatePCKeyMap[pc.Key] = K
+			pc.KeyMap.Map[pc.Key] = K
+		}
+		pc.KeyMap.Lock.Unlock()
+	}
+
+	if p.BuyerLen > 0 {
+		pb := NewCompareInfo("pb", thisinfo.PBKey, PBKey)
+		pncb = append(pncb, pb)
+		pb.KeyMap.Lock.Lock()
+		K := pb.KeyMap.Map[pb.Key]
+		if K == nil {
+			K = &Key{&[]string{}, &sync.Mutex{}}
+			pb.KeyMap.Map[pb.Key] = K
+		} else {
+			for _, id := range *K.Arr {
+				if !repeatId[id] {
+					newarr = append(newarr, id)
+					repeatId[id] = true
+				}
+			}
+		}
+		pb.KeyMap.Lock.Unlock()
+	}
+
+	if len(newarr) > 0 {
+		res = redis.Mget(REDISIDS, newarr)
+	}
+	return
+}

fullproject/src/handleproject.go

@@ -0,0 +1,205 @@
+package main
+
+import (
+	"fmt"
+	"qfw/util"
+	"regexp"
+	"strings"
+)
+
+var pnreg = regexp.MustCompile("^(及编号[：:])|(项目|采购|招标|中标|成交|结果|[_]|公告)$")
+var numreg = regexp.MustCompile("^[0-9]$")
+
+/**
+0 项目名称不是多包结构,直接按项目名称查找
+1 项目名称多包,截去多包查找，再按不截取的查找
+2 非招标项目名称含单个子包,截取多包查找，再搂
+**/
+func handleprojectname(pn, buyer, toptype string) (string, int) {
+	for i := 0; i < 4; i++ {
+		opn := pn
+		pn = pnreg.ReplaceAllString(opn, "")
+		if opn == pn {
+			break
+		}
+	}
+	//return pn
+	if len([]rune(pn)) > lenprojectname || strings.Index(pn, buyer) > -1 || AreaGet.CheckSensitiveWord(pn) {
+		return pn, 0
+	} else {
+		return buyer + pn, 0
+	}
+}
+
+//对字段的优先级处理
+type ExtractLevel struct {
+	Strarr []string
+}
+
+func InitEL(v string) (e *ExtractLevel) {
+	if v == "" {
+		v = "0999999999"
+		//第1位一下标为0，不用
+	}
+	Strarr := strings.Split(v, "")
+	e = &ExtractLevel{Strarr}
+	return
+}
+
+func (e *ExtractLevel) PutVal(field, val string) {
+	e.Strarr[extractpos[field]] = val
+}
+
+func (e *ExtractLevel) GetVal() string {
+	return strings.Join(e.Strarr, "")
+}
+
+//字段优先级处理
+func (e *ExtractLevel) fieldpriority(info, project, set *map[string]interface{}) {
+	defer util.Catch()
+	for _k, v := range extractpos {
+		breplace := false
+		var _infov interface{}
+		_infopos := fmt.Sprintf("%d", (*info)[_k+"_w"])
+		if !numreg.MatchString(_infopos) {
+			_infopos = "9"
+		}
+		if project == nil {
+			breplace = true
+			_infov = (*info)[_k]
+		} else {
+			ty := cextractpos[_k]
+			switch ty {
+			case 's':
+				_v := util.ObjToString((*project)[_k])
+				_tv := util.ObjToString((*info)[_k])
+				_infov = _tv
+				if _v == "" && _tv != "" {
+					breplace = true
+				} else if _tv != "" { //对比
+					if e.Strarr[v] > _infopos {
+						breplace = true
+					}
+				}
+			case 'l':
+				_v := util.Float64All((*project)[_k])
+				_tv := util.Float64All((*info)[_k])
+				_infov = _tv
+				if _v == 0 && _tv > 0 {
+					breplace = true
+				} else if _tv > 0 {
+					if e.Strarr[v] > _infopos {
+						breplace = true
+					}
+				}
+
+			}
+		}
+		if breplace {
+			(*set)[_k] = _infov
+			e.PutVal(_k, _infopos)
+		}
+	}
+	otherfieldpriority(info, project, set)
+}
+
+//抽取字段
+var cextractpos = map[string]rune{
+	"projectname":  's',
+	"projectcode":  's',
+	"buyer":        's',
+	"winner":       's',
+	"budget":       'l',
+	"bidamount":    'l',
+	"bidstatus":    's',
+	"agency":       's',
+	"projectscope": 's',
+}
+var extractpos = map[string]int{
+	"projectname":  0,
+	"projectcode":  1,
+	"buyer":        2,
+	"winner":       3,
+	"budget":       4,
+	"bidamount":    5,
+	"bidstatus":    6,
+	"agency":       7,
+	"projectscope": 8,
+}
+
+//合并字段
+//"area","city","topscopeclass","subscopeclass","bidtype","zbtime","jgtime","buyerclass"
+var bidtype = map[string]string{
+	"招标": "招标",
+	"邀标": "邀标",
+	"询价": "询价",
+	"竞谈": "竞谈",
+	"单一": "单一",
+	"竞价": "竞价",
+}
+
+func otherfieldpriority(info, project, set *map[string]interface{}) {
+	area2 := util.ObjToString((*info)["area"])
+	infoformat := util.IntAll((*info)["infoformat"])
+	toptype := util.ObjToString((*info)["toptype"])
+	topscopeclass := util.ObjToString((*info)["topscopeclass"])
+	subscopeclass := util.ObjToString((*info)["subscopeclass"])
+	bt := bidtype[util.ObjToString((*info)["subtype"])]
+	if project == nil {
+		if area2 == "" || area2 == "全国" {
+			area2 = "A"
+		}
+		(*set)["area"] = area2
+		(*set)["city"] = util.ObjToString((*info)["city"])
+		(*set)["topscopeclass"] = topscopeclass
+		(*set)["subscopeclass"] = subscopeclass
+		if bt == "" {
+			bt = "招标"
+		}
+		(*set)["bidtype"] = bt
+		if infoformat == 2 {
+			(*set)["njtime"] = (*info)["publishtime"]
+		} else {
+			if toptype == "招标" {
+				(*set)["zbtime"] = (*info)["publishtime"]
+			} else if toptype == "结果" {
+				(*set)["jgtime"] = (*info)["publishtime"]
+			}
+		}
+		if (*set)["zbtime"] == nil {
+			(*set)["zbtime"] = (*info)["publishtime"]
+		}
+	} else {
+		area := util.ObjToString((*project)["area"])
+		if area == "A" && (area2 != "" && area2 != "A" && area2 != "全国") {
+			(*set)["area"] = area2
+		}
+		publishtime := util.Int64All((*info)["publishtime"])
+		if infoformat == 2 {
+			//拟建信息，先不判断
+			if publishtime > 0 {
+				(*set)["njtime"] = publishtime
+			}
+		} else {
+			//招标信息
+			if toptype == "招标" {
+				zbtime := util.Int64All((*project)["zbtime"])
+				if publishtime > 0 && publishtime < zbtime {
+					(*set)["zbtime"] = publishtime
+				}
+			} else if toptype == "结果" {
+				jgtime := util.Int64All((*project)["jgtime"])
+				if publishtime > 0 && publishtime > jgtime {
+					(*set)["jgtime"] = publishtime
+				}
+			}
+		}
+		if subscopeclass != "" {
+			(*set)["topscopeclass"] = topscopeclass
+			(*set)["subscopeclass"] = subscopeclass
+		}
+		if bt != "" && bt != "招标" {
+			(*set)["bidtype"] = bt
+		}
+	}
+}

fullproject/src/main.go

@@ -0,0 +1,101 @@
+package main
+
+import (
+	"qfw/util"
+	"qfw/util/mongodb"
+	"qfw/util/redis"
+	"sync"
+	"time"
+
+	"gopkg.in/mgo.v2/bson"
+)
+
+const (
+	REDISIDS    = "ids"
+	REDISKEYS   = "keys"
+	INFOID      = "info"
+	INFOTIMEOUT = 86400 * 30
+)
+
+var (
+	Sysconfig                map[string]interface{}
+	MQFW                     mongodb.MongodbSim
+	extractColl, projectColl string
+	lenprojectname           int
+	MultiThread              chan bool
+	IdLock                   = &sync.Mutex{}
+	PncbMayLock              = &sync.Mutex{}
+	MegerFieldsLen           *MegerFields
+	//三组lock,对应的（PNKey）key为项目名称,值对应的是此项目名称对应的项目id数组
+	PNKey, PCKey, PBKey          = NewKeyMap(), NewKeyMap(), NewKeyMap()
+	PNKeyMap, PCKeyMap, PBKeyMap = sync.Map{}, sync.Map{}, sync.Map{}
+
+	currentMegerTime  int64 //合并项目的时间位置，用来清理几个月之前的项目
+	currentMegerCount int   //合并项目的计数，用来定时清理
+)
+
+type MegerFields struct {
+	ProjectNamelen int
+	ProjectCodelen int
+}
+
+type KeyMap struct {
+	Lock sync.Mutex
+	Map  map[string]*Key
+}
+
+type Key struct {
+	Arr  *[]string
+	Lock *sync.Mutex
+}
+
+func NewKeyMap() *KeyMap {
+	return &KeyMap{
+		Map: map[string]*Key{},
+	}
+}
+
+func init() {
+	initarea()
+
+	util.ReadConfig(&Sysconfig)
+	MultiThread = make(chan bool, util.IntAllDef(Sysconfig["thread"], 200))
+	lenprojectname = util.IntAllDef(Sysconfig["lenprojectname"], 20) - 1
+	megerfields, _ := Sysconfig["megerfields"].(map[string]interface{})
+	MegerFieldsLen = &MegerFields{
+		ProjectNamelen: util.IntAllDef(megerfields["projectlen"], 5),
+		ProjectCodelen: util.IntAllDef(megerfields["projectcodelen"], 8),
+	}
+	redis.InitRedisBySize(Sysconfig["redisaddrs"].(string), util.IntAllDef(Sysconfig["redisPoolSize"], 100), 30, 300)
+	MQFW = mongodb.MongodbSim{
+		MongodbAddr: Sysconfig["mongodbServers"].(string),
+		Size:        util.IntAll(Sysconfig["mongodbPoolSize"]),
+		DbName:      Sysconfig["mongodbName"].(string),
+	}
+	MQFW.InitPool()
+	extractColl = Sysconfig["extractColl"].(string)
+	projectColl = Sysconfig["projectColl"].(string)
+}
+
+func main() {
+	RunFullData()
+	time.Sleep(99999 * time.Hour)
+}
+
+func NewPushInfo(tmp map[string]interface{}) bson.M {
+	return bson.M{
+		"comeintime":  tmp["comeintime"],
+		"publishtime": tmp["publishtime"],
+		"title":       tmp["title"],
+		"toptype":     tmp["toptype"],
+		"subtype":     tmp["subtype"],
+		"infoformat":  tmp["infoformat"],
+		"infoid":      util.BsonIdToSId(tmp["_id"]),
+		"href":        tmp["href"],
+		"area":        tmp["area"],
+		"city":        tmp["city"],
+
+		"cresult": tmp["cresult"],
+		"score":   tmp["score"],
+	}
+}

fullproject/src/main_test.go

@@ -0,0 +1,58 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"testing"
+)
+
+func Test_main(t *testing.T) {
+	m1 := map[string]*[]string{}
+	s := m1["dd"]
+	log.Println("aaaaa1")
+	func() {
+		if s == nil {
+			defer func() {
+				log.Println("defer")
+			}()
+			s = &[]string{}
+			m1["dd"] = s
+			log.Println("aaa3")
+		}
+	}()
+	n := 0
+	for {
+		defer func(n int) {
+			log.Println("for", n)
+		}(n)
+		n++
+		log.Println(n)
+		if n > 2 {
+			break
+		}
+	}
+	log.Println("aaa2")
+	*s = append(*s, "aa")
+	log.Println("---m1[dd]:", m1["dd"])
+
+	//arr := []string{"aa", "bb", "cc", "dd", "ee", "abdsfsdfsd"}
+	//log.Println("二分查找", binarySearch(arr, "bb"))
+}
+func Test_3t2(t *testing.T) {
+	pcb := [][]string{
+		[]string{"A", "B"},
+		[]string{"A", "B"},
+		[]string{"A", "B"},
+	}
+	for _, v1 := range pcb[0] {
+		tmp := []string{}
+		for _, v2 := range pcb[1] {
+			for _, v3 := range pcb[1] {
+				key := fmt.Sprintf("%s%s%s", v1, v2, v3)
+				tmp = append(tmp, key)
+			}
+		}
+		log.Println(tmp)
+	}
+
+}

fullproject/src/projectmeger.go

@@ -0,0 +1,615 @@
+// projectmeger
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	du "jy/util"
+	"log"
+	qu "qfw/util"
+	"qfw/util/redis"
+	"sort"
+	"strings"
+	"sync"
+	"time"
+)
+
+//有效值三选一、三选二
+var ThreeToTow, ThreeToOne map[string]bool
+
+func init() {
+	ThreeToTow = map[string]bool{}
+	ThreeToOne = map[string]bool{
+		"AAA": true,
+		"AAB": true,
+	}
+	tows := [][][]string{
+		[][]string{
+			[]string{"A", "B"},
+			[]string{"A", "B"},
+			[]string{"A", "B"},
+		},
+		[][]string{
+			[]string{"A", "B"},
+			[]string{"D", "E"},
+			[]string{"A", "B"},
+		},
+		[][]string{
+			[]string{"A", "B"},
+			[]string{"A", "B"},
+			[]string{"D", "E"},
+		},
+		[][]string{
+			[]string{"D", "E"},
+			[]string{"A", "B"},
+			[]string{"A", "B"},
+		},
+	}
+	for _, tow := range tows {
+		for _, v1 := range tow[0] {
+			for _, v2 := range tow[1] {
+				for _, v3 := range tow[2] {
+					key := fmt.Sprintf("%s%s%s", v1, v2, v3)
+					log.Println(key)
+					ThreeToTow[key] = true
+				}
+			}
+		}
+	}
+}
+
+func startProjectMerge(thisinfo *Info, tmp map[string]interface{}) {
+	bNormalScore := false
+	pcbv := PCBVal(tmp)
+	if checkInfoAlter(tmp) { //进入变更信息流程
+		if pcbv.Val > 1 { //判断三项至少包含两项
+			bNormalScore = true
+		} else {
+			extInfoTag("invalid", qu.BsonIdToSId(tmp["_id"])) //无效信息，打标记
+			//go IS.Add("invalid")                              //数据统计使用
+			return
+		}
+	} else {
+		bNormalScore = true
+	}
+	//合并流程
+	if bNormalScore {
+		PNKeyMap.Store(thisinfo.PNKey, true)
+		PBKeyMap.Store(thisinfo.PBKey, true)
+		PCKeyMap.Store(thisinfo.PCKey, true)
+		if pcbv.Buyer { //有采购单位
+			hasBuyer(pcbv, thisinfo, tmp)
+		} else { //无采购单位
+			noBuyer(pcbv, thisinfo, tmp)
+		}
+	}
+}
+
+//判断信息是否是变更
+func checkInfoAlter(tmp map[string]interface{} /*新信息*/) bool {
+	toptype := qu.ObjToString(tmp["toptype"])
+	subtype := qu.ObjToString(tmp["subtype"])
+	title := qu.ObjToString(tmp["title"])
+	if subtype == "变更" || strings.Index(title, "变更公告") > -1 || strings.Index(title, "更正公告") > -1 {
+		//当信息类型是变更或标题中含变更时
+		if toptype == "招标" {
+			//招标的变更公告，不作处理
+		} else if toptype == "结果" {
+			subtype = "变更"
+		}
+	}
+	return subtype == "变更"
+}
+
+//有采购单位
+func hasBuyer(p PCBV, thisinfo *Info, tmp map[string]interface{}) {
+	var pncb []*CompareInfo
+	var res []interface{}
+	sflag := ""
+	pici := time.Now().Unix()
+	if p.Pname || p.Pcode { //有项目名称或项目编号
+		//获取对比项目数组
+		res, pncb = getComeperProjects(p, thisinfo)
+		//三选二打分
+		scores := score3Select2(p, thisinfo, tmp, res, pncb)
+		//项目合并
+		sflag = mergeProject(tmp, thisinfo, scores, pncb)
+	} else {
+		//生成项目，不参与后续对比
+		sflag = "alone"
+		mess := map[string]interface{}{
+			"meger_mess":  "有采购单位,不满足三选二",
+			"meger_sflag": sflag,
+		}
+		newProject(tmp, mess, pici, thisinfo)
+	}
+	extInfoTag(sflag, thisinfo.Id)
+	//go IS.Add(sflag) //数据统计使用
+}
+
+//无采购单位
+func noBuyer(p PCBV, thisinfo *Info, tmp map[string]interface{}) {
+	var pncb []*CompareInfo
+	var res []interface{}
+	sflag := ""
+	pici := time.Now().Unix()
+	if p.Pname { //有项目名称
+		//获取对比项目数组
+		res, pncb = getComeperProjects(p, thisinfo)
+		if p.Pcode { //有项目编号
+			//三选二打分
+			scores := score3Select2(p, thisinfo, tmp, res, pncb)
+			//项目合并
+			sflag = mergeProject(tmp, thisinfo, scores, pncb)
+		} else { //无项目编号
+			if p.PnameLen > MegerFieldsLen.ProjectNamelen {
+				//三选一打分
+				scores := score3Select1(p, thisinfo, tmp, res, pncb)
+				//项目合并
+				sflag = mergeProject(tmp, thisinfo, scores, pncb)
+			} else {
+				//生成项目，不参与后续对比
+				sflag = "alone"
+				mess := map[string]interface{}{
+					"meger_mess":  "无采购单位,不满足三选一",
+					"meger_sflag": sflag,
+				}
+				newProject(tmp, mess, pici, thisinfo)
+			}
+		}
+	} else { //无项目名称
+		if p.Pcode {
+			//获取对比项目数组
+			res, pncb = getComeperProjects(p, thisinfo)
+			if p.PcodeLen > MegerFieldsLen.ProjectCodelen {
+				if p.Area && p.City && p.Agency { //有省市代理机构
+					//三选一打分
+					scores := score3Select1(p, thisinfo, tmp, res, pncb)
+					//项目合并
+					sflag = mergeProject(tmp, thisinfo, scores, pncb)
+				} else {
+					//生成项目，不参与后续对比
+					sflag = "alone"
+					mess := map[string]interface{}{
+						"meger_mess":  "无采购单位,不满足三选一",
+						"meger_sflag": sflag,
+					}
+					newProject(tmp, mess, pici, thisinfo)
+				}
+			} else {
+				//生成项目，不参与后续对比
+				sflag = "alone"
+				mess := map[string]interface{}{
+					"meger_mess":  "无采购单位,不满足三选一",
+					"meger_sflag": sflag,
+				}
+				newProject(tmp, mess, pici, thisinfo)
+			}
+		} else {
+			//信息无效,打标记
+			sflag = "invalid"
+		}
+	}
+	extInfoTag(sflag, thisinfo.Id)
+	//go IS.Add(sflag) //数据统计使用
+}
+
+//3选2打分
+func score3Select2(p PCBV, thisinfo *Info, tmp map[string]interface{}, res []interface{}, pncb []*CompareInfo) (scores []*CompareOne) {
+	defer qu.Catch()
+	if len(res) > 0 {
+		//对比打分
+		for k, tmps := range res { //遍历对象数组
+			if tmp, ok := tmps.([]interface{}); ok {
+				for _, b1 := range tmp {
+					if b1 != nil {
+						var info ProjectInfo
+						err := json.Unmarshal(b1.([]byte), &info)
+						if err != nil {
+							log.Println(err)
+						}
+						cone := &CompareOne{
+							Parent: pncb[k],
+							Pinfo:  &info,
+						}
+						cone.BuyerType, cone.Score = fieldPCBScore(thisinfo.Buyer, info.Buyer, cone.BuyerType, cone.Score)
+						if p.Buyer {
+							cone.ProjectNameType, cone.Score = fieldPCBScore(thisinfo.ProjectName, info.ProjectName, cone.ProjectNameType, cone.Score)
+							cone.ProjectCodeType, cone.Score = fieldPCBScore(thisinfo.ProjectCode, info.ProjectCode, cone.ProjectCodeType, cone.Score)
+						} else { //无采购单位，打分考虑长度
+							if len([]rune(thisinfo.ProjectName)) > MegerFieldsLen.ProjectNamelen {
+								cone.ProjectNameType, cone.Score = fieldPCBScore(thisinfo.ProjectName, info.ProjectName, cone.ProjectNameType, cone.Score)
+							} else {
+								cone.ProjectNameType = "D"
+							}
+							if len(thisinfo.ProjectCode) > MegerFieldsLen.ProjectCodelen {
+								cone.ProjectCodeType, cone.Score = fieldPCBScore(thisinfo.ProjectCode, info.ProjectCode, cone.ProjectCodeType, cone.Score)
+							} else {
+								cone.ProjectCodeType = "D"
+							}
+						}
+						//省市打分
+						if thisinfo.Area != "A" && thisinfo.Area != "全国" && info.Area != "A" && info.Area != "全国" {
+							if thisinfo.Area == info.Area && thisinfo.City == info.City {
+								cone.Score += 2
+							} else {
+								cone.Score -= 1
+							}
+						} else {
+							cone.Score += 1
+						}
+						//代理机构打分
+						if len([]rune(info.Agency)) > 0 {
+							if thisinfo.Agency == info.Agency { //A
+								cone.Score += 2
+							} else if strings.Index(info.Agency, thisinfo.Agency) > -1 || strings.Index(thisinfo.Agency, info.Agency) > -1 { //B
+								cone.Score += 1
+							} else {
+								if len(thisinfo.Agency) < 1 { //E
+									cone.Score -= 1
+								} else { //C
+									cone.Score -= 2
+								}
+							}
+						} else { //D不计分
+							//
+						}
+						skey := fmt.Sprintf("%s%s%s", cone.BuyerType, cone.ProjectNameType, cone.ProjectCodeType)
+						cone.Cresult = skey
+						if ThreeToTow[skey] {
+							scores = append(scores, cone)
+						}
+					}
+				}
+			}
+		}
+	}
+	return
+}
+
+//3选1打分
+func score3Select1(p PCBV, thisinfo *Info, tmp map[string]interface{}, res []interface{}, pncb []*CompareInfo) (scores []*CompareOne) {
+	defer qu.Catch()
+	//对比打分
+	if len(res) > 0 { //找到项目名称、项目编号或采购单位相同时
+		for k, tmps := range res { //遍历对象数组
+			if tmp, ok := tmps.([]interface{}); ok {
+				for _, b1 := range tmp {
+					if b1 != nil {
+						var info ProjectInfo
+						err := json.Unmarshal(b1.([]byte), &info)
+						if err != nil {
+							log.Println(err)
+						}
+						cone := &CompareOne{
+							Parent: pncb[k],
+							Pinfo:  &info,
+						}
+						if pncb[k].Field == "pn" { //比较字段项目名称
+							if len(info.ProjectName) > 0 {
+								if thisinfo.ProjectName == info.ProjectName { //A
+									cone.Score += 2
+									cone.ProjectNameType = "A"
+								} else if strings.Index(info.ProjectName, thisinfo.ProjectName) > -1 || strings.Index(thisinfo.ProjectName, info.ProjectName) > -1 { //B
+									cone.Score += 1
+									cone.ProjectNameType = "B"
+								} else { //C
+									cone.Score -= 2
+									cone.ProjectNameType = "C"
+								}
+							} else { //D不计分
+								cone.ProjectNameType = "D"
+							}
+						}
+						if pncb[k].Field == "pc" { //比较字段项目编号
+							if len(info.ProjectCode) > 0 {
+								if thisinfo.ProjectCode == info.ProjectCode { //A
+									cone.Score += 2
+									cone.ProjectCodeType = "A"
+								} else if strings.Index(info.ProjectCode, thisinfo.ProjectCode) > -1 || strings.Index(thisinfo.ProjectCode, info.ProjectCode) > -1 { //B
+									cone.Score += 1
+									cone.ProjectCodeType = "B"
+								} else { //C
+									cone.Score -= 2
+									cone.ProjectCodeType = "C"
+								}
+							} else { //D不计分
+								cone.ProjectCodeType = "D"
+							}
+						}
+						if thisinfo.Area != "A" && thisinfo.Area != "全国" && info.Area != "A" && info.Area != "全国" {
+							if thisinfo.Area == info.Area && thisinfo.City == info.City {
+								cone.Score += 2
+								cone.AreaType = "A"
+							} else {
+								cone.Score -= 1
+								cone.AreaType = "C"
+							}
+						} else {
+							cone.Score += 1
+							cone.AreaType = "B"
+						}
+						if len([]rune(info.Agency)) > 0 {
+							if thisinfo.Agency == info.Agency { //A
+								cone.Score += 2
+								cone.AgencyType = "A"
+							} else if strings.Index(info.Agency, thisinfo.Agency) > -1 || strings.Index(thisinfo.Agency, info.Agency) > -1 { //B
+								cone.Score += 1
+								cone.AgencyType = "B"
+							} else {
+								if len(thisinfo.Agency) < 1 { //E
+									cone.Score -= 1
+									cone.AgencyType = "E"
+								} else { //C
+									cone.Score -= 2
+									cone.AgencyType = "C"
+								}
+							}
+						} else { //D不计分
+							cone.AgencyType = "D"
+						}
+						skey := fmt.Sprintf("%s%s%s", cone.BuyerType, cone.ProjectNameType, cone.ProjectCodeType)
+						cone.Cresult = skey
+						if ThreeToOne[skey] {
+							scores = append(scores, cone)
+						}
+					}
+				}
+			}
+		}
+	}
+	return
+}
+
+//获取对比项目数组
+func getComeperProjects(p PCBV, thisinfo *Info) (res []interface{}, pncb []*CompareInfo) {
+	if p.PnameLen > 0 {
+		pn := NewCompareInfo("pn", thisinfo.PNKey, PNKey)
+		pncb = append(pncb, pn)
+	}
+	if p.PcodeLen > 0 {
+		pc := NewCompareInfo("pc", thisinfo.PCKey, PCKey)
+		pncb = append(pncb, pc)
+	}
+	if p.BuyerLen > 0 {
+		pb := NewCompareInfo("pb", thisinfo.PBKey, PBKey)
+		pncb = append(pncb, pb)
+	}
+	repeatId := map[string]bool{}
+	IdLock.Lock() //此处加id锁，会引进多线程的死锁，对比三个大map数组，找到key相同的项目id数组,并去重
+	for _, pv := range pncb {
+		if pv != nil {
+			pv.KeyMap.Lock.Lock()
+			K := pv.KeyMap.Map[pv.Key]
+			if K == nil {
+				K = &Key{&[]string{}, &sync.Mutex{}}
+				pv.KeyMap.Map[pv.Key] = K
+			}
+			pv.K = K
+			pv.K.Lock.Lock()
+			pv.KeyMap.Lock.Unlock()
+			defer pv.K.Lock.Unlock()
+			newarr := []string{}
+			for _, id := range *K.Arr {
+				if !repeatId[id] {
+					newarr = append(newarr, id)
+					repeatId[id] = true
+				}
+			}
+			pv.IdArr = newarr
+		}
+	}
+	IdLock.Unlock()
+	for _, pv := range pncb {
+		if len(pv.IdArr) > 0 {
+			res = append(res, redis.Mget(REDISIDS, pv.IdArr))
+		}
+	}
+	return
+}
+
+//合并项目
+func mergeProject(tmp map[string]interface{}, thisinfo *Info, scores []*CompareOne, pncb []*CompareInfo) (sflag string) {
+	var id = ""
+	//分值排序
+	sort.Slice(scores, func(i, j int) bool {
+		return scores[i].Score > scores[j].Score
+	})
+	if len(scores) > 0 {
+		//分值排序
+		sort.Slice(scores, func(i, j int) bool {
+			return scores[i].Score > scores[j].Score
+		})
+		max := scores[0]
+		if max.Score > 0 {
+			sflag = "repeat"
+			max.Parent.Bfind = true
+			tmp["cresult"] = max.Cresult
+			tmp["score"] = max.Score
+			id = updateinfo(thisinfo, tmp, max.Pinfo, time.Now().Unix())
+			//log.Println(sflag, id, max.Cresult)
+			if len(scores) > 1 && (scores[0].Score == scores[1].Score) {
+				//通知检查,异常数据存库
+				checkNotice(thisinfo.Id, id, scores)
+			}
+		} else {
+			sflag = "invalidscore"
+		}
+	} else {
+		//生成项目
+		sflag = "normal"
+		mess := map[string]interface{}{
+			"meger_sflag": sflag,
+		}
+		id = newProject(tmp, mess, time.Now().Unix(), thisinfo)
+	}
+	if id != "" { //更新REDISKEYS redis
+		put := []interface{}{}
+		for _, pv := range pncb {
+			if pv != nil && !pv.Bfind {
+				if BinarySearch(*pv.K.Arr, id) == -1 {
+					*(pv.K.Arr) = append(*(pv.K.Arr), id)
+					put = append(put, []interface{}{pv.Key, *(pv.K.Arr)})
+				}
+			}
+		}
+		if len(put) > 0 {
+			redis.BulkPut(REDISKEYS, 0, put...)
+		}
+	}
+	return sflag
+}
+
+//新增项目
+func newProject(tmp, mess map[string]interface{}, pipc int64, thisinfo *Info) (id string) {
+	id = InsertProject(thisinfo.NewPNKey, tmp, mess, pipc, thisinfo)
+	sflag := qu.ObjToString(mess["meger_sflag"])
+	if sflag != "alone" {
+		p1 := NewPinfo(id, thisinfo)
+		redis.PutCKV(REDISIDS, id, p1)
+	} else {
+		du.Debug("新增项目，不参与对比", id)
+	}
+	return id
+}
+
+//抽取信息打标记
+func extInfoTag(sflag, id string) {
+	MQFW.UpdateById(extractColl, id,
+		map[string]interface{}{
+			"$set": map[string]interface{}{
+				"meger_sflag": sflag,
+			},
+		})
+}
+
+//检查通知
+func checkNotice(infoid, pid string, scores []*CompareOne) {
+	MQFW.Update("project_unusual", `{"project_id":"`+pid+`"}`,
+		map[string]interface{}{
+			"$set": map[string]interface{}{
+				"project_id": pid,
+				"pici":       time.Now().Unix(),
+			},
+			"$push": map[string]interface{}{
+				"list": map[string]interface{}{
+					"infoid": infoid,
+					"pinfo1": scores[0].Pinfo.Id,
+					"pinfo2": scores[1].Pinfo.Id,
+				},
+			},
+		}, true, false)
+	du.Debug("通知检查,异常数据存库", infoid, pid)
+}
+
+//属性判断组
+func PCBVal(tmp map[string]interface{}) PCBV {
+	pcbv := PCBV{}
+	projectName := qu.ObjToString(tmp["projectname"])
+	if len([]rune(projectName)) > 1 {
+		pcbv.Val += 1
+		pcbv.Pname = true
+		pcbv.PnameLen = len([]rune(projectName))
+	}
+	projectCode := qu.ObjToString(tmp["projectcode"])
+	if len([]rune(projectCode)) > 1 {
+		pcbv.Val += 1
+		pcbv.Pcode = true
+		pcbv.PcodeLen = len(projectCode)
+	}
+	buyer := qu.ObjToString(tmp["buyer"])
+	if len([]rune(buyer)) > 1 {
+		pcbv.Val += 1
+		pcbv.Buyer = true
+		pcbv.BuyerLen = len([]rune(buyer))
+	}
+	//省市代理机构
+	if qu.ObjToString(tmp["area"]) != "" {
+		pcbv.Area = true
+	}
+	if qu.ObjToString(tmp["city"]) != "" {
+		pcbv.City = true
+	}
+	if qu.ObjToString(tmp["agency"]) != "" {
+		pcbv.Agency = true
+	}
+	return pcbv
+}
+
+//项目名称、项目编号、采购单位打分
+func fieldPCBScore(this, info, ctype string, score int) (string, int) {
+	if len(info) > 0 {
+		if this == info { //A
+			score += 5
+			ctype = "A"
+		} else if strings.Index(info, this) > -1 || strings.Index(this, info) > -1 { //B
+			score += 2
+			ctype = "B"
+		} else {
+			if len(this) < 1 { //E
+				score -= 1
+				ctype = "E"
+			} else { //C
+				score -= 2
+				ctype = "C"
+			}
+		}
+	} else { //D不计分
+		ctype = "D"
+	}
+	return ctype, score
+}
+
+//pncbMap加锁
+func lockPNCBMap(thisinfo *Info) {
+	for { //等待其他任务完成
+		ok := true
+		if len(thisinfo.PBKey) > 3 {
+			if _, b := PBKeyMap.Load(thisinfo.PBKey); b {
+				ok = false
+			}
+		}
+		if ok && len(thisinfo.PNKey) > 3 {
+			PNKeyMap.Range(func(k, v interface{}) bool {
+				if strings.Contains(k.(string), thisinfo.PNKey) || strings.Contains(thisinfo.PNKey, k.(string)) {
+					ok = false
+					return false
+				}
+				return true
+			})
+			//			if _, b := PNKeyMap.Load(thisinfo.PNKey); b {
+			//				ok = false
+			//			}
+		}
+		if ok && len(thisinfo.PCKey) > 3 {
+			PCKeyMap.Range(func(k, v interface{}) bool {
+				if strings.Contains(k.(string), thisinfo.PCKey) || strings.Contains(thisinfo.PCKey, k.(string)) {
+					ok = false
+					return false
+				}
+				return true
+			})
+			//			if _, b := PCKeyMap.Load(thisinfo.PCKey); b {
+			//				ok = false
+			//			}
+		}
+		if ok {
+			break
+		} else {
+			time.Sleep(10 * time.Millisecond)
+		}
+	}
+}
+
+//pncbMap解锁
+func unlockPNCBMap(thisinfo *Info) {
+	//if len(thisinfo.PNKey) > 3 {
+	PNKeyMap.Delete(thisinfo.PNKey)
+	//}
+	//if len(thisinfo.PCKey) > 3 {
+	PCKeyMap.Delete(thisinfo.PCKey)
+	//}
+	//if len(thisinfo.PBKey) > 3 {
+	PBKeyMap.Delete(thisinfo.PBKey)
+	//}
+}

fullproject/src/thisinfo.go

@@ -0,0 +1,153 @@
+// thisinfo
+package main
+
+import (
+	"crypto/sha1"
+	"encoding/json"
+	"fmt"
+	"io"
+	du "jy/util"
+	"qfw/util"
+	"strings"
+
+	"gopkg.in/mgo.v2/bson"
+)
+
+//抽取信息映射实体类
+type Info struct {
+	Id            string                 `json:"_id"`
+	Href          string                 `json:"href"`
+	Publishtime   int64                  `json:"publishtime"`
+	Title         string                 `json:"title"`
+	TopType       string                 `json:"toptype"`
+	SubType       string                 `json:"subtype"`
+	ProjectName   string                 `json:"projectname"`
+	ProjectCode   string                 `json:"projectcode"`
+	Buyer         string                 `json:"buyer"`
+	Buyerperson   string                 `json:"buyerperson"`
+	Buyertel      string                 `json:"buyertel"`
+	Agency        string                 `json:"agency"`
+	Area          string                 `json:"area"`
+	City          string                 `json:"city"`
+	HasPackage    bool                   `json:"haspackage"`
+	Package       map[string]interface{} `json:"package"`
+	PNum          string                 `json:"pnum"`
+	Topscopeclass []string               `json:"topscopeclass"`
+	Subscopeclass []string               `json:"subscopeclass"`
+	Winners       []string
+	dealtype      int
+
+	Buyerclass  string `json:"buyerclass"`
+	Bidopentime int64  `json:"bidopentime"`
+	District    string `json:"district"`
+	Winnerorder []string
+
+	NewPNKey string
+	PNKey    string
+	PCKey    string
+	PBKey    string
+
+	AllRelatePNKeyMap map[string]*Key
+	AllRelatePCKeyMap map[string]*Key
+}
+
+//pcb三选值
+type PCBV struct {
+	Val    int  //1一项有效值,2二项有效值,3三项有效值
+	Pname  bool //有项目名称
+	Pcode  bool //有项目编号
+	Buyer  bool //有采购单位
+	Area   bool //区域
+	City   bool //市
+	Agency bool //代理机构
+
+	PnameLen int //值长度
+	PcodeLen int //值长度
+	BuyerLen int //值长度
+}
+
+func PreThisInfo(tmp map[string]interface{} /*新信息*/) *Info {
+	bys, _ := json.Marshal(tmp)
+	var thisinfo *Info
+	json.Unmarshal(bys, &thisinfo)
+	if thisinfo == nil {
+		return nil
+	}
+	if len(thisinfo.Topscopeclass) == 0 {
+		thisinfo.Topscopeclass = []string{}
+	}
+	if len(thisinfo.Subscopeclass) == 0 {
+		thisinfo.Subscopeclass = []string{}
+	}
+	//去重
+	thisinfo.Subscopeclass = RemoveDup(thisinfo.Subscopeclass)
+
+	if len(thisinfo.Package) > 0 { //信息是否分包
+		thisinfo.HasPackage = true
+	} else if thisinfo.TopType == "结果" && TitleReg.MatchString(thisinfo.Title) {
+		//当信息类型是结果时，并且标题中包含分包字样，找到包号，用以后面比较打分
+		res := TitleReg.FindAllStringSubmatch(thisinfo.Title, -1)
+		pnum := du.PackageNumberConvert(res[0][0])
+		//du.Debug(pnum, res)
+		thisinfo.PNum = pnum
+	}
+	if thisinfo.SubType == "变更" || strings.Index(thisinfo.Title, "变更公告") > -1 || strings.Index(thisinfo.Title, "更正公告") > -1 {
+		//当信息类型是变更或标题中含变更时
+		if thisinfo.TopType == "招标" {
+			//招标的变更公告过，不作处理
+			//du.Debug(thisinfo.Id, thisinfo.Href, thisinfo.ProjectName, thisinfo.ProjectCode)
+			return nil
+		} else if thisinfo.TopType == "结果" {
+			thisinfo.SubType = "变更"
+		}
+	}
+
+	//计算中标人
+	winner, _ := tmp["winner"].(string)
+	m1 := map[string]bool{}
+	winners := []string{}
+	if winner != "" {
+		m1[winner] = true
+		winners = append(winners, winner)
+	}
+	if thisinfo.HasPackage {
+		packageM, _ := tmp["package"].(bson.M)
+		for _, p := range packageM {
+			pm, _ := p.(map[string]interface{})
+			pw, _ := pm["winner"].(string)
+			if pw != "" {
+				m1[pw] = true
+				winners = append(winners, pw)
+			}
+		}
+	}
+	thisinfo.Winners = winners
+	m1 = nil
+	//中标候选人
+	winnerorder := []string{}
+	if winorders, ok := tmp["winnerorder"].([]interface{}); ok {
+		for _, wins := range winorders {
+			if win, ok := wins.(map[string]interface{}); ok {
+				entname := util.ObjToString(win["entname"])
+				if entname != "" && len([]rune(entname)) > 6 {
+					winnerorder = append(winnerorder, entname)
+				}
+			}
+		}
+	}
+	thisinfo.Winnerorder = winnerorder
+
+	new_pn, _ := handleprojectname(thisinfo.ProjectName, thisinfo.Buyer, thisinfo.TopType) //作为判断依据
+	thisinfo.NewPNKey = new_pn
+	thisinfo.PNKey = "pn_" + new_pn
+	thisinfo.PCKey = "pc_" + thisinfo.ProjectCode
+	thisinfo.PBKey = "pb_" + thisinfo.Buyer
+	return thisinfo
+}
+
+//获取hascode
+func GetHas1(key string) string {
+	t := sha1.New()
+	io.WriteString(t, key)
+	return fmt.Sprintf("%x", t.Sum(nil))
+}

fullproject/src/udptaskmap.go

@@ -0,0 +1,57 @@
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"log"
+	"net"
+	"net/http"
+	"sync"
+	"time"
+)
+
+var udptaskmap = &sync.Map{}
+var tomail string
+var api string
+
+type udpNode struct {
+	data      []byte
+	addr      *net.UDPAddr
+	timestamp int64
+	retry     int
+}
+
+func checkMapJob() {
+	//阿里云内网无法发送邮件
+	jkmail, _ := Sysconfig["jkmail"].(map[string]interface{})
+	if jkmail != nil {
+		tomail, _ = jkmail["to"].(string)
+		api, _ = jkmail["api"].(string)
+	}
+	log.Println("start checkMapJob", tomail, Sysconfig["jkmail"])
+	for {
+		udptaskmap.Range(func(k, v interface{}) bool {
+			now := time.Now().Unix()
+			node, _ := v.(*udpNode)
+			if now-node.timestamp > 120 {
+				node.retry++
+				if node.retry > 5 {
+					log.Println("udp重试失败", k)
+					udptaskmap.Delete(k)
+					res, err := http.Get(fmt.Sprintf("%s?to=%s&title=%s&body=%s", api, tomail, "extract-send-fail", k.(string)))
+					if err == nil {
+						defer res.Body.Close()
+						read, err := ioutil.ReadAll(res.Body)
+						log.Println("邮件发发送：", string(read), err)
+					}
+				} else {
+					log.Println("udp重发", k)
+				}
+			} else if now-node.timestamp > 10 {
+				log.Println("udp任务超时中..", k)
+			}
+			return true
+		})
+		time.Sleep(60 * time.Second)
+	}
+}

src/jy/admin/rulecheck.go

@@ -286,7 +286,7 @@ func checkCoreReg(field, content, ruleText string) map[string]string {
 //lua脚本前置过滤验证
 func checkPreScript(code, name, infoid, script string) map[string]interface{} {
 	doc, _ := Mgo.FindById("bidding", infoid, extract.Fields)
-	j,_ := extract.PreInfo(*doc)
+	j, _ := extract.PreInfo(*doc)
 	delete(*j.Data, "contenthtml")
 	lua := ju.LuaScript{Code: code, Name: name, Doc: *j.Data, Script: script}
 	lua.Block = j.Block
@@ -306,28 +306,51 @@ func checkBackScript(table, code, name, version, infoid, script string, alone bo
 	e.InitRuleCore()
 	e.InitTag()
 	tmp, _ := Mgo.FindById("bidding", infoid, extract.Fields)
-	j,_ := extract.PreInfo(*tmp)
+	j, _ := extract.PreInfo(*tmp)
 	doc := *j.Data
 	//全局前置规则,结果覆盖doc属性
 	for _, v := range e.RulePres {
 		doc = extract.ExtRegPre(doc, j, v, e.TaskInfo)
 	}
 	//抽取规则
-	for _, vc := range e.RuleCores {
-		tmp := ju.DeepCopy(doc).(map[string]interface{})
-		//是否进入逻辑
-		if !ju.Logic(vc.LuaLogic, tmp) {
-			continue
-		}
-		//抽取-前置规则
-		for _, v := range vc.RulePres {
-			tmp = extract.ExtRegPre(tmp, j, v, e.TaskInfo)
+	if j.CategorySecond==""{
+		for _, vc1 := range e.RuleCores[j.Category] {
+			for _, vc := range vc1 {
+				tmp := ju.DeepCopy(doc).(map[string]interface{})
+				//是否进入逻辑
+				if !ju.Logic(vc.LuaLogic, tmp) {
+					continue
+				}
+				//抽取-前置规则
+				for _, v := range vc.RulePres {
+					tmp = extract.ExtRegPre(tmp, j, v, e.TaskInfo)
+				}
+				//抽取-规则
+				for _, v := range vc.RuleCores {
+					extract.ExtRegCore(vc.ExtFrom, tmp, j, v, e)
+				}
+			}
 		}
-		//抽取-规则
-		for _, v := range vc.RuleCores {
-			extract.ExtRegCore(vc.ExtFrom, tmp, j, v, e)
+	}else{
+		for _, vc1 := range e.RuleCores[j.Category+"_"+j.CategorySecond] {
+			for _, vc := range vc1 {
+				tmp := ju.DeepCopy(doc).(map[string]interface{})
+				//是否进入逻辑
+				if !ju.Logic(vc.LuaLogic, tmp) {
+					continue
+				}
+				//抽取-前置规则
+				for _, v := range vc.RulePres {
+					tmp = extract.ExtRegPre(tmp, j, v, e.TaskInfo)
+				}
+				//抽取-规则
+				for _, v := range vc.RuleCores {
+					extract.ExtRegCore(vc.ExtFrom, tmp, j, v, e)
+				}
+			}
 		}
 	}
+
 	result := extract.GetResultMapForLua(j)
 	lua := ju.LuaScript{Code: code, Name: name, Result: result, Script: script}
 	lua.Block = j.Block
@@ -350,7 +373,7 @@ func checkBackScript(table, code, name, version, infoid, script string, alone bo
 //lua脚本抽取验证
 func checkCoreScript(code, name, infoid, script string) interface{} {
 	doc, _ := Mgo.FindById("bidding", infoid, extract.Fields)
-	j ,_ := extract.PreInfo(*doc)
+	j, _ := extract.PreInfo(*doc)
 	delete(*j.Data, "contenthtml")
 	lua := ju.LuaScript{Code: code, Name: name, Doc: *j.Data, Script: script}
 	lua.Block = j.Block

src/jy/admin/user.go

@@ -13,6 +13,7 @@ import (
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
 	"gopkg.in/mgo.v2/bson"
+	"fmt"
 )
 
 func init() {
@@ -25,6 +26,9 @@ func init() {
 	Admin.GET("/menu", func(c *gin.Context) {
 		c.HTML(http.StatusOK, "menu.html", gin.H{})
 	})
+	Admin.GET("/infotype", func(c *gin.Context) {
+		c.HTML(http.StatusOK, "class.html", gin.H{})
+	})
 	Admin.GET("/role", func(c *gin.Context) {
 		c.HTML(http.StatusOK, "role.html", gin.H{})
 	})
@@ -46,6 +50,13 @@ func init() {
 	Admin.POST("/menu/data", MenuData)
 	Admin.POST("/menu/searchbyid", MenuSearchById)
 	Admin.POST("/menu/del", MenuDel)
+	Admin.POST("/infotype/data", InfotypeData)
+	Admin.POST("/fields/data", FieldsData)
+	Admin.POST("/topclass/data", TopclassData)
+	Admin.POST("/subclass/data", SubclassData)
+	Admin.POST("/infotype/save", InfotypeSave)
+	Admin.POST("/infotype/select", InfotypeSelect)
+	Admin.POST("/infotype/del", InfotypeDel)
 	Admin.POST("/role/menu/data", RoleMenuData)
 	Admin.POST("/role/menu/save", RoleMenuSave)
 	Admin.POST("/role/select", RoleSelect)
@@ -84,6 +95,203 @@ func SecondMenuData(c *gin.Context) {
 	data, _ := Mgo.Find("menusecond", maps, nil, nil, false, -1, -1)
 	c.JSON(200, gin.H{"data": data})
 }
+func InfotypeData(c *gin.Context) {
+	datas, _ := Mgo.Find("infotype", `{}`, nil, nil, false, -1, -1)
+	list:=[]map[string]interface{}{}
+	for _,data:=range *datas{
+		if data["subclass"]==nil{
+			data["subclass"]=""
+			list=append(list,data)
+		}else{
+			for k,_:=range data["subclass"].(map[string]interface{}){
+				value:=map[string]interface{}{
+					"_id":data["_id"],
+					"topclass":data["topclass"],
+					"subclass":k,
+				}
+				list=append(list,value)
+			}
+		}
+	}
+	c.JSON(200, gin.H{"data": list})
+}
+func FieldsData(c *gin.Context){
+	datas, _ := Mgo.Find("fields", `{}`, nil, nil, false, -1, -1)
+	c.JSON(200, gin.H{"data": datas})
+}
+func TopclassData(c *gin.Context){
+	datas, _ := Mgo.Find("infoclass", `{}`, nil, nil, false, -1, -1)
+	c.JSON(200, gin.H{"data": datas})
+}
+func SubclassData(c *gin.Context){
+	topclass, _ := c.GetPostForm("top")
+	datas, _ := Mgo.FindOneByField("infoclass",`{"topclass":"`+topclass+`"}`,`{"subclass":"1"}`)
+	data:=*datas
+	if data["subclass"]!=nil{
+		c.JSON(200, gin.H{"data": datas})
+	}
+}
+func InfotypeSave(c *gin.Context){
+	topclass, _ := c.GetPostForm("topclass")
+	subclass, _ := c.GetPostForm("subclass")
+	fieldsStr, _ := c.GetPostForm("fields")
+	fieldsStr2, _ := c.GetPostForm("fields2")
+	_id,_:=c.GetPostForm("_id")
+	fields := make([]string, 0)
+	err := json.Unmarshal([]byte(fieldsStr), &fields)
+	fields2 := make([]string, 0)
+	err2 := json.Unmarshal([]byte(fieldsStr2), &fields2)
+	if _id=="" {
+		b := Mgo.Count("infotype", map[string]interface{}{
+			"topclass": topclass,
+		})
+		b2 := 0
+		if subclass != "" {
+			b2 = Mgo.Count("infotype", map[string]interface{}{
+				"subclass." + subclass: map[string]interface{}{
+					"$exists": true,
+				},
+			})
+		}
+		if (b == 0)||(b!=0&&b2==0&&subclass!=""){
+			if err == nil {
+				if subclass == "" {
+					maps := map[string]interface{}{
+						"topclass": topclass,
+						"fields":   map[string]interface{}{},
+					}
+					for _, field := range fields {
+						maps["fields"].(map[string]interface{})[field] = true
+					}
+					Mgo.Save("infotype", maps)
+				} else {
+					maps := map[string]interface{}{
+					}
+					for _, field := range fields {
+						maps = map[string]interface{}{
+							"subclass." + subclass + "." + field: true,
+						}
+						maps2 := map[string]interface{}{
+							"$set": maps,
+						}
+						set := map[string]interface{}{
+							"topclass": topclass,
+						}
+						Mgo.Update("infotype", set, maps2, true, false)
+					}
+				}
+				c.JSON(200, gin.H{"rep": true})
+			}
+		}
+	}else{
+		if err == nil && err2==nil{
+			set:=map[string]interface{}{
+				"_id":bson.ObjectIdHex(_id),
+			}
+			if subclass == "" {
+				maps := map[string]interface{}{
+					"fields":   map[string]interface{}{},
+				}
+				for _, field := range fields {
+					maps["fields"].(map[string]interface{})[field] = true
+				}
+				maps2:=map[string]interface{}{
+					"$set":maps,
+				}
+				Mgo.Update("infotype", set, maps2, false, false)
+			} else {
+				maps := map[string]interface{}{
+					"subclass."+subclass:map[string]interface{}{},
+				}
+				for _, field := range fields {
+					maps["subclass."+subclass].(map[string]interface{})[field] = true
+					maps2 := map[string]interface{}{
+						"$set": maps,
+					}
+					Mgo.Update("infotype", set, maps2, false, false)
+				}
+			}
+			c.JSON(200, gin.H{"rep": true})
+		}
+	}
+
+}
+func InfotypeSelect(c *gin.Context) {
+	_id, _ := c.GetPostForm("_id")
+	subclass, _ := c.GetPostForm("subclass")
+	fmt.Println(_id)
+	fmt.Println(subclass)
+	one1,_:=Mgo.FindById("infotype",_id,`{}`)
+	one:=*one1
+	datas, _ := Mgo.Find("fields", `{}`, nil, nil, false, -1, -1)
+	datas2:=*datas
+	//list2:=[]map[string]interface{}{}
+	if one["subclass"]==nil{
+		list:=[]interface{}{}
+		for k,v:=range one["fields"].(map[string]interface{}){
+			if v==true{
+				s_name1,_:=Mgo.FindOneByField("fields",map[string]interface{}{"s_field":k},`{}`)
+				s_name:=*s_name1
+				//已存在属性
+				list=append(list,s_name)
+				for key,value:=range datas2{
+					if value["s_field"]==k{
+						datas2 = append(datas2[:key], datas2[key+1:]...)
+					}
+				}
+			}
+		}
+		fmt.Println(one["topclass"].(string),list)
+		c.JSON(200, gin.H{"topclass": one["topclass"].(string), "subclass": "","fields2":datas2, "fields": list})
+	}else{
+		maps:=one["subclass"].(map[string]interface{})[subclass]
+		list:=[]interface{}{}
+		for k,v:=range maps.(map[string]interface{}){
+			if v==true{
+				s_name1,_:=Mgo.FindOneByField("fields",map[string]interface{}{"s_field":k},`{}`)
+				s_name:=*s_name1
+				list=append(list,s_name)
+				for key,value:=range datas2{
+					if value["s_field"]==k{
+						datas2 = append(datas2[:key], datas2[key+1:]...)
+					}
+				}
+			}
+		}
+		fmt.Println(one["topclass"].(string),subclass,list)
+		c.JSON(200, gin.H{"topclass": one["topclass"].(string), "subclass":subclass,"fields2":datas2, "fields": list})
+	}
+
+}
+func InfotypeDel(c *gin.Context) {
+	_id, _ := c.GetPostForm("_id")
+	subclass, _ := c.GetPostForm("subclass")
+	set:=map[string]interface{}{
+		"_id":bson.ObjectIdHex(_id),
+	}
+	if subclass==""{
+		b:=Mgo.Del("infotype",set)
+		c.JSON(200, gin.H{"rep": b})
+	}else{
+		info1,_:=Mgo.FindById("infotype",_id,`{}`)
+		info:=*info1
+		maps:=info["subclass"].(map[string]interface{})
+		delete(maps,subclass)
+		if len(maps)==0{
+			b:=Mgo.Del("infotype",set)
+			c.JSON(200, gin.H{"rep": b})
+		}else{
+			maps2:=map[string]interface{}{
+				"subclass":maps,
+			}
+			maps3:=map[string]interface{}{
+				"$set":maps2,
+			}
+			b:=Mgo.Update("infotype",set,maps3,false,false)
+			c.JSON(200, gin.H{"rep": b})
+		}
+	}
+}
 func RoleMenuData(c *gin.Context) {
 	role, _ := c.GetPostForm("role")
 	maps := map[string]interface{}{

src/jy/admin/version.go

@@ -2,15 +2,17 @@
 package admin
 
 import (
-	"github.com/gin-contrib/sessions"
-	"github.com/gin-gonic/gin"
-	"gopkg.in/mgo.v2/bson"
 	. "jy/mongodbutil"
 	"jy/util"
+	"log"
 	"net/http"
 	qu "qfw/util"
 	"strings"
 	"time"
+
+	"github.com/gin-contrib/sessions"
+	"github.com/gin-gonic/gin"
+	"gopkg.in/mgo.v2/bson"
 )
 
 func init() {
@@ -27,20 +29,20 @@ func init() {
 	})
 	//根据_id查询版本详细信息
 	Admin.GET("/version/dataById", func(c *gin.Context) {
-		gid ,b :=c.GetQuery("_id")
-		if !b || !bson.IsObjectIdHex(gid){
-			c.JSON(400,gin.H{"req":false})
+		gid, b := c.GetQuery("_id")
+		if !b || !bson.IsObjectIdHex(gid) {
+			c.JSON(400, gin.H{"req": false})
 			return
 		}
 
 		data, _ := Mgo.FindOne("version", `{"_id":"`+gid+`","delete":false}`)
-		c.JSON(200, gin.H{"req":true,"data": data})
+		c.JSON(200, gin.H{"req": true, "data": data})
 	})
 	Admin.POST("/version/save", func(c *gin.Context) {
 		_id, _ := c.GetPostForm("_id")
 		data := GetPostForm(c)
-		if data["s_filefileds"]!=nil{
-			data["s_filefileds"] = strings.Split(data["s_filefileds"].(string),",")
+		if data["s_filefileds"] != nil {
+			data["s_filefileds"] = strings.Split(data["s_filefileds"].(string), ",")
 		}
 		if _id != "" {
 			Mgo.UpdateById("version", _id, map[string]interface{}{"$set": data})
@@ -249,6 +251,70 @@ func init() {
 		//b := Mgo.Del("versioninfo", `{"_id":"`+_id+`"}`)
 		c.JSON(200, gin.H{"rep": b})
 	})
+	//分块配置
+	Admin.GET("/version/blockinfo", func(c *gin.Context) {
+		vid := c.Query("vid")
+		c.HTML(http.StatusOK, "blockinfo.html", gin.H{"vid": vid})
+	})
+	Admin.POST("/version/blockinfo_list", func(c *gin.Context) {
+		vid, _ := c.GetPostForm("vid")
+		data, _ := Mgo.Find("block_info", bson.M{"vid": vid, "delete": false}, `{"index":-1}`, `{"block_reg":1,"title_reg":1,"index":1}`, false, -1, -1)
+		for _, v := range *data {
+			v["id"] = qu.BsonIdToSId(v["_id"])
+		}
+		c.JSON(http.StatusOK, gin.H{"data": data})
+	})
+	//分块配置保存
+	Admin.POST("/version/blockinfo_save", func(c *gin.Context) {
+		status := false
+		_id, _ := c.GetPostForm("_id")
+		block_reg, _ := c.GetPostForm("block_reg")
+		title_reg, _ := c.GetPostForm("title_reg")
+		if _id != "" {
+			status = Mgo.UpdateById("block_info", _id, bson.M{
+				"$set": bson.M{
+					"l_updatetime": time.Now().Unix(),
+					"block_reg":    block_reg,
+					"title_reg":    title_reg,
+				},
+			})
+		} else {
+			vid, _ := c.GetPostForm("vid")
+			list, flag := Mgo.Find("block_info", bson.M{"vid": vid}, `{"index": 1}`, `{"index":1}`, false, 0, 1)
+			index := -1
+			if flag && len(*list) == 1 {
+				index = qu.IntAllDef((*list)[0]["index"], 1) - 1
+			}
+			status = Mgo.Save("block_info", bson.M{
+				"delete":       false,
+				"index":        index,
+				"block_reg":    block_reg,
+				"title_reg":    title_reg,
+				"vid":          vid,
+				"l_createtime": time.Now().Unix(),
+				"s_username":   sessions.Default(c).Get("username"),
+			}) != ""
+		}
+		c.JSON(http.StatusOK, gin.H{"status": status})
+	})
+	Admin.POST("/version/blockinfo_updateindex", func(c *gin.Context) {
+		_ids := c.PostFormArray("_ids")
+		indexs := c.PostFormArray("indexs")
+		log.Println(_ids, indexs)
+		for k, _id := range _ids {
+			Mgo.UpdateById("block_info", _id, bson.M{
+				"$set": bson.M{
+					"index": qu.IntAll(indexs[k]),
+				},
+			})
+		}
+		c.JSON(http.StatusOK, gin.H{})
+	})
+	Admin.POST("/version/blockinfo_delete", func(c *gin.Context) {
+		_id, _ := c.GetPostForm("_id")
+		status := Mgo.UpdateById("block_info", _id, bson.M{"$set": bson.M{"delete": true}})
+		c.JSON(http.StatusOK, gin.H{"status": status})
+	})
 }
 
 //克隆版本通用属性

src/jy/extract/exportask.go

@@ -56,6 +56,8 @@ func extractAndExport(v string, t map[string]interface{}) {
 	e.InitRuleCore()
 	e.InitTag()
 	e.InitClearFn()
+	e.InfoTypeList()
+	e.InitBlockRule()
 	//品牌抽取是否开启
 	ju.IsBrandGoods = ju.Config["brandgoods"].(bool)
 
@@ -72,9 +74,9 @@ func extractAndExport(v string, t map[string]interface{}) {
 		var j, jf *ju.Job
 		if e.IsFileField && v["projectinfo"] != nil {
 			v["isextFile"] = true
-			j, jf = PreInfo(v)
+			j, jf = e.PreInfo(v)
 		} else {
-			j, _ = PreInfo(v)
+			j, _ = e.PreInfo(v)
 		}
 		e.TaskInfo.ProcessPool <- true
 		go e.ExtractProcess(j, jf)

src/jy/extract/extpackage.go

@@ -146,23 +146,49 @@ func PackageDetail(j *ju.Job, e *ExtractTask) {
 func extRegBackPack(j *ju.Job, e *ExtractTask) {
 	defer qu.Catch()
 	//正则清理
-	for _, rc := range e.RuleCores {
-		for pk, pack := range j.PackageInfo {
-			clear, _ := pack["clear"].(map[string]interface{})
-			for k, val := range pack {
-				if b, ok := clear[k].(bool); ok && b {
-					if rc.Field == k {
-						text := qu.ObjToString(val)
-						for _, in := range rc.RuleBacks {
-							if text != "" && !in.IsLua {
-								text = in.RegPreBac.Reg.ReplaceAllString(text, in.RegPreBac.Replace)
+	if j.CategorySecond == "" {
+		for _, rc1 := range e.RuleCores[j.Category] {
+			for _, rc := range rc1 {
+				for pk, pack := range j.PackageInfo {
+					clear, _ := pack["clear"].(map[string]interface{})
+					for k, val := range pack {
+						if b, ok := clear[k].(bool); ok && b {
+							if rc.Field == k {
+								text := qu.ObjToString(val)
+								for _, in := range rc.RuleBacks {
+									if text != "" && !in.IsLua {
+										text = in.RegPreBac.Reg.ReplaceAllString(text, in.RegPreBac.Replace)
+									}
+								}
+								pack[k] = text
 							}
 						}
-						pack[k] = text
 					}
+					j.PackageInfo[pk] = pack
+				}
+			}
+		}
+	} else {
+		for _, rc1 := range e.RuleCores[j.Category+"_"+j.CategorySecond] {
+			for _, rc := range rc1 {
+				for pk, pack := range j.PackageInfo {
+					clear, _ := pack["clear"].(map[string]interface{})
+					for k, val := range pack {
+						if b, ok := clear[k].(bool); ok && b {
+							if rc.Field == k {
+								text := qu.ObjToString(val)
+								for _, in := range rc.RuleBacks {
+									if text != "" && !in.IsLua {
+										text = in.RegPreBac.Reg.ReplaceAllString(text, in.RegPreBac.Replace)
+									}
+								}
+								pack[k] = text
+							}
+						}
+					}
+					j.PackageInfo[pk] = pack
 				}
 			}
-			j.PackageInfo[pk] = pack
 		}
 	}
 	//通用正则清理

src/jy/extract/extract.go

@@ -45,6 +45,8 @@ func StartExtractTestTask(taskId, startId, num, resultcoll, trackcoll string) bo
 	ext.InitRuleBacks()
 	ext.InitRuleCore()
 	ext.InitPkgCore()
+	ext.InitBlockRule()
+	ext.InfoTypeList()
 	ext.InitTag()
 	ext.InitClearFn()
 	if ext.IsExtractCity { //版本上控制是否开始城市抽取
@@ -83,9 +85,9 @@ func RunExtractTestTask(ext *ExtractTask, startId, num string) bool {
 			var j, jf *ju.Job
 			if ext.IsFileField && v["projectinfo"] != nil {
 				v["isextFile"] = true
-				j, jf = PreInfo(v)
+				j, jf = ext.PreInfo(v)
 			} else {
-				j, _ = PreInfo(v)
+				j, _ = ext.PreInfo(v)
 			}
 			ext.TaskInfo.ProcessPool <- true
 			go ext.ExtractProcess(j, jf)
@@ -116,6 +118,8 @@ func StartExtractTaskId(taskId string) bool {
 	ext.InitRuleBacks()
 	ext.InitRuleCore()
 	ext.InitPkgCore()
+	ext.InitBlockRule()
+	ext.InfoTypeList()
 	ext.InitTag()
 	ext.InitClearFn()
 	if ext.IsExtractCity { //版本上控制是否开始城市抽取
@@ -184,9 +188,9 @@ func RunExtractTask(taskId string) {
 			var j, jf *ju.Job
 			if ext.IsFileField && v["projectinfo"] != nil {
 				v["isextFile"] = true
-				j, jf = PreInfo(v)
+				j, jf = ext.PreInfo(v)
 			} else {
-				j, _ = PreInfo(v)
+				j, _ = ext.PreInfo(v)
 			}
 			ext.TaskInfo.ProcessPool <- true
 			go ext.ExtractProcess(j, jf)
@@ -201,8 +205,13 @@ func RunExtractTask(taskId string) {
 	time.AfterFunc(1*time.Minute, func() { RunExtractTask(taskId) })
 }
 
-//信息预处理
+//信息预处理-不和版本关联，取最新版本的配置项
 func PreInfo(doc map[string]interface{}) (j, jf *ju.Job) {
+	return (&ExtractTask{}).PreInfo(doc)
+}
+
+//信息预处理-和版本关联
+func (e *ExtractTask) PreInfo(doc map[string]interface{}) (j, jf *ju.Job) {
 	defer qu.Catch()
 	//判断是否有附件这个字段
 	var isextFile bool
@@ -225,6 +234,7 @@ func PreInfo(doc map[string]interface{}) (j, jf *ju.Job) {
 		file2text(&doc) //附件文本堆一起（后期可以考虑，分开处理）,方法里修改了doc["detailfile"]结果
 	}
 	toptype := qu.ObjToString(doc["toptype"])
+	subtype := qu.ObjToString(doc["subtype"])
 	if qu.ObjToString(doc["type"]) == "bid" {
 		toptype = "结果"
 	}
@@ -232,10 +242,11 @@ func PreInfo(doc map[string]interface{}) (j, jf *ju.Job) {
 		toptype = "*"
 	}
 	j = &ju.Job{
-		SourceMid:  qu.BsonIdToSId(doc["_id"]),
-		Category:   toptype,
-		Content:    qu.ObjToString(doc["detail"]),
-		SpiderCode: qu.ObjToString(doc["spidercode"]),
+		SourceMid:      qu.BsonIdToSId(doc["_id"]),
+		Category:       toptype,
+		CategorySecond: subtype,
+		Content:        qu.ObjToString(doc["detail"]),
+		SpiderCode:     qu.ObjToString(doc["spidercode"]),
 		//Domain:     qu.ObjToString(doc["domain"]),
 		//Href:       qu.ObjToString(doc["href"]),
 		Title:     qu.ObjToString(doc["title"]),
@@ -244,6 +255,7 @@ func PreInfo(doc map[string]interface{}) (j, jf *ju.Job) {
 		Province:  qu.ObjToString(doc["area"]),
 		Result:    map[string][]*ju.ExtField{},
 		BuyerAddr: qu.ObjToString(doc["buyeraddr"]),
+		RuleBlock: e.RuleBlock,
 	}
 	if isextFile {
 		jf = &ju.Job{
@@ -257,6 +269,7 @@ func PreInfo(doc map[string]interface{}) (j, jf *ju.Job) {
 			Province:   qu.ObjToString(doc["area"]),
 			Result:     map[string][]*ju.ExtField{},
 			BuyerAddr:  qu.ObjToString(doc["buyeraddr"]),
+			RuleBlock:  e.RuleBlock,
 			IsFile:     isextFile,
 		}
 	}
@@ -321,37 +334,81 @@ func (e *ExtractTask) ExtractDetail(j *ju.Job) {
 		for _, v := range e.RulePres {
 			doc = ExtRegPre(doc, j, v, e.TaskInfo)
 		}
-		//抽取规则
-		for _, vc := range e.RuleCores {
-			tmp := ju.DeepCopy(doc).(map[string]interface{})
-			//是否进入逻辑
-			if !ju.Logic(vc.LuaLogic, tmp) {
-				continue
-			}
-			//抽取-前置规则
-			for _, v := range vc.RulePres {
-				tmp = ExtRegPre(tmp, j, v, e.TaskInfo)
+		if j.CategorySecond == "" {
+			//抽取规则
+			tmprules := map[string][]*RuleCore{}
+			lock.Lock()
+			for k, vc1 := range e.RuleCores[j.Category] {
+				tmprules[k] = vc1
 			}
-			// log.Debug("抽取-前置规则", tmp)
+			lock.Unlock()
+			for _, vc1 := range tmprules {
+				for _, vc := range vc1 {
+					tmp := ju.DeepCopy(doc).(map[string]interface{})
+					//是否进入逻辑
+					if !ju.Logic(vc.LuaLogic, tmp) {
+						continue
+					}
+					//抽取-前置规则
+					for _, v := range vc.RulePres {
+						tmp = ExtRegPre(tmp, j, v, e.TaskInfo)
+					}
+					// log.Debug("抽取-前置规则", tmp)
 
-			//抽取-规则
-			for _, v := range vc.RuleCores {
-				ExtRegCore(vc.ExtFrom, tmp, j, v, e)
-			}
-			// log.Debug("抽取-规则", tmp)
+					//抽取-规则
+					for _, v := range vc.RuleCores {
+						ExtRegCore(vc.ExtFrom, tmp, j, v, e)
+					}
+					// log.Debug("抽取-规则", tmp)
+
+					//项目名称未能抽取到，标题来凑
+					if vc.Field == "projectname" {
+						if len(j.Result[vc.Field]) < 1 {
+							j.Result[vc.Field] = append(j.Result[vc.Field], &ju.ExtField{vc.Field, "title", "title", "regexp", "title", vc.ExtFrom, j.Title, 0})
+						}
+					}
 
-			//项目名称未能抽取到，标题来凑
-			if vc.Field == "projectname" {
-				if len(j.Result[vc.Field]) < 1 {
-					j.Result[vc.Field] = append(j.Result[vc.Field], &ju.ExtField{vc.Field, "title", "title", "regexp", "title", vc.ExtFrom, j.Title, 0})
+					//抽取-后置规则
+					for _, v := range vc.RuleBacks {
+						ExtRegBack(j, v, e.TaskInfo)
+					}
+					// log.Debug("抽取-后置规则", tmp)
 				}
 			}
+		} else {
+			for _, vc1 := range e.RuleCores[j.Category+"_"+j.CategorySecond] {
+				for _, vc := range vc1 {
+					tmp := ju.DeepCopy(doc).(map[string]interface{})
+					//是否进入逻辑
+					if !ju.Logic(vc.LuaLogic, tmp) {
+						continue
+					}
+					//抽取-前置规则
+					for _, v := range vc.RulePres {
+						tmp = ExtRegPre(tmp, j, v, e.TaskInfo)
+					}
+					// log.Debug("抽取-前置规则", tmp)
 
-			//抽取-后置规则
-			for _, v := range vc.RuleBacks {
-				ExtRegBack(j, v, e.TaskInfo)
+					//抽取-规则
+					for _, v := range vc.RuleCores {
+						ExtRegCore(vc.ExtFrom, tmp, j, v, e)
+					}
+					// log.Debug("抽取-规则", tmp)
+
+					//项目名称未能抽取到，标题来凑
+					if vc.Field == "projectname" {
+						if len(j.Result[vc.Field]) < 1 {
+							j.Result[vc.Field] = append(j.Result[vc.Field], &ju.ExtField{vc.Field, "title", "title", "regexp", "title", vc.ExtFrom, j.Title, 0})
+						}
+					}
+
+					//抽取-后置规则
+					for _, v := range vc.RuleBacks {
+						ExtRegBack(j, v, e.TaskInfo)
+					}
+					// log.Debug("抽取-后置规则", tmp)
+				}
 			}
-			// log.Debug("抽取-后置规则", tmp)
 		}
 
 		//全局后置规则
@@ -413,45 +470,82 @@ func (e *ExtractTask) ExtractFile(j *ju.Job) {
 		doc := *j.Data
 		//全局前置规则,结果覆盖doc属性
 		for _, v := range e.RulePres {
-			if value, ok := e.FileFields.Load(v.Field);ok && qu.IntAllDef(value,1) >0{
+			if value, ok := e.FileFields.Load(v.Field); ok && qu.IntAllDef(value, 1) > 0 {
 				doc = ExtRegPre(doc, j, v, e.TaskInfo)
 			}
 		}
 		//抽取规则
-		for _, vc := range e.RuleCores {
-			tmp := ju.DeepCopy(doc).(map[string]interface{})
-			//是否进入逻辑
-			if !ju.Logic(vc.LuaLogic, tmp) {
-				continue
-			}
-			//抽取-前置规则
-			for _, v := range vc.RulePres {
-				if value, ok := e.FileFields.Load(v.Field);ok && qu.IntAllDef(value,1) >0{
-					tmp = ExtRegPre(tmp, j, v, e.TaskInfo)
-				}
-			}
-			// log.Debug("抽取-前置规则", tmp)
+		if j.CategorySecond == "" {
+			for _, vc1 := range e.RuleCores[j.Category] {
+				for _, vc := range vc1 {
+					tmp := ju.DeepCopy(doc).(map[string]interface{})
+					//是否进入逻辑
+					if !ju.Logic(vc.LuaLogic, tmp) {
+						continue
+					}
+					//抽取-前置规则
+					for _, v := range vc.RulePres {
+						if value, ok := e.FileFields.Load(v.Field); ok && qu.IntAllDef(value, 1) > 0 {
+							tmp = ExtRegPre(tmp, j, v, e.TaskInfo)
+						}
+					}
+					// log.Debug("抽取-前置规则", tmp)
 
-			//抽取-规则
-			for _, v := range vc.RuleCores {
-				if value, ok := e.FileFields.Load(v.Field);ok && qu.IntAllDef(value,1) >0{
-					ExtRegCore(vc.ExtFrom, tmp, j, v, e)
+					//抽取-规则
+					for _, v := range vc.RuleCores {
+						if value, ok := e.FileFields.Load(v.Field); ok && qu.IntAllDef(value, 1) > 0 {
+							ExtRegCore(vc.ExtFrom, tmp, j, v, e)
+						}
+					}
+					// log.Debug("抽取-规则", tmp)
+
+					//抽取-后置规则
+					for _, v := range vc.RuleBacks {
+						if value, ok := e.FileFields.Load(v.Field); ok && qu.IntAllDef(value, 1) > 0 {
+							ExtRegBack(j, v, e.TaskInfo)
+						}
+					}
+					// log.Debug("抽取-后置规则", tmp)
 				}
 			}
-			// log.Debug("抽取-规则", tmp)
+		} else {
+			for _, vc1 := range e.RuleCores[j.Category+"_"+j.CategorySecond] {
+				for _, vc := range vc1 {
+					tmp := ju.DeepCopy(doc).(map[string]interface{})
+					//是否进入逻辑
+					if !ju.Logic(vc.LuaLogic, tmp) {
+						continue
+					}
+					//抽取-前置规则
+					for _, v := range vc.RulePres {
+						if value, ok := e.FileFields.Load(v.Field); ok && qu.IntAllDef(value, 1) > 0 {
+							tmp = ExtRegPre(tmp, j, v, e.TaskInfo)
+						}
+					}
+					// log.Debug("抽取-前置规则", tmp)
 
-			//抽取-后置规则
-			for _, v := range vc.RuleBacks {
-				if value, ok := e.FileFields.Load(v.Field);ok && qu.IntAllDef(value,1) >0{
-					ExtRegBack(j, v, e.TaskInfo)
+					//抽取-规则
+					for _, v := range vc.RuleCores {
+						if value, ok := e.FileFields.Load(v.Field); ok && qu.IntAllDef(value, 1) > 0 {
+							ExtRegCore(vc.ExtFrom, tmp, j, v, e)
+						}
+					}
+					// log.Debug("抽取-规则", tmp)
+
+					//抽取-后置规则
+					for _, v := range vc.RuleBacks {
+						if value, ok := e.FileFields.Load(v.Field); ok && qu.IntAllDef(value, 1) > 0 {
+							ExtRegBack(j, v, e.TaskInfo)
+						}
+					}
+					// log.Debug("抽取-后置规则", tmp)
 				}
 			}
-			// log.Debug("抽取-后置规则", tmp)
 		}
 
 		//全局后置规则
 		for _, v := range e.RuleBacks {
-			if value, ok := e.FileFields.Load(v.Field);ok && qu.IntAllDef(value,1) >0{
+			if value, ok := e.FileFields.Load(v.Field); ok && qu.IntAllDef(value, 1) > 0 {
 				ExtRegBack(j, v, e.TaskInfo)
 			}
 		}
@@ -1027,7 +1121,7 @@ func AnalysisSaveResult(j, jf *ju.Job, e *ExtractTask) {
 
 		//质量审核
 		if ok, _ := ju.Config["qualityaudit"].(bool); ok {
-			e.QualityAudit(tmp, _id)
+			e.QualityAudit(tmp)
 		}
 		if e.IsExtractCity { //城市抽取
 			b, p, c, d := e.TransmitData(tmp, _id) //抽取省份城市
@@ -1154,101 +1248,62 @@ func funcAnalysis(j *ju.Job) (*map[string]interface{}, map[string][]*ju.ExtField
 	return doc, result, _id, values
 }
 
-func (e *ExtractTask) QualityAudit(resulttmp map[string]interface{}, _id string) {
+func (e *ExtractTask) QualityAudit(resulttmp map[string]interface{}) {
 	defer qu.Catch()
 	//获取审核字段
 	for _, field := range e.AuditFields {
-		//1.分包 暂时不处理
-		//		if resulttmp["package"] != nil {
-		//			packagedata := resulttmp["package"].(map[string]map[string]interface{})
-		//			for _, val := range packagedata {
-		//				if val[field] != nil {
-		//					fv := qu.ObjToString(val[field])
-		//					if fv != "" {
-		//						if field == "buyer" || field == "winner" { //field为buyer和winner时特殊处理，先从Redis中查，有直接通过，没有走匹配规则
-		//							e.RedisMatch(field, fv, _id, true) //redis匹配
-		//						} else { //除了buyer和winner，其他字段走规则匹配
-		//							e.RuleMatch(field, fv, _id, true)
-		//						}
-		//					}
-		//				}
-		//			}
-		//		}
+		//1.分包
+		if resulttmp["package"] != nil {
+			packagedata := resulttmp["package"].(map[string]map[string]interface{})
+			for _, val := range packagedata {
+				if val[field] != nil {
+					fv := qu.ObjToString(val[field])
+					if fv != "" {
+						if field == "buyer" || field == "winner" { //field为buyer和winner时特殊处理，先从Redis中查，有直接通过，没有走匹配规则
+							e.RedisMatch(field, fv, val) //redis匹配
+						} else { //除了buyer和winner，其他字段走规则匹配
+							e.RuleMatch(field, fv, val)
+						}
+					}
+				}
+			}
+		}
 		//2.外围
-		//if resulttmp[field] != nil {
-		//fv := qu.ObjToString(resulttmp[field])
-		fv := "中标单位123"
-		if fv != "" {
-			if field == "buyer" || field == "winner" { //field为buyer和winner时特殊处理，先从Redis中查，有直接通过，没有走匹配规则
-				e.RedisMatch(field, fv, _id, false) //redis匹配
-			} else { //除了buyer和winner，其他字段走规则匹配
-				e.RuleMatch(field, fv, _id, false)
+		if resulttmp[field] != nil {
+			fv := qu.ObjToString(resulttmp[field])
+			if fv != "" {
+				if field == "buyer" || field == "winner" { //field为buyer和winner时特殊处理，先从Redis中查，有直接通过，没有走匹配规则
+					e.RedisMatch(field, fv, resulttmp) //redis匹配
+				} else { //除了buyer和winner，其他字段走规则匹配
+					e.RuleMatch(field, fv, resulttmp)
+				}
 			}
 		}
-		//}
 	}
 }
 
 //Redis匹配
-func (e *ExtractTask) RedisMatch(field, fv, _id string, isPackage bool) {
+func (e *ExtractTask) RedisMatch(field, fv string, val map[string]interface{}) {
 	defer qu.Catch()
-	//先匹配redis,在匹配企业名称库
 	i := redis.GetInt(field, field+"_"+fv) //查找redis
-	if i == 0 {
-		has := e.GetFromBusinessLab(fv) //查企业名称库
-		if !has {                       //没有保存到审核表
-			go func(_id, field, fv string, isPackage bool) {
-				save := map[string]interface{}{
-					"extractid":    _id,
-					"field":        field,
-					"val":          fv,
-					"l_createtime": time.Now().Unix(),
-					"ispackage":    isPackage,
-					"extractcoll":  e.TaskInfo.TrackColl,
-				}
-				db.Mgo.Save("audit_err", save) //保存
-			}(_id, field, fv, isPackage)
-		}
-	} else {
-		return
+	if i == 0 {                            //reids未找到，执行规则匹配
+		val[field+"_isredis"] = false
+		e.RuleMatch(field, fv, val) //规则匹配
+	} else { //redis找到，打标识存库
+		val[field+"_isredis"] = true
 	}
-
-	//	if i == 0 {                            //reids未找到，执行规则匹配
-	//		val[field+"_isredis"] = false
-	//		e.RuleMatch(field, fv, val) //规则匹配
-	//	} else { //redis找到，打标识存库
-	//		val[field+"_isredis"] = true
-	//	}
-}
-
-//查企业库
-func (e *ExtractTask) GetFromBusinessLab(name string) bool {
-	//db.Mgo.FindOne()
-	return false
 }
 
 //规则匹配
-func (e *ExtractTask) RuleMatch(field, fieldval, _id string, isPackage bool) {
+func (e *ExtractTask) RuleMatch(field, fieldval string, tmpMap map[string]interface{}) {
 	defer qu.Catch()
 	if fieldval != "" {
 		SMap := e.StartMatch(field, fieldval)
+		//SMap.AddKey(field+"_isaudit", false)
 		for _, k := range SMap.Keys {
-			if k == "err" {
-				go func(_id, field, fv string, isPackage bool) {
-					save := map[string]interface{}{
-						"extractid":    _id,
-						"field":        field,
-						"val":          fv,
-						"l_createtime": time.Now().Unix(),
-						"ispackage":    isPackage,
-						"extractcoll":  e.TaskInfo.TrackColl,
-					}
-					db.Mgo.Save("audit_err", save) //保存
-				}(_id, field, fieldval, isPackage)
-			}
-			//tmpMap[k] = SMap.Map[k]
+			tmpMap[k] = SMap.Map[k]
 		}
-		//tmpMap[field+"_isaudit"] = false //添加字段未审核信息
+		tmpMap[field+"_isaudit"] = false //添加字段未审核信息
 	}
 }
 
@@ -1271,7 +1326,7 @@ func (e *ExtractTask) StartMatch(field, text string) *pretreated.SortMap {
 			for _, c := range classMap { //class
 				classid := qu.BsonIdToSId(c["_id"])
 				classPrerule := qu.ObjToString(c["s_class_prerule"])
-				savefield := qu.ObjToString(c["s_savefield"])
+				savefield := qu.ObjToString(c["s_savefield"])                                   //保存字段
 				textAfterClassPrerule := ju.PreFilter(textAfterRecogFieldPrerule, classPrerule) //class的前置过滤
 				if textAfterClassPrerule != "" {
 					lock.Lock()
@@ -1286,8 +1341,7 @@ func (e *ExtractTask) StartMatch(field, text string) *pretreated.SortMap {
 							b, _ := ju.RecogAnalyRules(textAfterRulePrerule, rule)
 							if b { //匹配到一个分类下某个规则时，不再继续匹配
 								if savefield != "" { //保存字段不为空，存储代码信息
-									//SMap.AddKey(field+"_"+savefield, s_name)
-									SMap.AddKey(savefield, s_name)
+									SMap.AddKey(field+"_"+savefield, s_name)
 								}
 								break L
 							}

src/jy/extract/extractInit.go

@@ -55,20 +55,22 @@ type TaskInfo struct {
 	TestLua                             bool      //检查测试用
 }
 type ExtractTask struct {
-	Id            string              //任务id
-	IsRun         bool                //是否启动
-	Content       string              //信息内容
-	TaskInfo      *TaskInfo           //任务信息
-	RulePres      []*RegLuaInfo       //通用前置规则
-	RuleBacks     []*RegLuaInfo       //通用后置规则
-	RuleCores     []*RuleCore         //抽取规则
-	PkgRuleCores  []*RuleCore         //分包抽取规则
-	Tag           map[string][]*Tag   //标签库
-	ClearFn       map[string][]string //清理函数
-	IsExtractCity bool                //是否开启城市抽取
-	Fields        map[string]int      //抽取属性组
-
-	IsFileField bool           //是否开启附件抽取
+	Id        string        //任务id
+	IsRun     bool          //是否启动
+	Content   string        //信息内容
+	TaskInfo  *TaskInfo     //任务信息
+	RulePres  []*RegLuaInfo //通用前置规则
+	RuleBacks []*RegLuaInfo //通用后置规则
+	RuleBlock *ju.RuleBlock
+	//RuleCores      []*RuleCore         //抽取规则
+	RuleCores     map[string]map[string][]*RuleCore //分类抽取规则
+	PkgRuleCores  []*RuleCore                       //分包抽取规则
+	Tag           map[string][]*Tag                 //标签库
+	ClearFn       map[string][]string               //清理函数
+	IsExtractCity bool                              //是否开启城市抽取
+	Fields        map[string]int                    //抽取属性组
+
+	IsFileField bool      //是否开启附件抽取
 	FileFields  *sync.Map //抽取附件属性组
 
 	ResultChanel chan bool                  //抽取结果详情
@@ -92,6 +94,8 @@ type ExtractTask struct {
 	AreaProvinceGet   *ju.DFA //省
 	AreaSimGet        *ju.DFA //市简称
 	AreaStreet        *ju.DFA //街道
+
+	InfoType []map[string]interface{}
 }
 
 type ClearTaskInfo struct {
@@ -263,156 +267,183 @@ func (e *ExtractTask) InitRuleBacks() {
 		}
 	}
 }
+func (e *ExtractTask) InfoTypeList() {
+	infolist1, _ := db.Mgo.Find("infotype", `{}`, `{}`, `{}`, false, -1, -1)
+	infolist := *infolist1
+	for _, v := range infolist {
+		e.InfoType = append(e.InfoType, v)
+	}
+}
 
 //加载抽取规则
 func (e *ExtractTask) InitRuleCore() {
 	defer qu.Catch()
 	e.Fields = map[string]int{}
-	e.RuleCores = []*RuleCore{}
-	vinfos, _ := db.Mgo.Find("versioninfo", `{"vid":"`+e.TaskInfo.VersionId+`","delete":false}`, nil, nil, false, -1, -1)
-	for _, vinfo := range *vinfos {
-		if b, _ := vinfo["isuse"].(bool); !b {
+	infolist, _ := db.Mgo.Find("infotype", `{}`, `{}`, `{}`, false, -1, -1)
+	e.RuleCores = make(map[string]map[string][]*RuleCore)
+	for _, v := range *infolist {
+		topclass := qu.ObjToString(v["topclass"])
+		if v["subclass"] == nil {
+			e.RuleCores[topclass] = make(map[string][]*RuleCore)
+			for attr, _ := range v["fields"].(map[string]interface{}) {
+				vinfo, _ := db.Mgo.FindOneByField("versioninfo", `{"vid":"`+e.TaskInfo.VersionId+`","delete":false,"s_field":"`+attr+`"}`, `{}`)
+				e.RuleCores[topclass][attr] = append(e.RuleCores[topclass][attr], e.InfoRole(*vinfo)...)
+			}
+		} else {
+			for ca, fs := range v["subclass"].(map[string]interface{}) {
+				e.RuleCores[topclass+"_"+ca] = make(map[string][]*RuleCore)
+				for field, _ := range fs.(map[string]interface{}) {
+					vinfo, _ := db.Mgo.FindOneByField("versioninfo", `{"vid":"`+e.TaskInfo.VersionId+`","delete":false,"s_field":"`+field+`"}`, `{}`)
+					e.RuleCores[topclass+"_"+ca][field] = append(e.RuleCores[topclass+"_"+ca][field], e.InfoRole(*vinfo)...)
+				}
+			}
+		}
+	}
+}
+func (e *ExtractTask) InfoRole(vinfo map[string]interface{}) []*RuleCore {
+	maps := []*RuleCore{}
+	if b, _ := vinfo["isuse"].(bool); !b {
+		return nil
+	}
+	s_field := qu.ObjToString(vinfo["s_field"])
+	pid := qu.BsonIdToSId(vinfo["_id"])
+	list, _ := db.Mgo.Find("rule_logic", `{"pid":"`+pid+`","delete":false}`, nil, nil, false, -1, -1)
+	for _, vv := range *list {
+		if b, _ := vv["isuse"].(bool); !b {
 			continue
 		}
-		s_field := qu.ObjToString(vinfo["s_field"])
-		pid := qu.BsonIdToSId(vinfo["_id"])
-		list, _ := db.Mgo.Find("rule_logic", `{"pid":"`+pid+`","delete":false}`, nil, nil, false, -1, -1)
-		for _, vv := range *list {
-			if b, _ := vv["isuse"].(bool); !b {
-				continue
+		rcore := &RuleCore{}
+		rcore.Field = s_field
+		rcore.LuaLogic = qu.ObjToString(vv["s_luascript"]) //是否进入逻辑脚本
+		rcore.ExtFrom = qu.If(vv["extfrom"].(bool), "title", "detail").(string)
+		//前置规则
+		rulePres := []*RegLuaInfo{}
+		plist, _ := db.Mgo.Find("rule_logicpre", `{"sid":"`+qu.BsonIdToSId(vv["_id"])+`","delete":false}`, nil, nil, false, -1, -1)
+		for _, v := range *plist {
+			rinfo := &RegLuaInfo{
+				Field: qu.ObjToString(v["s_field"]),
+				Code:  v["s_code"].(string),
+				Name:  v["s_name"].(string),
+				IsLua: qu.If(v["s_type"].(string) == "1", true, false).(bool),
 			}
-			rcore := &RuleCore{}
-			rcore.Field = s_field
-			rcore.LuaLogic = qu.ObjToString(vv["s_luascript"]) //是否进入逻辑脚本
-			rcore.ExtFrom = qu.If(vv["extfrom"].(bool), "title", "detail").(string)
-			//前置规则
-			rulePres := []*RegLuaInfo{}
-			plist, _ := db.Mgo.Find("rule_logicpre", `{"sid":"`+qu.BsonIdToSId(vv["_id"])+`","delete":false}`, nil, nil, false, -1, -1)
-			for _, v := range *plist {
-				rinfo := &RegLuaInfo{
-					Field: qu.ObjToString(v["s_field"]),
-					Code:  v["s_code"].(string),
-					Name:  v["s_name"].(string),
-					IsLua: qu.If(v["s_type"].(string) == "1", true, false).(bool),
-				}
-				if rinfo.IsLua {
-					rinfo.RuleText = v["s_luascript"].(string)
+			if rinfo.IsLua {
+				rinfo.RuleText = v["s_luascript"].(string)
+				rulePres = append(rulePres, rinfo)
+			} else {
+				qu.Try(func() {
+					rinfo.RuleText = v["s_rule"].(string)
+					tmp := strings.Split(rinfo.RuleText, "__")
+					var pattern string
+					if strings.Contains(tmp[0], "\\u") {
+						pattern, _ = strconv.Unquote(`"` + tmp[0] + `"`)
+					} else {
+						pattern = tmp[0]
+					}
+					if len(tmp) == 2 {
+						rinfo.RegPreBac = &ExtReg{Reg: regexp.MustCompile(pattern), Replace: tmp[1]}
+					} else {
+						rinfo.RegPreBac = &ExtReg{Reg: regexp.MustCompile(pattern), Replace: ""}
+					}
 					rulePres = append(rulePres, rinfo)
-				} else {
-					qu.Try(func() {
-						rinfo.RuleText = v["s_rule"].(string)
-						tmp := strings.Split(rinfo.RuleText, "__")
-						var pattern string
-						if strings.Contains(tmp[0], "\\u") {
-							pattern, _ = strconv.Unquote(`"` + tmp[0] + `"`)
-						} else {
-							pattern = tmp[0]
-						}
-						if len(tmp) == 2 {
-							rinfo.RegPreBac = &ExtReg{Reg: regexp.MustCompile(pattern), Replace: tmp[1]}
-						} else {
-							rinfo.RegPreBac = &ExtReg{Reg: regexp.MustCompile(pattern), Replace: ""}
-						}
-						rulePres = append(rulePres, rinfo)
-					}, func(err interface{}) {
-						log.Debug(rinfo.Code, rinfo.Field, err)
-					})
-				}
+				}, func(err interface{}) {
+					log.Debug(rinfo.Code, rinfo.Field, err)
+				})
 			}
-			rcore.RulePres = rulePres
+		}
+		rcore.RulePres = rulePres
 
-			//后置规则
-			ruleBacks := []*RegLuaInfo{}
-			blist, _ := db.Mgo.Find("rule_logicback", `{"sid":"`+qu.BsonIdToSId(vv["_id"])+`","delete":false}`, nil, nil, false, -1, -1)
-			for _, v := range *blist {
-				rinfo := &RegLuaInfo{
-					Field: qu.ObjToString(v["s_field"]),
-					Code:  v["s_code"].(string),
-					Name:  v["s_name"].(string),
-					IsLua: qu.If(v["s_type"].(string) == "1", true, false).(bool),
-				}
-				if rinfo.IsLua {
-					rinfo.RuleText = v["s_luascript"].(string)
+		//后置规则
+		ruleBacks := []*RegLuaInfo{}
+		blist, _ := db.Mgo.Find("rule_logicback", `{"sid":"`+qu.BsonIdToSId(vv["_id"])+`","delete":false}`, nil, nil, false, -1, -1)
+		for _, v := range *blist {
+			rinfo := &RegLuaInfo{
+				Field: qu.ObjToString(v["s_field"]),
+				Code:  v["s_code"].(string),
+				Name:  v["s_name"].(string),
+				IsLua: qu.If(v["s_type"].(string) == "1", true, false).(bool),
+			}
+			if rinfo.IsLua {
+				rinfo.RuleText = v["s_luascript"].(string)
+				ruleBacks = append(ruleBacks, rinfo)
+			} else {
+				qu.Try(func() {
+					rinfo.RuleText = v["s_rule"].(string)
+					tmp := strings.Split(rinfo.RuleText, "__")
+					var pattern string
+					if strings.Contains(tmp[0], "\\u") {
+						pattern, _ = strconv.Unquote(`"` + tmp[0] + `"`)
+					} else {
+						pattern = tmp[0]
+					}
+					if len(tmp) == 2 {
+						rinfo.RegPreBac = &ExtReg{Reg: regexp.MustCompile(pattern), Replace: tmp[1]}
+					} else {
+						rinfo.RegPreBac = &ExtReg{Reg: regexp.MustCompile(pattern), Replace: ""}
+					}
 					ruleBacks = append(ruleBacks, rinfo)
-				} else {
-					qu.Try(func() {
-						rinfo.RuleText = v["s_rule"].(string)
-						tmp := strings.Split(rinfo.RuleText, "__")
-						var pattern string
-						if strings.Contains(tmp[0], "\\u") {
-							pattern, _ = strconv.Unquote(`"` + tmp[0] + `"`)
-						} else {
-							pattern = tmp[0]
-						}
-						if len(tmp) == 2 {
-							rinfo.RegPreBac = &ExtReg{Reg: regexp.MustCompile(pattern), Replace: tmp[1]}
-						} else {
-							rinfo.RegPreBac = &ExtReg{Reg: regexp.MustCompile(pattern), Replace: ""}
-						}
-						ruleBacks = append(ruleBacks, rinfo)
-					}, func(err interface{}) {
-						log.Debug(rinfo.Code, rinfo.Field, err)
-					})
-				}
+				}, func(err interface{}) {
+					log.Debug(rinfo.Code, rinfo.Field, err)
+				})
 			}
-			rcore.RuleBacks = ruleBacks
+		}
+		rcore.RuleBacks = ruleBacks
 
-			//抽取规则
-			ruleCores := []*RegLuaInfo{}
-			clist, _ := db.Mgo.Find("rule_logicore", `{"sid":"`+qu.BsonIdToSId(vv["_id"])+`","delete":false}`, nil, nil, false, -1, -1)
-			for _, v := range *clist {
-				if b, _ := v["isuse"].(bool); !b {
-					continue
-				}
-				field := qu.ObjToString(v["s_field"])
-				e.Fields[field] = 1 //加入抽取属性组备用
-				rinfo := &RegLuaInfo{
-					Field: field,
-					Code:  v["s_code"].(string),
-					Name:  v["s_name"].(string),
-					IsLua: qu.If(v["s_type"].(string) == "1", true, false).(bool),
-				}
-				if rinfo.IsLua {
-					rinfo.RuleText = v["s_luascript"].(string)
-					//提取全部属性
-					rinfo.LFields = getALLFields()
-					ruleCores = append(ruleCores, rinfo)
-				} else {
-					qu.Try(func() {
-						rinfo.RuleText = v["s_rule"].(string)
-						tmp := strings.Split(rinfo.RuleText, "__")
-						var pattern string
-						if strings.Contains(tmp[0], "\\u") {
-							pattern, _ = strconv.Unquote(`"` + tmp[0] + `"`)
-						} else {
-							pattern = tmp[0]
-						}
-						if len(tmp) == 2 {
-							epos := strings.Split(tmp[1], ",")
-							posm := map[string]int{}
-							for _, v := range epos {
-								ks := strings.Split(v, ":")
-								if len(ks) == 2 { //(.*)招标公告(.*)__2:projectname,4:area
-									posm[ks[1]] = qu.IntAll(ks[0])
-								} else { //(.*)招标公告__2
-									posm[rinfo.Field] = qu.IntAll(ks[0])
-								}
+		//抽取规则
+		ruleCores := []*RegLuaInfo{}
+		clist, _ := db.Mgo.Find("rule_logicore", `{"sid":"`+qu.BsonIdToSId(vv["_id"])+`","delete":false}`, nil, nil, false, -1, -1)
+		for _, v := range *clist {
+			if b, _ := v["isuse"].(bool); !b {
+				continue
+			}
+			field := qu.ObjToString(v["s_field"])
+			e.Fields[field] = 1 //加入抽取属性组备用
+			rinfo := &RegLuaInfo{
+				Field: field,
+				Code:  v["s_code"].(string),
+				Name:  v["s_name"].(string),
+				IsLua: qu.If(v["s_type"].(string) == "1", true, false).(bool),
+			}
+			if rinfo.IsLua {
+				rinfo.RuleText = v["s_luascript"].(string)
+				//提取全部属性
+				rinfo.LFields = getALLFields()
+				ruleCores = append(ruleCores, rinfo)
+			} else {
+				qu.Try(func() {
+					rinfo.RuleText = v["s_rule"].(string)
+					tmp := strings.Split(rinfo.RuleText, "__")
+					var pattern string
+					if strings.Contains(tmp[0], "\\u") {
+						pattern, _ = strconv.Unquote(`"` + tmp[0] + `"`)
+					} else {
+						pattern = tmp[0]
+					}
+					if len(tmp) == 2 {
+						epos := strings.Split(tmp[1], ",")
+						posm := map[string]int{}
+						for _, v := range epos {
+							ks := strings.Split(v, ":")
+							if len(ks) == 2 { //(.*)招标公告(.*)__2:projectname,4:area
+								posm[ks[1]] = qu.IntAll(ks[0])
+							} else { //(.*)招标公告__2
+								posm[rinfo.Field] = qu.IntAll(ks[0])
 							}
-							rinfo.RegCore = &ExtReg{Reg: regexp.MustCompile(pattern), Bextract: true, ExtractPos: posm}
-						} else {
-							rinfo.RegCore = &ExtReg{Reg: regexp.MustCompile(pattern), Bextract: false}
 						}
-						ruleCores = append(ruleCores, rinfo)
-					}, func(err interface{}) {
-						log.Debug(rinfo.Code, rinfo.Field, err)
-					})
-				}
+						rinfo.RegCore = &ExtReg{Reg: regexp.MustCompile(pattern), Bextract: true, ExtractPos: posm}
+					} else {
+						rinfo.RegCore = &ExtReg{Reg: regexp.MustCompile(pattern), Bextract: false}
+					}
+					ruleCores = append(ruleCores, rinfo)
+				}, func(err interface{}) {
+					log.Debug(rinfo.Code, rinfo.Field, err)
+				})
 			}
-			rcore.RuleCores = ruleCores
-			//
-			e.RuleCores = append(e.RuleCores, rcore)
 		}
+		rcore.RuleCores = ruleCores
+		//
+		maps = append(maps, rcore)
 	}
+	return maps
 }
 
 //加载分包抽取规则
@@ -927,7 +958,7 @@ func (e *ExtractTask) InitFile() {
 
 	if (*ve)["s_filefileds"] != nil {
 		for _, vff := range (*ve)["s_filefileds"].([]interface{}) {
-			syscefiled.Store(vff.(string),1)
+			syscefiled.Store(vff.(string), 1)
 		}
 	}
 	e.FileFields = syscefiled
@@ -981,3 +1012,32 @@ func (c *ClearTask) InitClearLuas() {
 		}
 	}
 }
+
+//加载分块规则
+func (e *ExtractTask) InitBlockRule() {
+	datas, _ := db.Mgo.Find("block_info", map[string]interface{}{
+		"vid":    e.TaskInfo.VersionId,
+		"delete": false,
+	}, `{"index":-1}`, `{"block_reg":1,"title_reg":1}`, false, -1, -1)
+	brs, trs := []*regexp.Regexp{}, []*regexp.Regexp{}
+	for _, v := range *datas {
+		block_reg, _ := v["block_reg"].(string)
+		block_reg, _ = strconv.Unquote(`"` + block_reg + `"`)
+		title_reg, _ := v["title_reg"].(string)
+		title_reg, _ = strconv.Unquote(`"` + title_reg + `"`)
+		if block_reg == "" || title_reg == "" {
+			continue
+		}
+		b_reg, b_err := regexp.Compile(block_reg)
+		t_reg, t_err := regexp.Compile(title_reg)
+		if b_err != nil || t_err != nil {
+			continue
+		}
+		brs = append(brs, b_reg)
+		trs = append(trs, t_reg)
+	}
+	e.RuleBlock = &ju.RuleBlock{
+		BlockRegs: brs,
+		TitleRegs: trs,
+	}
+}

src/jy/extract/extractudp.go

@@ -103,6 +103,7 @@ func ExtractByUdp(sid, eid string, instanceId ...string) {
 		ext.InitRulePres()
 		ext.InitRuleBacks()
 		ext.InitRuleCore()
+		ext.InitBlockRule()
 		ext.InitTag()
 		ext.InitClearFn()
 		if ext.IsExtractCity { //版本上控制是否开始城市抽取
@@ -159,9 +160,9 @@ func ExtractByUdp(sid, eid string, instanceId ...string) {
 					var j, jf *ju.Job
 					if ext.IsFileField && v["projectinfo"] != nil {
 						v["isextFile"] = true
-						j, jf = PreInfo(v)
+						j, jf = ext.PreInfo(v)
 					} else {
-						j, _ = PreInfo(v)
+						j, _ = ext.PreInfo(v)
 					}
 					ext.TaskInfo.ProcessPool <- true
 					go ext.ExtractProcess(j, jf)
@@ -185,9 +186,9 @@ func ExtractByUdp(sid, eid string, instanceId ...string) {
 					var j, jf *ju.Job
 					if ext.IsFileField && v["projectinfo"] != nil {
 						v["isextFile"] = true
-						j, jf = PreInfo(v)
+						j, jf = ext.PreInfo(v)
 					} else {
-						j, _ = PreInfo(v)
+						j, _ = ext.PreInfo(v)
 					}
 					ext.TaskInfo.ProcessPool <- true
 					go ext.ExtractProcess(j, jf)
@@ -225,9 +226,9 @@ func ExtractByUdp(sid, eid string, instanceId ...string) {
 				var j, jf *ju.Job
 				if ext.IsFileField && v["projectinfo"] != nil {
 					v["isextFile"] = true
-					j, jf = PreInfo(v)
+					j, jf = ext.PreInfo(v)
 				} else {
-					j, _ = PreInfo(v)
+					j, _ = ext.PreInfo(v)
 				}
 				ext.TaskInfo.ProcessPool <- true
 				wg.Add(1)

src/jy/pretreated/analystep.go

@@ -21,20 +21,20 @@ func AnalyStart(job *util.Job) {
 	//计算表格占比,返回表格数组、占比
 	tabs, ration := ComputeConRatio(con, 1)
 	if len(tabs) > 0 {
-		newcon, newtabs, newration := findBigText(con, ration, tabs)//查找大文本，5次
+		newcon, newtabs, newration := FindBigText(con, ration, tabs)//查找大文本，5次
 		if newcon != "" && newration == 0 {
 			con = newcon
 			tabs = newtabs
 			ration = newration
 		}
 	}
-	blockArrays, _ := DivideBlock(con, 1)//分块
+	blockArrays, _ := DivideBlock(con, 1, job.RuleBlock)//分块
 	if len(blockArrays) > 0 { //有分块
 		//从块里面找分包
 		job.BlockPackage = FindPackageFromBlocks(&blockArrays, job.Title)//从块里面找分包
 		for _, bl := range blockArrays {
 			if len([]rune(bl.Text)) > 80 {
-				ba1, _ := DivideBlock(bl.Text, 1)
+				ba1, _ := DivideBlock(bl.Text, 1, job.RuleBlock)
 				if len(ba1) > 0 {
 					t := ""
 					for _, t1 := range ba1 {
@@ -49,7 +49,7 @@ func AnalyStart(job *util.Job) {
 			t1, _ := ComputeConRatio(bl.Text, 2)
 			if len(t1) > 0 {
 				job.HasTable = 1 //添加标识:文本中有table
-				tabres := AnalyTableV2(t1, job.Category, bl.Title, bl.Text, 2, job.SourceMid)//解析表格入口 返回：汇总表格对象
+				tabres := AnalyTableV2(t1, job.Category, bl.Title, bl.Text, 2, job.SourceMid, job.RuleBlock)//解析表格入口 返回：汇总表格对象
 				processTableResult(tabres, bl, job)//分析table解析结果
 				if bl.Title == "" && tabres.BlockTag != "" {
 					bl.Title = tabres.BlockTag
@@ -59,6 +59,11 @@ func AnalyStart(job *util.Job) {
 				//				}
 			}
 			job.Block = append(job.Block, bl)
+
+			if job.Winnerorder == nil || len(job.Winnerorder) == 0 {
+				//新加table未找到winnerorder， 从分块文本中找中标候选人
+				job.Winnerorder = winnerOrderEntity.Find(bl.Text, true, 1)
+			}
 		}
 	} else { //未分块,创建分块
 		bl := &util.Block{}
@@ -67,7 +72,7 @@ func AnalyStart(job *util.Job) {
 			job.HasTable = 1 //添加标识:文本中有table
 			newCon = TextAfterRemoveTable(con)
 			job.BlockPackage = FindPackageFromText(job.Title, newCon)
-			tabres := AnalyTableV2(tabs, job.Category, "", con, 1, job.SourceMid)
+			tabres := AnalyTableV2(tabs, job.Category, "", con, 1, job.SourceMid, job.RuleBlock)
 			processTableResult(tabres, bl, job)
 			//			for k, v := range bl.TableKV.Kv {
 			//				log.Println("bl.TableKV.Kv", k, v)
@@ -76,6 +81,11 @@ func AnalyStart(job *util.Job) {
 			//从正文里面找分包
 			job.BlockPackage = FindPackageFromText(job.Title, newCon)
 		}
+		//新加 未分块table中未能解析到中标候选人，从正文中解析
+		if job.Winnerorder == nil || len(job.Winnerorder) == 0 {
+			bl.Winnerorder = winnerOrderEntity.Find(bl.Text, true, 1)
+		}
+
 		//调用kv解析
 		bl.ColonKV = GetKVAll(newCon, "", 1)
 		bl.SpaceKV = SspacekvEntity.Entrance(newCon, "")
@@ -224,7 +234,7 @@ func processTableResult(tabres *TableResult, block *util.Block, job *util.Job) {
 //ration==1 遍历所有tabs，ration!=1 tabs只有一个
 func tableDivideBlock(con string, ration float32, tabs []*goquery.Selection) string {
 	if len(tabs) != 1 {
-		return ""
+		//return ""
 	}
 	for _, tab := range tabs {
 		content := ""
@@ -275,7 +285,7 @@ func tableDivideBlock(con string, ration float32, tabs []*goquery.Selection) str
 }
 
 //查找大文本，5次
-func findBigText(con string, r float32, t []*goquery.Selection) (content string, tabs []*goquery.Selection, ration float32) {
+func FindBigText(con string, r float32, t []*goquery.Selection) (content string, tabs []*goquery.Selection, ration float32) {
 	content = tableDivideBlock(con, r, t)
 	if content == "" {
 		return

src/jy/pretreated/analytable.go

@@ -88,7 +88,7 @@ var (
 
 	//Tg = map[string]interface{}{}
 	//一些表格没有表头，是空的，对值是排序的做处理对应 NullTxBid
-	NullTdReg      = regexp.MustCompile("(首选|第[一二三四五1-5])(中标|成交)?(名|(候选|排序)?(人|单位|供应商))")
+	NullTdReg      = regexp.MustCompile("(首选|第[一二三四五1-5])(中标|成交)?(名(称)?|(候选|排序)?(人|单位|供应商))")
 	NullTxtBid     = "成交供应商排名"
 	projectnameReg = regexp.MustCompile("((公开)?招标)*[(（第]*[一二三四五六七八九十a-zA-Z0-9]+(标段|包|标|段)[)）]*$")
 	MhSpilt        = regexp.MustCompile("[:：]")
@@ -105,6 +105,8 @@ var (
 	FilterSerial                = regexp.MustCompile(".+[、．.:：，]")
 	filterTableWror             = regexp.MustCompile("班子成员")
 	underline                   = regexp.MustCompile("_+$")
+	iswinnertabletag            = regexp.MustCompile("(中标|候选人|成交|结果)")
+	nswinnertabletag            = regexp.MustCompile("[评得分估]+")
 )
 
 //在解析时，判断表格元素是否隐藏
@@ -196,11 +198,16 @@ func CommonDataAnaly(k, tabletag, tabledesc string, v interface{}) (k1 []string,
 //对解析后的表格的kv进行过滤
 func (table *Table) KVFilter() {
 	//1.标准化值查找
-	// 2.对数组的处理
-	// 3.对分包的处理
-	// 4.对KV的处理
-	// 判断表格是否有用，调用abandontable正则数组进行判断
-	table.analyTdKV()//1.td元素有内嵌kv,遍历放入table的Kv中2.td有子表格的处理，中标候选人排序
+	//2.对数组的处理
+	//3.对分包的处理
+	//4.对KV的处理
+	//判断表格是否有用，调用abandontable正则数组进行判断
+	//遍历每一行
+	winnertag := iswinnertabletag.MatchString(table.Tag) && !nswinnertabletag.MatchString(table.Tag) //table标签
+	if !winnertag {
+		winnertag = iswinnertabletag.MatchString(table.Tag) && !nswinnertabletag.MatchString(table.TableResult.BlockTag) //块标签
+	}
+	table.analyTdKV()
 	as := NewSortMap()
 	//表格描述处理，对成交结果的处理
 	for _, k := range table.SortKV.Keys {
@@ -214,11 +221,10 @@ func (table *Table) KVFilter() {
 			continue
 		}
 		v := table.SortKV.Map[k]
-		//u.Debug(k, v)
 		if _, ok := v.(string); ok {
 			k = regSpliteSegment.ReplaceAllString(regReplAllSpace.ReplaceAllString(k, ""), "")
-			k1, w1, v1, tag, b := CommonDataAnaly(k, table.Tag, table.Desc, v)//对key标准化处理，没有找到会走中标
-			//u.Debug(k, v, k1, w1, v1, tag, b)
+			k1, w1, v1, tag, b := CommonDataAnaly(k, table.Tag, table.Desc, v) //对key标准化处理，没有找到会走中标
+			//qutil.Debug(k, v, k1, w1, v1, tag, b)
 			if b {
 				//降低冒号值的权重
 				if MhSpilt.MatchString(v1) {
@@ -247,6 +253,7 @@ func (table *Table) KVFilter() {
 			as.AddKey(k, v)
 		}
 	}
+
 	//处理值是数组的kv放入标准化kv中
 	checkKey := map[int]bool{}
 	for kn, k := range as.Keys {
@@ -264,12 +271,17 @@ func (table *Table) KVFilter() {
 					for n1, _ := range vs1 {
 						smap[n1] = map[string]interface{}{}
 					}
+					//hadSort := false
+					tmpEntname := make([]string, len(vs1))
+					tmpPrice := make([]string, len(vs1))
 					for kn1, k := range as.Keys[kn:] {
 						v := as.Map[k]
 						if ContactType["采购单位"].MatchString(k) || ContactType["代理机构"].MatchString(k) {
 							continue
 						}
-						if vs, ok := v.([]string); ok && len(vs) == len(vs1) {
+						//目前对数组数据的key做判断，但是某些额可以是不满足情况的
+						//载明内容:[第一中标候选人 第二中标候选人] id：5d00587da5cb26b9b75e367b
+						if vs, ok := v.([]string); ok && len(vs) == len(vs1) { //数组值的个数相同
 							res, _, _, _, repl := CheckCommon(k, "bidorder")
 							kv := ""
 							if !res {
@@ -278,23 +290,72 @@ func (table *Table) KVFilter() {
 									kv = kt[0].Value
 								}
 							}
+							//qutil.Debug(k, res, repl, kv, "--", vs)
+							if !res && kv == "" { //key未验证出，验证数组的val值
+								checkKey[kn+kn1] = true
+								if winnertag { //如果是中标信息 在根据val数组信息解析候选人
+									for vsk, vsv := range vs {
+										if NullTdReg.MatchString(vsv) { //数据先验证val是否有排序
+											//hadSort = true
+											smap[vsk]["sortstr"] = vsv
+											smap[vsk]["sort"] = GetBidSort(vsv, vsk+1)
+										} else if findCandidate2.MatchString(vsv) && tmpEntname[vsk] == "" { //数据验证val是否是候选人
+											entname, _ := winnerOrderEntity.clear("中标单位", vsv).(string)
+											if entname != "" {
+												tmpEntname[vsk] = entname
+											}
+										} else { //验证val时如果数组中的第一条数据既不满足sort或者entname 判定此数组数据错误
+											break
+										}
+									}
+								}
+							}
 							if res || kv != "" { //连续往下找几个key
 								checkKey[kn+kn1] = true
+							SORT:
 								if repl == "sort" {
+									//hadSort = true
 									for vsk, vsv := range vs {
 										smap[vsk]["sortstr"] = vsv
 										smap[vsk]["sort"] = GetBidSort(vsv, vsk+1)
 									}
 								} else if repl == "entname" || kv == "中标单位" {
 									for vsk, vsv := range vs {
-										smap[vsk]["entname"] = winnerOrderEntity.clear("中标单位", vsv)
+										if winnerReg6.MatchString(vsv) { //k:中标候选人 v:["第一名","第二名"]
+											repl = "sort"
+											goto SORT
+										}
+										//										if entname, _ := smap[vsk]["entname"].(string); entname != "" || len([]rune(vsv)) < 3 {
+										//											break
+										//										}
+										//										entname, _ := winnerOrderEntity.clear("中标单位", vsv).(string)
+										//										if entname != "" {
+										//											smap[vsk]["entname"] = entname
+										//
+										if tmpEntname[vsk] != "" || len([]rune(vsv)) < 4 { //排除 单位：["台","个","套"]
+											break
+										}
+										entname, _ := winnerOrderEntity.clear("中标单位", vsv).(string)
+										if entname != "" {
+											tmpEntname[vsk] = entname
+										}
 									}
 								} else if kv == "中标金额" {
 									for vsk, vsv := range vs {
-										p1 := qutil.Float64All(smap[vsk]["price"])
-										p2 := qutil.Float64All(vsv)
+										//过滤price 2348273.432元(万元)-->2348273.432
+										//tmp1, _ := smap[vsk]["price"].(string)
+										tmp1 := tmpPrice[vsk]
+										p1num := numberReg2.FindString(tmp1)
+										p2num := numberReg2.FindString(vsv)
+										p1 := qutil.Float64All(p1num)
+										p2 := qutil.Float64All(p2num)
 										if p2 > p1 {
-											smap[vsk]["price"] = winnerOrderEntity.clear("中标金额", vsv+GetMoneyUnit(k, vsv))
+											//smap[vsk]["price"] = winnerOrderEntity.clear("中标金额", vsv+GetMoneyUnit(k, vsv))
+											price := winnerOrderEntity.clear("中标金额", vsv+GetMoneyUnit(k, vsv))
+											if pricestr, _ := price.(string); len(pricestr) < 30 && len(pricestr) > 0 {
+												tmpPrice[vsk] = pricestr
+											}
+
 										}
 									}
 								}
@@ -304,8 +365,22 @@ func (table *Table) KVFilter() {
 						}
 					}
 					newSmap := []map[string]interface{}{}
-					for _, smap_v := range smap {
-						if len(smap_v) > 0 {
+					//qutil.Debug("smap=======", smap)
+					//qutil.Debug("tmpEntname--", len(tmpEntname), tmpEntname)
+					//qutil.Debug("tmpPrice--", len(tmpPrice), tmpPrice)
+					for n, smap_v := range smap {
+						//if hadSort { //有排序，再添加entname和price
+						if len(tmpEntname) > 0 && n < len(tmpEntname) && tmpEntname[n] != "" {
+							smap_v["entname"] = tmpEntname[n]
+
+							if len(tmpPrice) > 0 && n < len(tmpPrice) && tmpPrice[n] != "" {
+								smap_v["price"] = tmpPrice[n]
+							}
+						}
+						//} else if len(tmpEntname) > 0 {
+						//fmt.Println("table winnerorder only has entname", tmpEntname)
+						//}
+						if len(smap_v) > 2 { //只有排序信息 sort和sortstr
 							newSmap = append(newSmap, smap_v)
 						}
 					}
@@ -384,7 +459,7 @@ func (table *Table) KVFilter() {
 					table.StandKVWeight["中标单位"] = -25
 				}
 			}
-		} else if !table.BPackage {
+		} else if !table.BPackage { //没有table.WinnerOrder也没有分包 将td中的WinnerOrder赋值给table.WinnerOrder
 			if len(winnerOrder) > 1 {
 				table.WinnerOrder = winnerOrder
 			}
@@ -404,6 +479,7 @@ func (table *Table) KVFilter() {
 		}
 	}
 }
+
 //1.td元素有内嵌kv,遍历放入table的Kv中2.td有子表格的处理，中标候选人排序
 func (table *Table) analyTdKV() {
 	//遍历每一行
@@ -511,6 +587,7 @@ func (table *Table) MergerToTableresult() {
 	if table.TableResult.BlockTag == "" && table.Tag != "" {
 		table.TableResult.BlockTag = table.Tag
 	}
+	//中标候选人(多个table，现在默认取第一个table的信息，考虑需不需要多个table分析合并数据？)
 	if table.TableResult.WinnerOrder == nil || len(table.TableResult.WinnerOrder) == 0 {
 		table.TableResult.WinnerOrder = table.WinnerOrder
 	}
@@ -528,7 +605,7 @@ func (table *Table) MergerToTableresult() {
 解析表格入口
 返回：汇总表格对象
 **/
-func AnalyTableV2(tabs []*goquery.Selection, toptype, blockTag, con string, itype int, _id interface{}) (tabres *TableResult) {
+func AnalyTableV2(tabs []*goquery.Selection, toptype, blockTag, con string, itype int, _id interface{}, ruleBlock *u.RuleBlock) (tabres *TableResult) {
 	defer qutil.Catch()
 	//u.Debug(con)
 	if itype == 1 {
@@ -536,7 +613,7 @@ func AnalyTableV2(tabs []*goquery.Selection, toptype, blockTag, con string, ityp
 		con = RepairCon(con)
 	}
 	//生成tableresult对象
-	tabres = NewTableResult(_id, toptype, blockTag, con, itype)
+	tabres = NewTableResult(_id, toptype, blockTag, con, itype, ruleBlock)
 	//可以有多个table
 	for _, table := range tabs {
 		//隐藏表格跳过
@@ -638,7 +715,7 @@ func (ts *TableResult) Analy() {
 	for _, table := range tabs {
 		table.MergerToTableresult()
 		//		for k, v := range table.TableResult.SortKV.Map {
-		//			log.Println(k, v)
+		//			qutil.Debug(k, "=====", v)
 		//		}
 	}
 }
@@ -658,9 +735,10 @@ func (table *Table) Analy(contactFormat *u.ContactFormat) []*Table {
 	ts := table.AnalyTables(contactFormat)
 	return ts
 }
+
 //遍历节点，初始化table 结构体
 func (table *Table) createTabe(trs *goquery.Selection) {
-	 trs.Each(func(n int, sel *goquery.Selection) {
+	trs.Each(func(n int, sel *goquery.Selection) {
 		//隐藏行不处理
 		if IsHide(sel) {
 			return
@@ -691,7 +769,7 @@ func (table *Table) createTabe(trs *goquery.Selection) {
 
 //对table进行整体解析处理
 func (table *Table) AnalyTables(contactFormat *u.ContactFormat) []*Table {
-	ts := table.tableSubDemolitionTable()//分包，拆表
+	ts := table.tableSubDemolitionTable() //分包，拆表
 	for n, table := range ts {
 		//处理每个table
 		if len(table.TRs) > 0 {
@@ -733,7 +811,7 @@ func (table *Table) AnalyTables(contactFormat *u.ContactFormat) []*Table {
 				//过滤、标准化、合并kv,table.StandKV,table.StandKVWeight
 				table.KVFilter()
 			}
-			for k, v := range table.StandKV {//过滤后的标准化kv
+			for k, v := range table.StandKV { //过滤后的标准化kv
 				if table.TableResult.SortKV.Map[k] == nil {
 					table.TableResult.SortKV.AddKey(k, v)
 					table.TableResult.SortKVWeight[k] = table.StandKVWeight[k]
@@ -744,6 +822,7 @@ func (table *Table) AnalyTables(contactFormat *u.ContactFormat) []*Table {
 	}
 	return ts
 }
+
 //分包，拆表
 func (table *Table) tableSubDemolitionTable() []*Table {
 	tm := []map[string]interface{}{}
@@ -801,8 +880,9 @@ func (table *Table) tableSubDemolitionTable() []*Table {
 	}
 	return ts
 }
+
 //分割表格
-func (table *Table) bSplit( n int, ts []*Table) {
+func (table *Table) bSplit(n int, ts []*Table) {
 	if table.BSplit {
 		if !table.BHeader && n > 0 {
 			for i := n - 1; i > -1; i-- {
@@ -818,6 +898,7 @@ func (table *Table) bSplit( n int, ts []*Table) {
 		}
 	}
 }
+
 //删除尾部空白行
 func (table *Table) deleteTrimTr() {
 	for len(table.TRs) > 0 {
@@ -838,6 +919,7 @@ func (table *Table) deleteTrimTr() {
 		}
 	}
 }
+
 //校对表格
 func (table *Table) Adjust() {
 	//计算行列起止位置，跨行跨列处理
@@ -901,11 +983,11 @@ func (table *Table) Adjust() {
 
 //计算行/列表格的结束位置 StartRow=0 EndRow=0,table.TDNum td个数 table.RowNum 行数
 func (table *Table) ComputeRowColSpan() {
-	n := 0//td总个数
+	n := 0                         //td总个数
 	mapRC := map[int]map[int]int{} //记录第几行pos，起始列对应的合并值
 	for k, v := range table.TRs {
-		n += len(v.TDs)//每行的td总数相加
-		nk := 0 //nk列的起始,k行的起始||如果有合并，起始就不是0
+		n += len(v.TDs) //每行的td总数相加
+		nk := 0         //nk列的起始,k行的起始||如果有合并，起始就不是0
 		ball := true
 		rowspans := v.TDs[0].Rowspan //某一行第一个td的rowspan
 		for _, v1 := range v.TDs {
@@ -966,13 +1048,14 @@ func (table *Table) ComputeRowColSpan() {
 			}
 		}
 	}
-	table.TDNum = n//td总个数
-	table.RowNum = len(table.TRs)//tr总行数
+	table.TDNum = n               //td总个数
+	table.RowNum = len(table.TRs) //tr总行数
 }
 
 func fmtkey(t string, start, end int) string {
 	return fmt.Sprintf("%s_%d_%d", t, start, end)
 }
+
 //查找每个table的标签，如果有标签可按标签处理，否则根据表格去判断
 func (table *Table) FindTag() {
 	//查找每个table的标签，如果有标签可按标签处理，否则根据表格去判断
@@ -1347,10 +1430,10 @@ func (table *Table) FindKV() {
 				}
 				**/
 				//				if td.Val == "电视" || td.Val == "电话机" || td.Val == "传真机" || td.Val == "音响" {
-				//	qutil.Debug("----", "td.BH:", td.BH, "KVDirect:", td.KVDirect, "Val:", td.Val, "direct:", direct, "vdirect:", vdirect)
+				//qutil.Debug("----td.Valtype", td.Valtype, "td.BH:", td.BH, "KVDirect:", td.KVDirect, "Val:", td.Val, "direct:", direct, "vdirect:", vdirect)
 				//				}
 				if !td.BH && td.KVDirect < 3 {
-					if !table.FindTdVal(td, direct, vdirect) {//table.FindTdVal()存储了table.SortKV
+					if !table.FindTdVal(td, direct, vdirect) { //table.FindTdVal()存储了table.SortKV
 						if !table.FindTdVal(td, vdirect, direct) {
 							//都识别不到时，对第一、二中标候选人的处理
 							bo, res := GetBidOrder(td, bodirect, sort)
@@ -1576,6 +1659,11 @@ func (table *Table) FindTdVal(td *TD, direct, vdirect int) (b bool) {
 	//	if near != nil {
 	//		fmt.Println("near----", near.Val, td.Val)
 	//	}
+	//	qutil.Debug(near != nil)
+	//	qutil.Debug(near.BH)
+	//	qutil.Debug(near.KeyDirect == vdirect, near.KeyDirect == 0)
+	//	qutil.Debug(near.KVDirect == direct, near.KVDirect == 0)
+	//	qutil.Debug(near.KVDirect < 3)
 	if near != nil && near.BH && (near.KeyDirect == vdirect || near.KeyDirect == 0) && (near.KVDirect == direct || near.KVDirect == 0) && near.KVDirect < 3 {
 		near.KVDirect = direct
 		near.KeyDirect = vdirect
@@ -1703,7 +1791,6 @@ func (table *Table) FindTdVal(td *TD, direct, vdirect int) (b bool) {
 		}
 		b = true
 	}
-	//qutil.Debug("map", b, table.SortKV.Map)
 	return
 }
 
@@ -1815,7 +1902,7 @@ func (tn *Table) CheckMultiPackageByTable() (b bool, index []string) {
 				}
 			}
 		} else if v1, ok := v.(string); ok {
-			v1 = replPkgConfusion(v1)//替换分包中混淆的词
+			v1 = replPkgConfusion(v1) //替换分包中混淆的词
 			if len([]rune(v1)) < 8 && !moneyNum.MatchString(v1) && FindVal_1.MatchString(v1) {
 				key_index = in
 				index = append(index, FindVal_1.FindString(v1))
@@ -1879,7 +1966,7 @@ func (tn *Table) CheckMultiPackageByTable() (b bool, index []string) {
 				L:
 					for in2, v1 := range vs {
 						if len([]rune(v1)) < 20 && !moneyNum.MatchString(v1) && FindVal2_1.MatchString(v1) {
-							for _, serial := range regSerialTitles_2 {
+							for _, serial := range tn.TableResult.RuleBlock.TitleRegs {
 								if serial.MatchString(v1) {
 									break L
 								}
@@ -2035,8 +2122,8 @@ func (tn *Table) CheckMultiPackageByTable() (b bool, index []string) {
 					//if !(len(k1tags) > 0 && k1tags[0].Value == "采购单位") {
 					//	tn.SortKV.RemoveKey(k1)
 					//}
-					for _,vcgdw:=range k1tags{
-						if vcgdw.Value =="采购单位"{
+					for _, vcgdw := range k1tags {
+						if vcgdw.Value == "采购单位" {
 							tn.SortKV.RemoveKey(k1)
 						}
 					}
@@ -2304,7 +2391,7 @@ func (tn *Table) TdContactFormat(contactFormat *u.ContactFormat) {
 	LS:
 		for _, tr := range tn.TRs {
 			for td_index, td := range tr.TDs {
-				thisTdKvs := colonkvEntity.GetKvs(td.Text, tn.Desc, 2)//获取有序的kv
+				thisTdKvs := colonkvEntity.GetKvs(td.Text, tn.Desc, 2) //获取有序的kv
 				if len(thisTdKvs) == 0 {
 					tdValue := regReplAllSpace.ReplaceAllString(td.Text, "")
 					if tdValue != "" && len([]rune(tdValue)) < 10 {
@@ -2413,7 +2500,7 @@ L:
 				jumpNextTd = false
 			}
 			///////////////////////////////////////
-			thisTdKvs := kvAfterDivideBlock(td.Text, 3)//分块之后的kv
+			thisTdKvs := kvAfterDivideBlock(td.Text, 3, tn.TableResult.RuleBlock) //分块之后的kv
 			if len(thisTdKvs) == 0 {
 				thisTdKvs = colonkvEntity.GetKvs(td.Text, tn.Desc, 2)
 			}
@@ -2545,7 +2632,7 @@ L:
 					}
 					if len(indexMap) == 0 {
 						prevLine := FilterSerial.ReplaceAllString(td_kv.PrevLine, "")
-						for k, v := range ContactType {//采购单位，代理机构正则
+						for k, v := range ContactType { //采购单位，代理机构正则
 							if u.IsArrayHasValue(prevLine, v.FindAllString(prevLine, -1)) {
 								indexMap[thidTdIndex] = k
 								thisTrHasMatch = true
@@ -2695,9 +2782,7 @@ func (table *Table) analyBrand() {
 	lineMap := make(map[string]*SortMap)
 	brandRule := u.BrandRules
 	//初始化lineMapArr,lineMap;
-	initLineMapLineMapArr(table, lineMapArr, lineMap)
-	//添加table.BrandData
-	//处理数组数据后,匹配必须title和替换要保存的title
+	initLineMapLineMapArr(table, lineMapArr, lineMap) //处理数组数据后,匹配必须title和替换要保存的title
 	//qutil.Debug("lineMapArr----", len(lineMapArr))
 	if len(lineMapArr) > 0 {
 		for _, aMap := range lineMapArr {
@@ -2894,7 +2979,6 @@ func (table *Table) analyBrand() {
 }
 //初始化lineMapArr,lineMap
 func initLineMapLineMapArr(table *Table, lineMapArr map[string]*SortMap, lineMap map[string]*SortMap) {
-	//将val为数组和string的分开
 	for _, key := range table.SortKV.Keys { //遍历table.SortKV.Keys而不是直接遍历table.SortKV.Map是为了得到table头的顺序
 		val := table.SortKV.Map[key]
 		key = regReplAllSpace.ReplaceAllString(key, "")
@@ -2965,7 +3049,7 @@ func initLineMapLineMapArr(table *Table, lineMapArr map[string]*SortMap, lineMap
 		} else {
 			// "_id" : ObjectId("5c2c3802a5cb26b9b78646c4")5c2b0551a5cb26b9b7cb05db否5c2a42e6a5cb26b9b763ba5a采购人：一、采购人5c2b06f5a5cb26b9b7cc4409
 			//成交供应商排名 [map[entname:昆明合优科技有限公司 sortstr:第一中标候选人 sort:1] map[sort:2 entname:昆明厚起科技有限公司 sortstr:第二中标候选人] map[entname:云南远安科技发展有限公司 sortstr:第三中标候选人 sort:3]]
-			//fmt.Println("err data:", key, val)
+			//qutil.Debug("err data:", key, val)
 		}
 	}
 }
@@ -3273,6 +3357,6 @@ func dealNumber(val ...string) ([]string, []string) {
 	return result, unitnameArr
 }
 
-func (tn *Table) analyProNameAndItemNumber(){
+func (tn *Table) analyProNameAndItemNumber() {
 
-}
+}

src/jy/pretreated/colonkv.go

@@ -18,7 +18,7 @@ var (
 	regReplKV2    = regexp.MustCompile("(.+?[\u4e00-\u9fa5)）][\\s\u3000\u2003\u00a0]*[:：].*[(（]?[^\r\n\\s\u3000\u2003\u00a0标段包]+?[)）]?)([一二三四五六七八九十]+[、.．][^一二三四五六七八九十]+?)")
 	regKV         = regexp.MustCompile("([\\p{Han}][^,，。、.;；\r\n]{1,30}?)[:：](.*)")
 	filterK       = regexp.MustCompile("[(（\\[【].*?[)）\\]】]|<[^>].+?>|[①②③￥·；;‘“'’”,*<>(（\\[【、)）/\\]】？?,。．\".\\s\u3000\u2003\u00a0]+|^[一二三四五六七八九十0-9１２３４５６７８９０]+")
-	filterValue   = regexp.MustCompile("^(无)$")
+	filterValue   = regexp.MustCompile("(^(无)$|.+%.*|[\r\n\\s\u3000\u2003\u00a0]+|^<.*>)")
 	regReplKey    = regexp.MustCompile("^(包(.+[A-Za-z\\d])?|本项目|推荐|的|本次)|([约为元万亿]+|[大小]写|人民币|[全名]称|姓名)$")
 	BlockTagMap   = map[string]bool{
 		"招标范围": true,

src/jy/pretreated/division.go

@@ -11,14 +11,14 @@ import (
 
 //分块、分段功能
 var (
-	regSerialTitles = []string{
+	/*regSerialTitles = []string{
 		"([一二三四五六七八九十]+)[\u3000\u2003\u00a0\\s]*[、．.:：，](.*)",
 		"[（(]([一二三四五六七八九十]+)[)）][\u3000\u2003\u00a0\\s]*[、．.:：]?(.*)",
 		"(\\d+)[\u3000\u2003\u00a0\\s]*、(.*)",
 		"(\\d+)[\u3000\u2003\u00a0\\s]*[.．]([^\\d][^\r\n]+)",
 		"(\\d+)[\u3000\u2003\u00a0\\s]+([^\\d][^\r\n]+)",
 		"1[.．](\\d+)[\u3000\u2003\u00a0\\s]+([^\\d.．][^\r\n]+)",
-	}
+	}*/
 	regSerialTitles_1 = []*regexp.Regexp{
 		regexp.MustCompile("([\r\n][\u3000\u2003\u00a0\\s]*|^[\u3000\u2003\u00a0\\s]*)([一二三四五六七八九十]+)[\u3000\u2003\u00a0\\s]*[、．.:：，](.*)"),
 		regexp.MustCompile("([\r\n][\u3000\u2003\u00a0\\s]*|^[\u3000\u2003\u00a0\\s]*)[（(]([一二三四五六七八九十]+)[)）][\u3000\u2003\u00a0\\s]*[、．.:：]?(.*)"),
@@ -64,7 +64,7 @@ var (
 )
 
 //分块
-func DivideBlock(content string, from int) ([]*util.Block, int) {
+func DivideBlock(content string, from int, ruleBlock *util.RuleBlock) ([]*util.Block, int) {
 	defer qutil.Catch()
 	returnValue := 0
 	var blocks []*util.Block
@@ -75,7 +75,13 @@ func DivideBlock(content string, from int) ([]*util.Block, int) {
 	//contentTemp := regReplAllTd.ReplaceAllString(content, "")
 	contentTemp := TextAfterRemoveTable(content)
 	tdIndexs := regReplAllTd.FindAllStringSubmatchIndex(content, -1)
-	regContenSerialTitle, regSerialTitleIndex := getSerialType(contentTemp)
+	var regContenSerialTitle *regexp.Regexp
+	var regSerialTitleIndex int
+	if ruleBlock!=nil && len(ruleBlock.BlockRegs)>0{
+		regContenSerialTitle, regSerialTitleIndex = getSerialType(contentTemp, ruleBlock.BlockRegs)
+	}else {
+		regContenSerialTitle, regSerialTitleIndex = getSerialType(contentTemp,  regSerialTitles_1)
+	}
 	//没有分块
 	if regSerialTitleIndex == -1 {
 		if len(contentTemp) == len(content) {
@@ -86,7 +92,12 @@ func DivideBlock(content string, from int) ([]*util.Block, int) {
 		}
 	}
 	//匹配序号和标题
-	regSerialTitle := regSerialTitles_2[regSerialTitleIndex]
+	var regSerialTitle *regexp.Regexp
+	if ruleBlock != nil && len(ruleBlock.TitleRegs)>0{
+		regSerialTitle = ruleBlock.TitleRegs[regSerialTitleIndex]
+	}else {
+		regSerialTitle = regSerialTitles_2[regSerialTitleIndex]
+	}
 	indexs := regContenSerialTitle.FindAllStringIndex(content, -1)
 	indexs = filterSerial(content, indexs, tdIndexs)
 	//头块
@@ -330,11 +341,11 @@ func filterSerial(content string, indexs, tdIndexs [][]int) [][]int {
 }
 
 //获取正文所用的序号类型
-func getSerialType(content string) (*regexp.Regexp, int) {
+func getSerialType(content string, blockRegs []*regexp.Regexp) (*regexp.Regexp, int) {
 	var regContenSerialTitle *regexp.Regexp
 	//先判断文章最外层使用的是哪种序号
 	contentStartIndex, regSerialTitleIndex := -1, -1
-	for k, v := range regSerialTitles_1 {
+	for k, v := range blockRegs {
 		indexs := v.FindStringIndex(content)
 		//只用最外层的序号，里面的过滤掉
 		if len(indexs) == 2 && !regSpliteSegment.MatchString(strings.TrimSpace(content[indexs[0]:indexs[1]])) && (contentStartIndex == -1 || indexs[0] < contentStartIndex) {
@@ -753,8 +764,8 @@ func interceptText(indexs []int, indexPkgMap map[int]string, pkgIndexMap map[str
 }
 
 //分块之后的kv
-func kvAfterDivideBlock(text string, from int) []*util.Kv {
-	blocks, _ := DivideBlock(text, from)
+func kvAfterDivideBlock(text string, from int, ruleBlock *util.RuleBlock) []*util.Kv {
+	blocks, _ := DivideBlock(text, from, ruleBlock)
 	kvs := []*util.Kv{}
 	for _, v := range blocks {
 		//util.Debug(v.Text)

src/jy/pretreated/tablev2.go

@@ -33,10 +33,11 @@ type TableResult struct {
 	HasKey         int                   //有key
 	HasBrand       int                   //有品牌
 	HasGoods       int                   //有商品
+	RuleBlock      *u.RuleBlock
 }
 
 //快速创建TableResult对象
-func NewTableResult(Id interface{}, Toptype, BlockTag, con string, Itype int) *TableResult {
+func NewTableResult(Id interface{}, Toptype, BlockTag, con string, Itype int, ruleBlock *u.RuleBlock) *TableResult {
 	return &TableResult{
 		Id:           Id,
 		Toptype:      Toptype,
@@ -48,6 +49,7 @@ func NewTableResult(Id interface{}, Toptype, BlockTag, con string, Itype int) *T
 		PackageMap:   NewSortMap(),
 		SortKV:       NewSortMap(),
 		SortKVWeight: map[string]int{},
+		RuleBlock:    ruleBlock,
 	}
 }
 
@@ -115,10 +117,11 @@ func NewTD(Goquery *goquery.Selection, tr *TR, table *Table) *TD {
 	ht := td.Goquery.ChildrenFiltered("table") //获取td的table
 	bsontable := false                         //默认td中没有table
 	txt := ""
+	//子table处理合并
 	if ht.Size() > 0 {
 		//qutil.Debug("有子表格")
 		txt = TextAfterRemoveTable(td.Html)
-		td.tdHasTable(&bsontable, tr) //处理td中的table，块标签处理，子表解析集处理
+		td.tdHasTable(&bsontable, tr, table) //处理td中的table，块标签处理，子表解析集处理
 	} else {
 		txt = strings.TrimSpace(td.Goquery.Text())
 	}
@@ -143,7 +146,7 @@ func NewTD(Goquery *goquery.Selection, tr *TR, table *Table) *TD {
 }
 
 //处理td中的table，块标签处理，子表解析集处理
-func (td *TD) tdHasTable(bsontable *bool, tr *TR) {
+func (td *TD) tdHasTable(bsontable *bool, tr *TR, table *Table) {
 	ts := td.TR.Table.TableResult
 	tabs, _ := ComputeConRatio(td.Html, 2) //计算表格占比
 	if len(tabs) > 0 {
@@ -169,59 +172,58 @@ func (td *TD) tdHasTable(bsontable *bool, tr *TR) {
 				}
 				stag = str
 			}
-		}
-		sonts := AnalyTableV2(tabs, ts.Toptype, stag, td.Html, 2, ts.Id) //又一次调用解析表格入口
-		td.BH = false
-
-		td.SonTableResult = sonts
-		//for _, k := range sonts.SortKV.Keys {
-		//u.Debug(k, sonts.SortKV.Map[k])
-		//				td.TR.Table.StandKV[k] = sonts.SortKV.Map[k].(string)
-		//				td.TR.Table.StandKVWeight[k] = sonts.SortKVWeight[k]
-		//}
-		//增加brand (子表)
-		//fmt.Println("sonsHasKey=============", sonts.HasKey)
-		//fmt.Println("sonsHasGoods========", sonts.HasGoods)
-		//fmt.Println("sonsHasBrand========", sonts.HasBrand)
-		if sonts.HasKey != 0 {
-			td.TR.Table.TableResult.HasKey = sonts.HasKey
-		}
-		if sonts.HasGoods != 0 {
-			td.TR.Table.TableResult.HasGoods = sonts.HasGoods
-		}
-		if sonts.HasBrand != 0 {
-			td.TR.Table.TableResult.HasBrand = sonts.HasBrand
-		}
-		if sonts.BrandData != nil && len(sonts.BrandData) > 0 { //子table
-			for _, v := range sonts.BrandData {
-				if len(v) > 0 {
-					td.TR.Table.TableResult.BrandData = append(td.TR.Table.TableResult.BrandData, v)
+			sonts := AnalyTableV2(tabs, ts.Toptype, stag, td.Html, 2, ts.Id, table.TableResult.RuleBlock) //又一次调用解析表格入口
+			td.BH = false
+			td.SonTableResult = sonts
+			//for _, k := range sonts.SortKV.Keys {
+			//u.Debug(k, sonts.SortKV.Map[k])
+			//				td.TR.Table.StandKV[k] = sonts.SortKV.Map[k].(string)
+			//				td.TR.Table.StandKVWeight[k] = sonts.SortKVWeight[k]
+			//}
+			//增加brand (子表)
+			//fmt.Println("sonsHasKey=============", sonts.HasKey)
+			//fmt.Println("sonsHasGoods========", sonts.HasGoods)
+			//fmt.Println("sonsHasBrand========", sonts.HasBrand)
+			if sonts.HasKey != 0 {
+				td.TR.Table.TableResult.HasKey = sonts.HasKey
+			}
+			if sonts.HasGoods != 0 {
+				td.TR.Table.TableResult.HasGoods = sonts.HasGoods
+			}
+			if sonts.HasBrand != 0 {
+				td.TR.Table.TableResult.HasBrand = sonts.HasBrand
+			}
+			if sonts.BrandData != nil && len(sonts.BrandData) > 0 { //子table
+				for _, v := range sonts.BrandData {
+					if len(v) > 0 {
+						td.TR.Table.TableResult.BrandData = append(td.TR.Table.TableResult.BrandData, v)
+					}
 				}
 			}
-		}
-		if sonts.WinnerOrder != nil && len(sonts.WinnerOrder) > 0 {
-			td.TR.Table.TableResult.WinnerOrder = sonts.WinnerOrder
-		}
-		if sonts.IsMultiPackage {
-			td.TR.Table.BPackage = true
-			tb1 := td.TR.Table.BlockPackage
-			for k, v := range sonts.PackageMap.Map {
-				v1 := v.(*u.BlockPackage)
-				if tb1.Map[k] == nil {
-					tb1.AddKey(k, v)
-				} else {
-					bp := tb1.Map[k].(*u.BlockPackage)
-					if bp != nil && v1.TableKV != nil && v1.TableKV.Kv != nil {
-						for k2, v2 := range v1.TableKV.Kv {
-							if bp.TableKV.Kv != nil && bp.TableKV.Kv[k2] == "" {
-								bp.TableKV.Kv[k2] = v2
-								bp.Text += fmt.Sprintf("%v:%v\n", k2, v2)
+			if sonts.WinnerOrder != nil && len(sonts.WinnerOrder) > 0 {
+				td.TR.Table.TableResult.WinnerOrder = sonts.WinnerOrder
+			}
+			if sonts.IsMultiPackage {
+				td.TR.Table.BPackage = true
+				tb1 := td.TR.Table.BlockPackage
+				for k, v := range sonts.PackageMap.Map {
+					v1 := v.(*u.BlockPackage)
+					if tb1.Map[k] == nil {
+						tb1.AddKey(k, v)
+					} else {
+						bp := tb1.Map[k].(*u.BlockPackage)
+						if bp != nil && v1.TableKV != nil && v1.TableKV.Kv != nil {
+							for k2, v2 := range v1.TableKV.Kv {
+								if bp.TableKV.Kv != nil && bp.TableKV.Kv[k2] == "" {
+									bp.TableKV.Kv[k2] = v2
+									bp.Text += fmt.Sprintf("%v:%v\n", k2, v2)
+								}
 							}
 						}
 					}
 				}
+				//u.Debug(fmt.Sprintf("%v", td.TR.Table.BlockPackage.Map["1"]))
 			}
-			//u.Debug(fmt.Sprintf("%v", td.TR.Table.BlockPackage.Map["1"]))
 		}
 	}
 }
@@ -235,14 +237,13 @@ func (td *TD) tdIsKey(tr *TR, table *Table, bsontable bool) {
 	//经过处理的td内容长度大于50
 	if lenval > 50 {
 		//看是否划块
-		ub, _ = DivideBlock(td.Text, 2) //对td的原始值
+		ub, _ = DivideBlock(td.Text, 2, nil) //对td的原始值
 		if len(ub) > 0 {
 			colonKvWeight := map[string]int{}
 			spaceKvWeight := map[string]int{}
 			for _, bl := range ub {
 				//冒号kv
 				for bl_ck, bl_cv := range bl.ColonKV.Kv {
-					//u.Debug(bl_ck, bl_cv)
 					if td.SortKV.Map[bl_ck] == nil || bl.ColonKV.KvTag[bl_ck].Weight >= colonKvWeight[bl_ck] {
 						colonKvWeight[bl_ck] = bl.ColonKV.KvTag[bl_ck].Weight
 						td.SortKV.AddKey(bl_ck, bl_cv)

src/jy/pretreated/winnerorder.go

@@ -24,19 +24,25 @@ type WinnerFlag struct {
 var (
 	winnerOrderEntity = &WinnerOrderEntity{}
 	numberReg         = regexp.MustCompile("[一二三四五六七八九十0-9]+")
+	numberReg2        = regexp.MustCompile("[\\d一二三四五六七八九十.,，]+")
 	thisNumberReg     = regexp.MustCompile("第" + numberReg.String())
 	winnerReg1        = regexp.MustCompile("(^|[^为])(【?(推荐)?第[一二三四五六七八九十1-9]+(合格|名|包|标段)?】?((候|侯)选)?(备选|成交|中(标|选))人?([(（]成交[）)])?((候|侯)选|排序)?(人(单位)?|供应商|单位|机构)(名称)?为?)($|[^，；;。,])")
 	winnerReg2        = regexp.MustCompile("(排名第[一二三四五六七八九十1-9]+|第[一二三四五六七八九十1-9]+(候|侯)选人)")
-	winnerReg3        = regexp.MustCompile("(第[一二三四五六七八九十1-9]+名)")
-	winnerReg4        = regexp.MustCompile("((确认|推荐|评审|排(名|序))[为:：]+|(由高到低排序前.名|公示下列内容|(确定|推荐)的?中(标|选)候选人|\n中(标|选)候选.{1,3}\\s*\n|\n(中(标|选)候选.{1,3}[:：\u3000\u2003\u00a0\\s]|成交候选供应商)|(排(名|序)|公(示|告)|具体|推荐|结果(公示)?|中(标|选)候选人.{0,2})如下|[一二三四五六七八九十\\d]+、(中(标|选)候选[^\n:：]{1,8}|.{0,8}(成交|结果)信息|成交[^\n:：]{2,8}))[为:：]?)")
-	winnerReg5        = regexp.MustCompile("([^，；;。,、\n]+)(为?第[一二三四五六七八九十1-9]+(成交|中标)?((候|侯)选(人|供应商|单位|机构)|名)|排名第[一二三四五六七八九十1-9]+)([，；;。,、]|\\s+\n)")
-	colonEndReg       = regexp.MustCompile("[:：]$")
-	toWarpReg         = regexp.MustCompile("[，。,;；]+")
-	findamountReg     = regexp.MustCompile("[，。,;；\u3000\u2003\u00a0\\s]+")
-	amountReg         = regexp.MustCompile("^\\d+(\\.\\d+)?((百|千)?元|(百|千)?(万|亿)元?)$")
-	companyWarpReg    = regexp.MustCompile("(公司)(.+?[:：])")
-	findCompanyReg    = regexp.MustCompile("[^:：]+公司")
-	colonSpaceReg     = regexp.MustCompile("[:：]\\s+")
+	//winnerReg2     = regexp.MustCompile("(第[一二三四五六七八九十1-9]+(候|侯)选人)")
+	winnerReg3     = regexp.MustCompile("(第[一二三四五六七八九十1-9]+名)")
+	winnerReg4     = regexp.MustCompile("((确认|推荐|评审|排(名|序))[为:：]+|(由高到低排序前.名|公示下列内容|(确定|推荐)的?中(标|选)候选人|\n中(标|选)候选.{1,3}\\s*\n|\n(中(标|选)候选.{1,3}[:：\u3000\u2003\u00a0\\s]|成交候选供应商)|(排(名|序)|公(示|告)|具体|推荐|结果(公示)?|中(标|选)候选人.{0,2})如下|[一二三四五六七八九十\\d]+、(中(标|选)候选[^\n:：]{1,8}|.{0,8}(成交|结果)信息|成交[^\n:：]{2,8}))[为:：]?)")
+	winnerReg5     = regexp.MustCompile("([^，；;。,、\n]+?)(为?)(第[一二三四五六七八九十1-9]+(成交|中标)?((候|侯)选(人|供应商|单位|机构)|名)|排名第[一二三四五六七八九十1-9]+)([，；;。,、]|\\s+\n)")
+	winnerReg6     = regexp.MustCompile("(^(排名)?第[一二三四五六七八九十1-9]+[名中标成交备选候选人单位供应商]*)")
+	colonEndReg    = regexp.MustCompile("[:：]$")
+	toWarpReg      = regexp.MustCompile("[，。,;；]+")
+	findamountReg  = regexp.MustCompile("[，。,;；\u3000\u2003\u00a0\\s]+")
+	amountReg      = regexp.MustCompile("^\\d+(\\.\\d+)?((百|千)?元|(百|千)?(万|亿)元?)$")
+	companyWarpReg = regexp.MustCompile("(公司)(.+?[:：])")
+	findCompanyReg = regexp.MustCompile("[^:：]+公司")
+	colonSpaceReg  = regexp.MustCompile("[:：]\\s+")
+	findCandidate  = regexp.MustCompile("(^.{5,}(公司|集团|单位|机构|企业|厂|场|院|所|店|中心|市|局|站|城|处|行|部|队|联合(会|体))|工作室)")
+	findCandidate2 = regexp.MustCompile("(^.{5,}(公司|集团|单位|机构|企业|厂|场|院|所|店|中心|市|局|站|城|处|行|部|队|联合(会|体)|工作室)$)")
+	clearSpace1    = regexp.MustCompile("([（(][\\d一二三四五六七八九十][)）][\\s\u3000\u2003\u00a0\\t]*|<[^>].+?>)")
 )
 
 /*
@@ -45,7 +51,17 @@ var (
  *from 来源
  */
 func (wo *WinnerOrderEntity) Find(text string, flag bool, from int) []map[string]interface{} {
-	text = winnerReg5.ReplaceAllString(text, "\n$2：$1\n")
+	text = winnerReg5.ReplaceAllString(text, "\n$3：$1\n")
+	/*
+		"_id" : ObjectId("5c2c6f60a5cb26b9b7b62cd8")
+
+		1 .第一中选候选人：
+		（1）	单位名称：成都维诺信科技有限公司
+		（2）	参选报价：522,00.00元
+		（3）	质量：符合比选文件规定的质量标准
+
+	*/
+	text = clearSpace1.ReplaceAllString(text, "") //清理（1）	单位名称：成都维诺信科技有限公司-->单位名称：成都维诺信科技有限公司
 	if strings.TrimSpace(text) == "" {
 		return []map[string]interface{}{}
 	}
@@ -192,6 +208,13 @@ func (wo *WinnerOrderEntity) findByReg(content string, blocks []string, reg_2 *r
 				winners = append(winners, object)
 				object = map[string]interface{}{}
 			}
+			//新加 从正文抽取时对v校验
+			if from == 1 || from == 3 {
+				v = findCandidate.FindString(v)
+				if v == "" {
+					continue
+				}
+			}
 			val := wo.clear("中标单位", v)
 			if val != nil {
 				count++
@@ -236,6 +259,8 @@ func (wo *WinnerOrderEntity) clear(typ, v string) interface{} {
 	if typ == "中标单位" && regDivision.MatchString(v) {
 		v = findCompanyReg.FindString(v)
 	}
+	v = filterValue.ReplaceAllString(v, "")
+	//过滤
 	return v //clear.ClearResult(typ, v)
 }
 

src/jy/util/article.go

@@ -1,30 +1,35 @@
 package util
 
+import (
+	"regexp"
+)
+
 //
 type Job struct {
-	SourceMid    string                            //数据源的MongoId
-	Category     string                            //类别
-	Content      string                            //正文
-	Title        string                            //标题
-	SpiderCode   string                            //爬虫代码
-	Domain       string                            //网站域名
-	Href         string                            //原文链接
-	City         string                            //城市
-	Province     string                            //省份
-	Data         *map[string]interface{}           //数据库源数据
-	Block        []*Block                          //分块
-	Result       map[string][]*ExtField            //结果
-	BuyerAddr    string                            //采购单位地址
-	BlockPackage map[string]*BlockPackage          //块中的分包
-	Winnerorder  []map[string]interface{}          //中标候选人排序
-	PackageInfo  map[string]map[string]interface{} //分包信息
-
-	BrandData [][]map[string]string //
-	HasTable  int                   //有table
-	HasKey    int                   //是否匹配到table中的标题
-	HasBrand  int                   //有品牌
-	HasGoods  int                   //有商品
-	IsFile    bool                  //有附件
+	SourceMid      string                            //数据源的MongoId
+	Category       string                            //类别
+	CategorySecond string                            //二级分类
+	Content        string                            //正文
+	Title          string                            //标题
+	SpiderCode     string                            //爬虫代码
+	Domain         string                            //网站域名
+	Href           string                            //原文链接
+	City           string                            //城市
+	Province       string                            //省份
+	Data           *map[string]interface{}           //数据库源数据
+	Block          []*Block                          //分块
+	Result         map[string][]*ExtField            //结果
+	BuyerAddr      string                            //采购单位地址
+	BlockPackage   map[string]*BlockPackage          //块中的分包
+	Winnerorder    []map[string]interface{}          //中标候选人排序
+	PackageInfo    map[string]map[string]interface{} //分包信息
+	RuleBlock      *RuleBlock                        //分块规则
+	BrandData      [][]map[string]string             //
+	HasTable       int                               //有table
+	HasKey         int                               //是否匹配到table中的标题
+	HasBrand       int                               //有品牌
+	HasGoods       int                               //有商品
+	IsFile         bool                              //有附件
 }
 
 type ExtField struct {
@@ -38,20 +43,27 @@ type ExtField struct {
 	Score     int         //得分
 }
 
+//分块规则
+type RuleBlock struct {
+	BlockRegs []*regexp.Regexp
+	TitleRegs []*regexp.Regexp
+}
+
 //块
 type Block struct {
-	Tags     []Tags          //对块做的标签，可以作为数据抽取的依据
-	Title    string          //块标题
-	Index    int             //块索引
-	Text     string          //块内容
-	Start    int             //开始索引
-	End      int             //结束索引
-	ColonKV  *JobKv          //冒号kv (分出的对应的KV值)
-	TableKV  *JobKv          //table kv (分出的对应的KV值)
-	SpaceKV  *JobKv          //空格 kv (分出的对应的KV值)
-	BPackage *BlockPackage   //分包信息
-	Tag      map[string]bool //块标签
-	Block    []*Block        //子块
+	Tags        []Tags                   //对块做的标签，可以作为数据抽取的依据
+	Title       string                   //块标题
+	Index       int                      //块索引
+	Text        string                   //块内容
+	Start       int                      //开始索引
+	End         int                      //结束索引
+	ColonKV     *JobKv                   //冒号kv (分出的对应的KV值)
+	TableKV     *JobKv                   //table kv (分出的对应的KV值)
+	SpaceKV     *JobKv                   //空格 kv (分出的对应的KV值)
+	BPackage    *BlockPackage            //分包信息
+	Tag         map[string]bool          //块标签
+	Block       []*Block                 //子块
+	Winnerorder []map[string]interface{} //块中，中标候选人排序
 }
 
 //段落

src/jy/util/config.go

@@ -12,9 +12,9 @@ import (
 var FormatTextMap map[string][]map[string]interface{}
 
 func init() {
-	loadFormatText()
+	//loadFormatText()
 	//LoadTagDb("./res/tagdb")
-	LoadTagDb("./res/blocktagdb")
+	//LoadTagDb("./res/blocktagdb")
 }
 
 //加载格式化正文配置

src/main_test.go

@@ -29,7 +29,7 @@ func Test_han(t *testing.T) {
 func Test_task(t *testing.T) {
 	Mgo = MgoFactory(1, 3, 120, "192.168.3.207:27082", "extract_kf")
 	//extract.StartExtractTaskId("5b8f804025e29a290415aee1")5c528686698414055c47b115
-	extract.StartExtractTestTask("5b8f804025e29a290415aee1", "5a53966e40d2d9bbe8f7d30a", "1", "mxs_v2", "mxs_v2")
+	extract.StartExtractTestTask("5cdd3025698414032c8322b1", "5c2b55f1a5cb26b9b7fac3c3", "1", "mxs_v2", "mxs_v2")
 	//extract.StartExtractTestTask("5c3d75c96984142998eb00e1", "5c2a3d28a5cb26b9b76144dd", "100", "mxs_v3", "mxs_v3")
 	time.Sleep(5 * time.Second)
 }
@@ -40,11 +40,11 @@ func Test_extractcity(t *testing.T) {
 	extract.FindBuyer()
 }
 func Test_reg(t *testing.T) {
-	context := `sfsa.`
-	reg := regexp.MustCompile(`(勘察|设计|设备|项目|标段|工程|监理|范围|分包|月|日|天|[,，\.。、：:“”‘’"])`)
-	//reg := regexp.MustCompile(`[\\p{Han}]`)
+	context := `sfsa发斯蒂芬.`
+	//reg := regexp.MustCompile(`(勘察|设计|设备|项目|标段|工程|监理|范围|分包|月|日|天|[,，\.。、：:“”‘’"])`)
+	reg := regexp.MustCompile(`[\\p{Han}]`)
 	tmp := reg.MatchString(context)
-	log.Println(tmp)
+	log.Println("--", tmp)
 }
 
 func Test_reg1(t *testing.T) {

src/res/tablev1.json

@@ -62,7 +62,7 @@
 		"其他投标人"
 	],
 	"bidorder":[
-		".{0,8}排[序名]$__sort",
-		"(人|供应商|单位)(名称)?$__entname"
+		"(.{0,8}排[序名]$|名次|^序号$)__sort",
+		"([^负责联系需求]+人|供应商|^单位)(名称)?$__entname"
 	]
 }

src/web/templates/admin/blockinfo.html

@@ -0,0 +1,190 @@
+{{template "inc"}}
+<!-- Main Header -->
+{{template "header"}}
+<!-- Left side column. 权限菜单 -->
+{{template "memu"}}
+
+<!-- Content Wrapper. Contains page content -->
+<div class="content-wrapper">
+	<section class="content-header">
+		<h1>
+			<small><a class="btn btn-primary opr" opr="new">新增规则</a></small>
+		</h1>
+		<ol class="breadcrumb">
+		  <li><a href="/admin/version"><i class="fa fa-dashboard"></i>抽取版本</a></li>
+		  <li class="active"><a href="/admin/version/blockinfo?vid={{.vid}}">分块配置</a></li>
+		</ol>
+    </section>
+  <!-- Main content -->
+  <section class="content">
+      <div class="row">
+	      <div class="col-xs-12">
+	        <div class="box">
+		        <div class="box-body">
+		            <table id="dataTable" class="table table-striped table-bordered table-hover">
+		              <thead>
+		              <tr>
+						<th>优先级</th>
+						<th>分块正则</th>
+						<th>块标题正则</th>
+						<th>操作</th>
+		              </tr>
+		              </thead>
+		            </table>
+					<p class="text-danger text-right">注：可拖拽调整优先级顺序</p>
+		        </div>
+	          <!-- /.box-body -->
+	        </div>
+        <!-- /.box -->
+		</div>
+	</div>
+  </section>
+</div>
+	
+<!-- footer -->
+{{template "dialog"}}
+{{template "footer"}}
+<link rel="stylesheet" href="https://cdn.datatables.net/rowreorder/1.2.5/css/rowReorder.bootstrap.min.css">
+<script src="https://cdn.datatables.net/rowreorder/1.2.5/js/dataTables.rowReorder.min.js"></script>
+<script>
+menuActive("version")
+$(function () {
+	ttable=$('#dataTable').DataTable({
+		"columnDefs": [
+			{
+				"targets": 0,
+				visible:true
+			},
+	        {
+	            "orderable": false,
+	            "targets": "_all"
+	        }
+		],
+		rowReorder: {
+			dataSrc: 'index',
+            selector: 'tr'
+        },
+		"order": [[ 0, 'desc' ]],
+		"paging"      : false,
+		"lengthChange": false,
+		"searching"   : false,
+		"info"        : true,
+		"autoWidth"   : false,
+		"language": {
+            "url": "/res/dist/js/dataTables.chinese.lang"
+        },
+		"ajax": {
+			"url": "/admin/version/blockinfo_list",
+			"type": "post",
+			"data":{"vid":{{ .vid}}}
+		},
+		"columns": [
+			{"data": "index","orderable": false},
+			{"data": "block_reg","width":"50%"},
+			{"data": "title_reg","width":"30%"},
+			{"data":"_id","width":"12%",render:function(val,a,row){
+				return '<a class="btn btn-sm btn-primary opr" opr="edit">编辑</a>&nbsp;<a class="btn btn-sm btn-danger" href="#" onclick="del(\''+val+'\')">删除</a>';
+			}}
+       	]
+	});
+	ttable.on('init.dt', function () {
+		$(".opr").click(function(){
+			var n=$(this).attr("opr")
+			var _tit="",htmlObj={},obj,tag=[]
+			switch(n){
+			case "edit":	
+                obj=ttable.row($(this).closest("tr")).data();
+			case "new":
+                tag=[
+						{label:"分块正则",s_label:"block_reg",type:"tpl_input",placeholder:"分块正则",must:true},
+						{label:"块标题正则",s_label:"title_reg",type:"tpl_input",placeholder:"块标题正则",must:true},
+                        {s_label:"_id",type:"tpl_hidden"},
+					]
+				
+				if(n=="new"){
+					_tit="新增规则"
+					obj={}
+				}else{
+					_tit="编辑规则"
+				}
+				htmlObj={
+					title:_tit,
+					tag:tag,
+					bts:[
+						{label:"保存",class:"btn-primary",
+							fun:function(){
+								var block_reg = $.trim($("#block_reg").val());
+								var title_reg = $.trim($("#title_reg").val());
+								var bcon=true;
+								if(block_reg==""||title_reg==""){
+									bcon=false;
+								}
+								if (bcon){
+									var obj={
+										_id:$("#_id").val(),
+										block_reg:block_reg,
+										title_reg:title_reg,
+										vid:{{.vid}}
+									}
+                                    //console.log(obj)							
+									$.post("/admin/version/blockinfo_save",obj,function(data){
+										if(data.status){
+											window.location.href="/admin/version/blockinfo?vid={{.vid}}";	
+										}else{
+											showTip("保存失败！",1000)
+										}
+									},'json')
+								}else{
+									alert("红色标签的表单不能为空！")
+								}
+							}
+						}
+					]
+				}
+			OpenDialog(htmlObj,obj)
+			break;
+			}
+		});
+	});
+	ttable.on( 'order.dt search.dt', function () {
+        ttable.column(0, {search:'applied', order:'applied'}).nodes().each( function (cell, i) {
+            cell.innerHTML = i+1;
+        } );
+    } ).draw();
+	ttable.on( 'row-reordered', function ( e, diff, edit ) {
+		var _ids = [],indexs=[];
+		for(var i=0;i<diff.length;i++){
+			var rowData = ttable.row( diff[i].node ).data();
+			_ids.push(rowData._id);
+			indexs.push(rowData.index);
+		}
+		ttable.rowReorder.disable();
+		$.ajax({
+			type: "POST",
+			url: "/admin/version/blockinfo_updateindex",
+			data: {_ids:_ids,indexs:indexs},
+			dataType: "json",
+			traditional: true,
+			success: function(r){
+				ttable.rowReorder.enable();
+			}
+		});
+    });
+})
+function del(_id){
+	showConfirm("确定删除?", function() {
+		$.ajax({
+			url:"/admin/version/blockinfo_delete",
+			type:"post",
+			data:{"_id":_id},
+			success:function(r){
+				if(r.status){				
+					ttable.ajax.reload();
+				}else{
+					showTip("删除失败", 1000, function() {});
+				}
+			}
+		})
+	});
+}
+</script>

src/web/templates/admin/class.html

@@ -0,0 +1,302 @@
+{{template "inc"}}
+<!-- Main Header -->
+{{template "header"}}
+<!-- Left side column. 权限菜单 -->
+{{template "memu"}}
+<head>
+    <style>
+
+        #selectclear2 select {
+            width:190px;
+            height:167px;
+            padding:5px;
+        }
+        #selectclear2{
+            display: flex;
+            flex-direction: row;
+        }
+        #selectclear2 .move{
+            display: flex;
+            flex-direction: column;
+            margin: 20px 25px
+        }
+        #selectclear2 .move button{
+            margin: 1px 0px;
+            padding: 4px 6px;
+        }
+        #selectclear2 .doublebox {
+            text-align:center;
+        }
+
+
+    </style>
+</head>
+
+<!-- Content Wrapper. Contains page content -->
+<div class="content-wrapper">
+    <section class="content-header">
+        <h1>
+            <small><button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modal-info" onclick="formReset()">新增分类抽取</button></small>
+        </h1>
+        <ol class="breadcrumb">
+            <li><a href="/admin/infotype"><i class="fa fa-dashboard"></i> 分类抽取</a></li>
+        </ol>
+    </section>
+    <!-- Main content -->
+    <section class="content">
+        <div class="row">
+            <div class="col-xs-12">
+                <div class="box">
+                    <div class="box-body">
+                        <table id="dataTable" class="table table-bordered table-hover">
+                            <thead>
+                            <tr>
+                                <th>一级分类</th>
+                                <th>二级分类</th>
+                                <th>操作</th>
+                            </tr>
+                            </thead>
+                        </table>
+                    </div>
+                    <!-- /.box-body -->
+                </div>
+                <!-- /.box -->
+            </div>
+        </div>
+    </section>
+</div>
+
+<div class="modal fade" id="modal-info">
+    <div class="modal-dialog">
+        <form id="userform" class="form-horizontal" role="form">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span></button>
+                    <h4 class="modal-title">分类信息</h4>
+                </div>
+                <div class="modal-body">
+                    <div class="form-group">
+                        <label for="code" class="col-sm-2 control-label" style="width:20% !important;">一级分类名称:</label>
+                        <div class="col-sm-10" style="width:80% !important;">
+                            <select id="topclass" name="topclass" class="form-control" onclick="topfunc()">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="code" class="col-sm-2 control-label" style="width:20% !important;">二级分类名称:</label>
+                        <div class="col-sm-10" style="width:80% !important;">
+                            <select id="subclass" name="subclass" class="form-control" >
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="code" class="col-sm-2 control-label" style="width:20% !important;">属性:</label>
+                        <div class="col-sm-10" id="selectclear2" style="width:75% !important;">
+                            <div class="doublebox">
+                                <select multiple="multiple" id="select3" style="overflow-x: scroll;"></select>
+                            </div>
+                            <div class="move" style="margin: 10px;">
+                                <button type="button" id="up2" class="btn btn-primary">上移</button>
+                                <button type="button" id="right2" class="btn btn-primary">右移</button>
+                                <button type="button" id="left2" class="btn btn-primary">左移</button>
+                                <button type="button" id="down2" class="btn btn-primary">下移</button>
+                            </div>
+                            <div class="doublebox">
+                                <select multiple="multiple" id="select4" style="overflow-x: scroll;"></select>
+                            </div>
+                        </div>
+                    </div>
+                    <!--<div class="form-group">
+                        <label for="modify" class="col-sm-2 control-label">二级菜单:</label>
+                        <div id="secondmenu" class="col-sm-10">
+                            <input type="button" value="+" onclick="append()"></input>
+                        </div>
+                    </div>-->
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal" onclick="formReset()">取消</button>
+                    <button type="button" class="btn btn-primary" onclick="save()">保存</button>
+                </div>
+            </div>
+            <!-- /.modal-content -->
+        </form>
+        <input type="hidden" id="_id">
+    </div>
+    <!-- /.modal-dialog -->
+</div>
+<!-- /.modal -->
+
+<!-- footer -->
+{{template "footer"}}
+
+<script>
+    menuActive("infotype")
+    $(function () {
+        ttable=$('#dataTable').DataTable({
+            "paging"      : true,
+            "lengthChange": false,
+            "searching"   : true,
+            "ordering"    : true,
+            "info"        : true,
+            "autoWidth"   : false,
+            "ajax": {
+                "url": "/admin/infotype/data",
+                "type": "post",
+                "data":{}
+            },
+            "language": {
+                "url": "/res/dist/js/dataTables.chinese.lang"
+            },
+            "columns": [
+                { "data": "topclass",render:function(val,a,row){
+                        return row.topclass}},
+                { "data": "subclass",render:function(val,a,row){
+                        return row.subclass}},
+                {"data":"_id",render:function(val,a,row){
+                        return "<a href='#' onclick='edit(\""+val+"\",\""+row.subclass+"\")'><i class='fa fa-fw fa-edit text-yellow'></i></a> &nbsp;"+
+                                "<a href='#' onclick='del(\""+val+"\",\""+row.subclass+"\")'><i class='fa fa-fw fa-trash text-red'></i></a>"
+                    }}
+            ]
+        });
+        //ttable.on('init.dt', function () {});
+    })
+
+    function save(){
+        _id=$("#_id").val()
+        topclass=$("#topclass").val()
+        var clearArr = [];
+        var clearArr2 = [];
+        $("#select4 option").each(function(i,val){
+            clearArr[i] = this.value
+        })
+        $("#select3 option").each(function(i,val){
+            clearArr2[i] = this.value
+        })
+        var subclass=$("#subclass").val()
+        var fields = JSON.stringify(clearArr)
+        var fields2 = JSON.stringify(clearArr2)
+        if(topclass == "" || clearArr.length==0){
+            alert("表单填写不完整！");
+            return false;
+        }
+        $.ajax({
+            url:"/admin/infotype/save",
+            type:"post",
+            data:{"topclass":topclass,"subclass":subclass,"fields":fields,"fields2":fields2,"_id":_id},
+            success:function(r){
+                if(r.rep){
+                    $("#userform")[0].reset();
+                    $("#modal-info").modal("hide");
+                    ttable.ajax.reload();
+                }else{
+                    alert("保存失败,可能是要添加的分类已存在");
+                }
+            }
+        })
+    }
+    function del(_id,subclass){
+        showConfirm("确定删除？", function() {
+            $.ajax({
+                url:"/admin/infotype/del",
+                type:"post",
+                data:{"_id":_id,"subclass":subclass},
+                success:function(r){
+                    if(r.rep){
+                        ttable.ajax.reload();
+                    }else{
+                        showTip("删除失败", 1000, function() {});
+                    }
+                }
+            })
+        });
+    }
+    function edit(_id,subclass){
+        $("#topclass").empty()
+        $("#subclass").empty()
+        $("#select3").empty();
+        $("#select4").empty();
+        $("#_id").val(_id)
+        console.log(_id,subclass)
+        $.ajax({
+            url:"/admin/infotype/select",
+            type:"post",
+            data:{"_id":_id,"subclass":subclass},
+            success:function(r){
+                console.log(r)
+                if(r){
+                    $("#topclass").append("<option value="+r.topclass+">"+r.topclass+"</option>")
+                    $("#topclass").attr("disabled",true);
+                    $("#subclass").append("<option value="+r.subclass+">"+r.subclass+"</option>")
+                    $("#subclass").attr("disabled",true);
+                    for(var a=0;a<r.fields.length;a++){
+                        $("#select4").append("<option  value='"+r.fields[a].s_field+"'>"+r.fields[a].s_name+"</option>");
+                    }
+                    for(var a=0;a<r.fields2.length;a++){
+                        $("#select3").append("<option  value='"+r.fields2[a].s_field+"'>"+r.fields2[a].s_name+"</option>");
+                    }
+                }
+            }
+        })
+        $("#modal-info").modal("show");
+    }
+    function topfunc() {
+        $("#subclass").empty()
+        var top=$("#topclass").val()
+        var topmap={"top":top}
+        $.post("/admin/subclass/data",topmap,function (data,status) {
+            if(data.length!=0){
+                for(var a=0;a<data.data.subclass.length;a++) {
+                    $("#subclass").append("<option value="+data.data.subclass[a]+">"+data.data.subclass[a]+"</option>")
+                }
+            }
+        })
+    }
+    function formReset(){
+        $("#_id").val("")
+        $("#topclass").empty()
+        $("#topclass").attr("disabled",false);
+        $("#subclass").empty()
+        $("#subclass").attr("disabled",false);
+        $("#select3").empty();
+        $("#select4").empty();
+        $.post("/admin/topclass/data",'',function (data,status) {
+            $("#topclass").append("<option value=''>--请选择--</option>")
+            for(var a=0;a<data.data.length;a++) {
+                $("#topclass").append("<option value="+data.data[a].topclass+">"+data.data[a].topclass+"</option>")
+            }
+        })
+        $.post("/admin/fields/data",'',function (data,status) {
+            for(var a=0;a<data.data.length;a++) {
+                $("#select3").append("<option value="+data.data[a].s_field+">"+data.data[a].s_name+"</option>")
+            }
+        })
+        $("#modal-info-addclear").modal("show");
+    }
+    $("#selectclear2 #right2").click(function(){
+        $("#select3 option:selected").appendTo("#select4");
+    });
+    //左移
+    $("#selectclear2 #left2").click(function(){
+        $("#select4 option:selected").appendTo("#select3");
+    });
+    $("#selectclear2 #up2,#selectclear2 #down2").click(function() {
+        var $opt = $("#select4 option:selected:first");
+        if (!$opt.length){
+            return;
+        }
+        if (this.id == "up2"){
+            $opt.prev().before($opt);
+        }else{
+            $opt.next().after($opt);
+        }
+    });
+    //双击右移
+    $("#selectclear2 #select3").dblclick(function(){
+        $("#selectclear2 #select3 option:selected").appendTo("#select4");
+    });
+    //双击左移
+    $("#selectclear2 #select4").dblclick(function(){
+        $("#selectclear2 #select4 option:selected").appendTo("#select3");
+    });
+</script>

src/web/templates/admin/secondmenu.html

@@ -86,7 +86,7 @@
 {{template "footer"}}
 
 <script>
-    menuActive("secondmenu")
+    menuActive("menu")
     $(function () {
         ttable=$('#dataTable').DataTable({
             "paging"      : true,

src/web/templates/admin/version.html

@@ -174,8 +174,9 @@ $(function () {
 			}},
 			{ "data":"_id","width":"25%",render:function(val,a,row){
 				return '<div class="btn-group">'+
-						'<a class="btn btn-sm btn-success" href="/admin/version/info?vid='+val+'" >属性配置</a>'+
-						'<a class="btn btn-sm btn-info" href="/admin/version/pkginfo?vid='+val+'" >分包配置</a>'+
+						'<a class="btn btn-sm btn-success" href="/admin/version/info?vid='+val+'" >属性</a>'+
+						'<a class="btn btn-sm btn-warning" href="/admin/version/blockinfo?vid='+val+'" >分块</a>'+
+						'<a class="btn btn-sm btn-info" href="/admin/version/pkginfo?vid='+val+'" >分包</a>'+
 						/*'<a class="btn btn-sm btn-primary opr" opr="edit">编&nbsp;&nbsp;辑1</a>'+*/
 						"<a class=\"btn btn-sm btn-primary opr\" href='#' onclick=\"edit('"+val+"')\">编&nbsp;&nbsp;辑</a> &nbsp;"+
 						'<a class="btn btn-sm btn-danger" href="#" onclick="del(\''+val+'\',\''+row["version"]+'\')">删&nbsp;&nbsp;除</a>'

udpprojectset/src/cleareids.go

@@ -7,7 +7,6 @@ import (
 	"qfw/util"
 	"qfw/util/redis"
 	"sync"
-	"time"
 
 	"github.com/robfig/cron"
 )
@@ -32,7 +31,7 @@ func clearedis() {
 
 func clearPKey() {
 	log.Println("开始清理")
-	nowtime := time.Now().Unix()
+	nowtime := currentMegerTime //time.Now().Unix() int64(1461204000)
 	wg := sync.WaitGroup{}
 	for _, pncb := range []*KeyMap{PNKey, PCKey, PBKey} {
 		wg.Add(1)
@@ -57,6 +56,7 @@ func clearPNCBKey(pncb *KeyMap, nowtime int64) {
 func clearIdsKeys(pKey *KeyMap, nowtime int64) []string {
 	defer util.Catch()
 	delkey := []string{}
+	pKey.Lock.Lock()
 	for k, ma := range pKey.Map {
 		ids := ma.Arr
 		delids := []interface{}{}
@@ -95,6 +95,7 @@ func clearIdsKeys(pKey *KeyMap, nowtime int64) []string {
 			}
 		}
 	}
+	pKey.Lock.Unlock()
 	return delkey
 }
 

udpprojectset/src/compare.go

@@ -1,13 +1,11 @@
 package main
 
 import (
-	"log"
 	"qfw/util"
 	"qfw/util/redis"
 	"regexp"
 	"sort"
 	"strings"
-	"sync"
 	"time"
 
 	"gopkg.in/mgo.v2/bson"
@@ -65,9 +63,8 @@ type CompareOne struct {
 }
 
 type CompareInfo struct {
-	Field string //对比属性 pn/pc/pb
-	Key   string //存放rediskey
-	//Pinfo  []ProjectInfo //存放redis对象
+	Field  string        //对比属性 pn/pc/pb
+	Key    string        //存放rediskey
 	Scores []*CompareOne //对比分值 pinfo索引对应分值
 	Bfind  bool          //是否查找到
 	IdArr  []string
@@ -88,110 +85,6 @@ func NewCompareInfo(field, key string, KeyMap *KeyMap) *CompareInfo {
 var numreg2 = regexp.MustCompile("^[0-9]+$")
 var TitleReg = regexp.MustCompile("([一二三四五六七八九十0-9A-Za-zⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩⅪⅫ、\\-~至]+(子|合同|分|施工|监理|标)?[包标段][号段]?[、]?)+|((子|合同|分|施工|监理|标)?[包标段][号段]?[一二三四五六七八九十0-9A-Za-zⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩⅪⅫ、\\-~至]+[、]?)+|(子|合同|分|施工|监理|标)?[包标段][号段]?[a-zA-Z0-9]+[\\-~－至、](子|合同|分|施工|监理|标)?[包标段][号段]?[a-zA-Z0-9]+")
 
-//对比打分程序
-func Compare(tmp map[string]interface{} /*新信息*/, pici int64) (sflag string) {
-	defer util.Catch()
-	thisinfo := PreThisInfo(tmp) //信息预处理
-	if thisinfo == nil {
-		return
-	}
-	var PN, PC, PB *CompareInfo
-	new_pn, _ := handleprojectname(thisinfo.ProjectName, thisinfo.Buyer, thisinfo.TopType) //作为判断依据
-	if thisinfo.ProjectName != "" {
-		KEY := "pn_" + new_pn
-		PN = NewCompareInfo("pn", KEY, PNKey)
-	}
-	if len(thisinfo.ProjectCode) > 5 && !numreg.MatchString(thisinfo.ProjectCode) { //大于5且不是纯数字bfind
-		KEY := "pc_" + thisinfo.ProjectCode
-		PC = NewCompareInfo("pc", KEY, PCKey)
-	}
-	if len([]rune(thisinfo.Buyer)) > 4 {
-		KEY := "pb_" + thisinfo.Buyer
-		PB = NewCompareInfo("pb", KEY, PBKey)
-	}
-	repeatId := map[string]bool{}
-	IdLock.Lock()
-	//此处加id锁，会引进多线程的死锁，对比三个大map数组，找到key相同的项目id数组,并去重
-	for _, PNCB := range []*CompareInfo{PN, PC, PB} {
-		if PNCB != nil {
-			PNCB.KeyMap.Lock.Lock()
-			K := PNCB.KeyMap.Map[PNCB.Key]
-			if K == nil {
-				K = &Key{&[]string{}, &sync.Mutex{}}
-				PNCB.KeyMap.Map[PNCB.Key] = K
-			}
-			PNCB.K = K
-			PNCB.K.Lock.Lock()
-			PNCB.KeyMap.Lock.Unlock()
-			defer PNCB.K.Lock.Unlock()
-			newarr := []string{}
-			for _, id := range *K.Arr {
-				if !repeatId[id] {
-					newarr = append(newarr, id)
-					repeatId[id] = true
-				}
-			}
-			PNCB.IdArr = newarr
-		}
-	}
-	IdLock.Unlock()
-	updateid, ncid := "", ""
-	tmpArr := []*CompareOne{}
-	//三个对比对象分别和thisinfo比较，打完分的对象放入scores，合并放入tempArr
-	for _, PNCB := range []*CompareInfo{PN, PC, PB} {
-		if PNCB != nil {
-			if len(PNCB.IdArr) > 0 {
-				//PNCB.compute(thisinfo, PNCB.IdArr)
-				ncid = PNCB.ProcessInfo(new_pn, tmp, pici, thisinfo)
-				tmpArr = append(tmpArr, PNCB.Scores...)
-			}
-		}
-	}
-	if ncid == "" {
-		//排序取出最大分值的对象，更新对象
-		if len(tmpArr) > 0 {
-			sort.Slice(tmpArr, func(i, j int) bool {
-				return tmpArr[i].Score > tmpArr[j].Score
-			})
-			max := tmpArr[0]
-			if max.Score > 0 {
-				//获取到对象
-				max.Parent.Bfind = true
-				tmp["cresult"] = max.Cresult
-				updateid = updateinfo(thisinfo, tmp, max.Pinfo, pici)
-				//log.Println("更新项目", updateid)
-			}
-		}
-		if updateid == "" {
-			sflag = "normal"
-			updateid = InsertProject(new_pn, tmp, nil, pici, thisinfo)
-			p1 := NewPinfo(updateid, thisinfo)
-			redis.PutCKV(REDISIDS, updateid, p1)
-			//log.Println("生成项目", updateid)
-		} else {
-			sflag = "repeat"
-		}
-		//更新redis中存入的三大map对象中的id
-		if updateid != "" {
-			PUT := []interface{}{}
-			for _, PNCB := range []*CompareInfo{PN, PC, PB} {
-				if PNCB != nil && !PNCB.Bfind {
-					if BinarySearch(*PNCB.K.Arr, updateid) == -1 {
-						*(PNCB.K.Arr) = append(*(PNCB.K.Arr), updateid)
-						PUT = append(PUT, []interface{}{PNCB.Key, *(PNCB.K.Arr)})
-					}
-				}
-			}
-			if len(PUT) > 0 {
-				redis.BulkPut(REDISKEYS, 0, PUT...)
-			}
-		}
-	} else {
-		log.Println("无效项目", ncid)
-	}
-	return
-}
-
 //没有在redis中查找到，新增项目
 func InsertProject(new_pn string, tmp, mess map[string]interface{}, pici int64, thisinfo *Info) string {
 	e := InitEL("")
@@ -225,14 +118,8 @@ func InsertProject(new_pn string, tmp, mess map[string]interface{}, pici int64,
 		set["winnerorder"] = thisinfo.Winnerorder
 	}
 	s_subscopeclass := strings.Join(thisinfo.Subscopeclass, ",")
-	//	if len(s_subscopeclass) > 0 {
-	//		s_subscopeclass = "," + s_subscopeclass + ","
-	//	}
 	set["s_subscopeclass"] = s_subscopeclass
 	s_winner := strings.Join(thisinfo.Winners, ",")
-	//	if len(s_winner) > 0 {
-	//		s_winner = "," + s_winner + ","
-	//	}
 	set["s_winner"] = s_winner
 	if tmp["package"] != nil {
 		set["package"] = tmp["package"] //没定义优先级
@@ -246,7 +133,7 @@ func InsertProject(new_pn string, tmp, mess map[string]interface{}, pici int64,
 	set["list"] = []bson.M{
 		push,
 	}
-	if mess != nil { //不参与对比项目标识
+	if mess != nil { //项目标识
 		for k, v := range mess {
 			set[k] = v
 		}
@@ -509,144 +396,6 @@ func EqInfoUpdate(thisinfo *Info, pInfo *ProjectInfo) {
 	//return pInfo
 }
 
-/**
-func (com *CompareInfo) compute(thisinfo *Info, ids []string) {
-	//根据 com的key到redis中查找对应的值（如：项目名称的key为"pn_某某项目",值为一维对象数组 即:[]ProjectInfo）
-	//这些信息id上面已经加过锁
-	defer util.Catch()
-	res := redis.Mget(REDISIDS, ids)
-	//redis.GetInterface("other", com.Key, &com.Pinfo)
-	//redispush := false
-	if len(res) > 0 { //找到项目名称、项目编号或采购单位相同时
-		for _, b1 := range res { //遍历对象数组
-			if b1 != nil {
-				var info ProjectInfo
-				err := json.Unmarshal(b1.([]byte), &info)
-				if err != nil {
-					log.Println(err)
-				}
-				cone := &CompareOne{
-					Parent: com,
-					Pinfo:  &info,
-				}
-				if com.Field != "pn" { //比较字段不是项目名称时，对项目名称要素的打分逻辑
-					//新信息和对比信息的项目名称长度都大于5时
-					if len([]rune(thisinfo.ProjectName)) > 5 && len([]rune(info.ProjectName)) > 5 {
-						if thisinfo.ProjectName == info.ProjectName { //绝对相等加5分
-							cone.ProjectNameType = 1
-							cone.Score += 5
-						} else if strings.Index(info.ProjectName, thisinfo.ProjectName) > -1 || strings.Index(thisinfo.ProjectName, info.ProjectName) > -1 { //包含或被包含关系不加分不减分
-							cone.ProjectNameType = 2
-							//cone.Score += 3
-						} else { //不相等且不包含减5分
-							cone.ProjectNameType = 3
-							cone.Score -= 10
-						}
-					}
-				}
-				if com.Field != "pc" { //比较字段不是项目编号时，对项目编号要素的打分逻辑
-					//新信息和对比信息和项目编号长度大于5
-					if len(thisinfo.ProjectCode) > 5 && len(info.ProjectCode) > 5 {
-						if thisinfo.ProjectCode == info.ProjectCode { //项目编号相等加5分
-							cone.ProjectCodeType = 1
-							cone.Score += 5
-						} else if strings.Index(info.ProjectCode, thisinfo.ProjectCode) > -1 || strings.Index(thisinfo.ProjectCode, info.ProjectCode) > -1 { //包含或被包含关系加3分
-							cone.ProjectCodeType = 2
-							cone.Score += 3
-						} else {
-							//不相等减5分
-							cone.ProjectCodeType = 3
-							cone.Score -= 5
-							if len(thisinfo.ProjectCode) == len(info.ProjectCode) { //值不相等但长度相等减20分
-								cone.Score -= 20
-							}
-						}
-					}
-				}
-				if com.Field != "pb" { //比较字段不是采购单位时，对采购单位要素的打分逻辑
-					//采购单位大于4个字时做比较
-					if len(thisinfo.Buyer) > 12 && len(info.Buyer) > 12 {
-						if thisinfo.Buyer == info.Buyer { //相等加5分
-							cone.BuyerType = 1
-							cone.Score += 5
-						} else if strings.Index(thisinfo.Buyer, info.Buyer) > -1 || strings.Index(info.Buyer, thisinfo.Buyer) > -1 { //包含与被包含加3分
-							cone.BuyerType = 2
-							cone.Score += 3
-						} else { //不相等减5分
-							cone.BuyerType = 3
-							cone.Score -= 5
-						}
-					}
-				}
-				//对发布时间打分，两者信息发布时间在120天以内加2分
-				if math.Abs(float64(thisinfo.Publishtime-info.Publistime[0])) < 120*86400 && math.Abs(float64(thisinfo.Publishtime-info.Publistime[len(info.Publistime)-1])) < 120*86400 {
-					cone.PublistimeType = 1
-					//cone.Score += 2
-				} else { //发布时间相差超过120天减5分
-					cone.PublistimeType = 2
-					cone.Score -= 5
-				}
-
-				//对招标机构进行打分
-				//招标机构长度大于4分字时做比较
-				if len(thisinfo.Agency) > 12 && len(info.Agency) > 12 {
-					if thisinfo.Agency == info.Agency { //相等加3分
-						cone.AgencyType = 1
-						cone.Score += 3
-					} else if strings.Index(thisinfo.Agency, info.Agency) > -1 || strings.Index(info.Agency, thisinfo.Agency) > -1 { //包含关系不加分
-						cone.AgencyType = 2
-					} else { //不相等减5分
-						cone.AgencyType = 3
-						cone.Score -= 5
-					}
-				}
-				//对地区进行打分，地区都不为空，且范围都不是全国时做比较
-				if thisinfo.Area != "" && info.Area != "" && thisinfo.Area != "A" && thisinfo.Area != "全国" && info.Area != "A" && info.Area != "全国" {
-					if thisinfo.Area == info.Area { //地区相同不加分
-						cone.AreaType = 1
-					} else { //地区不同减5分
-						cone.AreaType = 2
-						cone.Score -= 5
-					}
-				}
-				//分包类型相同时
-				if thisinfo.HasPackage == info.HasPackage {
-					if thisinfo.HasPackage {
-						cone.PackageType = 1
-					} else { //都不是多包
-						cone.PackageType = 2
-					}
-					//都是分包或都不是分包加4分
-					cone.Score += 4
-				} else { //分包不一致时
-					if thisinfo.TopType == "招标" { //新信息类型为招标时
-						if thisinfo.HasPackage && len(thisinfo.Package) == 1 { //当前信息是招标类，且是一个包，对比信息不是分包，认为它们都不是分包，加2分
-							cone.PackageType = 3
-							cone.Score += 2
-						} else if !thisinfo.HasPackage { //当前信息不是分包，合并信息是分包（要从标题中查找），不加分不减分
-							cone.PackageType = 31
-						} else { //当前信息是分包，合并信息不是分包，不加减分
-							cone.PackageType = 32
-						}
-					} else if thisinfo.TopType == "结果" { //新信息类型为结果时
-						if thisinfo.HasPackage && len(thisinfo.Package) == 1 { //从标题中查找有没有分包 ，当前信息结果类是一个分包，合并信息不是分包，加2分
-							cone.PackageType = 4
-							cone.Score += 2
-						} else if !thisinfo.HasPackage { //当前信息是结果，不是分包，而合并信息是分包，不加分
-							cone.PackageType = 41
-						} else {
-							cone.PackageType = 42 //当前信息是分包，而合并信息不是分包，不加减分
-						}
-					}
-				}
-				//cone.Pos = k
-				//放入打分数组中
-				com.Scores = append(com.Scores, cone)
-			}
-		}
-	}
-}
-**/
 //二分字符串查找
 func BinarySearch(s []string, k string) int {
 	sort.Strings(s)

udpprojectset/src/config.json

@@ -1,22 +1,30 @@
 {
     "mongodbServers": "192.168.3.207:27082",
-    "mongodbPoolSize": 100,
-    "mongodbName": "qfw",
+    "mongodbPoolSize": 10,
+    "mongodbName": "extract_v3",
     "jkmail": {
-        "to": "renzheng@topnet.net.cn",
+        "to": "zhangjinkun@topnet.net.cn",
         "api": "http://10.171.112.160:19281/_send/_mail"
     },
-    "thread": 300,
-    "extractColl": "extract_v2.0",
+    "thread": 1,
+    "extractColl": "bidding20190521",
     "projectColl": "projectset",
     "lenprojectname": 18,
-    "redisPoolSize": 300,
-    "redisaddrs": "ids=192.168.3.207:3379,keys=192.168.3.207:3378,info=192.168.3.207:3378",
+    "redisPoolSize": 60,
+    "redisaddrs": "ids=192.168.3.18:3379,keys=192.168.3.18:3379,info=192.168.3.18:3379",
     "clearedis": {
         "open": true,
         "clearcron": "0 10 15 ? * 4",
         "projectcycle": 180
     },
+    "megerfields": {
+        "projectlen": 5,
+        "projectcodelen": 8
+    },
+    "taskstock": {
+        "open": true,
+        "endate": "2019-06-30"
+    },
     "udpport": ":1482",
     "nextNode": [
         {

udpprojectset/src/fulldata.go

@@ -0,0 +1,204 @@
+package main
+
+import (
+	"log"
+	"strings"
+
+	"qfw/util"
+	"qfw/util/mongodb"
+
+	"qfw/util/redis"
+	"sync"
+	"time"
+)
+
+var FullCount = 0
+
+func RunFullData() {
+	defer util.Catch()
+	var wg = sync.WaitGroup{}
+	startTime := int64(1325347200) //2012-01-01
+	ps := 3
+	pool := make(chan *task, ps)
+	day := 0
+	endChan := make(chan bool, 1)
+	go func() {
+		now := time.Now().Unix()
+		bComplete := false
+		for {
+			if startTime > now || bComplete {
+				log.Println("任务结束")
+				endChan <- true
+				break
+			}
+			endTime := startTime + 86400
+			q := map[string]interface{}{
+				"publishtime": map[string]interface{}{
+					"$gt":  startTime,
+					"$lte": endTime,
+				},
+			}
+
+			//数据正序处理
+			sess := MQFW.GetMgoConn()
+			var result []map[string]interface{}
+			sess.DB(MQFW.DbName).C(extractColl).Find(q).All(&result)
+			MQFW.DestoryMongoConn(sess)
+			pool <- &task{result}
+			wg.Add(1)
+			startTime = endTime
+			day++
+			log.Println("day====", day)
+			if day > 0 && day%ps == 0 {
+				wg.Wait()
+				MQFW.Destory()
+				MQFW = mongodb.MongodbSim{
+					MongodbAddr: Sysconfig["mongodbServers"].(string),
+					Size:        2 * ps,
+					DbName:      Sysconfig["mongodbName"].(string),
+				}
+				MQFW.InitPool()
+			}
+
+		}
+	}()
+
+	for {
+		select {
+		case t := <-pool:
+			t.query()
+			t.result = nil
+			t = nil
+			wg.Done()
+		case <-endChan:
+			return
+		}
+	}
+
+}
+
+type task struct {
+	result []map[string]interface{}
+}
+
+func (t *task) query() {
+	index := 0
+	wg := &sync.WaitGroup{}
+	for _, tmp := range t.result {
+		if index%10000 == 0 {
+			log.Println(index, tmp["_id"])
+		}
+		index++
+		if util.IntAll(tmp["repeat"]) == 1 {
+			continue
+		}
+		pt := util.Int64All(tmp["publishtime"])
+		if pt > currentMegerTime {
+			currentMegerTime = pt
+		}
+		currentMegerCount++
+		if currentMegerCount > 300000 {
+			log.Println("执行清理", currentMegerTime)
+			clearPKey()
+			currentMegerCount = 0
+		}
+		wg.Add(1)
+		MultiThread <- true
+		go func(tmp map[string]interface{}) {
+			defer func() {
+				<-MultiThread
+				wg.Done()
+			}()
+			thisid := util.BsonIdToSId(tmp["_id"])
+			info := PreThisInfo(tmp)
+			if info != nil {
+				lockPNCBMap(info)
+				startProjectMerge(info, tmp)
+				redis.Put(INFOID, thisid, 1, INFOTIMEOUT)
+				currentMegerTime = info.Publishtime
+				unlockPNCBMap(info)
+			}
+		}(tmp)
+	}
+	wg.Wait()
+	FullCount += index
+
+	log.Println("currentFull", FullCount)
+
+}
+
+//获取对比项目数组
+func getComeperProjects2(p PCBV, thisinfo *Info) (res []interface{}, pncb []*CompareInfo) {
+	newarr := []string{}
+	repeatId := map[string]bool{}
+	if p.PnameLen > 0 {
+		pn := NewCompareInfo("pn", thisinfo.PNKey, PNKey)
+		pncb = append(pncb, pn)
+		thisinfo.AllRelatePNKeyMap = map[string]*Key{}
+		pn.KeyMap.Lock.Lock()
+		for k, v := range pn.KeyMap.Map {
+			if strings.Contains(k, pn.Key) || strings.Contains(pn.Key, k) {
+				thisinfo.AllRelatePNKeyMap[k] = v
+				for _, id := range *v.Arr {
+					if !repeatId[id] {
+						newarr = append(newarr, id)
+						repeatId[id] = true
+					}
+				}
+			}
+		}
+		if thisinfo.AllRelatePNKeyMap[pn.Key] == nil {
+			K := &Key{&[]string{}, &sync.Mutex{}}
+			thisinfo.AllRelatePNKeyMap[pn.Key] = K
+			pn.KeyMap.Map[pn.Key] = K
+		}
+		pn.KeyMap.Lock.Unlock()
+	}
+	if p.PcodeLen > 0 {
+		pc := NewCompareInfo("pc", thisinfo.PCKey, PCKey)
+		pncb = append(pncb, pc)
+		thisinfo.AllRelatePCKeyMap = map[string]*Key{}
+		pc.KeyMap.Lock.Lock()
+		for k, v := range pc.KeyMap.Map {
+			if strings.Contains(k, pc.Key) || strings.Contains(pc.Key, k) {
+				thisinfo.AllRelatePCKeyMap[k] = v
+				for _, id := range *v.Arr {
+					if !repeatId[id] {
+						newarr = append(newarr, id)
+						repeatId[id] = true
+					}
+				}
+			}
+		}
+		if thisinfo.AllRelatePCKeyMap[pc.Key] == nil {
+			K := &Key{&[]string{}, &sync.Mutex{}}
+			thisinfo.AllRelatePCKeyMap[pc.Key] = K
+			pc.KeyMap.Map[pc.Key] = K
+		}
+		pc.KeyMap.Lock.Unlock()
+	}
+
+	if p.BuyerLen > 0 {
+		pb := NewCompareInfo("pb", thisinfo.PBKey, PBKey)
+		pncb = append(pncb, pb)
+		pb.KeyMap.Lock.Lock()
+		K := pb.KeyMap.Map[pb.Key]
+		if K == nil {
+			K = &Key{&[]string{}, &sync.Mutex{}}
+			pb.KeyMap.Map[pb.Key] = K
+		} else {
+			for _, id := range *K.Arr {
+				if !repeatId[id] {
+					newarr = append(newarr, id)
+					repeatId[id] = true
+				}
+			}
+		}
+		pb.KeyMap.Lock.Unlock()
+	}
+
+	if len(newarr) > 0 {
+		res = redis.Mget(REDISIDS, newarr)
+	}
+	return
+}

udpprojectset/src/main.go

@@ -3,12 +3,10 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	du "jy/util"
 	"log"
-	//"math"
 	mu "mfw/util"
 	"net"
-	//"os"
-	du "jy/util"
 	"qfw/util"
 	"qfw/util/mongodb"
 	"qfw/util/redis"
@@ -18,12 +16,13 @@ import (
 	"gopkg.in/mgo.v2/bson"
 )
 
-/*
-从extract_result表中抽到projectset表中，根据3选2判断是不是同一条信息，抽取信息至少有两个字段。
-可以使用redis
-//对时间的判断
-*/
-var MultiThread chan bool
+const (
+	REDISIDS    = "ids"
+	REDISKEYS   = "keys"
+	INFOID      = "info"
+	INFOTIMEOUT = 86400 * 30
+)
+
 var (
 	Sysconfig                map[string]interface{}
 	MQFW                     mongodb.MongodbSim
@@ -32,15 +31,40 @@ var (
 	udpclient                mu.UdpClient             //udp对象
 	nextNode                 []map[string]interface{} //下节点数组
 	toaddr                   = []*net.UDPAddr{}       //下节点对象
-)
+	MultiThread              chan bool
+	SingleThread             = make(chan bool, 1) //udp调用
+	IdLock                   = &sync.Mutex{}
+	PncbMayLock              = &sync.Mutex{}
+	MegerFieldsLen           *MegerFields
+	//三组lock,对应的（PNKey）key为项目名称,值对应的是此项目名称对应的项目id数组
+	PNKey, PCKey, PBKey          = NewKeyMap(), NewKeyMap(), NewKeyMap()
+	PNKeyMap, PCKeyMap, PBKeyMap = sync.Map{}, sync.Map{}, sync.Map{}
 
-const (
-	REDISIDS    = "ids"
-	REDISKEYS   = "keys"
-	INFOID      = "info"
-	INFOTIMEOUT = 86400 * 30
+	currentMegerTime  int64 //合并项目的时间位置，用来清理几个月之前的项目
+	currentMegerCount int   //合并项目的计数，用来定时清理
 )
 
+type MegerFields struct {
+	ProjectNamelen int
+	ProjectCodelen int
+}
+
+type KeyMap struct {
+	Lock sync.Mutex
+	Map  map[string]*Key
+}
+
+type Key struct {
+	Arr  *[]string
+	Lock *sync.Mutex
+}
+
+func NewKeyMap() *KeyMap {
+	return &KeyMap{
+		Map: map[string]*Key{},
+	}
+}
+
 func init() {
 	initarea()
 	du.SetConsole(false)
@@ -49,6 +73,11 @@ func init() {
 	util.ReadConfig(&Sysconfig)
 	MultiThread = make(chan bool, util.IntAllDef(Sysconfig["thread"], 200))
 	lenprojectname = util.IntAllDef(Sysconfig["lenprojectname"], 20) - 1
+	megerfields, _ := Sysconfig["megerfields"].(map[string]interface{})
+	MegerFieldsLen = &MegerFields{
+		ProjectNamelen: util.IntAllDef(megerfields["projectlen"], 5),
+		ProjectCodelen: util.IntAllDef(megerfields["projectcodelen"], 8),
+	}
 	redis.InitRedisBySize(Sysconfig["redisaddrs"].(string), util.IntAllDef(Sysconfig["redisPoolSize"], 100), 30, 300)
 	MQFW = mongodb.MongodbSim{
 		MongodbAddr: Sysconfig["mongodbServers"].(string),
@@ -67,29 +96,6 @@ func init() {
 	}
 }
 
-type KeyMap struct {
-	Lock sync.Mutex
-	Map  map[string]*Key
-}
-
-type Key struct {
-	Arr  *[]string
-	Lock *sync.Mutex
-}
-
-func NewKeyMap() *KeyMap {
-	//k:=&Key{[]string{}}
-	return &KeyMap{
-		Map: map[string]*Key{},
-	}
-}
-
-//三组lock,对应的（PNKey）key为项目名称,值对应的是此项目名称对应的项目id数组
-var PNKey, PCKey, PBKey = NewKeyMap(), NewKeyMap(), NewKeyMap()
-
-//id-lock
-var IdLock = &sync.Mutex{}
-
 func main() {
 	go checkMapJob()
 	//先加载所有锁
@@ -99,8 +105,7 @@ func main() {
 	for pos, key := range []string{"pn_*", "pc_*", "pb_*"} {
 		res := redis.GetKeysByPattern(REDISKEYS, key)
 		pk := km[pos]
-		if res != nil {
-			//一次500条
+		if res != nil { //一次500条
 			num := 0
 			arr := []string{}
 			for _, v := range res {
@@ -141,6 +146,12 @@ func main() {
 	log.Println("load data from redis finished.", n)
 	//清理redis
 	//clearedis()
+	if taskstock, ok := Sysconfig["taskstock"].(map[string]interface{}); ok { //跑存量数据
+		if b, _ := taskstock["open"].(bool); b {
+			endate, _ := taskstock["endate"].(string)
+			taskStock(endate)
+		}
+	}
 	updport := Sysconfig["udpport"].(string)
 	udpclient = mu.UdpClient{Local: updport, BufSize: 1024}
 	udpclient.Listen(processUdpMsg)
@@ -163,7 +174,7 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
 			}
 			go udpclient.WriteUdp([]byte(key), mu.OP_NOOP, ra)
 			SingleThread <- true
-			go task(data, mapInfo)
+			go taskInc(mapInfo)
 		}
 	case mu.OP_NOOP: //下个节点回应
 		ok := string(data)
@@ -174,9 +185,7 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
 	}
 }
 
-var SingleThread = make(chan bool, 1)
-
-func task(data []byte, mapInfo map[string]interface{}) {
+func taskInc(mapInfo map[string]interface{}) {
 	defer func() {
 		<-SingleThread
 	}()
@@ -193,17 +202,12 @@ func task(data []byte, mapInfo map[string]interface{}) {
 	sess := MQFW.GetMgoConn()
 	defer MQFW.DestoryMongoConn(sess)
 	//数据正序处理
-	it := sess.DB(MQFW.DbName).C(extractColl).Find(&q).Iter() //.Sort("publishtime")
+	it := sess.DB(MQFW.DbName).C(extractColl).Find(map[string]interface{}{}).Sort("publishtime").Iter()
 	count, index := 0, 0
 	pici := time.Now().Unix()
-	//log.Println(q, MQFW.DbName, extractColl)
 	wg := &sync.WaitGroup{}
-	idmap := &sync.Map{}
+	//idmap := &sync.Map{}
 	for tmp := make(map[string]interface{}); it.Next(tmp); {
-		//		if util.IntAll(tmp["extracttype"]) == -1 {
-		//			tmp = make(map[string]interface{})
-		//			continue
-		//		}
 		if index%10000 == 0 {
 			log.Println(index, tmp["_id"])
 		}
@@ -212,26 +216,40 @@ func task(data []byte, mapInfo map[string]interface{}) {
 			tmp = make(map[string]interface{})
 			continue
 		}
+		pt := util.Int64All(tmp["publishtime"])
+		if pt > currentMegerTime {
+			currentMegerTime = pt
+		}
 		count++
+
+		currentMegerCount++
+		if currentMegerCount > 300000 {
+			time.Sleep(100 * time.Millisecond)
+			clearPKey()
+		}
 		thisid := util.BsonIdToSId(tmp["_id"])
 		b, err := redis.Exists(INFOID, thisid)
 		if err != nil {
 			log.Println("checkid err", err.Error())
 		}
-		if !b { // && util.IntAll(tmp["infoformat"]) < 2 && tmp["detail"] != nil {
-			//增加判重逻辑,重复id不再生成
+		if !b {
 			wg.Add(1)
-			idmap.Store(tmp["_id"], true)
+			//idmap.Store(tmp["_id"], true) //增加判重逻辑,重复id不再生成
 			MultiThread <- true
 			go func(tmp map[string]interface{}, thisid string) {
 				defer func() {
 					<-MultiThread
 					wg.Done()
-					idmap.Delete(tmp["_id"])
+					//idmap.Delete(tmp["_id"])
 				}()
-				sflag := Compare(tmp, pici)
-				redis.Put(INFOID, thisid, 1, INFOTIMEOUT)
-				go IS.Add(sflag)
+				info := PreThisInfo(tmp)
+				if info != nil {
+					lockPNCBMap(info)
+					startProjectMerge(info, tmp)
+					redis.Put(INFOID, thisid, 1, INFOTIMEOUT)
+					currentMegerTime = info.Publishtime
+					unlockPNCBMap(info)
+				}
 			}(tmp, thisid)
 		}
 		if count%500 == 0 {
@@ -239,18 +257,18 @@ func task(data []byte, mapInfo map[string]interface{}) {
 		}
 		tmp = make(map[string]interface{})
 	}
-	for {
-		time.Sleep(5 * time.Second)
-		n := 0
-		idmap.Range(func(key interface{}, v interface{}) bool {
-			n++
-			log.Println(key, v)
-			return true
-		})
-		if n < 1 {
-			break
-		}
-	}
+	//	for {
+	//		time.Sleep(5 * time.Second)
+	//		n := 0
+	//		idmap.Range(func(key interface{}, v interface{}) bool {
+	//			n++
+	//			log.Println(key, v)
+	//			return true
+	//		})
+	//		if n < 1 {
+	//			break
+	//		}
+	//	}
 	wg.Wait()
 	log.Println("task over...", index, count)
 	//发送udp,调用生成项目索引
@@ -270,6 +288,112 @@ func task(data []byte, mapInfo map[string]interface{}) {
 	}
 }
 
+func taskStock(endDate string) {
+	defer func() {
+		<-SingleThread
+	}()
+	defer util.Catch()
+	publishtimes := []map[string]interface{}{}
+	start, _ := time.ParseInLocation(util.Date_Short_Layout, "2015-11-01", time.Local)
+	end, _ := time.ParseInLocation(util.Date_Short_Layout, endDate, time.Local)
+	for {
+		publishtime := map[string]interface{}{
+			"date":  start.Format(util.Date_Short_Layout),
+			"stime": start.Unix(),
+			"etime": start.Add(24 * time.Hour).Unix(),
+		}
+		publishtimes = append(publishtimes, publishtime)
+		start = start.Add(24 * time.Hour)
+		if start.Unix() > end.Unix() {
+			break
+		}
+	}
+	sess := MQFW.GetMgoConn()
+	defer MQFW.DestoryMongoConn(sess)
+	wg := &sync.WaitGroup{}
+	idmap := &sync.Map{}
+	count, index := 0, 0
+	for _, v := range publishtimes {
+		q := map[string]interface{}{
+			"publishtime": map[string]interface{}{
+				"$gt":  util.Int64All(v["stime"]),
+				"$lte": util.Int64All(v["etime"]),
+			},
+		}
+		log.Println(q)
+		//数据正序处理
+		it := sess.DB(MQFW.DbName).C(extractColl).Find(&q).Sort("publishtime").Iter()
+		datenum := 0
+		for tmp := make(map[string]interface{}); it.Next(tmp); {
+			if index%10000 == 0 {
+				log.Println(index, tmp["_id"])
+			}
+			index++
+			datenum++
+			if util.IntAll(tmp["repeat"]) == 1 {
+				tmp = make(map[string]interface{})
+				continue
+			}
+			pt := util.Int64All(tmp["publishtime"])
+			if pt > currentMegerTime {
+				currentMegerTime = pt
+			}
+			count++
+			currentMegerCount++
+			if currentMegerCount > 300000 {
+				log.Println("执行清理", currentMegerTime)
+				time.Sleep(1 * time.Second)
+				clearPKey()
+				currentMegerCount = 0
+			}
+			thisid := util.BsonIdToSId(tmp["_id"])
+			b, err := redis.Exists(INFOID, thisid)
+			if err != nil {
+				log.Println("checkid err", err.Error())
+			}
+			if !b {
+				wg.Add(1)
+				idmap.Store(tmp["_id"], true) //增加判重逻辑,重复id不再生成
+				MultiThread <- true
+				go func(tmp map[string]interface{}, thisid string) {
+					defer func() {
+						<-MultiThread
+						wg.Done()
+						idmap.Delete(tmp["_id"])
+					}()
+					info := PreThisInfo(tmp)
+					if info != nil {
+						lockPNCBMap(info)
+						startProjectMerge(info, tmp)
+						redis.Put(INFOID, thisid, 1, INFOTIMEOUT)
+						currentMegerTime = info.Publishtime
+						unlockPNCBMap(info)
+					}
+				}(tmp, thisid)
+			}
+			if count%1000 == 0 {
+				log.Println("count:", count)
+			}
+			tmp = make(map[string]interface{})
+		}
+		log.Println(v["date"], datenum)
+	}
+	for {
+		time.Sleep(5 * time.Second)
+		n := 0
+		idmap.Range(func(key interface{}, v interface{}) bool {
+			n++
+			log.Println(key, v)
+			return true
+		})
+		if n < 1 {
+			break
+		}
+	}
+	wg.Wait()
+	log.Println("taskStock over...", index, count)
+}
+
 func NewPushInfo(tmp map[string]interface{}) bson.M {
 	return bson.M{
 		"comeintime":  tmp["comeintime"],
@@ -282,6 +406,8 @@ func NewPushInfo(tmp map[string]interface{}) bson.M {
 		"href":        tmp["href"],
 		"area":        tmp["area"],
 		"city":        tmp["city"],
-		"cresult":     tmp["cresult"],
+
+		"cresult": tmp["cresult"],
+		"score":   tmp["score"],
 	}
 }

udpprojectset/src/projectmeger.go

@@ -0,0 +1,600 @@
+// projectmeger
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	du "jy/util"
+	"log"
+	qu "qfw/util"
+	"qfw/util/redis"
+	"sort"
+	"strings"
+	"sync"
+	"time"
+)
+
+//有效值三选一、三选二
+var ThreeToTow, ThreeToOne map[string]bool
+
+func init() {
+	ThreeToTow = map[string]bool{}
+	ThreeToOne = map[string]bool{
+		"AAA": true,
+		"AAB": true,
+	}
+	tows := [][][]string{
+		[][]string{
+			[]string{"A", "B"},
+			[]string{"A", "B"},
+			[]string{"A", "B"},
+		},
+		[][]string{
+			[]string{"A", "B"},
+			[]string{"D", "E"},
+			[]string{"A", "B"},
+		},
+		[][]string{
+			[]string{"A", "B"},
+			[]string{"A", "B"},
+			[]string{"D", "E"},
+		},
+		[][]string{
+			[]string{"D", "E"},
+			[]string{"A", "B"},
+			[]string{"A", "B"},
+		},
+	}
+	for _, tow := range tows {
+		for _, v1 := range tow[0] {
+			for _, v2 := range tow[1] {
+				for _, v3 := range tow[2] {
+					key := fmt.Sprintf("%s%s%s", v1, v2, v3)
+					ThreeToTow[key] = true
+				}
+			}
+		}
+	}
+}
+
+func startProjectMerge(thisinfo *Info, tmp map[string]interface{}) {
+	bNormalScore := false
+	pcbv := PCBVal(tmp)
+	if checkInfoAlter(tmp) { //进入变更信息流程
+		if pcbv.Val > 1 { //判断三项至少包含两项
+			bNormalScore = true
+		} else {
+			extInfoTag("invalid", qu.BsonIdToSId(tmp["_id"])) //无效信息，打标记
+			//go IS.Add("invalid")                              //数据统计使用
+			return
+		}
+	} else {
+		bNormalScore = true
+	}
+	//合并流程
+	if bNormalScore {
+		PNKeyMap.Store(thisinfo.PNKey, true)
+		PBKeyMap.Store(thisinfo.PBKey, true)
+		PCKeyMap.Store(thisinfo.PCKey, true)
+		if pcbv.Buyer { //有采购单位
+			hasBuyer(pcbv, thisinfo, tmp)
+		} else { //无采购单位
+			noBuyer(pcbv, thisinfo, tmp)
+		}
+	}
+}
+
+//判断信息是否是变更
+func checkInfoAlter(tmp map[string]interface{} /*新信息*/) bool {
+	toptype := qu.ObjToString(tmp["toptype"])
+	subtype := qu.ObjToString(tmp["subtype"])
+	title := qu.ObjToString(tmp["title"])
+	if subtype == "变更" || strings.Index(title, "变更公告") > -1 || strings.Index(title, "更正公告") > -1 {
+		//当信息类型是变更或标题中含变更时
+		if toptype == "招标" {
+			//招标的变更公告，不作处理
+		} else if toptype == "结果" {
+			subtype = "变更"
+		}
+	}
+	return subtype == "变更"
+}
+
+//有采购单位
+func hasBuyer(p PCBV, thisinfo *Info, tmp map[string]interface{}) {
+	var pncb []*CompareInfo
+	var res []interface{}
+	sflag := ""
+	pici := time.Now().Unix()
+	if p.Pname || p.Pcode { //有项目名称或项目编号
+		//获取对比项目数组
+		res, pncb = getComeperProjects(p, thisinfo)
+		//三选二打分
+		scores := score3Select2(p, thisinfo, tmp, res, pncb)
+		//项目合并
+		sflag = mergeProject(tmp, thisinfo, scores, pncb)
+	} else {
+		//生成项目，不参与后续对比
+		sflag = "alone"
+		mess := map[string]interface{}{
+			"meger_mess":  "有采购单位,不满足三选二",
+			"meger_sflag": sflag,
+		}
+		newProject(tmp, mess, pici, thisinfo)
+	}
+	extInfoTag(sflag, thisinfo.Id)
+	go IS.Add(sflag) //数据统计使用
+}
+
+//无采购单位
+func noBuyer(p PCBV, thisinfo *Info, tmp map[string]interface{}) {
+	var pncb []*CompareInfo
+	var res []interface{}
+	sflag := ""
+	pici := time.Now().Unix()
+	if p.Pname { //有项目名称
+		//获取对比项目数组
+		res, pncb = getComeperProjects(p, thisinfo)
+		if p.Pcode { //有项目编号
+			//三选二打分
+			scores := score3Select2(p, thisinfo, tmp, res, pncb)
+			//项目合并
+			sflag = mergeProject(tmp, thisinfo, scores, pncb)
+		} else { //无项目编号
+			if p.PnameLen > MegerFieldsLen.ProjectNamelen {
+				//三选一打分
+				scores := score3Select1(p, thisinfo, tmp, res, pncb)
+				//项目合并
+				sflag = mergeProject(tmp, thisinfo, scores, pncb)
+			} else {
+				//生成项目，不参与后续对比
+				sflag = "alone"
+				mess := map[string]interface{}{
+					"meger_mess":  "无采购单位,不满足三选一",
+					"meger_sflag": sflag,
+				}
+				newProject(tmp, mess, pici, thisinfo)
+			}
+		}
+	} else { //无项目名称
+		if p.Pcode {
+			//获取对比项目数组
+			res, pncb = getComeperProjects(p, thisinfo)
+			if p.PcodeLen > MegerFieldsLen.ProjectCodelen {
+				if p.Area && p.City && p.Agency { //有省市代理机构
+					//三选一打分
+					scores := score3Select1(p, thisinfo, tmp, res, pncb)
+					//项目合并
+					sflag = mergeProject(tmp, thisinfo, scores, pncb)
+				} else {
+					//生成项目，不参与后续对比
+					sflag = "alone"
+					mess := map[string]interface{}{
+						"meger_mess":  "无采购单位,不满足三选一",
+						"meger_sflag": sflag,
+					}
+					newProject(tmp, mess, pici, thisinfo)
+				}
+			} else {
+				//生成项目，不参与后续对比
+				sflag = "alone"
+				mess := map[string]interface{}{
+					"meger_mess":  "无采购单位,不满足三选一",
+					"meger_sflag": sflag,
+				}
+				newProject(tmp, mess, pici, thisinfo)
+			}
+		} else {
+			//信息无效,打标记
+			sflag = "invalid"
+		}
+	}
+	//extInfoTag(sflag, thisinfo.Id)
+	//go IS.Add(sflag) //数据统计使用
+}
+
+//3选2打分
+func score3Select2(p PCBV, thisinfo *Info, tmp map[string]interface{}, res []interface{}, pncb []*CompareInfo) (scores []*CompareOne) {
+	defer qu.Catch()
+	if len(res) > 0 {
+		//对比打分
+		for k, tmps := range res { //遍历对象数组
+			if tmp, ok := tmps.([]interface{}); ok {
+				for _, b1 := range tmp {
+					if b1 != nil {
+						var info ProjectInfo
+						err := json.Unmarshal(b1.([]byte), &info)
+						if err != nil {
+							log.Println(err)
+						}
+						cone := &CompareOne{
+							Parent: pncb[k],
+							Pinfo:  &info,
+						}
+						cone.BuyerType, cone.Score = fieldPCBScore(thisinfo.Buyer, info.Buyer, cone.BuyerType, cone.Score)
+						if p.Buyer {
+							cone.ProjectNameType, cone.Score = fieldPCBScore(thisinfo.ProjectName, info.ProjectName, cone.ProjectNameType, cone.Score)
+							cone.ProjectCodeType, cone.Score = fieldPCBScore(thisinfo.ProjectCode, info.ProjectCode, cone.ProjectCodeType, cone.Score)
+						} else { //无采购单位，打分考虑长度
+							if len([]rune(thisinfo.ProjectName)) > MegerFieldsLen.ProjectNamelen {
+								cone.ProjectNameType, cone.Score = fieldPCBScore(thisinfo.ProjectName, info.ProjectName, cone.ProjectNameType, cone.Score)
+							} else {
+								cone.ProjectNameType = "D"
+							}
+							if len(thisinfo.ProjectCode) > MegerFieldsLen.ProjectCodelen {
+								cone.ProjectCodeType, cone.Score = fieldPCBScore(thisinfo.ProjectCode, info.ProjectCode, cone.ProjectCodeType, cone.Score)
+							} else {
+								cone.ProjectCodeType = "D"
+							}
+						}
+						//省市打分
+						if thisinfo.Area != "A" && thisinfo.Area != "全国" && info.Area != "A" && info.Area != "全国" {
+							if thisinfo.Area == info.Area && thisinfo.City == info.City {
+								cone.Score += 2
+							} else {
+								cone.Score -= 1
+							}
+						} else {
+							cone.Score += 1
+						}
+						//代理机构打分
+						if len([]rune(info.Agency)) > 0 {
+							if thisinfo.Agency == info.Agency { //A
+								cone.Score += 2
+							} else if strings.Index(info.Agency, thisinfo.Agency) > -1 || strings.Index(thisinfo.Agency, info.Agency) > -1 { //B
+								cone.Score += 1
+							} else {
+								if len(thisinfo.Agency) < 1 { //E
+									cone.Score -= 1
+								} else { //C
+									cone.Score -= 2
+								}
+							}
+						} else { //D不计分
+							//
+						}
+						skey := fmt.Sprintf("%s%s%s", cone.BuyerType, cone.ProjectNameType, cone.ProjectCodeType)
+						cone.Cresult = skey
+						if ThreeToTow[skey] {
+							scores = append(scores, cone)
+						}
+					}
+				}
+			}
+		}
+	}
+	return
+}
+
+//3选1打分
+func score3Select1(p PCBV, thisinfo *Info, tmp map[string]interface{}, res []interface{}, pncb []*CompareInfo) (scores []*CompareOne) {
+	defer qu.Catch()
+	//对比打分
+	if len(res) > 0 { //找到项目名称、项目编号或采购单位相同时
+		for k, tmps := range res { //遍历对象数组
+			if tmp, ok := tmps.([]interface{}); ok {
+				for _, b1 := range tmp {
+					if b1 != nil {
+						var info ProjectInfo
+						err := json.Unmarshal(b1.([]byte), &info)
+						if err != nil {
+							log.Println(err)
+						}
+						cone := &CompareOne{
+							Parent: pncb[k],
+							Pinfo:  &info,
+						}
+						if pncb[k].Field == "pn" { //比较字段项目名称
+							if len(info.ProjectName) > 0 {
+								if thisinfo.ProjectName == info.ProjectName { //A
+									cone.Score += 2
+									cone.ProjectNameType = "A"
+								} else if strings.Index(info.ProjectName, thisinfo.ProjectName) > -1 || strings.Index(thisinfo.ProjectName, info.ProjectName) > -1 { //B
+									cone.Score += 1
+									cone.ProjectNameType = "B"
+								} else { //C
+									cone.Score -= 2
+									cone.ProjectNameType = "C"
+								}
+							} else { //D不计分
+								cone.ProjectNameType = "D"
+							}
+						}
+						if pncb[k].Field == "pc" { //比较字段项目编号
+							if len(info.ProjectCode) > 0 {
+								if thisinfo.ProjectCode == info.ProjectCode { //A
+									cone.Score += 2
+									cone.ProjectCodeType = "A"
+								} else if strings.Index(info.ProjectCode, thisinfo.ProjectCode) > -1 || strings.Index(thisinfo.ProjectCode, info.ProjectCode) > -1 { //B
+									cone.Score += 1
+									cone.ProjectCodeType = "B"
+								} else { //C
+									cone.Score -= 2
+									cone.ProjectCodeType = "C"
+								}
+							} else { //D不计分
+								cone.ProjectCodeType = "D"
+							}
+						}
+						if thisinfo.Area != "A" && thisinfo.Area != "全国" && info.Area != "A" && info.Area != "全国" {
+							if thisinfo.Area == info.Area && thisinfo.City == info.City {
+								cone.Score += 2
+								cone.AreaType = "A"
+							} else {
+								cone.Score -= 1
+								cone.AreaType = "C"
+							}
+						} else {
+							cone.Score += 1
+							cone.AreaType = "B"
+						}
+						if len([]rune(info.Agency)) > 0 {
+							if thisinfo.Agency == info.Agency { //A
+								cone.Score += 2
+								cone.AgencyType = "A"
+							} else if strings.Index(info.Agency, thisinfo.Agency) > -1 || strings.Index(thisinfo.Agency, info.Agency) > -1 { //B
+								cone.Score += 1
+								cone.AgencyType = "B"
+							} else {
+								if len(thisinfo.Agency) < 1 { //E
+									cone.Score -= 1
+									cone.AgencyType = "E"
+								} else { //C
+									cone.Score -= 2
+									cone.AgencyType = "C"
+								}
+							}
+						} else { //D不计分
+							cone.AgencyType = "D"
+						}
+						skey := fmt.Sprintf("%s%s%s", cone.BuyerType, cone.ProjectNameType, cone.ProjectCodeType)
+						cone.Cresult = skey
+						if ThreeToOne[skey] {
+							scores = append(scores, cone)
+						}
+					}
+				}
+			}
+		}
+	}
+	return
+}
+
+//获取对比项目数组
+func getComeperProjects(p PCBV, thisinfo *Info) (res []interface{}, pncb []*CompareInfo) {
+	if p.PnameLen > 0 {
+		pn := NewCompareInfo("pn", thisinfo.PNKey, PNKey)
+		pncb = append(pncb, pn)
+	}
+	if p.PcodeLen > 0 {
+		pc := NewCompareInfo("pc", thisinfo.PCKey, PCKey)
+		pncb = append(pncb, pc)
+	}
+	if p.BuyerLen > 0 {
+		pb := NewCompareInfo("pb", thisinfo.PBKey, PBKey)
+		pncb = append(pncb, pb)
+	}
+	repeatId := map[string]bool{}
+	IdLock.Lock() //此处加id锁，会引进多线程的死锁，对比三个大map数组，找到key相同的项目id数组,并去重
+	for _, pv := range pncb {
+		if pv != nil {
+			pv.KeyMap.Lock.Lock()
+			K := pv.KeyMap.Map[pv.Key]
+			if K == nil {
+				K = &Key{&[]string{}, &sync.Mutex{}}
+				pv.KeyMap.Map[pv.Key] = K
+			}
+			pv.K = K
+			pv.K.Lock.Lock()
+			pv.KeyMap.Lock.Unlock()
+			defer pv.K.Lock.Unlock()
+			newarr := []string{}
+			for _, id := range *K.Arr {
+				if !repeatId[id] {
+					newarr = append(newarr, id)
+					repeatId[id] = true
+				}
+			}
+			pv.IdArr = newarr
+		}
+	}
+	IdLock.Unlock()
+	for _, pv := range pncb {
+		if len(pv.IdArr) > 0 {
+			res = append(res, redis.Mget(REDISIDS, pv.IdArr))
+		}
+	}
+	return
+}
+
+//合并项目
+func mergeProject(tmp map[string]interface{}, thisinfo *Info, scores []*CompareOne, pncb []*CompareInfo) (sflag string) {
+	var id = ""
+	//分值排序
+	sort.Slice(scores, func(i, j int) bool {
+		return scores[i].Score > scores[j].Score
+	})
+	if len(scores) > 0 {
+		//分值排序
+		sort.Slice(scores, func(i, j int) bool {
+			return scores[i].Score > scores[j].Score
+		})
+		max := scores[0]
+		if max.Score > 0 {
+			sflag = "repeat"
+			max.Parent.Bfind = true
+			tmp["cresult"] = max.Cresult
+			tmp["score"] = max.Score
+			id = updateinfo(thisinfo, tmp, max.Pinfo, time.Now().Unix())
+			//log.Println(sflag, id, max.Cresult)
+			if len(scores) > 1 && (scores[0].Score == scores[1].Score) {
+				//通知检查,异常数据存库
+				checkNotice(thisinfo.Id, id, scores)
+			}
+		} else {
+			sflag = "invalidscore"
+		}
+	} else {
+		//生成项目
+		sflag = "normal"
+		mess := map[string]interface{}{
+			"meger_sflag": sflag,
+		}
+		id = newProject(tmp, mess, time.Now().Unix(), thisinfo)
+	}
+	if id != "" { //更新REDISKEYS redis
+		put := []interface{}{}
+		for _, pv := range pncb {
+			if pv != nil && !pv.Bfind {
+				if BinarySearch(*pv.K.Arr, id) == -1 {
+					*(pv.K.Arr) = append(*(pv.K.Arr), id)
+					put = append(put, []interface{}{pv.Key, *(pv.K.Arr)})
+				}
+			}
+		}
+		if len(put) > 0 {
+			redis.BulkPut(REDISKEYS, 0, put...)
+		}
+	}
+	return sflag
+}
+
+//新增项目
+func newProject(tmp, mess map[string]interface{}, pipc int64, thisinfo *Info) (id string) {
+	id = InsertProject(thisinfo.NewPNKey, tmp, mess, pipc, thisinfo)
+	sflag := qu.ObjToString(mess["meger_sflag"])
+	if sflag != "alone" {
+		p1 := NewPinfo(id, thisinfo)
+		redis.PutCKV(REDISIDS, id, p1)
+	} else {
+		du.Debug("新增项目，不参与对比", id)
+	}
+	return id
+}
+
+//抽取信息打标记
+func extInfoTag(sflag, id string) {
+	MQFW.UpdateById(extractColl, id,
+		map[string]interface{}{
+			"$set": map[string]interface{}{
+				"meger_sflag": sflag,
+			},
+		})
+}
+
+//检查通知
+func checkNotice(infoid, pid string, scores []*CompareOne) {
+	MQFW.Update("project_unusual", `{"project_id":"`+pid+`"}`,
+		map[string]interface{}{
+			"$set": map[string]interface{}{
+				"project_id": pid,
+				"pici":       time.Now().Unix(),
+			},
+			"$push": map[string]interface{}{
+				"list": map[string]interface{}{
+					"infoid": infoid,
+					"pinfo1": scores[0].Pinfo.Id,
+					"pinfo2": scores[1].Pinfo.Id,
+				},
+			},
+		}, true, false)
+	du.Debug("通知检查,异常数据存库", infoid, pid)
+}
+
+//属性判断组
+func PCBVal(tmp map[string]interface{}) PCBV {
+	pcbv := PCBV{}
+	projectName := qu.ObjToString(tmp["projectname"])
+	if len([]rune(projectName)) > 1 {
+		pcbv.Val += 1
+		pcbv.Pname = true
+		pcbv.PnameLen = len([]rune(projectName))
+	}
+	projectCode := qu.ObjToString(tmp["projectcode"])
+	if len([]rune(projectCode)) > 1 {
+		pcbv.Val += 1
+		pcbv.Pcode = true
+		pcbv.PcodeLen = len(projectCode)
+	}
+	buyer := qu.ObjToString(tmp["buyer"])
+	if len([]rune(buyer)) > 1 {
+		pcbv.Val += 1
+		pcbv.Buyer = true
+		pcbv.BuyerLen = len([]rune(buyer))
+	}
+	//省市代理机构
+	if qu.ObjToString(tmp["area"]) != "" {
+		pcbv.Area = true
+	}
+	if qu.ObjToString(tmp["city"]) != "" {
+		pcbv.City = true
+	}
+	if qu.ObjToString(tmp["agency"]) != "" {
+		pcbv.Agency = true
+	}
+	return pcbv
+}
+
+//项目名称、项目编号、采购单位打分
+func fieldPCBScore(this, info, ctype string, score int) (string, int) {
+	if len(info) > 0 {
+		if this == info { //A
+			score += 5
+			ctype = "A"
+		} else if strings.Index(info, this) > -1 || strings.Index(this, info) > -1 { //B
+			score += 2
+			ctype = "B"
+		} else {
+			if len(this) < 1 { //E
+				score -= 1
+				ctype = "E"
+			} else { //C
+				score -= 2
+				ctype = "C"
+			}
+		}
+	} else { //D不计分
+		ctype = "D"
+	}
+	return ctype, score
+}
+
+//pncbMap加锁
+func lockPNCBMap(thisinfo *Info) {
+	for { //等待其他任务完成
+		ok := true
+		if len(thisinfo.PNKey) > 3 {
+			if _, b := PNKeyMap.Load(thisinfo.PNKey); b {
+				ok = false
+			}
+		}
+		if len(thisinfo.PCKey) > 3 {
+			if _, b := PCKeyMap.Load(thisinfo.PCKey); b {
+				ok = false
+			}
+		}
+		if len(thisinfo.PBKey) > 3 {
+			if _, b := PBKeyMap.Load(thisinfo.PBKey); b {
+				ok = false
+			}
+		}
+		if ok {
+			break
+		} else {
+			time.Sleep(100 * time.Millisecond)
+		}
+	}
+}
+
+//pncbMap解锁
+func unlockPNCBMap(thisinfo *Info) {
+	//if len(thisinfo.PNKey) > 3 {
+	PNKeyMap.Delete(thisinfo.PNKey)
+	//}
+	//if len(thisinfo.PCKey) > 3 {
+	PCKeyMap.Delete(thisinfo.PCKey)
+	//}
+	//if len(thisinfo.PBKey) > 3 {
+	PBKeyMap.Delete(thisinfo.PBKey)
+	//}
+}

udpprojectset/src/scores.go

@@ -1,231 +0,0 @@
-// scores
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"log"
-	"qfw/util"
-	"qfw/util/redis"
-	"strings"
-)
-
-//有效值三选一、三选二
-var ThreeToTow, ThreeToOne map[string]bool
-
-func init() {
-	ThreeToTow = map[string]bool{}
-	ThreeToOne = map[string]bool{
-		"AAA": true,
-		"AAB": true,
-	}
-	tows := [][][]string{
-		[][]string{
-			[]string{"A", "B"},
-			[]string{"A", "B"},
-			[]string{"A", "B"},
-		},
-		[][]string{
-			[]string{"A", "B"},
-			[]string{"D", "E"},
-			[]string{"A", "B"},
-		},
-		[][]string{
-			[]string{"A", "B"},
-			[]string{"A", "B"},
-			[]string{"D", "E"},
-		},
-		[][]string{
-			[]string{"D", "E"},
-			[]string{"A", "B"},
-			[]string{"A", "B"},
-		},
-	}
-	for _, tow := range tows {
-		for _, v1 := range tow[0] {
-			for _, v2 := range tow[1] {
-				for _, v3 := range tow[2] {
-					key := fmt.Sprintf("%s%s%s", v1, v2, v3)
-					ThreeToTow[key] = true
-				}
-			}
-		}
-	}
-}
-
-//三选一打分
-func (com *CompareInfo) ComputeOne(thisinfo *Info, ids []string) []*CompareOne {
-	defer util.Catch()
-	res := redis.Mget(REDISIDS, ids)
-	scores := []*CompareOne{}
-	if len(res) > 0 { //找到项目名称、项目编号或采购单位相同时
-		for _, b1 := range res { //遍历对象数组
-			if b1 != nil {
-				var info ProjectInfo
-				err := json.Unmarshal(b1.([]byte), &info)
-				if err != nil {
-					log.Println(err)
-				}
-				cone := &CompareOne{
-					Parent: com,
-					Pinfo:  &info,
-				}
-				if com.Field == "pn" { //比较字段项目名称
-					if len(info.ProjectName) > 0 {
-						if thisinfo.ProjectName == info.ProjectName { //A
-							cone.Score += 2
-							cone.ProjectNameType = "A"
-						} else if strings.Index(info.ProjectName, thisinfo.ProjectName) > -1 || strings.Index(thisinfo.ProjectName, info.ProjectName) > -1 { //B
-							cone.Score += 1
-							cone.ProjectNameType = "B"
-						} else { //C
-							cone.Score -= 2
-							cone.ProjectNameType = "C"
-						}
-					} else { //D不计分
-						cone.ProjectNameType = "D"
-					}
-				}
-				if com.Field == "pc" { //比较字段项目编号
-					if len(info.ProjectCode) > 0 {
-						if thisinfo.ProjectCode == info.ProjectCode { //A
-							cone.Score += 2
-							cone.ProjectCodeType = "A"
-						} else if strings.Index(info.ProjectCode, thisinfo.ProjectCode) > -1 || strings.Index(thisinfo.ProjectCode, info.ProjectCode) > -1 { //B
-							cone.Score += 1
-							cone.ProjectCodeType = "B"
-						} else { //C
-							cone.Score -= 2
-							cone.ProjectCodeType = "C"
-						}
-					} else { //D不计分
-						cone.ProjectCodeType = "D"
-					}
-				}
-				if thisinfo.Area != "A" && thisinfo.Area != "全国" && info.Area != "A" && info.Area != "全国" {
-					if thisinfo.Area == info.Area && thisinfo.District == info.District {
-						cone.Score += 2
-						cone.AreaType = "A"
-					} else {
-						cone.Score -= 1
-						cone.AreaType = "C"
-					}
-				} else {
-					cone.Score += 1
-					cone.AreaType = "B"
-				}
-				if len([]rune(info.Agency)) > 0 {
-					if thisinfo.Agency == info.Agency { //A
-						cone.Score += 2
-						cone.AgencyType = "A"
-					} else if strings.Index(info.Agency, thisinfo.Agency) > -1 || strings.Index(thisinfo.Agency, info.Agency) > -1 { //B
-						cone.Score += 1
-						cone.AgencyType = "B"
-					} else {
-						if len(thisinfo.Agency) < 1 { //E
-							cone.Score -= 1
-							cone.AgencyType = "E"
-						} else { //C
-							cone.Score -= 2
-							cone.AgencyType = "C"
-						}
-					}
-				} else { //D不计分
-					cone.AgencyType = "D"
-				}
-				scores = append(scores, cone)
-			}
-		}
-	}
-	return scores
-}
-
-//三选二打分
-func (com *CompareInfo) ComputeTow(thisinfo *Info, ids []string, hasbyer bool) []*CompareOne {
-	defer util.Catch()
-	res := redis.Mget(REDISIDS, ids)
-	scores := []*CompareOne{}
-	if len(res) > 0 { //找到项目名称、项目编号或采购单位相同时
-		for _, b1 := range res { //遍历对象数组
-			if b1 != nil {
-				var info ProjectInfo
-				err := json.Unmarshal(b1.([]byte), &info)
-				if err != nil {
-					log.Println(err)
-				}
-				cone := &CompareOne{
-					Parent: com,
-					Pinfo:  &info,
-				}
-				cone.BuyerType, cone.Score = fieldPCBScore(thisinfo.Buyer, info.Buyer, cone.BuyerType, cone.Score)
-				if hasbyer {
-					cone.ProjectNameType, cone.Score = fieldPCBScore(thisinfo.ProjectName, info.ProjectName, cone.ProjectNameType, cone.Score)
-					cone.ProjectCodeType, cone.Score = fieldPCBScore(thisinfo.ProjectCode, info.ProjectCode, cone.ProjectCodeType, cone.Score)
-				} else { //无采购单位，打分考虑长度
-					if len([]rune(thisinfo.ProjectName)) > 5 {
-						cone.ProjectNameType, cone.Score = fieldPCBScore(thisinfo.ProjectName, info.ProjectName, cone.ProjectNameType, cone.Score)
-					} else {
-						cone.ProjectNameType = "D"
-					}
-					if len(thisinfo.ProjectCode) > 6 {
-						cone.ProjectCodeType, cone.Score = fieldPCBScore(thisinfo.ProjectCode, info.ProjectCode, cone.ProjectCodeType, cone.Score)
-					} else {
-						cone.ProjectCodeType = "D"
-					}
-				}
-				//省市打分
-				if thisinfo.Area != "A" && thisinfo.Area != "全国" && info.Area != "A" && info.Area != "全国" {
-					if thisinfo.Area == info.Area && thisinfo.City == info.City {
-						cone.Score += 2
-					} else {
-						cone.Score -= 1
-					}
-				} else {
-					cone.Score += 1
-				}
-				//代理机构打分
-				if len([]rune(info.Agency)) > 0 {
-					if thisinfo.Agency == info.Agency { //A
-						cone.Score += 2
-					} else if strings.Index(info.Agency, thisinfo.Agency) > -1 || strings.Index(thisinfo.Agency, info.Agency) > -1 { //B
-						cone.Score += 1
-					} else {
-						if len(thisinfo.Agency) < 1 { //E
-							cone.Score -= 1
-						} else { //C
-							cone.Score -= 2
-						}
-					}
-				} else { //D不计分
-					//
-				}
-				scores = append(scores, cone)
-			}
-		}
-	}
-	return scores
-}
-
-//项目名称、项目编号、采购单位打分
-func fieldPCBScore(this, info, ctype string, score int) (string, int) {
-	if len(info) > 0 {
-		if this == info { //A
-			score += 5
-			ctype = "A"
-		} else if strings.Index(info, this) > -1 || strings.Index(this, info) > -1 { //B
-			score += 2
-			ctype = "B"
-		} else {
-			if len(this) < 1 { //E
-				score -= 1
-				ctype = "E"
-			} else { //C
-				score -= 2
-				ctype = "C"
-			}
-		}
-	} else { //D不计分
-		ctype = "D"
-	}
-	return ctype, score
-}

udpprojectset/src/thisinfo.go

@@ -2,10 +2,11 @@
 package main
 
 import (
+	"crypto/sha1"
 	"encoding/json"
 	"fmt"
+	"io"
 	du "jy/util"
-	"log"
 	"qfw/util"
 	"strings"
 
@@ -40,21 +41,26 @@ type Info struct {
 	Bidopentime int64  `json:"bidopentime"`
 	District    string `json:"district"`
 	Winnerorder []string
+
+	NewPNKey string
+	PNKey    string
+	PCKey    string
+	PBKey    string
 }
 
 //pcb三选值
 type PCBV struct {
 	Val    int  //1一项有效值,2二项有效值,3三项有效值
 	Pname  bool //有项目名称
-	Cname  bool //有项目编号
-	Bname  bool //有采购单位
+	Pcode  bool //有项目编号
+	Buyer  bool //有采购单位
 	Area   bool //区域
 	City   bool //市
 	Agency bool //代理机构
 
 	PnameLen int //值长度
-	CnameLen int //值长度
-	BnameLen int //值长度
+	PcodeLen int //值长度
+	BuyerLen int //值长度
 }
 
 func PreThisInfo(tmp map[string]interface{} /*新信息*/) *Info {
@@ -127,196 +133,18 @@ func PreThisInfo(tmp map[string]interface{} /*新信息*/) *Info {
 		}
 	}
 	thisinfo.Winnerorder = winnerorder
-	return thisinfo
-}
-
-//流程处理
-func (com *CompareInfo) ProcessInfo(new_pn string, tmp map[string]interface{}, pici int64, info *Info) (id string) {
-	pcbv := PCBValue(info)
-	if info.SubType == "变更" {
-		if pcbv.Val > 1 {
-			id = com.Process(new_pn, tmp, pici, info, pcbv)
-		} else {
-			//信息无效
-			MQFW.UpdateById(extractColl, info.Id,
-				map[string]interface{}{
-					"$set": map[string]interface{}{
-						"ext_mess": info.SubType + ",不满足三选二",
-					},
-				})
-			du.Debug("信息无效", info.Id)
-		}
-	} else { //非变更
-		id = com.Process(new_pn, tmp, pici, info, pcbv)
-	}
-	return id
-}
 
-//流程
-func (com *CompareInfo) Process(new_pn string, tmp map[string]interface{}, pici int64, info *Info, pcbv PCBV) (id string) {
-	if pcbv.Bname { //有采购单位
-		if pcbv.Pname || pcbv.Cname {
-			//三选二打分
-			scores := com.ComputeTow(info, com.IdArr, true)
-			for _, v := range scores {
-				skey := fmt.Sprintf("%s%s%s", v.BuyerType, v.ProjectNameType, v.ProjectCodeType)
-				if ThreeToTow[skey] { //判断是否进入打分合并逻辑
-					log.Println(info.Id, skey)
-					v.Cresult = skey
-					com.Scores = append(com.Scores, v)
-				}
-			}
-			if len(scores) < 1 {
-				//新建项目，（Compare方法中创建）不在此创建，其他同理
-				//du.Debug("有采购单位,新建项目")
-			}
-		} else {
-			//生成项目，不参与后续对比
-			id = InsertProject(new_pn, tmp,
-				map[string]interface{}{
-					"ext_mess": map[string]interface{}{
-						"type": "有采购单位,不满足三选二",
-						"mess": "项目名称或项目编号不满足",
-					},
-				}, pici, info)
-			//du.Debug("生成项目，不参与后续对比", id)
-		}
-	} else { //无采购单位
-		if pcbv.Pname {
-			if pcbv.Cname {
-				//三选二打分
-				scores := com.ComputeTow(info, com.IdArr, false)
-				for _, v := range scores {
-					skey := fmt.Sprintf("%s%s%s", v.BuyerType, v.ProjectNameType, v.ProjectCodeType)
-					if ThreeToTow[skey] { //判断是否进入打分合并逻辑
-						v.Cresult = skey
-						com.Scores = append(com.Scores, v)
-					}
-				}
-				if len(scores) < 1 {
-					//新建项目
-					//du.Debug("无采购单位,新建项目")
-				}
-			} else {
-				if pcbv.PnameLen > 5 {
-					if pcbv.Area && pcbv.City {
-						//三选一打分
-						scores := com.ComputeOne(info, com.IdArr)
-						for _, v := range scores { // v.ProjectNameType, v.ProjectCodeType二者有其一
-							skey := fmt.Sprintf("%s%s%s%s", v.ProjectNameType, v.ProjectCodeType, v.AreaType, v.AgencyType)
-							if ThreeToOne[skey] { //判断是否进入打分合并逻辑
-								v.Cresult = skey
-								com.Scores = append(com.Scores, v)
-							}
-						}
-						if len(scores) < 1 {
-							//新建项目
-							du.Debug("新建项目")
-						}
-					} else {
-						//生成项目，不参与后续对比
-						id = InsertProject(new_pn, tmp,
-							map[string]interface{}{
-								"ext_mess": map[string]interface{}{
-									"type": "无采购单位,不满足三选一",
-									"mess": "省市不满足",
-								},
-							},
-							pici, info)
-						//du.Debug("生成项目，不参与后续对比", id)
-					}
-				} else {
-					//生成项目，不参与后续对比
-					id = InsertProject(new_pn, tmp,
-						map[string]interface{}{"ext_mess": map[string]interface{}{
-							"type": "无采购单位,不满足三选一",
-							"mess": "项目名称不满足",
-						},
-						}, pici, info)
-					//du.Debug("生成项目，不参与后续对比", id)
-				}
-			}
-		} else {
-			if pcbv.Cname {
-				if pcbv.CnameLen > 8 {
-					if pcbv.Area && pcbv.City {
-						//三选一打分
-						scores := com.ComputeOne(info, com.IdArr)
-						for _, v := range scores { // v.ProjectNameType, v.ProjectCodeType二者有其一
-							skey := fmt.Sprintf("%s%s%s%s", v.ProjectNameType, v.ProjectCodeType, v.AreaType, v.AgencyType)
-							if ThreeToOne[skey] { //判断是否进入打分合并逻辑
-								v.Cresult = skey
-								com.Scores = append(com.Scores, v)
-							}
-						}
-						if len(scores) < 1 {
-							//新建项目
-							//du.Debug("无采购单位，新建项目")
-						}
-					} else {
-						//生成项目，不参与后续对比
-						id = InsertProject(new_pn, tmp,
-							map[string]interface{}{
-								"ext_mess": map[string]interface{}{
-									"type": "无采购单位,不满足三选一",
-									"mess": "省市不满足",
-								},
-							}, pici, info)
-						//du.Debug("生成项目，不参与后续对比", id)
-					}
-				} else {
-					//生成项目，不参与后续对比
-					id = InsertProject(new_pn, tmp,
-						map[string]interface{}{
-							"ext_mess": map[string]interface{}{
-								"type": "无采购单位,不满足三选一",
-								"mess": "项目编号不满足",
-							},
-						}, pici, info)
-					//du.Debug("生成项目，不参与后续对比", id)
-				}
-			} else {
-				//信息无效
-				MQFW.UpdateById(extractColl, info.Id,
-					map[string]interface{}{
-						"$set": map[string]interface{}{
-							"ext_mess": info.SubType + ",不满足三选一",
-						},
-					})
-				//du.Debug("信息无效", info.Id)
-			}
-		}
-	}
-	return id
+	new_pn, _ := handleprojectname(thisinfo.ProjectName, thisinfo.Buyer, thisinfo.TopType) //作为判断依据
+	thisinfo.NewPNKey = new_pn
+	thisinfo.PNKey = "pn_" + new_pn
+	thisinfo.PCKey = "pc_" + thisinfo.ProjectCode
+	thisinfo.PBKey = "pb_" + thisinfo.Buyer
+	return thisinfo
 }
-func PCBValue(info *Info) PCBV {
-	pcbv := PCBV{}
-	if len([]rune(info.ProjectName)) > 1 {
-		pcbv.Val += 1
-		pcbv.Pname = true
-		pcbv.PnameLen = len([]rune(info.ProjectName))
 
-	}
-	if len([]rune(info.ProjectCode)) > 1 {
-		pcbv.Val += 1
-		pcbv.Cname = true
-		pcbv.CnameLen = len([]rune(info.ProjectCode))
-
-	}
-	if len([]rune(info.Buyer)) > 1 {
-		pcbv.Val += 1
-		pcbv.Bname = true
-		pcbv.BnameLen = len([]rune(info.Buyer))
-	}
-	//省市代理机构
-	if info.Area != "" {
-		pcbv.Area = true
-	}
-	if info.City != "" {
-		pcbv.City = true
-	}
-	if info.Agency != "" {
-		pcbv.Agency = true
-	}
-	return pcbv
+//获取hascode
+func GetHas1(key string) string {
+	t := sha1.New()
+	io.WriteString(t, key)
+	return fmt.Sprintf("%x", t.Sum(nil))
 }