标讯模型修改，配置测试

data_mgo_to_tidb/bidding/bidding.go

@@ -64,23 +64,20 @@ func taskBase(tmp map[string]interface{}) {
 	info["s_info_id"] = tmpid
 	area, city, district := util.ObjToString(tmp["area"]), util.ObjToString(tmp["city"]), util.ObjToString(tmp["district"])
 	if area != "" {
-		info["s_area_code"] = u.AreaCode[area]
+		info["s_area_code"] = u.RegionCode[area]
 		if city != "" {
-			info["s_city_code"] = u.AreaCode[area+","+city]
+			info["s_city_code"] = u.RegionCode[area+","+city]
 			if district != "" {
-				info["s_district_code"] = u.AreaCode[area+","+city+","+district]
+				info["s_district_code"] = u.RegionCode[area+","+city+","+district]
 			}
 		}
 	}
-	if toptype := util.ObjToString(tmp["toptype"]); toptype != "" {
-		info["s_toptype_code"] = u.TopTypeCode["toptype"]
-	}
-	if subtype := util.ObjToString(tmp["subtype"]); subtype != "" {
-		info["s_subtype_code"] = u.SubTypeCode[subtype]
-	}
 	if buyerclass := util.ObjToString(tmp["buyerclass"]); buyerclass != "" {
-		info["s_buyerclass_code"] = u.BuyerCode[buyerclass]
+		info["s_buyerclass_code"] = u.BuyerClassCode[buyerclass]
 	}
+
+	info["s_toptype_code"], info["s_subtype_code"] = u.GetTopSubCode(util.ObjToString(tmp["toptype"]), util.ObjToString(tmp["subtype"]))
+
 	//特别结构
 	info["i_isValidFile"] = util.IntAll(tmp["isValidFile"])
 	info["i_multipackage"] = util.IntAll(tmp["multipackage"])

data_mgo_to_tidb/common.toml

@@ -3,24 +3,24 @@ locport = ":1166"
 [db]
 
 [db.mysql]
-addr = "172.17.4.242:4000"
+addr = "192.168.3.217:4000"
 dbname = "global_common_data"
 size = 5
-user = "zhengkun"
-password = "Zk#20220824"
+user = "root"
+password = "=PDT49#80Z!RVv52_z"
 
 [db.mongob]
-addr = "172.17.189.140:27080,172.17.189.141:27081"
+addr = "192.168.3.166:27082"
 dbname = "qfw"
 size = 5
-user = "zhengkun"
-password = "zk@123123"
+user = ""
+password = ""
 [db.mongop]
-addr = "172.17.189.140:27080,172.17.189.141:27081"
+addr = "192.168.3.166:27082"
 dbname = "mixdata"
 size = 5
-user = "zhengkun"
-password = "zk@123123"
+user = ""
+password = ""
 
 [mail]
 send = false

data_mgo_to_tidb/mark

@@ -1,54 +1,45 @@
-//InitOss(false)
-//redis.InitRedis1("qyxy_id=127.0.0.1:8379", 1)
-//redis.InitRedis1("qyxy_id=192.168.3.166:4379", 1)
+[udp]
+locport = ":1166"
+[db]
 
+[db.mysql]
+addr = "172.17.4.242:4000"
+dbname = "global_common_data"
+size = 5
+user = "zhengkun"
+password = "Zk#20220824"
 
-//rootCmd := &cobra.Command{Use: "my cmd"}
-//rootCmd.AddCommand(bidding())
-//rootCmd.AddCommand(project())
-//rootCmd.AddCommand(projectAdd())
-//if err := rootCmd.Execute(); err != nil {
-//	fmt.Println("rootCmd.Execute failed", err.Error())
-//}
+[db.mongob]
+addr = "172.17.189.140:27080,172.17.189.141:27081"
+dbname = "qfw"
+size = 5
+user = "zhengkun"
+password = "zk@123123"
+[db.mongop]
+addr = "172.17.189.140:27080,172.17.189.141:27081"
+dbname = "mixdata"
+size = 5
+user = "zhengkun"
+password = "zk@123123"
 
-//UdpClient = udp.UdpClient{Local: config.Conf.Udp.LocPort, BufSize: 1024}
-//UdpClient.Listen(processUdpMsg)
-//log.Info("Udp服务监听", zap.String("port:", config.Conf.Udp.LocPort))
+[mail]
+send = false
+to = "wangjianghan@topnet.net.cn"
+api = "http://172.17.145.179:19281/_send/_mail"
 
-
-// @Description 项目数据
-// @Author J 2022/9/20 17:52
-func project() *cobra.Command {
-	cmdClient := &cobra.Command{
-		Use:   "project",
-		Short: "Start processing project data",
-		Run: func(cmd *cobra.Command, args []string) {
-			//go SaveProFunc()
-			//go SaveProTagFunc()
-			//go SaveProbFunc()
-			//go SaveRelationFunc()
-			taskP()
-		},
-	}
-	//cmdClient.Flags().StringVarP(&cfg, "conf", "c", "", "server config [toml]")
-	return cmdClient
-}
-
-// @Description 项目数据
-// @Author J 2022/9/20 17:52
-func projectAdd() *cobra.Command {
-	var pici int64
-	cmdClient := &cobra.Command{
-		Use:   "project",
-		Short: "Start processing project data",
-		Run: func(cmd *cobra.Command, args []string) {
-			//go SaveProFunc()
-			//go SaveProTagFunc()
-			//go SaveProbFunc()
-			//go SaveRelationFunc()
-			taskPAdd(pici)
-		},
-	}
-	cmdClient.Flags().Int64VarP(&pici, "pici", "p", 0, "")
-	return cmdClient
-}
+# 日志
+[log]
+# 日志路径，为空将输出控制台
+logpath = ""
+# log size (M)
+maxsize = 10
+# compress log
+compress = true
+# log save  time (day)
+maxage =  7
+# save total log file total
+maxbackups = 10
+# log level
+loglevel  = "debug"
+# text or json output
+format = "text"

data_mgo_to_tidb/util/init.go

@@ -14,13 +14,9 @@ import (
 var ( //通用
 	MongoB, MongoP *mongodb.MongodbSim
 	MysqlTool      *mysqldb.Mysql
-	FCriteria      map[string]interface{}
-	AreaCode       = make(map[string]string, 5000)
-	TopTypeCode    = make(map[string]string, 10)
-	SubTypeCode    = make(map[string]string, 40)
-	BuyerCode      = make(map[string]string, 100)
-	TopScopeCode   = make(map[string]interface{}, 20)
-	SubScopeCode   = make(map[string]interface{}, 70)
+	RegionCode     = make(map[string]string, 5000)
+	BuyerClassCode = make(map[string]string, 100)
+	TopSubtypeCode = make(map[string]map[string]string, 100)
 	FileTypeArr    = []string{"pdf", "doc", "docx", "xlsx", "xls", "jpg", "zip", "rar", "txt", "gif", "png", "bmp", "swf", "html"}
 )
 
@@ -105,37 +101,37 @@ func InitField() {
 				key += "," + util.ObjToString(m[v])
 			}
 		}
-		AreaCode[key] = util.ObjToString(m["code"])
+		RegionCode[key] = util.ObjToString(m["code"])
 	}
-	log.Info("InitField", zap.Int("AreaCode", len(AreaCode)))
+	log.Info("InitField", zap.Int("RegionCode", len(RegionCode)))
 
 	info1 := MysqlTool.Find("code_bidtopsubtype", nil, "", "", -1, -1)
-	for _, m := range *info1 {
-		if util.IntAll(m["level"]) == 1 {
-			TopTypeCode[util.ObjToString(m["name"])] = util.ObjToString(m["code"])
-		}
-		if util.IntAll(m["level"]) == 2 {
-			SubTypeCode[util.ObjToString(m["name"])] = util.ObjToString(m["code"])
-		}
-	}
-	log.Info("InitField", zap.Int("TopTypeCode", len(TopTypeCode)), zap.Int("SubTypeCode", len(SubTypeCode)))
-
-	info2 := MysqlTool.Find("code_buyerclass", nil, "", "", -1, -1)
-	for _, m := range *info2 {
-		BuyerCode[util.ObjToString(m["name"])] = util.ObjToString(m["code"])
-	}
-	log.Info("InitField", zap.Int("BuyerCode", len(BuyerCode)))
+	for _, v := range *info1 {
+		name := util.ObjToString(v["name"])
+		code := util.ObjToString(v["code"])
+		pcode := util.ObjToString(v["pcode"])
+		level := util.IntAll(v["level"])
+		if level == 1 {
+			TopSubtypeCode[name] = map[string]string{
+				"code": code,
+			}
+		} else if level == 2 {
+			match_name := ""
+			for k1, v1 := range TopSubtypeCode {
+				if v1["code"] == pcode {
+					match_name = k1
+					break
+				}
+			}
+			data := TopSubtypeCode[match_name]
+			data[name] = code
+			TopSubtypeCode[match_name] = data
+		} else {
 
-	info3 := MysqlTool.Find("code_bidscope", nil, "", "", -1, -1)
-	for _, m := range *info3 {
-		if util.IntAll(m["level"]) == 1 {
-			TopScopeCode[util.ObjToString(m["name"])] = util.ObjToString(m["code"])
-		}
-		if util.IntAll(m["level"]) == 2 {
-			SubScopeCode[util.ObjToString(m["name"])] = util.ObjToString(m["code"])
 		}
+
 	}
-	log.Info("InitField", zap.Int("TopScopeCode", len(TopScopeCode)), zap.Int("SubScopeCode", len(SubScopeCode)))
+	log.Info("InitField", zap.Int("TopSubtypeCode", len(TopSubtypeCode)))
 }
 
 // 插入并打印信息

data_mgo_to_tidb/util/util.go

@@ -86,6 +86,18 @@ func GetNameId(name string) string {
 	}
 }
 
+func GetTopSubCode(toptype string, subtype string) (string, string) {
+	top_code, sub_code := "", ""
+	datas := TopSubtypeCode[toptype]
+	if datas != nil {
+		top_code = datas["code"]
+		if datas[subtype] != "" {
+			sub_code = datas[subtype]
+		}
+	}
+	return top_code, sub_code
+}
+
 func IsMarkInterfaceArr(t interface{}) []string {
 	sub_list := []string{}
 	if list_3, ok_3 := t.([]string); ok_3 {