Browse Source

调整~增量服务~标的物

zhengkun 2 years ago
parent
commit
27323e1c4b

+ 2 - 3
fieldproject_medical/data_preparation/src/hospital/hospital.go

@@ -21,11 +21,10 @@ func RunHospital() {
 	//增加索引
 	createMgoIndex(save_hospital_coll, []string{"repeat_id"})
 	RunMergeHospitalInfo(save_hospital_coll, merge_hospital_coll_1)
-
-	RunRepairHospitalInfo()
-	RunResetHospitalInfo(merge_hospital_coll_1)
 	//增加索引
 	createMgoIndex(merge_hospital_coll_1, []string{"repeat_id", "name"})
+	RunRepairHospitalInfo()
+	RunResetHospitalInfo(merge_hospital_coll_1)
 	RunMergeHospitalInfo(merge_hospital_coll_1, merge_hospital_coll_2)
 }
 

+ 1 - 1
fieldproject_medical/data_preparation/src/hospital/hospital_extra.go

@@ -20,7 +20,7 @@ func compareHospital() {
 	it := sess.DB(class.Save_Mgo.DbName).C(merge_hospital_coll_1).Find(&q).Sort("_id").Iter()
 	total, isok := 0, 0
 	for tmp := make(map[string]interface{}); it.Next(&tmp); total++ {
-		if total%1000 == 0 {
+		if total%5000 == 0 {
 			log.Debug("cur index ", total, isok)
 		}
 		name := qu.ObjToString(tmp["name"])

+ 2 - 2
fieldproject_medical/data_preparation/src/hospital/hospital_repair.go

@@ -71,7 +71,7 @@ func updateMarkIdHospital() {
 	sess := class.Save_Mgo.GetMgoConn()
 	defer class.Save_Mgo.DestoryMongoConn(sess)
 	q := map[string]interface{}{}
-	it := sess.DB(class.Save_Mgo.DbName).C(merge_hospital_coll_2).Find(&q).Sort("_id").Iter()
+	it := sess.DB(class.Save_Mgo.DbName).C(merge_hospital_coll_1).Find(&q).Sort("_id").Iter()
 	total, isok := 0, 0
 	for tmp := make(map[string]interface{}); it.Next(&tmp); total++ {
 		if total%10000 == 0 {
@@ -84,7 +84,7 @@ func updateMarkIdHospital() {
 			isok++
 			c_id := uuid.New().String()
 			c_id = strings.ReplaceAll(c_id, "-", "")
-			class.Save_Mgo.UpdateById(merge_hospital_coll_2, tmpid, map[string]interface{}{
+			class.Save_Mgo.UpdateById(merge_hospital_coll_1, tmpid, map[string]interface{}{
 				"$set": map[string]interface{}{
 					"company_id": c_id,
 					"mark_id":    3,

+ 6 - 6
fieldproject_medical/data_service/src/bidding/bidding.go

@@ -26,7 +26,7 @@ func RunPurchasingInfo(gtid string, lteid string) {
 		},
 	}
 	it := sess.DB(ul.Mgo.DbName).C(ul.S_Bidding_Coll).Find(&q).Sort("_id").Select(fields).Iter()
-	pool := make(chan bool, 6)
+	pool := make(chan bool, 8)
 	wg := &sync.WaitGroup{}
 	total, isok := 0, 0
 	for tmp := make(map[string]interface{}); it.Next(&tmp); total++ {
@@ -49,11 +49,11 @@ func RunPurchasingInfo(gtid string, lteid string) {
 			if b {
 				numlock.Lock()
 				isok++
-				ul.Mgo.UpdateById(ul.S_Bidding_Coll, class.BsonTOStringId(tmp["_id"]), map[string]interface{}{
-					"$set": map[string]interface{}{
-						"bid_field": "0101",
-					},
-				})
+				//ul.Mgo.UpdateById(ul.S_Bidding_Coll, class.BsonTOStringId(tmp["_id"]), map[string]interface{}{
+				//	"$set": map[string]interface{}{
+				//		"bid_field": "0101",
+				//	},
+				//})
 				numlock.Unlock()
 			}
 		}(tmp)

+ 0 - 21
fieldproject_medical/data_service/src/bidding/purchasing.go

@@ -38,10 +38,6 @@ func ConfrimTargetMedicalClass(name string) string {
 //计算相似度得分
 func calculateSimilarityScore(indexDocs map[int][]string, itemArr []string) string {
 	scoreDocs := map[int]float64{}
-	//临时记录~
-	scoreDocs_1 := map[int]float64{}
-	scoreDocs_2 := map[int]float64{}
-
 	itemName := strings.Join(itemArr, "")
 	for k, v := range indexDocs {
 		v_str := strings.Join(v, "")
@@ -53,9 +49,6 @@ func calculateSimilarityScore(indexDocs map[int][]string, itemArr []string) stri
 		finally_score := (base_score + dice_score) / 2
 		if finally_score >= 0.55 && dice_score > 0.0 {
 			scoreDocs[k] = qu.FloatFormat(finally_score, 2)
-			//临时记录一下分数
-			scoreDocs_1[k] = qu.FloatFormat(base_score, 2)
-			scoreDocs_2[k] = qu.FloatFormat(dice_score, 2)
 		}
 	}
 	if len(scoreDocs) == 0 {
@@ -65,20 +58,6 @@ func calculateSimilarityScore(indexDocs map[int][]string, itemArr []string) stri
 	index, _ := getMaxScore(scoreDocs)
 	match_str := strings.Join(ul.NgrmDocIndex[index], "")
 	med_code := ul.ProductDocText[match_str]
-	//临时~测试保存数据
-	//catalog := ul.CodeCatalog[med_code]
-	//ul.Mgo.Save("zzzzzz", map[string]interface{}{
-	//	"name":       strings.Join(itemArr, ""),
-	//	"match_name": match_str,
-	//	"score":      score,
-	//	"score_1":    scoreDocs_1[index],
-	//	"score_2":    scoreDocs_2[index],
-	//	"code":       med_code,
-	//	"class_1":    catalog["class_1"],
-	//	"class_2":    catalog["class_2"],
-	//	"class_3":    catalog["class_3"],
-	//	"class_4":    catalog["class_4"],
-	//})
 	return med_code
 }
 

+ 3 - 3
fieldproject_medical/data_service/src/main.go

@@ -15,11 +15,11 @@ func init() {
 }
 
 func main() {
-
-	log.Debug("run main ... bidpur_class_test")
-	bidding.RunPurchasingInfo("100000000000000000000000", "900000000000000000000000")
+	log.Debug("run main ... ...")
+	bidding.RunPurchasingInfo("62e6a7000000000000000000", "62e7f8800000000000000000")
 	time.Sleep(999 * time.Hour)
 	return
+
 	//测试相似度计算
 	http.ListenAndServe(":9991", nil)
 	time.Sleep(999 * time.Hour)

+ 3 - 24
fieldproject_medical/data_service/src/util/initcfg.go

@@ -16,7 +16,6 @@ const (
 	V_Code_Productclass  = "code_productclass"
 	V_Product_Baseinfo   = "product_baseinfo"
 
-	//S_Bidding_Coll = "zktest_mysql_bidding_test"
 	S_Bidding_Coll = "bidding"
 )
 
@@ -36,11 +35,10 @@ var (
 	//编号~对应具体分类详细
 	CodeCatalog = map[string]map[string]string{}
 
-	isLocal bool
+	IsLocal bool
 )
 
 func InitClass() {
-	isLocal = true //本地
 	initMgo()
 	initMysql()
 	initVCode()
@@ -48,25 +46,7 @@ func InitClass() {
 
 //初始化mgo
 func initMgo() {
-	if isLocal {
-		//Mgo = &MongodbSim{
-		//	MongodbAddr: "127.0.0.1:27017",
-		//	DbName:      "zhengkun",
-		//	Size:        10,
-		//	UserName:    "",
-		//	Password:    "",
-		//}
-		//Mgo.InitPool()
-
-		//Mgo = &MongodbSim{
-		//	MongodbAddr: "192.168.3.207:27092",
-		//	DbName:      "zhengkun",
-		//	Size:        10,
-		//	UserName:    "",
-		//	Password:    "",
-		//}
-		//Mgo.InitPool()
-
+	if IsLocal {
 		Mgo = &MongodbSim{
 			MongodbAddr: "192.168.3.207:27001",
 			DbName:      "qfw_data",
@@ -90,7 +70,7 @@ func initMgo() {
 func initMysql() {
 	username, password := "root", "=PDT49#80Z!RVv52_z"
 	address := "192.168.3.217:4000"
-	if !isLocal {
+	if !IsLocal {
 		username = "zhengkun"
 		password = "Zk#20220824"
 		address = "172.17.4.242:4000"
@@ -116,7 +96,6 @@ func initMysql() {
 func initVCode() {
 	initBidInfoClass()     //招标信息分类
 	initBidIndustryClass() //行业分类
-
 	GSE.LoadDict("./dictionary.txt")
 	initMedicalLevelClass() //标准分类表
 	initMedicalProduct()    //分类产品