1.11 项目合并，修改、测试

fullproject/src_v1/config.json

@@ -9,9 +9,8 @@
     "extractColl": "ceshi_info",
     "projectColl": "jh_project",
     "backupFlag": false,
-    "backupColl": "jh_project1",
     "siteColl": "site",
-    "thread": 4,
+    "thread": 1,
     "jkmail": {
         "to": "wangjianghan@topnet.net.cn",
         "api": "http://10.171.112.160:19281/_send/_mail"

fullproject/src_v1/init.go

@@ -63,7 +63,8 @@ func init() {
 
 	ExtractColl = Sysconfig["extractColl"].(string)
 	ProjectColl = Sysconfig["projectColl"].(string)
-	BackupColl = Sysconfig["backupColl"].(string)
+	BackupColl = Sysconfig["projectColl"].(string)+"_back"
+	log.Println(BackupColl)
 	SiteColl = Sysconfig["siteColl"].(string)
 	Thread = util.IntAll(Sysconfig["thread"])
 	//NextNode = Sysconfig["nextNode"].([]interface{})
@@ -277,6 +278,7 @@ type ProjectInfo struct {
 	Winners       []string           `json:"winners,omitempty"`       //中标人
 	ProjectName   string             `json:"projectname,omitempty"`   //项目名称
 	ProjectCode   string             `json:"projectcode,omitempty"`   //项目代码唯一（纯数字的权重低）
+	ContractCode  string			 `json:"contractcode,omitempty"`  //项目编号
 	Buyer         string             `json:"buyer,omitempty"`         //采购单位唯一
 	MPN           []string           `json:"mpn,omitempty"`           //合并后多余的项目名称
 	MPC           []string           `json:"mpc,omitempty"`           //合并后多余的项目编号

fullproject/src_v1/main.go

@@ -20,7 +20,7 @@ var (
 	toaddr       = []*net.UDPAddr{} //下节点对象
 	ChSign       = make(chan os.Signal)
 
-	stype, sid, eid string 	//测试使用
+	sid, eid string 	//测试使用
 )
 
 func init() {
@@ -59,7 +59,7 @@ func DealSign() {
 	}
 }
 
-func main() {
+func mainT() {
 	//udp跑增量  id段   project
 	//udp跑全量			ql
 	//udp跑历史数据  信息id1,id2/或id段  ls
@@ -78,13 +78,12 @@ func main() {
 }
 
 //测试组人员使用
-func mainT() {
+func main() {
 	//sid = "5dfbd43ce9d1f601e43fa402"
 	//eid = "5e0954b30cf41612e061d0c8"
 
 	flag.StringVar(&sid, "sid", "", "开始id")
 	flag.StringVar(&eid, "eid", "", "结束id")
-	flag.StringVar(&stype, "stype", "", "stype")
 	flag.Parse()
 
 	mapinfo := map[string]interface{}{}
@@ -92,13 +91,9 @@ func mainT() {
 		log.Println("sid, eid参数不能为空")
 		os.Exit(0)
 	}
-	if stype == "" {
-		log.Println("stype参数不能为空")
-		os.Exit(0)
-	}
 	mapinfo["gtid"] = qu.StringTOBsonId(sid)
 	mapinfo["lteid"] = qu.StringTOBsonId(eid)
-	mapinfo["stype"] = stype
+	mapinfo["stype"] = "ql"
 	mapinfo["ip"] = "127.0.0.1"
 	mapinfo["port"] = Sysconfig["udpport"]
 	if Sysconfig["loadStart"] != nil {
@@ -109,7 +104,7 @@ func mainT() {
 	}
 	P_QL.loadSite()
 	task(mapinfo)
-	time.Sleep(5 * time.Second)
+	time.Sleep(20 * time.Second)
 }
 
 func task(mapInfo map[string]interface{})  {

fullproject/src_v1/project.go

@@ -498,6 +498,10 @@ func (p *ProjectTask) NewProject(tmp map[string]interface{}, thisinfo *Info) (st
 			set["projecthref"] = jsonData["projecthref"]
 		}
 	}
+	//合同编号
+	if thisinfo.ContractCode != "" {
+		set["contractcode"] = thisinfo.ContractCode
+	}
 
 	bt := qu.ObjToString(tmp["toptype"])
 	bs := qu.ObjToString(tmp["subtype"])
@@ -620,6 +624,7 @@ func (p *ProjectTask) NewCachePinfo(id primitive.ObjectID, thisinfo *Info, bidty
 		Ids:           []string{thisinfo.Id},
 		ProjectName:   thisinfo.ProjectName,
 		ProjectCode:   thisinfo.ProjectCode,
+		ContractCode:  thisinfo.ContractCode,
 		Buyer:         thisinfo.Buyer,
 		Buyerclass:    thisinfo.Buyerclass,
 		Buyerperson:   thisinfo.Buyerperson,
@@ -750,10 +755,12 @@ func (p *ProjectTask) UpdateProject(tmp map[string]interface{}, thisinfo *Info,
 		pInfo.Buyerclass = thisinfo.Buyerclass
 		set["buyerclass"] = thisinfo.Buyerclass
 	}
-
 	if pInfo.Buyer == "" {
 		set["buyerclass"] = ""
 	}
+	if thisinfo.ContractCode != "" {
+		set["contractcode"] = pInfo.ContractCode + ","+thisinfo.ContractCode
+	}
 
 	//8--代理机构
 	if (pInfo.Agency == "" && thisinfo.Agency != "") || (len([]rune(pInfo.Agency)) < 5 && len([]rune(thisinfo.Agency)) > 5) {

fullproject/src_v1/task.go

@@ -256,7 +256,7 @@ func (p *ProjectTask) taskQl(udpInfo map[string]interface{}) {
 			if idmap == nil {
 				idmap = map[string]interface{}{}
 			}
-			idmap["$gt"] = StringTOBsonId(gtid)
+			idmap["$gte"] = StringTOBsonId(gtid)
 		}
 		if idmap != nil {
 			q["_id"] = idmap
@@ -334,7 +334,7 @@ func (p *ProjectTask) taskUpdateInfo(udpInfo map[string]interface{}) {
 	if q == nil {
 		q = map[string]interface{}{
 			"_id": map[string]interface{}{
-				"$gt":  StringTOBsonId(gtid),
+				"$gte":  StringTOBsonId(gtid),
 				"$lte": StringTOBsonId(lteid),
 			},
 			"is_m": 1,