|
@@ -18,7 +18,7 @@ import (
|
|
|
)
|
|
|
|
|
|
const (
|
|
|
- sourceName = "lysww" // 粮油商务网
|
|
|
+ lySourceName = "lysww" // 粮油商务网
|
|
|
)
|
|
|
|
|
|
// TableData 用于存储表格的数据
|
|
@@ -116,9 +116,9 @@ func (p *ImportCostProcessor) Process(ctx context.Context, product string, repor
|
|
|
indexNameList := append(indexNamePrefix, append([]string{targetMonth}, indexNameSuffix...)...)
|
|
|
indexName := strings.Join(indexNameList[:len(keywords)-2], ":")
|
|
|
// 指标编码
|
|
|
- indexCode := utils.GenerateIndexCode(sourceName, indexName)
|
|
|
+ indexCode := utils.GenerateIndexCode(lySourceName, indexName)
|
|
|
// 指标id获取
|
|
|
- indexId, err := getIndexId(indexCode, indexName, classifyId, sourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
+ indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
if err != nil {
|
|
|
logs.Error("ProcessingImportCostProcessor Process() : Failed to get index id: %v", err)
|
|
|
continue
|
|
@@ -237,9 +237,9 @@ func (p *ProcessingProfitProcessor) Process(ctx context.Context, product string,
|
|
|
indexNameList := append(indexNamePrefix, append([]string{targetMonth}, indexNameSuffix...)...)
|
|
|
indexName := strings.Join(indexNameList[:len(keywords)-1], ":")
|
|
|
// 指标编码
|
|
|
- indexCode := utils.GenerateIndexCode(sourceName, indexName)
|
|
|
+ indexCode := utils.GenerateIndexCode(lySourceName, indexName)
|
|
|
// 指标id获取
|
|
|
- indexId, err := getIndexId(indexCode, indexName, classifyId, sourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
+ indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
if err != nil {
|
|
|
logs.Error("ProcessingProfitProcessor Process() : Failed to get index id: %v", err)
|
|
|
continue
|
|
@@ -350,9 +350,9 @@ func (p *ShippingCostProcessor) Process(ctx context.Context, product string, rep
|
|
|
// 指标名称
|
|
|
indexName := strings.Join(keywords[:len(keywords)-3], `:`)
|
|
|
// 指标编码
|
|
|
- indexCode := utils.GenerateIndexCode(sourceName, indexName)
|
|
|
+ indexCode := utils.GenerateIndexCode(lySourceName, indexName)
|
|
|
// 指标id获取
|
|
|
- indexId, err := getIndexId(indexCode, indexName, classifyId, sourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
+ indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
if err != nil {
|
|
|
logs.Error("ShippingCostProcessor Process() : Failed to get index id: %v", err)
|
|
|
continue
|
|
@@ -476,9 +476,9 @@ func (p *SupplyDemandBalanceProcessor) Process(ctx context.Context, product stri
|
|
|
// 指标名称
|
|
|
indexName := strings.Join(keywords[:len(keywords)-2], ":")
|
|
|
// 指标编码
|
|
|
- indexCode := utils.GenerateIndexCode(sourceName, indexName)
|
|
|
+ indexCode := utils.GenerateIndexCode(lySourceName, indexName)
|
|
|
// 指标id获取
|
|
|
- indexId, err := getIndexId(indexCode, indexName, classifyId, sourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
+ indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
if err != nil {
|
|
|
logs.Error("SupplyDemandBalanceProcessor Process() : Failed to get index id: %v", err)
|
|
|
continue
|
|
@@ -611,9 +611,9 @@ func (p *PurchaseShippingProcessor) Process(ctx context.Context, product string,
|
|
|
// 指标名称
|
|
|
indexName := strings.Join(keywords[:len(keywords)-3], ":")
|
|
|
// 指标编码
|
|
|
- indexCode := utils.GenerateIndexCode(sourceName, indexName)
|
|
|
+ indexCode := utils.GenerateIndexCode(lySourceName, indexName)
|
|
|
// 指标id获取
|
|
|
- indexId, err := getIndexId(indexCode, indexName, classifyId, sourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
+ indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
if err != nil {
|
|
|
logs.Error("SupplyDemandBalanceProcessor Process() : Failed to get index id: %v", err)
|
|
|
continue
|
|
@@ -737,9 +737,9 @@ func (p *ProcessingReportProcessor) Process(ctx context.Context, product string,
|
|
|
}
|
|
|
indexName := strings.Join(keywords[:len(keywords)-2], ":")
|
|
|
// 指标编码
|
|
|
- indexCode := utils.GenerateIndexCode(sourceName, indexName)
|
|
|
+ indexCode := utils.GenerateIndexCode(lySourceName, indexName)
|
|
|
// 指标id获取
|
|
|
- indexId, err := getIndexId(indexCode, indexName, classifyId, sourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
+ indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
@@ -813,9 +813,9 @@ func (p *ProcessingReportProcessor) Process(ctx context.Context, product string,
|
|
|
// 指标名称
|
|
|
indexName := strings.Join(keywords[:len(keywords)-2], ":")
|
|
|
// 指标编码
|
|
|
- indexCode := utils.GenerateIndexCode(sourceName, indexName)
|
|
|
+ indexCode := utils.GenerateIndexCode(lySourceName, indexName)
|
|
|
// 指标id获取
|
|
|
- indexId, err := getIndexId(indexCode, indexName, classifyId, sourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
+ indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
if err != nil {
|
|
|
logs.Error("ProcessingReportProcessor Process() : Failed to get index id: %v", err)
|
|
|
continue
|
|
@@ -941,9 +941,9 @@ func (p *InventoryAnalysisProcessor) Process(ctx context.Context, product string
|
|
|
indexName := strings.Join(keywords[:len(keywords)-2], ":")
|
|
|
indexName = removeParentheses(indexName)
|
|
|
// 指标编码
|
|
|
- indexCode := utils.GenerateIndexCode(sourceName, indexName)
|
|
|
+ indexCode := utils.GenerateIndexCode(lySourceName, indexName)
|
|
|
// 指标id获取
|
|
|
- indexId, err := getIndexId(indexCode, indexName, classifyId, sourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
+ indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
if err != nil {
|
|
|
logs.Error("SupplyDemandBalanceProcessor Process() : Failed to get index id: %v", err)
|
|
|
continue
|
|
@@ -1047,9 +1047,9 @@ func (p *PriceSpreadArbitrageProcessor) Process(ctx context.Context, product str
|
|
|
// 指标名称
|
|
|
indexName := strings.Join(keywords[:len(keywords)-2], ":")
|
|
|
// 指标编码
|
|
|
- indexCode := utils.GenerateIndexCode(sourceName, indexName)
|
|
|
+ indexCode := utils.GenerateIndexCode(lySourceName, indexName)
|
|
|
// 指标id获取
|
|
|
- indexId, err := getIndexId(indexCode, indexName, classifyId, sourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
+ indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
if err != nil {
|
|
|
logs.Error("ProcessingProfitProcessor Process() : Failed to get index id: %v", err)
|
|
|
continue
|
|
@@ -1154,9 +1154,9 @@ func (p *DailyTransactionProcessor) Process(ctx context.Context, product string,
|
|
|
// 指标名称
|
|
|
indexName := strings.Join(keywords[:len(keywords)-3], ":")
|
|
|
// 指标编码
|
|
|
- indexCode := utils.GenerateIndexCode(sourceName, indexName)
|
|
|
+ indexCode := utils.GenerateIndexCode(lySourceName, indexName)
|
|
|
// 指标id获取
|
|
|
- indexId, err := getIndexId(indexCode, indexName, classifyId, sourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
+ indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
if err != nil {
|
|
|
logs.Error("DailyTransactionProcessor Process() : Failed to get index id: %v", err)
|
|
|
continue
|
|
@@ -1212,9 +1212,9 @@ func (p *DailyTransactionProcessor) Process(ctx context.Context, product string,
|
|
|
// 指标名称
|
|
|
indexName := strings.Join(keywords[:len(keywords)-3], ":")
|
|
|
// 指标编码
|
|
|
- indexCode := utils.GenerateIndexCode(sourceName, indexName)
|
|
|
+ indexCode := utils.GenerateIndexCode(lySourceName, indexName)
|
|
|
// 指标id获取
|
|
|
- indexId, err := getIndexId(indexCode, indexName, classifyId, sourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
+ indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
if err != nil {
|
|
|
logs.Error("DailyTransactionProcessor Process() : Failed to get index id: %v", err)
|
|
|
continue
|
|
@@ -1297,9 +1297,9 @@ func (p *DailyTransactionProcessor) Process(ctx context.Context, product string,
|
|
|
indexName := strings.Join(keywords[:len(keywords)-3], ":")
|
|
|
indexName = removeParentheses(indexName)
|
|
|
// 指标编码
|
|
|
- indexCode := utils.GenerateIndexCode(sourceName, indexName)
|
|
|
+ indexCode := utils.GenerateIndexCode(lySourceName, indexName)
|
|
|
// 指标id获取
|
|
|
- indexId, err := getIndexId(indexCode, indexName, classifyId, sourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
+ indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
if err != nil {
|
|
|
logs.Error("SupplyDemandBalanceProcessor Process() : Failed to get index id: %v", err)
|
|
|
continue
|
|
@@ -1429,9 +1429,9 @@ func (p *PalmOilImportCostProcessor) Process(ctx context.Context, product string
|
|
|
indexNameList := append(indexNamePrefix, append([]string{targetMonth}, indexNameSuffix...)...)
|
|
|
indexName := strings.Join(indexNameList[:len(keywords)-2], ":")
|
|
|
// 指标编码
|
|
|
- indexCode := utils.GenerateIndexCode(sourceName, indexName)
|
|
|
+ indexCode := utils.GenerateIndexCode(lySourceName, indexName)
|
|
|
// 指标id获取
|
|
|
- indexId, err := getIndexId(indexCode, indexName, classifyId, sourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
+ indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
if err != nil {
|
|
|
logs.Error("PalmOilImportCostProcessor Process() : Failed to get index id: %v", err)
|
|
|
continue
|
|
@@ -1542,9 +1542,9 @@ func (p *ImportEstimateProcessor) Process(ctx context.Context, product string, r
|
|
|
// 指标名称
|
|
|
indexName := strings.Join(keywords[:len(keywords)-2], `:`)
|
|
|
// 指标编码
|
|
|
- indexCode := utils.GenerateIndexCode(sourceName, indexName)
|
|
|
+ indexCode := utils.GenerateIndexCode(lySourceName, indexName)
|
|
|
// 指标id获取
|
|
|
- indexId, err := getIndexId(indexCode, indexName, classifyId, sourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
+ indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
if err != nil {
|
|
|
logs.Error("ImportEstimateProcessor Process() : Failed to get index id: %v", err)
|
|
|
continue
|
|
@@ -1708,9 +1708,9 @@ func (p *InternationalPriceProcessor) Process(ctx context.Context, product strin
|
|
|
indexNameList := append(indexNamePrefix, append([]string{targetMonth}, indexNameSuffix...)...)
|
|
|
indexName := strings.Join(indexNameList[:len(keywords)-2], ":")
|
|
|
// 指标编码
|
|
|
- indexCode := utils.GenerateIndexCode(sourceName, indexName)
|
|
|
+ indexCode := utils.GenerateIndexCode(lySourceName, indexName)
|
|
|
// 指标id获取
|
|
|
- indexId, err := getIndexId(indexCode, indexName, classifyId, sourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
+ indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
if err != nil {
|
|
|
logs.Error("InternationalPriceProcessor Process() : Failed to get index id: %v", err)
|
|
|
continue
|
|
@@ -1811,9 +1811,9 @@ func (p *CanadaStatisticsBureauProcessor) Process(ctx context.Context, product s
|
|
|
// 指标名称
|
|
|
indexName := strings.Join(keywords[:len(keywords)-2], ":")
|
|
|
// 指标编码
|
|
|
- indexCode := utils.GenerateIndexCode(sourceName, indexName)
|
|
|
+ indexCode := utils.GenerateIndexCode(lySourceName, indexName)
|
|
|
// 指标id获取
|
|
|
- indexId, err := getIndexId(indexCode, indexName, classifyId, sourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
+ indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
if err != nil {
|
|
|
logs.Error("CanadaStatisticsBureauProcessor Process() : Failed to get index id: %v", err)
|
|
|
continue
|
|
@@ -1917,9 +1917,9 @@ func (p *ImportExportAnalysisProcessor) Process(ctx context.Context, product str
|
|
|
// 指标名称
|
|
|
indexName := strings.Join(keywords[:len(keywords)-2], ":")
|
|
|
// 指标编码
|
|
|
- indexCode := utils.GenerateIndexCode(sourceName, indexName)
|
|
|
+ indexCode := utils.GenerateIndexCode(lySourceName, indexName)
|
|
|
// 指标id获取
|
|
|
- indexId, err := getIndexId(indexCode, indexName, classifyId, sourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
+ indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
|
|
|
if err != nil {
|
|
|
logs.Error("ProcessingProfitProcessor Process() : Failed to get index id: %v", err)
|
|
|
continue
|
|
@@ -1983,7 +1983,7 @@ func extractValueInParentheses(input string) (string, error) {
|
|
|
}
|
|
|
|
|
|
// 获取指标id,根据指标名称判断,没有插入指标生成返回
|
|
|
-func getIndexId(indexCode string, indexName string, classifyId int, sourceName string, frequency string, unit string) (int, error) {
|
|
|
+func getIndexId(indexCode string, indexName string, classifyId int, lySourceName string, frequency string, unit string) (int, error) {
|
|
|
// 判断指标是否存在
|
|
|
var indexId int
|
|
|
indexInfo, err := models.GetLyIndexByCode(indexCode)
|