xg

isrepeat/main.go

@@ -78,6 +78,9 @@ var FieldsMap = map[string]string{
 
 func task1(path string) {
 	if path != "" {
+
+		Mgo.Update("f_sourceinfo_chinaunicom_zb_data", nil, bson.M{"$unset": bson.M{"tag": ""}}, false, true)
+
 		file, err := xlsx.OpenFile(path)
 		if err != nil {
 			panic(err)

src/front/project.go

@@ -531,7 +531,7 @@ func (f *Front) ProjectGroupTaskSave() {
 			success = util.Mgo.SaveBulk(util.TASKCOLLNAME, taskArr...)
 			if success {
 				msg = "任务分发成功"
-				UpdateSourceInfoByGroup(stype, groupIdTask) //用户组分发任务成功后，给数据源打上用户组标识
+				UpdateSourceInfoByGroup(stype, appid, groupIdTask) //用户组分发任务成功后，给数据源打上用户组标识
 			} else {
 				msg = "任务分发失败"
 			}
@@ -734,7 +734,7 @@ func (f *Front) ProjectGroupTaskClose() {
 		//}
 	}
 	if success { //所有用户信息关闭成功后，更新用户组任务相关信息
-		count = util.Mgo.Count(util.TASKCOLLNAME, map[string]interface{}{ //统计该用户组任务下未标注的数据量
+		count = util.Mgo.Count(util.DATACOLLNAME, map[string]interface{}{ //统计该用户组任务下未标注的数据量
 			"s_grouptaskid": groupTaskId,
 			"b_istag":       false,
 		})
@@ -870,7 +870,7 @@ func DeleleDataTagInfo(sourceinfo string) {
 }
 
 // UpdateSourceInfoByGroup 用户组分发任务成功后，给数据源打上用户组标识
-func UpdateSourceInfoByGroup(stype string, groupIdInfo map[string]util.Task) {
+func UpdateSourceInfoByGroup(stype, appid string, groupIdInfo map[string]util.Task) {
 	defer qu.Catch()
 	for groupTaskId, tInfo := range groupIdInfo {
 		groupId := tInfo.UserId
@@ -881,6 +881,7 @@ func UpdateSourceInfoByGroup(stype string, groupIdInfo map[string]util.Task) {
 		wg := &sync.WaitGroup{}
 		lock := &sync.Mutex{}
 		query := map[string]interface{}{ //查找未分配且未标注对应stype的数据分发
+			"appid":         appid,
 			"b_isgivegroup": false,
 			"b_istag":       false,
 		}
@@ -1124,10 +1125,16 @@ func GetDataById(idInfoArr []util.Data, importType string, success *bool, msg *s
 						if s1 != qu.ObjToString((*m)["matchkey"]) {
 							s1 = qu.ObjToString((*m)["matchkey"]) + "," + s1
 						}
-						util.Mgo.UpdateById(util.DATACOLLNAME, id, bson.M{"$set": bson.M{"matchkey": s1, "$push": bson.M{"appid": qu.ObjToString(tmp["appid"])}}})
+						util.Mgo.UpdateById(util.DATACOLLNAME, id, bson.M{"$set": bson.M{"matchkey": s1}, "$push": bson.M{"appid": qu.ObjToString(tmp["appid"])}})
+					} else {
+						util.Mgo.UpdateById(util.DATACOLLNAME, id, bson.M{"$push": bson.M{"appid": qu.ObjToString(tmp["appid"])}})
 					}
 				}
 			} else {
+				//markData, _ := util.MgoHM.FindById("bidding", id, nil)
+				//if len(*markData) > 0 {
+				//
+				//}
 				//1.查bidding
 				tmpBidColl := util.BidColl1 //bidding
 				if id < util.BIDDINGSTARTID {
@@ -1158,29 +1165,6 @@ func GetDataById(idInfoArr []util.Data, importType string, success *bool, msg *s
 					//3.删除item
 					//删除item
 					delete((*bidData), "item")
-					//4.对比marked表，对比marked表是否已标注该数据
-					//markData, _ := util.Mgo.FindById(util.AllToColl, id, nil)
-					//if markData != nil && len(*markData) > 0 {
-					//	UpdateMarkColl(bidData, markData, &tagInfoMap, &baseInfoMap) //比对更新数据
-					//} else {
-					//	baseInfoMap["i_ckdata"] = 0 //设置ck_data默认值0
-					//多包、中标候选人、标的信息是否抽取
-					//if packageMap, ok := (*bidData)["package"].(map[string]interface{}); ok && len(packageMap) > 0 {
-					//	baseInfoMap["b_pkgisext"] = true
-					//} else {
-					//	baseInfoMap["b_pkgisext"] = false
-					//}
-					//if winorderArr, ok := (*bidData)["winnerorder"].([]interface{}); ok && len(winorderArr) > 0 {
-					//	baseInfoMap["b_wodrisext"] = true
-					//} else {
-					//	baseInfoMap["b_wodrisext"] = false
-					//}
-					//if purchArr, ok := (*bidData)["purchasinglist"].([]interface{}); ok && len(purchArr) > 0 {
-					//	baseInfoMap["b_pclisext"] = true
-					//} else {
-					//	baseInfoMap["b_pclisext"] = false
-					//}
-					//}
 					//合并导入表中客户所需的字段
 					if len(tmp) > 0 {
 						for k, v := range tmp {
@@ -1303,25 +1287,6 @@ func GetDataById(idInfoArr []util.Data, importType string, success *bool, msg *s
 
 }
 
-// UpdateMarkColl 更新数据
-func UpdateMarkColl(bidData, markData, tagInfoMap, baseInfoMap *map[string]interface{}) {
-	defer qu.Catch()
-	ckdata := qu.IntAll((*markData)["i_ckdata"])
-	v_taginfo := (*markData)["v_taginfo"].(map[string]interface{})   //标注信息
-	v_baseinfo := (*markData)["v_baseinfo"].(map[string]interface{}) //基本信息
-	for fk := range v_taginfo {
-		if v_baseinfo[fk] != nil {
-			(*bidData)[fk] = v_baseinfo[fk] //字段更新
-		}
-	}
-	(*tagInfoMap) = v_taginfo //marked中已有的标注信息保存到新数据上
-	if ckdata == 2 {          //某些字段已标注
-		(*baseInfoMap)["i_ckdata"] = 0 //marked表中该条数据如果为字段验证，临时表ck_data:0;若为数据验证ck_data:1
-	} else if ckdata == 1 {
-		(*baseInfoMap)["i_ckdata"] = 1
-	}
-}
-
 func (f *Front) ProjectCheckSuc() {
 	defer qu.Catch()
 	if f.Method() == "POST" {

src/util/common.go

@@ -21,7 +21,7 @@ type Data struct {
 
 // oss
 var (
-	ossEndpoint        = "oss-cn-beijing.aliyuncs.com" //正式环境用：oss-cn-beijing-internal.aliyuncs.com 测试：oss-cn-beijing.aliyuncs.com
+	ossEndpoint        = "oss-cn-beijing-internal.aliyuncs.com" //正式环境用：oss-cn-beijing-internal.aliyuncs.com 测试：oss-cn-beijing.aliyuncs.com
 	ossAccessKeyId     = "LTAI4G5x9aoZx8dDamQ7vfZi"
 	ossAccessKeySecret = "Bk98FsbPYXcJe72n1bG3Ssf73acuNh"
 	ossBucketName      = "topjy"

src/util/config.go

@@ -99,20 +99,19 @@ func InitConfig() {
 	}
 	MgoB.InitPool()
 
-	biddingHConf := Sysconfig["high_mark"].(map[string]interface{})
-	if biddingHConf == nil || len(biddingHConf) == 0 {
-		qu.Debug("high_mark 配置项为空，请配置高质量库参数")
-	}
+	//biddingHConf := Sysconfig["high_mark"].(map[string]interface{})
+	//if biddingHConf == nil || len(biddingHConf) == 0 {
+	//	qu.Debug("high_mark 配置项为空，请配置高质量库参数")
+	//}
 	//高质量库
-	MgoHM = &mongodb.MongodbSim{
-		MongodbAddr: biddingHConf["addr"].(string),
-		Size:        qu.IntAllDef(biddingHConf["size"], 5),
-		DbName:      biddingHConf["db"].(string),
-		UserName:    biddingHConf["username"].(string),
-		Password:    biddingHConf["password"].(string),
-	}
-
-	MgoHM.InitPool()
+	//MgoHM = &mongodb.MongodbSim{
+	//	MongodbAddr: biddingHConf["addr"].(string),
+	//	Size:        qu.IntAllDef(biddingHConf["size"], 5),
+	//	DbName:      biddingHConf["db"].(string),
+	//	UserName:    biddingHConf["username"].(string),
+	//	Password:    biddingHConf["password"].(string),
+	//}
+	//MgoHM.InitPool()
 
 	esConf := Sysconfig["es"].(map[string]interface{})
 	Es = &Elastic{

src/web/templates/project/project_clear.html

@@ -467,13 +467,13 @@
         }
     }
 
-    function closeTask(id,status) {
+    function closeTask(id, status) {
         if (status === "未开始") {
             showConfirm("确认要关闭当前任务吗？", function () {
                 $.ajax({
                     url: "/front/project/task/close",
                     type: 'POST',
-                    data: {"taskid": id},
+                    data: {"taskid": id, "appid": appid},
                     success: function (r) {
                         if (r.success) {
                             let msg = r.msg+"<br>"+"收回数据"+r.count+"条"

src/web/templates/project/project_list.html

@@ -28,7 +28,6 @@
                                 <option value="未开始">未开始</option>
                                 <option value="进行中">进行中</option>
                                 <option value="已完成">已完成</option>
-                                <option value="已关闭">已关闭</option>
                             </select></label>
                         </div>
                         <table id="dataTable" class="table table-bordered table-hover">
@@ -398,7 +397,7 @@
                                 // '<a class="btn btn-sm btn-primary" href="">质检结果</a>&nbsp;&nbsp;' +
                                 '<a class="btn btn-sm btn-primary" href="/front/project/field?id='+row._id+'">字段配置</a>&nbsp;&nbsp;' +
                                 '<a class="btn btn-sm btn-primary" href="/front/project/data?appid='+row.appid+'">数据预览</a>&nbsp;&nbsp;' +
-                                '<a class="btn btn-sm btn-primary" style="margin-top: 5px" onclick="completePro(\'' + val + '\',\'' + row.s_status + '\')">完成</a>&nbsp;&nbsp;' +
+                                '<a class="btn btn-sm btn-primary" style="margin-top: 5px" onclick="completePro(\'' + val + '\',\'' + row.appid + '\',\'' + row.s_status + '\')">完成</a>&nbsp;&nbsp;' +
                                 '</div>';
                         }else {
                             tmp = '<div>' +
@@ -410,7 +409,7 @@
                                 // '<a class="btn btn-sm btn-primary" href="">质检结果</a>&nbsp;&nbsp;' +
                                 '<a class="btn btn-sm btn-primary" href="/front/project/field?id='+row._id+'">字段配置</a>&nbsp;&nbsp;' +
                                 '<a class="btn btn-sm btn-primary" href="/front/project/data?appid='+row.appid+'">数据预览</a>&nbsp;&nbsp;' +
-                                '<a class="btn btn-sm btn-primary" style="margin-top: 5px" onclick="completePro(\'' + val + '\',\'' + row.s_status + '\')">完成</a>&nbsp;&nbsp;' +
+                                '<a class="btn btn-sm btn-primary" style="margin-top: 5px" onclick="completePro(\'' + val + '\',\'' + row.appid + '\',\'' + row.s_status + '\')">完成</a>&nbsp;&nbsp;' +
                                 '</div>';
                         }
                         return tmp

src/web/templates/project/task_user_list.html

@@ -193,7 +193,7 @@
 
     let ctid = ""
     let cgid = ""
-    function appendTask(id, sinfo, gid) {
+    function appendTask(id, gid) {
         $.ajax({
             url: "/front/user/task/append",
             type: 'POST',