From 889b82369c9833a9b567dab02cf483210c006563 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 15 八月 2023 17:38:06 +0800
Subject: [PATCH] 移除测试代码
---
report/send.go | 57 +++++++++++++++++++++++++++++++--------------------------
report/task.go | 2 +-
2 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/report/send.go b/report/send.go
index c51e58d..f495445 100644
--- a/report/send.go
+++ b/report/send.go
@@ -2,7 +2,6 @@
import (
"encoding/json"
- "io/ioutil"
"time"
"kingdee-dbapi/cache"
@@ -146,10 +145,7 @@
func SendBom(fData bool) {
// 涓婃姤bom
bomList := kingdee.BomList(fData)
- logger.Debug("鏌ヨ鍒�%d鏉om鏁版嵁", len(bomList))
-
- b, _ := json.Marshal(bomList)
- ioutil.WriteFile("bomList.tmp", b, 0644)
+ logger.Debug("鏌ヨ鍒�%d鏉OM鏁版嵁", len(bomList))
// 杩囨护鏁版嵁, 鍒ゆ柇鏄惁宸茬粡涓婃姤杩�, 璇锋眰鍏ㄩ噺鏁版嵁涓嶈繃婊�, 鐩存帴涓婃姤
if !fData {
@@ -191,6 +187,7 @@
successCnt = end
}
}
+
logger.Debug("宸蹭笂鎶�%d鏉OM鏁版嵁", successCnt)
}
@@ -200,34 +197,42 @@
// 濡傛灉璇锋眰鍏ㄩ噺鏁版嵁, 鐩存帴鏌ヨ鎵�鏈夌殑鏁版嵁骞跺彂閫�. 澧為噺涓婃姤, 鍏堝垽鏂璪om鏄惁鏈夋洿鏂�,鐒跺悗鎸塨om缂栫爜鏌ヨ瀛愰」
if fData {
bomChildList = kingdee.BomChild(nil)
- b, _ := json.Marshal(bomChildList)
- ioutil.WriteFile("bomChdList.tmp", b, 0644)
} else {
if len(bomList) <= 0 {
return
}
+
+ var bomIds []string
+ for _, v := range bomList {
+ bomIds = append(bomIds, v.FBOMNumber)
+ }
+
+ bomChildList = kingdee.BomChild(bomIds)
}
+
+ logger.Debug("鏌ヨ鍒�%d鏉OM瀛愰」鏁版嵁", len(bomList))
if len(bomChildList) == 0 {
logger.Debug("娌℃湁瑕佹洿鏂扮殑BOM瀛愰」鏁版嵁.")
- } else {
- // 姣忔鍙� 1000 鏉�
- successCnt := 0
- for i := 0; i < len(bomChildList); i += 1000 {
- end := i + 1000
- if end > len(bomChildList) {
- end = len(bomChildList)
- }
-
- b, _ := json.Marshal(bomChildList[i:end])
-
- ok := nsqclient.Produce(config.Options.BomChildTopic, b)
- if !ok {
- logger.Warn("BOM鏁版嵁涓婃姤澶辫触")
- } else {
- successCnt = end
- }
- }
- logger.Debug("宸蹭笂鎶�%d鏉OM瀛愰」鏁版嵁", successCnt)
+ return
}
+
+ // 姣忔鍙� 1000 鏉�
+ successCnt := 0
+ for i := 0; i < len(bomChildList); i += 1000 {
+ end := i + 1000
+ if end > len(bomChildList) {
+ end = len(bomChildList)
+ }
+
+ b, _ := json.Marshal(bomChildList[i:end])
+
+ ok := nsqclient.Produce(config.Options.BomChildTopic, b)
+ if !ok {
+ logger.Warn("BOM鏁版嵁涓婃姤澶辫触")
+ } else {
+ successCnt = end
+ }
+ }
+ logger.Debug("宸蹭笂鎶�%d鏉OM瀛愰」鏁版嵁", successCnt)
}
diff --git a/report/task.go b/report/task.go
index f0011d1..282c481 100644
--- a/report/task.go
+++ b/report/task.go
@@ -42,7 +42,7 @@
// 涓婃姤bom
if config.Options.BomTopic != "" {
- SendBom(true)
+ SendBom(false)
}
time.Sleep(time.Duration(config.Options.SyncInterval) * time.Second)
--
Gitblit v1.8.0