From 1873461012c99801f364bd07fae2c218d245048e Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期一, 11 九月 2023 19:42:39 +0800
Subject: [PATCH] 修复bom第一启动时的全量上报
---
report/send.go | 62 +++++--------------------------
1 files changed, 10 insertions(+), 52 deletions(-)
diff --git a/report/send.go b/report/send.go
index 35a6311..13e7af0 100644
--- a/report/send.go
+++ b/report/send.go
@@ -2,7 +2,6 @@
import (
"encoding/json"
- "io/ioutil"
"time"
"kingdee-dbapi/cache"
@@ -147,6 +146,11 @@
var bomList []kingdee.ICBom
var bomChildList []kingdee.ICBomChild
+ // 绗竴娆″惎鍔�, 涓婃姤鍏ㄩ噺
+ if len(bomReportedCache) == 0 {
+ fData = true
+ }
+
// 涓婃姤bom
bomList = kingdee.BomList(fData)
logger.Debug("鏌ヨ鍒�%d鏉OM鏁版嵁", len(bomList))
@@ -182,21 +186,19 @@
}
// 缁檅om娣诲姞缁勪欢
- for _, bom := range bomList {
- bom.Component = bomChildMap[bom.FInterID]
+ for idx, bom := range bomList {
+ bomList[idx].Component = bomChildMap[bom.FInterID]
}
- // 姣忔鍙� 1000 鏉�
+ // 姣忔鍙� 200 鏉�
successCnt := 0
- for i := 0; i < len(bomList); i += 1000 {
- end := i + 1000
+ for i := 0; i < len(bomList); i += 200 {
+ end := i + 200
if end > len(bomList) {
end = len(bomList)
}
b, _ := json.Marshal(bomList[i:end])
-
- ioutil.WriteFile("bomList.tmp", b, 0644)
ok := nsqclient.Produce(config.Options.BomTopic, b)
if !ok {
@@ -214,48 +216,4 @@
logger.Debug("宸蹭笂鎶�%d鏉OM鏁版嵁", successCnt)
}
- //
- //// 涓婃姤bom瀛愰」
- //
- //// 濡傛灉璇锋眰鍏ㄩ噺鏁版嵁, 鐩存帴鏌ヨ鎵�鏈夌殑鏁版嵁骞跺彂閫�. 澧為噺涓婃姤, 鍏堝垽鏂璪om鏄惁鏈夋洿鏂�,鐒跺悗鎸塨om缂栫爜鏌ヨ瀛愰」
- //if fData {
- // bomChildList = kingdee.BomChild(nil)
- //} 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瀛愰」鏁版嵁.")
- // 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)
}
--
Gitblit v1.8.0