project: add cicd2

Dockerfile

@@ -6,13 +6,13 @@ owner="yiping.xu"
 
 WORKDIR /bin
 
-RUN rm -rf bin && \
-    mkdir -p bin && \
-    GOARCH=amd64 GOOS=linux CGO_ENABLED=0 go build -o bin/kptTmrGroup -ldflags "-X kpt.kptyun.cn:3000/kpt-event/kpt-tmr-group/pod.appVersion=${version}" main.go
+RUN rm -rf /drone/src/kpt-tmr-group/bin && \
+    mkdir -p /drone/src/kpt-tmr-group/bin && \
+    GOARCH=amd64 GOOS=linux CGO_ENABLED=0 go build -o /drone/src/kpt-tmr-group/bin/kptTmrGroup -ldflags "-X kpt.kptyun.cn:3000/kpt-event/kpt-tmr-group/pod.appVersion=${version}" main.go
 
 
-ADD ./bin/kptTmrGroup /bin/kptTmrGroup
-COPY config/*.yaml /bin/config/
+ADD /drone/src/kpt-tmr-group/bin/kptTmrGroup /bin/kptTmrGroup
+COPY /drone/src/kpt-tmr-group/config/*.yaml /bin/config/
 
 EXPOSE 8090
 VOLUME /bin/logger

module/backend/dashboard_service.go

@@ -502,6 +502,7 @@ func (s *StoreEntry) SprinkleFeedTime(ctx context.Context, req *operationPb.Spri
 	}
 
 	tableList := make([]*model.SprinkleFeedTimeTable, 0)
+	infoSprinkleNumber, errorSprinkleNumber := make([]int32, 0), make([]int32, 0)
 	for pastureName, data := range pastureSprinkleDataList {
 		sprinkleFeedTimeList := make(map[int32]map[int32][]int64, 0)
 		for _, v := range data {
@@ -519,19 +520,20 @@ func (s *StoreEntry) SprinkleFeedTime(ctx context.Context, req *operationPb.Spri
 			sprinkleFeedTimeList[v.FBarId][v.Times] = append(sprinkleFeedTimeList[v.FBarId][v.Times], realityTimeUnix.Unix())
 		}
 		res.Data.Chart.Title = append(res.Data.Chart.Title, pastureName)
-		res.Data.Chart.SprinkleNumberList = append(res.Data.Chart.SprinkleNumberList, sprinkleExecTimeAnalysis(sprinkleFeedTimeList))
-	}
 
+		infoNumber, errNumber := sprinkleExecTimeAnalysis(sprinkleFeedTimeList)
+		infoSprinkleNumber = append(infoSprinkleNumber, infoNumber)
+		errorSprinkleNumber = append(errorSprinkleNumber, errNumber)
+	}
+	res.Data.Chart.SprinkleNumberList = append(res.Data.Chart.SprinkleNumberList, infoSprinkleNumber, errorSprinkleNumber)
 	res.Data.TableList = tableList
 	return res, nil
 }
 
-func sprinkleExecTimeAnalysis(sprinkleFeedTimeList map[int32]map[int32][]int64) []int32 {
-	res := make([]int32, 0)
+func sprinkleExecTimeAnalysis(sprinkleFeedTimeList map[int32]map[int32][]int64) (int32, int32) {
 	var infoSprinkleNumber, errorSprinkleNumber int32 = 0, 0
-
 	if len(sprinkleFeedTimeList) <= 0 {
-		return res
+		return infoSprinkleNumber, errorSprinkleNumber
 	} else {
 		for _, value := range sprinkleFeedTimeList {
 			for _, execTimeList := range value {
@@ -545,8 +547,7 @@ func sprinkleExecTimeAnalysis(sprinkleFeedTimeList map[int32]map[int32][]int64)
 				}
 			}
 		}
-		res = append(res, infoSprinkleNumber, errorSprinkleNumber)
 	}
 
-	return res
+	return infoSprinkleNumber, errorSprinkleNumber
 }