wip:代码调整

service/deduplication.go

@@ -88,14 +88,14 @@ func (service *DeduplicationService) DataDeduplicateInsert(data *deduplication.R
 			parmList = append(parmList, "(?,?,?,?,?)")
 			insertList = append(insertList, id, data.EntId, data.PersonId, "", 0)
 			if len(insertList) >= 100 {
-				insertSql = fmt.Sprintf("%s %s", insertSql, strings.Join(parmList, ","))
-				tmp := []interface{}{insertSql}
+				insertSqlS := fmt.Sprintf("%s %s", insertSql, strings.Join(parmList, ","))
+				tmp := []interface{}{insertSqlS}
 				tmp = append(tmp, insertList...)
 				_, err3 := orm.Exec(tmp...)
 				if err3 != nil {
 					orm.Rollback()
 					log.Printf("DataDeduplicateInsert 执行失败已回滚,err:%s", err3)
-					log.Printf("DataDeduplicateInsert 执行失败sql:%s,该批次部分数据：%v", insertSql, insertList)
+					log.Printf("DataDeduplicateInsert 执行失败sql:%s,该批次部分数据：%v", insertSqlS, insertList)
 					return &deduplication.Info{
 						TotalCount: int64(totalInfoCount),
 						ExistCount: int64(totalExist),
@@ -108,14 +108,14 @@ func (service *DeduplicationService) DataDeduplicateInsert(data *deduplication.R
 			}
 		}
 		if len(insertList) > 0 {
-			insertSql = fmt.Sprintf("%s %s", insertSql, strings.Join(parmList, ","))
-			tmp := []interface{}{insertSql}
+			insertSqlS := fmt.Sprintf("%s %s", insertSql, strings.Join(parmList, ","))
+			tmp := []interface{}{insertSqlS}
 			tmp = append(tmp, insertList...)
 			_, err3 := orm.Exec(tmp...)
 			if err3 != nil {
 				orm.Rollback()
 				log.Printf("DataDeduplicateInsert 执行失败已回滚,err:%s", err3)
-				log.Printf("DataDeduplicateInsert 执行失败sql:%s,该批次部分数据：%v", insertSql, insertList)
+				log.Printf("DataDeduplicateInsert 执行失败sql:%s,该批次部分数据：%v", insertSqlS, insertList)
 				return &deduplication.Info{
 					TotalCount: int64(totalInfoCount),
 					ExistCount: int64(totalExist),
@@ -126,8 +126,7 @@ func (service *DeduplicationService) DataDeduplicateInsert(data *deduplication.R
 		}
 		err := orm.Commit()
 		if err != nil {
-			log.Println("提交失败")
-			log.Printf("DataDeduplicateInsert commit err:%s  最后一个sql:%s", err, insertSql)
+			log.Printf("DataDeduplicateInsert commit err:%s  ", err)
 			log.Printf("DataDeduplicateInsert 提交失败该批次部分数据：%v", insertList...)
 			return &deduplication.Info{
 				TotalCount: int64(totalInfoCount),
@@ -336,14 +335,14 @@ func SaveMysql(tableName string, saveList []entity.Deduplication) {
 		parmList = append(parmList, "(?,?,?,?,?)")
 		insertList = append(insertList, saveData.InfoId, saveData.EntId, saveData.PersonId, saveData.AccountId, saveData.DataDesc)
 		if len(insertList) > 500 {
-			insertSql = fmt.Sprintf("%s %s", insertSql, strings.Join(parmList, ","))
-			tmp := []interface{}{insertSql}
+			insertSqlS := fmt.Sprintf("%s %s", insertSql, strings.Join(parmList, ","))
+			tmp := []interface{}{insertSqlS}
 			tmp = append(tmp, insertList...)
 			_, err3 := orm.Exec(tmp...)
 			if err3 != nil {
 				orm.Rollback()
 				log.Printf("DataDeduplicateAndSave执行失败err:%s", err3)
-				log.Printf("DataDeduplicateAndSave执行失败sql:%s,该批次部分数据：%v", insertSql, insertList)
+				log.Printf("DataDeduplicateAndSave执行失败sql:%s,该批次部分数据：%v", insertSqlS, insertList)
 				return
 			}
 			insertList = []interface{}{}
@@ -351,23 +350,22 @@ func SaveMysql(tableName string, saveList []entity.Deduplication) {
 		}
 	}
 	if len(insertList) > 0 {
-		insertSql = fmt.Sprintf("%s %s", insertSql, strings.Join(parmList, ","))
-		tmp := []interface{}{insertSql}
+		insertSqlS := fmt.Sprintf("%s %s", insertSql, strings.Join(parmList, ","))
+		tmp := []interface{}{insertSqlS}
 		tmp = append(tmp, insertList...)
 		_, err3 := orm.Exec(tmp...)
 		if err3 != nil {
 			orm.Rollback()
 			log.Printf("DataDeduplicateAndSave执行失败err:%s", err3)
-			log.Printf("DataDeduplicateAndSave执行失败sql:%s,该批次部分数据：%v", insertSql, insertList)
+			log.Printf("DataDeduplicateAndSave执行失败sql:%s,该批次部分数据：%v", insertSqlS, insertList)
 			return
 		}
 
 	}
 	err2 := orm.Commit()
 	if err2 != nil {
-		log.Printf("DataDeduplicateAndSave commit失败:%s 最后一次sql:%s", err2, insertSql)
+		log.Printf("DataDeduplicateAndSave commit失败:%s ", err2)
 		log.Printf("DataDeduplicateAndSave commit 该批次部分数据：%v", insertList)
 	}
 	log.Println("保存数据结束")
 }
-