Merge branch 'feature/eta2.6.5_kpler' into debug

services/base_from_kpler.go

@@ -627,6 +627,8 @@ func handleKplerIndex(req *models.HandleKplerExcelData, terminalCode string, cla
 		indexObj.Frequency = getKplerFrequency(req.Granularity)
 		indexObj.ClassifyId = int(classifyId)
 		indexObj.ProductNames = req.ProductNames
+		indexObj.FromZoneId = fromZoneIdsStr
+		indexObj.ToZoneId = toZoneIdsStr
 		indexObj.FromZoneName = fromZoneNamesStr
 		indexObj.ToZoneName = toZoneNamesStr
 		indexObj.FlowDirection = req.FlowDirection
@@ -1018,21 +1020,21 @@ func InitKplerZone() (err error) {
 				utils.FileLog.Info("新增开普勒区域库失败", err)
 			}
 			zoneMap[descendantId] = zoneObj
-			if _, ok := zoneMap[ancestorId]; !ok {
-				zoneObj := new(models.BaseFromKplerZone)
-				zoneObj.ZoneName = v.AncestorName
-				zoneObj.ZoneType = v.AncestorType
-				zoneObj.DescendantId = ancestorId
-				zoneObj.DescendantName = v.AncestorName
-				zoneObj.ModifyTime = time.Now()
-				zoneObj.CreateTime = time.Now()
-				_, err = zoneObj.Add()
-				if err != nil {
-					fmt.Println("新增开普勒区域库失败", err)
-					utils.FileLog.Info("新增开普勒区域库失败", err)
-				}
-				zoneMap[ancestorId] = zoneObj
-			}
+			// if _, ok := zoneMap[ancestorId]; !ok {
+			// 	zoneObj := new(models.BaseFromKplerZone)
+			// 	zoneObj.ZoneName = v.AncestorName
+			// 	zoneObj.ZoneType = v.AncestorType
+			// 	zoneObj.DescendantId = ancestorId
+			// 	zoneObj.DescendantName = v.AncestorName
+			// 	zoneObj.ModifyTime = time.Now()
+			// 	zoneObj.CreateTime = time.Now()
+			// 	_, err = zoneObj.Add()
+			// 	if err != nil {
+			// 		fmt.Println("新增开普勒区域库失败", err)
+			// 		utils.FileLog.Info("新增开普勒区域库失败", err)
+			// 	}
+			// 	zoneMap[ancestorId] = zoneObj
+			// }
 		}
 	}
 	return