Jianghan пре 4 година
родитељ
комит
a78d1f371a

+ 2 - 2
fullproject/src_v1/main.go

@@ -91,8 +91,8 @@ func mainT() {
 
 //测试组人员使用
 func main() {
-	sid = "5f50518ec014544073750cb8"
-	eid = "5f50518ec014544073750cb8"
+	sid = "5cde1a74a5cb26b9b782dd1f"
+	eid = "5dee234de9d1f601e4c4b813"
 	//flag.StringVar(&sid, "sid", "", "开始id")
 	//flag.StringVar(&eid, "eid", "", "结束id")
 	//flag.Parse()

+ 21 - 25
fullproject/src_v1/project.go

@@ -529,33 +529,9 @@ func (p *ProjectTask) NewProject(tmp map[string]interface{}, thisinfo *Info) (st
 		set["jgtime"] = tmp["publishtime"]
 		p1.Jgtime = thisinfo.Publishtime
 	}
-
 	if len(thisinfo.Subscopeclass) > 0 {
 		set["s_subscopeclass"] = strings.Join(thisinfo.Subscopeclass, ",")
 	}
-
-	if tmp["budget"] != nil && tmp["budget"] != "" {
-		set["budget"] = thisinfo.Budget
-		p1.Budgettag = 0
-		set["budgettag"] = 0
-	} else {
-		p1.Budgettag = 1
-		set["budgettag"] = 1
-	}
-	if tmp["bidamount"] != nil && tmp["bidamount"] != "" {
-		set["bidamount"] = thisinfo.Bidamount
-		p1.Bidamounttag = 0
-		set["bidamounttag"] = 0
-	} else {
-		p1.Bidamounttag = 1
-		set["bidamounttag"] = 1
-	}
-	if p1.Bidamount > 0 {
-		set["sortprice"] = p1.Bidamount
-	} else if p1.Budget > 0 {
-		set["sortprice"] = p1.Budget
-	}
-
 	if len(thisinfo.Winners) > 0 {
 		set["s_winner"] = strings.Join(thisinfo.Winners, ",")
 		p1.Winners = thisinfo.Winners
@@ -585,7 +561,6 @@ func (p *ProjectTask) NewProject(tmp map[string]interface{}, thisinfo *Info) (st
 		set["winnerorder"] = list
 		p1.Winnerorder = list
 	}
-
 	p1.InfoFiled = make(map[string]InfoField)
 	infofield := InfoField{
 		Budget:       thisinfo.Budget,
@@ -600,6 +575,27 @@ func (p *ProjectTask) NewProject(tmp map[string]interface{}, thisinfo *Info) (st
 	set["infofield"] = map[string]interface{}{
 		thisinfo.Id: res,
 	}
+	if tmp["budget"] != nil && tmp["budget"] != "" {
+		set["budget"] = thisinfo.Budget
+		p1.Budgettag = 0
+		set["budgettag"] = 0
+	} else {
+		p1.Budgettag = 1
+		set["budgettag"] = 1
+	}
+	if tmp["bidamount"] != nil && tmp["bidamount"] != "" {
+		set["bidamount"] = thisinfo.Bidamount
+		p1.Bidamounttag = 0
+		set["bidamounttag"] = 0
+	} else {
+		p1.Bidamounttag = 1
+		set["bidamounttag"] = 1
+	}
+	if p1.Bidamount > 0 {
+		set["sortprice"] = p1.Bidamount
+	} else if p1.Budget > 0 {
+		set["sortprice"] = p1.Budget
+	}
 	push := p.PushListInfo(tmp, thisinfo.Id)
 	push["s_winner"] = strings.Join(thisinfo.Winners, ",")
 	set["list"] = []bson.M{

+ 30 - 9
qyxy_change/qy_baidu/config.json

@@ -20,55 +20,76 @@
   "changeType": [
     {
       "change_code": "100001",
-      "change_name": "投资人变更(人事变动)",
+      "change_name": "法定代表人变更",
+      "change_push": true,
+      "change_info": "法定代表人变更",
+      "change_keyword": ["法定代表人", "法人"]
+    },
+    {
+      "change_code": "100002",
+      "change_name": "注册资本变更",
+      "change_push": true,
+      "change_info": "注册资本",
+      "change_keyword": ["注册资本"]
+    },
+    {
+      "change_code": "100003",
+      "change_name": "企业名称变更",
+      "change_push": true,
+      "change_info": "注册资本变更(注册资金、资金数额等变更)变更",
+      "change_keyword": ["企业名称", "隶属企业", "集团名称"]
+    },
+    {
+      "change_code": "100004",
+      "change_name": "投资人变更",
       "change_push": true,
       "change_info": "投资人、合伙人、投资者等名称变更",
       "change_keyword": ["投资人", "合伙人", "投资者", "董事", "经营者", "股东"]
     },
     {
-      "change_code": "100002",
+      "change_code": "100005",
       "change_name": "经营范围变更",
       "change_push": true,
       "change_info": "经营范围变更",
       "change_keyword": ["经营范围", "业务范围", "许可经营项目", "隶属企业变更", "母公司变更", "隶属集团变更"]
     },
     {
-      "change_code": "100003",
+      "change_code": "100006",
       "change_name": "经营期限变更",
       "change_push": false,
       "change_info": "经营期限",
       "change_keyword": ["经营期限", "营业期限", "驻在期限", "合伙期限"]
     },
     {
-      "change_code": "100004",
+      "change_code": "100007",
       "change_name": "高级管理人员备案",
       "change_push": true,
       "change_info": "投资人、董事、高管",
-      "change_keyword": ["高级管理人员", "高管人员", "经理", "主要人员", "负责人", "代表", "理事", "监事", "委员", "法定代表人", "主要部门人员"]
+      "change_keyword": ["高级管理人员", "高管人员", "经理", "主要人员", "负责人", "代表", "理事", "监事", "委员", "主要部门人员"]
     },
     {
-      "change_code": "100005",
+      "change_code": "100008",
       "change_name": "其他事项备案",
       "change_push": false,
       "change_info": "其他事项备案",
       "change_keyword": ["备案", "设立"]
     },
     {
-      "change_code": "100006",
+      "change_code": "100009",
       "change_name": "章程备案变更",
       "change_push": false,
       "change_info": "章程备案变更",
       "change_keyword": ["章程修正", "章程备案", "合伙协议"]
     },
     {
-      "change_code": "100007",
+      "change_code": "100010",
       "change_name": "经营场所,地址变更",
       "change_push": false,
       "change_info": "经营场所,地址变更",
       "change_keyword": ["营业地址", "地址", "住所", "经营产所"]
     },
     {
-      "change_code": "100008",
+      "change_code": "100011",
       "change_name": "其他变更",
       "change_push": false,
       "change_info": "无法分类的变更",

+ 27 - 8
qyxy_change/qy_baidu/task.go

@@ -13,11 +13,11 @@ import (
 )
 
 func TimeTask() {
+	GetBdData()
 	c := cron.New()
 	cronstrBd := "0 0 */" + fmt.Sprint(BdTaskTime) + " * * ?" 		//每TaskTime小时执行一次
 	//cronstr := "0 0 " + fmt.Sprint(TaskTime) + " * * ?"			//每天TaskTime跑一次
 	cronstrPa := "0 0 15 ? * " + fmt.Sprint(PaTaskTime) 			//凭安增量数据每周三跑一次
-	util.Debug(cronstrPa)
 	_ = c.AddFunc(cronstrBd, func() { GetBdData() })
 	_ = c.AddFunc(cronstrPa, func() { GetPaData() })
 	c.Start()
@@ -29,7 +29,7 @@ func GetBdData()  {
 	sess := MgoBd.GetMgoConn()
 	defer MgoBd.DestoryMongoConn(sess)
 	fields := map[string]interface{}{"data": 1, "down_time": 1}
-	q := bson.M{"down_time": bson.M{"$gte": LastTime}}
+	q := bson.M{"down_time": bson.M{"$gt": LastTime}}
 	query := sess.DB(Dbname_bd).C(CollBd).Find(q).Select(fields).Iter()
 	tmp := make(map[string]interface{})
 	for query.Next(&tmp) {
@@ -61,18 +61,19 @@ func GetPaData() {
 			q := bson.M{"company_name": tmp["company_name"]}
 			changeEnt, _ := MgoMix.FindOne(CollSave, q)
 			if changeEnt != nil && len(*changeEnt) > 0 {
-				changeList := tmp["changes"].([]interface{})
-				if len(changeList) < len((*changeEnt)["changes"].([]interface{})) {
-					tmp["changes"] = (*changeEnt)["changes"].([]interface{})
-					infoList := tmp["changes"].([]interface{})
+				tmpList := tmp["changes"].([]interface{})
+				changeList := clearRepeat((*changeEnt)["changes"].([]interface{}))
+				if len(tmpList) > len(changeList) {
+					infoList := clearRepeat(tmp["changes"].([]interface{}))
 					for _, item := range infoList {
 						item1 := item.(map[string]interface{})
 						setMark(item1)
 					}
+					tmp["changes"] = infoList
 					tmp["updatetime"] = currentTime
 				}
 			}else {
-				infoList := tmp["changes"].([]interface{})
+				infoList := clearRepeat(tmp["changes"].([]interface{}))
 				for _, item := range infoList {
 					item1 := item.(map[string]interface{})
 					setMark(item1)
@@ -112,7 +113,7 @@ func findEnt(tmp map[string]interface{}) {
 		//1、企业变更库有该企业信息
 		if (*changeEnt)["changes"] != nil{
 			(*changeEnt)["updatetime"] = currentTime
-			if len(infoList) > len(tmp["changes"].([]interface{})) {
+			if len(infoList) > len((*changeEnt)["changes"].([]interface{})) {
 				mapArr := setChangeInfo(infoList)
 				for _, v := range mapArr{
 					setMark(v)
@@ -197,6 +198,24 @@ func setMark(tmp map[string]interface{}) {
 	}
 }
 
+func clearRepeat(list []interface{}) []interface{} {
+	var tmp []interface{}
+	if len(list) > 1 {
+		for k, v := range list{
+			if k < len(list)-1 {
+				if fmt.Sprint(list[k]) != fmt.Sprint(list[k+1]) {
+					tmp = append(tmp, v)
+				}
+			}else {
+				tmp = append(tmp, v)
+			}
+		}
+		return tmp
+	}else {
+		return list
+	}
+}
+
 var MgoSaveCache = make(chan []map[string]interface{}, 2000)
 var SP = make(chan bool, 5)
 

+ 96 - 0
qyxy_change/qy_foucs/config.json

@@ -0,0 +1,96 @@
+{
+  "qy_focus": {
+    "dbServer": "192.168.3.128:27080",
+    "dbName": "qfw",
+    "dbSize": 2,
+    "dbColl": "follow_entinfo_bigvip"
+  },
+  "qy_change": {
+    "dbServer": "192.168.3.207:27092",
+    "dbName": "mixdata",
+    "dbSize": 2,
+    "dbColl": "qyxy_change",
+    "dbCollQy": "qyxy"
+  },
+  "lasttime": 0,
+  "tasktime": 5,
+  "changeType": [
+    {
+      "change_code": "100001",
+      "change_name": "法定代表人变更",
+      "change_push": true,
+      "change_info": "法定代表人变更",
+      "change_keyword": ["法定代表人", "法人"]
+    },
+    {
+      "change_code": "100002",
+      "change_name": "注册资本变更",
+      "change_push": true,
+      "change_info": "注册资本",
+      "change_keyword": ["注册资本"]
+    },
+    {
+      "change_code": "100003",
+      "change_name": "企业名称变更",
+      "change_push": true,
+      "change_info": "注册资本变更(注册资金、资金数额等变更)变更",
+      "change_keyword": ["企业名称", "隶属企业", "集团名称"]
+    },
+    {
+      "change_code": "100004",
+      "change_name": "投资人变更",
+      "change_push": true,
+      "change_info": "投资人、合伙人、投资者等名称变更",
+      "change_keyword": ["投资人", "合伙人", "投资者", "董事", "经营者", "股东"]
+    },
+    {
+      "change_code": "100005",
+      "change_name": "经营范围变更",
+      "change_push": true,
+      "change_info": "经营范围变更",
+      "change_keyword": ["经营范围", "业务范围", "许可经营项目", "隶属企业变更", "母公司变更", "隶属集团变更"]
+    },
+    {
+      "change_code": "100006",
+      "change_name": "经营期限变更",
+      "change_push": false,
+      "change_info": "经营期限",
+      "change_keyword": ["经营期限", "营业期限", "驻在期限", "合伙期限"]
+    },
+    {
+      "change_code": "100007",
+      "change_name": "高级管理人员备案",
+      "change_push": true,
+      "change_info": "投资人、董事、高管",
+      "change_keyword": ["高级管理人员", "高管人员", "经理", "主要人员", "负责人", "代表", "理事", "监事", "委员", "主要部门人员"]
+    },
+    {
+      "change_code": "100008",
+      "change_name": "其他事项备案",
+      "change_push": false,
+      "change_info": "其他事项备案",
+      "change_keyword": ["备案", "设立"]
+    },
+    {
+      "change_code": "100009",
+      "change_name": "章程备案变更",
+      "change_push": false,
+      "change_info": "章程备案变更",
+      "change_keyword": ["章程修正", "章程备案", "合伙协议"]
+    },
+    {
+      "change_code": "100010",
+      "change_name": "经营场所,地址变更",
+      "change_push": false,
+      "change_info": "经营场所,地址变更",
+      "change_keyword": ["营业地址", "地址", "住所", "经营产所"]
+    },
+    {
+      "change_code": "100011",
+      "change_name": "其他变更",
+      "change_push": false,
+      "change_info": "无法分类的变更",
+      "change_keyword": []
+    }
+  ]
+}

+ 68 - 0
qyxy_change/qy_foucs/main.go

@@ -0,0 +1,68 @@
+package main
+
+import (
+	"mongodb"
+	"qfw/util"
+)
+
+var (
+	Sysconfig                  map[string]interface{}
+	MgoJy, MgoQy               *mongodb.MongodbSim
+	JyDb					   string
+	CollJy, CollQy, CollSave   string
+	LastTime                   int64
+	TaskTime                   int64
+	ChangeMap                  []map[string]interface{}
+)
+
+func init() {
+	util.ReadConfig(&Sysconfig)
+
+	focusQy := util.ObjToMap(Sysconfig["qy_focus"])
+	JyDb = util.ObjToString((*focusQy)["dbName"])
+	MgoJy = &mongodb.MongodbSim{
+		MongodbAddr: util.ObjToString((*focusQy)["dbServer"]),
+		Size:        util.IntAll((*focusQy)["dbSize"]),
+		DbName:      JyDb,
+	}
+	MgoJy.InitPool()
+	qyxy := util.ObjToMap(Sysconfig["qy_change"])
+	MgoQy = &mongodb.MongodbSim{
+		MongodbAddr: util.ObjToString((*qyxy)["dbServer"]),
+		Size:        util.IntAll((*qyxy)["dbSize"]),
+		DbName:      util.ObjToString((*qyxy)["dbName"]),
+	}
+	MgoQy.InitPool()
+
+	CollJy = util.ObjToString((*focusQy)["dbColl"])
+	CollQy = util.ObjToString((*qyxy)["dbCollQy"])
+	CollSave = util.ObjToString((*qyxy)["dbColl"])
+	LastTime = util.Int64All(Sysconfig["lasttime"])
+	TaskTime = util.Int64All(Sysconfig["tasktime"])
+
+	ChangeMap = util.ObjArrToMapArr(Sysconfig["changeType"].([]interface{}))
+	initChangeMap()
+}
+
+func initChangeMap() {
+	for _, v := range ChangeMap {
+		list := v["change_keyword"].([]interface{})
+		var regList []string
+		if len(list) > 0 {
+			for _, v1 := range list {
+				reg := ".*" + util.ObjToString(v1) + ".*"
+				regList = append(regList, reg)
+			}
+			v["change_key_reg"] = regList
+		} else {
+			v["change_key_reg"] = []string{".*"}
+		}
+	}
+}
+
+func main() {
+	go SaveData()
+	go TimeTask()
+	ch := make(chan bool, 1)
+	<-ch
+}

+ 159 - 0
qyxy_change/qy_foucs/task.go

@@ -0,0 +1,159 @@
+package main
+
+import (
+	"fmt"
+	"github.com/cron"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/bson/primitive"
+	"log"
+	"mongodb"
+	"qfw/util"
+	"regexp"
+	"time"
+)
+
+func TimeTask() {
+	GetData()
+	c := cron.New()
+	cronstr := "0 */" + fmt.Sprint(TaskTime) + " * * * ?" 		//每TaskTime分钟执行一次
+	_ = c.AddFunc(cronstr, func() { GetData() })
+	c.Start()
+}
+
+func GetData()  {
+	count := 0
+	lastid := ""
+	sess := MgoJy.GetMgoConn()
+	defer MgoJy.DestoryMongoConn(sess)
+	fields := map[string]interface{}{"s_entname": 1, "l_createdate": 1}
+	q := bson.M{"l_createdate": bson.M{"$gt": LastTime}}
+	query := sess.DB(JyDb).C(CollJy).Find(q).Select(fields).Iter()
+	c := MgoJy.Count(CollJy, q)
+	util.Debug("total count ----", c)
+	tmp := make(map[string]interface{})
+	for query.Next(&tmp) {
+		lastid = mongodb.BsonIdToSId(tmp["_id"])
+		if count%200 == 0 {
+			util.Debug("jy ----current----", count, lastid)
+		}
+		q := map[string]interface{}{"company_name": tmp["s_entname"]}
+		ent, _ := MgoQy.FindOne(CollSave, q)
+		if (*ent) == nil {
+			qytmp, _ := MgoQy.FindOne(CollQy, q)
+			if qytmp != nil && len(*qytmp) > 0 {
+				if LastTime < util.Int64All(tmp["l_createdate"]) {
+					LastTime = util.Int64All(tmp["l_createdate"])
+					util.Debug(LastTime)
+				}
+				delete(tmp, "l_createdate")
+				delete(tmp, "s_entname")
+				tmp["changes"] = (*qytmp)["changes"]
+				tmp["company_name"] = (*qytmp)["company_name"]
+				tmp["company_id"] = (*qytmp)["company_id"]
+				if tmp["changes"] != nil && len(tmp["changes"].([]interface{})) > 0 {
+					findEnt(tmp)
+					count++
+				}else {
+					util.Debug("ent changes size 为 0", tmp["_id"])
+				}
+			}else {
+				util.Debug("qyxy not find data", q)
+			}
+		}
+	}
+	util.Debug("jy 处理", count, "条数据")
+}
+
+func findEnt(tmp map[string]interface{}) {
+	currentTime := time.Now().Unix()
+	infoList := clearRepeat(tmp["changes"].([]interface{}))
+	for _, item := range infoList {
+		item1 := item.(map[string]interface{})
+		setMark(item1)
+	}
+	tmp["_id"] = primitive.NewObjectID()
+	tmp["createtime"] = currentTime
+	tmp["updatetime"] = currentTime
+	update := make(map[string]interface{})
+	update["$set"] = tmp
+	updateInfo := []map[string]interface{}{
+		{
+			"_id": tmp["_id"],
+		},
+		update,
+	}
+	MgoSaveCache <- updateInfo
+}
+
+func setMark(tmp map[string]interface{}) {
+	for _, v := range ChangeMap {
+		str := util.ObjToString(tmp["change_field"])
+		regArr := v["change_key_reg"].([]string)
+		for _, v1 := range regArr {
+			matched, _ := regexp.MatchString(v1, str)
+			if matched {
+				tmp["change_name_new"] = v["change_name"]
+				return
+			}
+		}
+	}
+}
+
+func clearRepeat(list []interface{}) []interface{} {
+	var tmp []interface{}
+	if len(list) > 1 {
+		for k, v := range list{
+			if k < len(list)-1 {
+				if fmt.Sprint(list[k]) != fmt.Sprint(list[k+1]) {
+					tmp = append(tmp, v)
+				}
+			}else {
+				tmp = append(tmp, v)
+			}
+		}
+		return tmp
+	}else {
+		return list
+	}
+}
+
+var MgoSaveCache = make(chan []map[string]interface{}, 2000)
+var SP = make(chan bool, 5)
+
+func SaveData() {
+	log.Println("Mgo Save...")
+	arru := make([][]map[string]interface{}, 200)
+	indexu := 0
+	for {
+		select {
+		case v := <-MgoSaveCache:
+			arru[indexu] = v
+			indexu++
+			if indexu == 200 {
+				SP <- true
+				go func(arru [][]map[string]interface{}) {
+					defer func() {
+						<-SP
+					}()
+					MgoQy.UpSertBulk(CollSave, arru...)
+				}(arru)
+				arru = make([][]map[string]interface{}, 200)
+				indexu = 0
+			}
+		case <-time.After(1000 * time.Millisecond):
+			if indexu > 0 {
+				SP <- true
+				go func(arru [][]map[string]interface{}) {
+					defer func() {
+						<-SP
+					}()
+					MgoQy.UpSertBulk(CollSave, arru...)
+				}(arru[:indexu])
+				arru = make([][]map[string]interface{}, 200)
+				indexu = 0
+			}
+		}
+	}
+}
+
+

+ 34 - 13
qyxy_change/qy_pingan/config.json

@@ -1,61 +1,82 @@
 {
-  "mongodbServers": "192.168.3.128:27080",
+  "mongodbServers": "192.168.3.207:27092",
   "mongodbPoolSize": 10,
-  "mongodbName": "mxs",
+  "mongodbName": "mixdata",
   "mongoColl1": "qyxy",
-  "mongoColl2": "qyxy_change",
+  "mongoColl2": "qyxy_change_1",
   "changeType": [
     {
       "change_code": "100001",
-      "change_name": "投资人变更(人事变动)",
+      "change_name": "法定代表人变更",
+      "change_push": true,
+      "change_info": "法定代表人变更",
+      "change_keyword": ["法定代表人", "法人"]
+    },
+    {
+      "change_code": "100002",
+      "change_name": "注册资本变更",
+      "change_push": true,
+      "change_info": "注册资本",
+      "change_keyword": ["注册资本"]
+    },
+    {
+      "change_code": "100003",
+      "change_name": "企业名称变更",
+      "change_push": true,
+      "change_info": "注册资本变更(注册资金、资金数额等变更)变更",
+      "change_keyword": ["企业名称", "隶属企业", "集团名称"]
+    },
+    {
+      "change_code": "100004",
+      "change_name": "投资人变更",
       "change_push": true,
       "change_info": "投资人、合伙人、投资者等名称变更",
       "change_keyword": ["投资人", "合伙人", "投资者", "董事", "经营者", "股东"]
     },
     {
-      "change_code": "100002",
+      "change_code": "100005",
       "change_name": "经营范围变更",
       "change_push": true,
       "change_info": "经营范围变更",
       "change_keyword": ["经营范围", "业务范围", "许可经营项目", "隶属企业变更", "母公司变更", "隶属集团变更"]
     },
     {
-      "change_code": "100003",
+      "change_code": "100006",
       "change_name": "经营期限变更",
       "change_push": false,
       "change_info": "经营期限",
       "change_keyword": ["经营期限", "营业期限", "驻在期限", "合伙期限"]
     },
     {
-      "change_code": "100004",
+      "change_code": "100007",
       "change_name": "高级管理人员备案",
       "change_push": true,
       "change_info": "投资人、董事、高管",
-      "change_keyword": ["高级管理人员", "高管人员", "经理", "主要人员", "负责人", "代表", "理事", "监事", "委员", "法定代表人", "主要部门人员"]
+      "change_keyword": ["高级管理人员", "高管人员", "经理", "主要人员", "负责人", "代表", "理事", "监事", "委员", "主要部门人员"]
     },
     {
-      "change_code": "100005",
+      "change_code": "100008",
       "change_name": "其他事项备案",
       "change_push": false,
       "change_info": "其他事项备案",
-      "change_keyword": ["备案"]
+      "change_keyword": ["备案", "设立"]
     },
     {
-      "change_code": "100006",
+      "change_code": "100009",
       "change_name": "章程备案变更",
       "change_push": false,
       "change_info": "章程备案变更",
       "change_keyword": ["章程修正", "章程备案", "合伙协议"]
     },
     {
-      "change_code": "100007",
+      "change_code": "100010",
       "change_name": "经营场所,地址变更",
       "change_push": false,
       "change_info": "经营场所,地址变更",
       "change_keyword": ["营业地址", "地址", "住所", "经营产所"]
     },
     {
-      "change_code": "100008",
+      "change_code": "100011",
       "change_name": "其他变更",
       "change_push": false,
       "change_info": "无法分类的变更",

+ 1 - 4
qyxy_change/qy_pingan/main.go

@@ -39,9 +39,6 @@ func init() {
 func main() {
 	count, taskcount := 0, 0
 	lastid := ""
-
-	util.Debug(ChangeMap)
-
 	sess := MongoTool.GetMgoConn()
 	defer MongoTool.DestoryMongoConn(sess)
 
@@ -67,7 +64,7 @@ func main() {
 							item1 := item.(map[string]interface{})
 							setMark(item1)
 						}
-						tmp["_id"] = util.StringTOBsonId(util.ObjToString(tmp["company_id"]))
+						//tmp["_id"] = util.StringTOBsonId(util.ObjToString(tmp["company_id"]))
 						MongoTool.Save(MgoColl2, tmp)
 						taskcount ++
 					}