diff --git a/YLErpDAL/Modules/RiskModule/QuotaMonitorService.cs b/YLErpDAL/Modules/RiskModule/QuotaMonitorService.cs
index 8c7d3314..e87ba2db 100644
--- a/YLErpDAL/Modules/RiskModule/QuotaMonitorService.cs
+++ b/YLErpDAL/Modules/RiskModule/QuotaMonitorService.cs
@@ -4289,15 +4289,6 @@ namespace YLErp.Modules.RiskModule
{
throw new ServiceException("未找到客户信息");
}
- try
- {
- RealtimePnlCalc.RealtimeSwapPosition(new OptUserInfo(0, "互换实时持仓服务", OptUserFrom.Service));
- }
- catch (Exception ex)
- {
- LogFactory.GetLogger("RealtimeSwapPosition").Error("风控调用实时持仓异常", ex);
- }
-
using var bondDb = new BondOmsDBContext();
var clientPositions = bondDb.client_position.AsNoTracking().ToList();//所有持仓
ClientPosition posi = new ClientPosition();
diff --git a/YLErpDAL/Modules/SwapModule/SwapConsumerService.cs b/YLErpDAL/Modules/SwapModule/SwapConsumerService.cs
index a70591ce..7abd70fb 100644
--- a/YLErpDAL/Modules/SwapModule/SwapConsumerService.cs
+++ b/YLErpDAL/Modules/SwapModule/SwapConsumerService.cs
@@ -73,44 +73,6 @@ namespace YLErp.Modules.SwapModule
}
-
-
-
- ///
- /// 接入对冲标的
- ///
- ///
- private void PrepareExchangeTradeData(SwapPosiReq swapPosiReq, string tradeSource)
- {
- var underlying = CheckUnderlying(swapPosiReq.TRADEINFO.I_CODE, swapPosiReq.TRADEINFO.MARKET);
- var orddDate = TryFormatDate(swapPosiReq.BASEINFO.ORDDATE);
- var longType = swapPosiReq.BASEINFO.TRDTYPE == "10" ? "多头" : "空头";
- var openType = swapPosiReq.TRADEINFO.OCFLAG == "0" ? "开仓" : "平仓";
-
- if (string.IsNullOrEmpty(swapPosiReq.BASEINFO.TRD_RELATED_NO) || !double.TryParse(swapPosiReq.TRADEINFO.PARVALUE, out _) || !double.TryParse(swapPosiReq.TRADEINFO.ORDPRICE, out _))
- {
- logger.Error("同步场内交易失败，数据格式不正确：" + JsonHelper.Serialize(swapPosiReq));
- return;
- }
-
- ExchangeTradeSaveApiReq req = new ExchangeTradeSaveApiReq
- {
- ExchangeAccountCode = swapPosiReq.BASEINFO.SECU_INT,
- BuySell = longType + openType,
- Commission = 0,
- IsHistory = orddDate.Date < valuedateBLL.ValueDate ? true : false,
- Lots = double.Parse(swapPosiReq.TRADEINFO.PARVALUE) / underlying.ContractSize,
- TradeDate = orddDate.Date,
- TradeNumber = swapPosiReq.BASEINFO.TRD_RELATED_NO,
- TradePrice = double.Parse(swapPosiReq.TRADEINFO.ORDPRICE) / (underlying.Price ?? 100),
- TradeType = underlying.UnderlyingInstrumentTypeCn,
- UnderlyingCode = underlying.UnderlyingCode
- };
- var service = new ExchangeTradeSyncApiService(UserInfo);
- service.Save(req, tradeSource);
- }
-
-
///
/// 接入对冲标的
///
@@ -145,6 +107,65 @@ namespace YLErp.Modules.SwapModule
service.Save(req, tradeSource);
}
+ ///
+ /// Trs成交流水接口
+ ///
+ ///
+ public void ConsumerTrsSwapFlowResp(KafkaConsumerHelper _kafkaConsumer)
+ {
+ _kafkaConsumer.Subscribe(msg =>
+ {
+ if (!string.IsNullOrEmpty(msg))
+ {
+ var result = JsonHelper.Deserialize(msg);
+ if (result == null)
+ {
+ return;
+ }
+ try
+ {
+ var swapFlow = DbContext.swap_flow.Where(x => x.trs_deal_id == result.trs_deal_id).FirstOrDefault();
+ if (swapFlow == null)
+ {
+ swapFlow = new swap_flow();
+ }
+ swapFlow.BsType = result.BsType;
+ swapFlow.ClientId = result.ClientId;
+ swapFlow.ClientName = result.ClientName;
+ swapFlow.ContractSize = result.ContractSize;
+ swapFlow.DataState = (int)SwapFlowDateStateEnum.等待完成;
+ swapFlow.DealType = 1;
+ swapFlow.OccurTime = result.OccurTime;
+ swapFlow.OptId = result.OptId;
+ swapFlow.OptName = result.OptName;
+ swapFlow.OptTime = result.OptTime;
+ swapFlow.SettleDate = result.SettleDate;
+ swapFlow.TradingAmount = result.TradingAmount;
+ swapFlow.TradingAmountAvg = result.TradingAmountAvg;
+ swapFlow.TradingAmountFeeAvg = result.TradingAmountFeeAvg;
+ swapFlow.TradingAmountNet = result.TradingAmountNet;
+ swapFlow.TradingAmountNetFee = result.TradingAmountNetFee;
+ swapFlow.TradingFee = result.TradingFee;
+ swapFlow.TradingQty = result.TradingQty;
+ swapFlow.trs_deal_id = result.trs_deal_id;
+ swapFlow.UnderlyingCode = result.UnderlyingCode;
+ swapFlow.UnderlyingName = result.UnderlyingName;
+ swapFlow.ytm = result.ytm;
+ if (swapFlow.id == 0)
+ {
+ DbContext.swap_flow.Add(swapFlow);
+ }
+ DbContext.SaveChanges();
+ RealtimePnlCalc.RealtimeSwapPosition(new OptUserInfo(0, "互换实时持仓服务", OptUserFrom.Service));
+ }
+ catch (Exception e)
+ {
+ LogFactory.GetLogger("SwapConsumerService").Error("TRS成交流水接口", e);
+ }
+
+ }
+ });
+ }
///
/// 校验标的信息
///
diff --git a/YLErpWeb/App/KafkaTask/TrsSwapFlowConsumerKafkaTask.cs b/YLErpWeb/App/KafkaTask/TrsSwapFlowConsumerKafkaTask.cs
new file mode 100644
index 00000000..c52584ad
--- /dev/null
+++ b/YLErpWeb/App/KafkaTask/TrsSwapFlowConsumerKafkaTask.cs
@@ -0,0 +1,58 @@
+using YLErp.Modules.SwapModule;
+
+namespace YLErp.Web.App.KafkaTask
+{
+ public class TrsSwapFlowConsumerKafkaTask : IHostedService, IDisposable
+ {
+
+ private readonly IYcLogger _logger;
+ private readonly CancellationTokenSource _cts = new CancellationTokenSource();
+ private KafkaConsumerHelper _swapFlowConsumer;//成交流水消费者
+ private string swapFlowTopic = string.Empty;
+ private string swapFlowTopicGroupId = string.Empty;
+
+ public TrsSwapFlowConsumerKafkaTask()
+ {
+ _logger = LogFactory.GetLogger("TrsSwapFlowConsumerKafkaTask");
+ swapFlowTopic = Environment.GetEnvironmentVariable("KafkaConfig_YiLian_SwapFlowTopic");
+ swapFlowTopicGroupId = Environment.GetEnvironmentVariable("KafkaConfig_YiLian_SwapFlowGroup");
+ _swapFlowConsumer = new KafkaConsumerHelper(swapFlowTopicGroupId, swapFlowTopic);
+ }
+
+ public void Dispose()
+ {
+ _cts.Dispose();
+ }
+
+ public Task StartAsync(CancellationToken cancellationToken)
+ {
+ _logger.Info("TrsSwapFlowConsumerKafkaTask started");
+ Task.Run(() => ExecuteTask(_cts.Token), _cts.Token);
+ return Task.CompletedTask;
+ }
+
+ public async Task StopAsync(CancellationToken cancellationToken)
+ {
+ _cts.Cancel();
+ await Task.CompletedTask;
+ }
+
+ private async Task ExecuteTask(CancellationToken cancellationToken)
+ {
+ while (!cancellationToken.IsCancellationRequested)
+ {
+ try
+ {
+ await Task.Run(() =>
+ {
+ new SwapConsumerService(OptUserInfo.SystemUser).ConsumerTrsSwapFlowResp(_swapFlowConsumer);
+ }, cancellationToken);
+ }
+ catch (Exception ex)
+ {
+ _logger.Error("TrsSwapFlowConsumerKafkaTask Exception", ex);
+ }
+ }
+ }
+ }
+}
diff --git a/YLErpWeb/Program.cs b/YLErpWeb/Program.cs
index bcfe11cc..c702dc22 100644
--- a/YLErpWeb/Program.cs
+++ b/YLErpWeb/Program.cs
@@ -111,7 +111,8 @@ try
builder.Services.AddHostedService();
-
+ builder.Services.AddHostedService();
+
builder.Services.AddCaptcha(builder.Configuration, option =>
{
option.ImageOption.Width = 256; // 验证码宽度
diff --git a/YLErpWeb/appsettings.dev.json b/YLErpWeb/appsettings.dev.json
index c28763aa..5509ec65 100644
--- a/YLErpWeb/appsettings.dev.json
+++ b/YLErpWeb/appsettings.dev.json
@@ -38,51 +38,17 @@
"HedgingAccountTopic": "ylHedgingAccountTopic", //对冲账户生产topic
"ReqAccountCapitalTopic": "ReqAccountCapital", //账户资金请求topic
"OnRspAccountCapitalTopic": "OnRspAccountCapital", //账户资金请求返回topic
- "ReqInterestRateSwapInsertTopic": "ReqInterestRateSwapInsert", //收益互换交易推送请求topic
- "OnRspInterestRateSwapInsertTopic": "OnRspInterestRateSwapInsert", //收益互换交易推送请求响应topic
- "OnRspInterestRateSwapInsertTopicGroupId": "OnRspInterestRateSwapInsertConsumer", //收益互换交易推送请求响应消费组
- "AccountCapitalTopicGroupId": "YiLian_OnRspAccountCapitalConsumer", //账户资金消费组
- "ReqAssetSwapInsertTopic": "ReqAssetSwapInsert", //互换资产交易推送请求
- "OnRspAssetSwapInsertTopic": "OnRspAssetSwapInsert", //互换资产交易推送请求响应
- "OnRspAssetSwapInsertTopicGroupId": "OnRspAssetSwapInsertConsumer", //互换资产交易推送请求响应消费组
- "ReqMarginInsertTopic": "ReqMarginInsert", //预付金交易推送请求
- "OnRspMarginInsertTopic": "OnRspMarginInsert", //预付金交易推送请求响应
- "OnRspMarginInsertTopicGroupId": "OnRspMarginInsertConsumer", //预付金交易推送请求响应消费组
- "ReqAcctSwapTerminateTopic": "ReqAcctSwapTerminate", //平仓推送请求
- "OnRspAcctSwapTerminateTopic": "OnRspAcctSwapTerminate", //平仓推送请求响应
- "OnRspAcctSwapTerminateTopicGroupId": "OnRspAcctSwapTerminateConsumer", //平仓推送请求响应消费组
- "ReqCalcBondTopic": "ReqCalcBond", //互换成交收益率计算器topic
- "OnRspCalcBondTopic": "OnRspCalcBond", //互换成交收益率计算器消费topic
- "OnRspCalcBondTopicGroupId": "OnRspCalcBondConsumer", //互换成交收益率计算器消费topic消费组
"AutoOffsetReset": 1, //Latest(0),Earliest(1),Error(2)
"EnableCalcBongd": false, //是否启用kafka计算
"ReqClientRiskCheckTopic": "YiLian_ReqClientRiskCheck", //客户风控检查
"ReqClientRiskCheckConsumerTopic": "YiLian_OnRspClientRiskCheck", //客户风控检查消费者
"ReqClientRiskCheckTopicGroupId": "YiLian_ReqClientRiskCheckConsumer", //客户风控检查消费者
- "ReqCounterPartyInfoInsertTopic": "ReqCounterPartyInfoInsert", //交易对手信息导入请求
- "OnRspCounterPartyInsertTopic": "OnRspCounterPartyInsert", //交易对手信息导入请求响应
- "OnRspCounterPartyInsertTopicGroupId": "OnRspCounterPartyInsertConsumer", //交易对手信息导入请求响应消费组
- "ReqCounterPartyCashAccoutInsertTopic": "ReqCounterPartyCashAccoutInsert", //交易对手资金账户信息导入请求
- "OnRspCounterPartyCashAccoutInsertTopic": "OnRspCounterPartyCashAccoutInsert", //交易对手资金账户信息请求响应
- "OnRspCounterPartyCashAccoutInsertTopicGroupId": "OnRspCounterPartyCashAccoutInsertConsumer", //交易对手资金账户信息请求响应消费组
- "RtnInterestRateSwapTopic": "RtnInterestRateSwap", //收益互换回执消费
- "RtnInterestRateSwapTopicGroupId": "RtnInterestRateSwapConsumer", //收益互换回执消费组
- "RtnAssetSwapTopic": "RtnAssetSwap", //互换资产交易回执消费
- "RtnAssetSwapTopicGroupId": "RtnAssetSwapConsumer", //互换资产交易回执消费组
- "RtnMarginTopic": "RtnMargin", //预付金交易回执消费
- "RtnMarginTopicGroupId": "RtnMarginConsumer", //预付金交易回执消费组
- "RtnAcctSwapTerminateTopic": "RtnAcctSwapTerminate", //合约终止回执消费
- "RtnAcctSwapTerminateTopicGroupId": "RtnAcctSwapTerminateConsumer", //合约终止回执消费组
- "RtnInterestRateSwapAccountTopic": "RtnInterestRateSwapAccount", //收益互换日终资金流水回执消费
- "RtnInterestRateSwapAccountTopicGroupId": "RtnInterestRateSwapAccountConsumer", //收益互换日终资金流水回执消费组
"ReqClientMonitorTopic": "YiLian_ReqClientMonitor", //客户资金监控
"OnRspClientMonitorConsumerTopic": "YiLian_OnRspClientMonitor", //客户资金监控消费者
"ReqClientMonitorTopicGroupId": "YiLian_ReqClientMonitorConsumer", //客户资金监控消费组
"ReqClientMonitorSingleTopic": "YiLian_ReqClientMonitorSingle", //单个客户资金监控
"OnRspClientMonitorSingleConsumerTopic": "YiLian_OnRspClientMonitorSingle", //单个客户资金监控
"ReqClientMonitorSingleTopicGroupId": "YiLian_ReqClientMonitorSingleConsumer", //单个客户资金监控
- "ExchangeTradeConsumerTopic": "RtnAssetSwapDb", //对冲交易消费 topic
- "ExchangeTradeConsumerTopicGroupId": "RtnAssetSwapDbGroup", //对冲交易消费 Group
"TrsExchangeTradeConsumerTopic": "YiLian_HedgingOrder", //TRS对冲交易消费 topic
"TrsExchangeTradeConsumerTopicGroupId": "YiLian_HedgingOrderGroup", //TRS对冲交易消费 Group
"YiLian_ReqHedgingOrderCancelTopic": "YiLian_ReqHedgingOrderCancel", //TRS对冲交易撤单请求消费 topic
@@ -94,7 +60,9 @@
"YiLian_CashNoticeConsumerTopic": "YiLian_CashNotice", //客户资金通知 topic
"YiLian_CashNoticeConsumerGroup": "YiLian_CashNoticeGroup", //客户资金通知消费组 topic
"YiLian_HolidayResetTopic": "YiLian_HolidayReset", //交易日历缓存重新加载 topic
- "YiLian_HolidayResetGroupId": "YiLian_HedgingOrderGroup" //交易日历缓存重新加载消费 Group
+ "YiLian_HolidayResetGroupId": "YiLian_HedgingOrderGroup", //交易日历缓存重新加载消费 Group
+ "YiLian_SwapFlowTopic": "YiLian_SwapFlow", //交易端同步流水
+ "YiLian_SwapFlowGroup": "YiLian_SwapFlowGroup" //交易端同步流水消费组
},
"BondOmsInterface": {
"BaseUrl": "http://localhost:8887",
diff --git a/YLErpWeb/appsettings.local.json b/YLErpWeb/appsettings.local.json
index bc113b43..8da1e8bb 100644
--- a/YLErpWeb/appsettings.local.json
+++ b/YLErpWeb/appsettings.local.json
@@ -62,7 +62,9 @@
"YiLian_CashNoticeConsumerTopic": "YiLian_CashNotice", //客户资金通知 topic
"YiLian_CashNoticeConsumerGroup": "YiLian_CashNoticeGroup", //客户资金通知消费组 topic
"YiLian_HolidayResetTopic": "YiLian_HolidayReset", //交易日历缓存重新加载 topic
- "YiLian_HolidayResetGroupId": "YiLian_HedgingOrderGroup1" //交易日历缓存重新加载消费 Group
+ "YiLian_HolidayResetGroupId": "YiLian_HedgingOrderGroup1", //交易日历缓存重新加载消费 Group
+ "YiLian_SwapFlowTopic": "YiLian_SwapFlow", //交易端同步流水
+ "YiLian_SwapFlowGroup": "YiLian_SwapFlowGroup1" //交易端同步流水消费组
},
"BondOmsInterface": {
"BaseUrl": "http://git.yiliantech.com:8887"
diff --git a/YLErpWeb/appsettings.prod.json b/YLErpWeb/appsettings.prod.json
index ce580b54..d3460338 100644
--- a/YLErpWeb/appsettings.prod.json
+++ b/YLErpWeb/appsettings.prod.json
@@ -37,65 +37,34 @@
"MessageTimeoutMs": 3000, // 控制生产者等待消息确认的时间，单位是毫秒
"ClientRateTopic": "ylClientRateTopic", //客户互换费率生产topic
"HedgingAccountTopic": "ylHedgingAccountTopic", //对冲账户生产topic
+ "AccountCapitalTopicGroupId": "YiLian_OnRspAccountCapitalConsumer", //账户资金消费组
"ReqAccountCapitalTopic": "ReqAccountCapital", //账户资金请求topic
"OnRspAccountCapitalTopic": "OnRspAccountCapital", //账户资金请求返回topic
- "ReqInterestRateSwapInsertTopic": "ReqInterestRateSwapInsert", //收益互换交易推送请求topic
- "OnRspInterestRateSwapInsertTopic": "OnRspInterestRateSwapInsert", //收益互换交易推送请求响应topic
- "OnRspInterestRateSwapInsertTopicGroupId": "OnRspInterestRateSwapInsertConsumer", //收益互换交易推送请求响应消费组
- "AccountCapitalTopicGroupId": "YiLian_OnRspAccountCapitalConsumer", //账户资金消费组
- "ReqAssetSwapInsertTopic": "ReqAssetSwapInsert", //互换资产交易推送请求
- "OnRspAssetSwapInsertTopic": "OnRspAssetSwapInsert", //互换资产交易推送请求响应
- "OnRspAssetSwapInsertTopicGroupId": "OnRspAssetSwapInsertConsumer", //互换资产交易推送请求响应消费组
- "ReqMarginInsertTopic": "ReqMarginInsert", //预付金交易推送请求
- "OnRspMarginInsertTopic": "OnRspMarginInsert", //预付金交易推送请求响应
- "OnRspMarginInsertTopicGroupId": "OnRspMarginInsertConsumer", //预付金交易推送请求响应消费组
- "ReqAcctSwapTerminateTopic": "ReqAcctSwapTerminate", //平仓推送请求
- "OnRspAcctSwapTerminateTopic": "OnRspAcctSwapTerminate", //平仓推送请求响应
- "OnRspAcctSwapTerminateTopicGroupId": "OnRspAcctSwapTerminateConsumer", //平仓推送请求响应消费组
- "ReqCalcBondTopic": "ReqCalcBond", //互换成交收益率计算器topic
- "OnRspCalcBondTopic": "OnRspCalcBond", //互换成交收益率计算器消费topic
- "OnRspCalcBondTopicGroupId": "OnRspCalcBondConsumer", //互换成交收益率计算器消费topic消费组
"AutoOffsetReset": 1, //Latest(0),Earliest(1),Error(2)
- "EnableCalcBongd": true, //是否启用kafka计算
+ "EnableCalcBongd": false, //是否启用kafka计算
"ReqClientRiskCheckTopic": "YiLian_ReqClientRiskCheck", //客户风控检查
"ReqClientRiskCheckConsumerTopic": "YiLian_OnRspClientRiskCheck", //客户风控检查消费者
- "ReqClientRiskCheckTopicGroupId": "YiLian_ReqClientRiskCheckConsumer", //客户风控检查消费者
- "ReqCounterPartyInfoInsertTopic": "ReqCounterPartyInfoInsert", //交易对手信息导入请求
- "OnRspCounterPartyInsertTopic": "OnRspCounterPartyInsert", //交易对手信息导入请求响应
- "OnRspCounterPartyInsertTopicGroupId": "OnRspCounterPartyInsertConsumer", //交易对手信息导入请求响应消费组
- "ReqCounterPartyCashAccoutInsertTopic": "ReqCounterPartyCashAccoutInsert", //交易对手资金账户信息导入请求
- "OnRspCounterPartyCashAccoutInsertTopic": "OnRspCounterPartyCashAccoutInsert", //交易对手资金账户信息请求响应
- "OnRspCounterPartyCashAccoutInsertTopicGroupId": "OnRspCounterPartyCashAccoutInsertConsumer", //交易对手资金账户信息请求响应消费组
- "RtnInterestRateSwapTopic": "RtnInterestRateSwap", //收益互换回执消费
- "RtnInterestRateSwapTopicGroupId": "RtnInterestRateSwapConsumer", //收益互换回执消费组
- "RtnAssetSwapTopic": "RtnAssetSwap", //互换资产交易回执消费
- "RtnAssetSwapTopicGroupId": "RtnAssetSwapConsumer", //互换资产交易回执消费组
- "RtnMarginTopic": "RtnMargin", //预付金交易回执消费
- "RtnMarginTopicGroupId": "RtnMarginConsumer", //预付金交易回执消费组
- "RtnAcctSwapTerminateTopic": "RtnAcctSwapTerminate", //合约终止回执消费
- "RtnAcctSwapTerminateTopicGroupId": "RtnAcctSwapTerminateConsumer", //合约终止回执消费组
- "RtnInterestRateSwapAccountTopic": "RtnInterestRateSwapAccount", //收益互换日终资金流水回执消费
- "RtnInterestRateSwapAccountTopicGroupId": "RtnInterestRateSwapAccountConsumer", //收益互换日终资金流水回执消费组
+ "ReqClientRiskCheckTopicGroupId": "YiLian_ReqClientRiskCheckConsumer1", //客户风控检查消费者
"ReqClientMonitorTopic": "YiLian_ReqClientMonitor", //客户资金监控
"OnRspClientMonitorConsumerTopic": "YiLian_OnRspClientMonitor", //客户资金监控消费者
- "ReqClientMonitorTopicGroupId": "YiLian_ReqClientMonitorConsumer", //客户资金监控消费组
+ "ReqClientMonitorTopicGroupId": "YiLian_ReqClientMonitorConsumer1", //客户资金监控消费组
"ReqClientMonitorSingleTopic": "YiLian_ReqClientMonitorSingle", //单个客户资金监控
"OnRspClientMonitorSingleConsumerTopic": "YiLian_OnRspClientMonitorSingle", //单个客户资金监控
- "ReqClientMonitorSingleTopicGroupId": "YiLian_ReqClientMonitorSingleConsumer", //单个客户资金监控
- "ExchangeTradeConsumerTopic": "RtnAssetSwapDb", //对冲交易消费 topic
- "ExchangeTradeConsumerTopicGroupId": "RtnAssetSwapDbGroup", //对冲交易消费 Group
+ "ReqClientMonitorSingleTopicGroupId": "YiLian_ReqClientMonitorSingleConsumer1", //单个客户资金监控
"TrsExchangeTradeConsumerTopic": "YiLian_HedgingOrder", //TRS对冲交易消费 topic
- "TrsExchangeTradeConsumerTopicGroupId": "YiLian_HedgingOrderGroup", //TRS对冲交易消费 Group
+ "TrsExchangeTradeConsumerTopicGroupId": "YiLian_HedgingOrderGroup1", //TRS对冲交易消费 Group
"YiLian_ReqHedgingOrderCancelTopic": "YiLian_ReqHedgingOrderCancel", //TRS对冲交易撤单请求消费 topic
- "YiLian_ReqHedgingOrderCancelTopicGroupId": "YiLian_ReqHedgingOrderCancelGroup", //TRS对冲交易撤单请求消费 Group
+ "YiLian_ReqHedgingOrderCancelTopicGroupId": "YiLian_ReqHedgingOrderCancelGroup1", //TRS对冲交易撤单请求消费 Group
"YiLian_RespHedgingOrderCancelTopic": "YiLian_RespHedgingOrderCancel", //TRS对冲交易撤单请求回应 topic
"YiLian_ClientInfoChangeTopic": "YiLian_ClientInfoChangeTopic", //客户信息变更通知客户端 topic
"YiLian_CashCalcConsumerTopic": "YiLian_CashCalc", //客户资金计算 topic
- "YiLian_CashCalcConsumerGroup": "YiLian_CashCalcGroup", //客户资金计算消费组 topic
+ "YiLian_CashCalcConsumerGroup": "YiLian_CashCalcGroup1", //客户资金计算消费组 topic
"YiLian_CashNoticeConsumerTopic": "YiLian_CashNotice", //客户资金通知 topic
"YiLian_CashNoticeConsumerGroup": "YiLian_CashNoticeGroup", //客户资金通知消费组 topic
"YiLian_HolidayResetTopic": "YiLian_HolidayReset", //交易日历缓存重新加载 topic
- "YiLian_HolidayResetGroupId": "YiLian_HedgingOrderGroup" //交易日历缓存重新加载消费 Group
+ "YiLian_HolidayResetGroupId": "YiLian_HedgingOrderGroup1", //交易日历缓存重新加载消费 Group
+ "YiLian_SwapFlowTopic": "YiLian_SwapFlow", //交易端同步流水
+ "YiLian_SwapFlowGroup": "YiLian_SwapFlowGroup1" //交易端同步流水消费组
},
"BondOmsInterface": {
"BaseUrl": "http://localhost:8887"
diff --git a/YLErpWeb/appsettings.uat.json b/YLErpWeb/appsettings.uat.json
index 8bac1cc0..186bb9db 100644
--- a/YLErpWeb/appsettings.uat.json
+++ b/YLErpWeb/appsettings.uat.json
@@ -37,65 +37,34 @@
"MessageTimeoutMs": 3000, // 控制生产者等待消息确认的时间，单位是毫秒
"ClientRateTopic": "ylClientRateTopic", //客户互换费率生产topic
"HedgingAccountTopic": "ylHedgingAccountTopic", //对冲账户生产topic
+ "AccountCapitalTopicGroupId": "YiLian_OnRspAccountCapitalConsumer", //账户资金消费组
"ReqAccountCapitalTopic": "ReqAccountCapital", //账户资金请求topic
"OnRspAccountCapitalTopic": "OnRspAccountCapital", //账户资金请求返回topic
- "ReqInterestRateSwapInsertTopic": "ReqInterestRateSwapInsert", //收益互换交易推送请求topic
- "OnRspInterestRateSwapInsertTopic": "OnRspInterestRateSwapInsert", //收益互换交易推送请求响应topic
- "OnRspInterestRateSwapInsertTopicGroupId": "OnRspInterestRateSwapInsertConsumer", //收益互换交易推送请求响应消费组
- "AccountCapitalTopicGroupId": "YiLian_OnRspAccountCapitalConsumer", //账户资金消费组
- "ReqAssetSwapInsertTopic": "ReqAssetSwapInsert", //互换资产交易推送请求
- "OnRspAssetSwapInsertTopic": "OnRspAssetSwapInsert", //互换资产交易推送请求响应
- "OnRspAssetSwapInsertTopicGroupId": "OnRspAssetSwapInsertConsumer", //互换资产交易推送请求响应消费组
- "ReqMarginInsertTopic": "ReqMarginInsert", //预付金交易推送请求
- "OnRspMarginInsertTopic": "OnRspMarginInsert", //预付金交易推送请求响应
- "OnRspMarginInsertTopicGroupId": "OnRspMarginInsertConsumer", //预付金交易推送请求响应消费组
- "ReqAcctSwapTerminateTopic": "ReqAcctSwapTerminate", //平仓推送请求
- "OnRspAcctSwapTerminateTopic": "OnRspAcctSwapTerminate", //平仓推送请求响应
- "OnRspAcctSwapTerminateTopicGroupId": "OnRspAcctSwapTerminateConsumer", //平仓推送请求响应消费组
- "ReqCalcBondTopic": "ReqCalcBond", //互换成交收益率计算器topic
- "OnRspCalcBondTopic": "OnRspCalcBond", //互换成交收益率计算器消费topic
- "OnRspCalcBondTopicGroupId": "OnRspCalcBondConsumer", //互换成交收益率计算器消费topic消费组
"AutoOffsetReset": 1, //Latest(0),Earliest(1),Error(2)
- "EnableCalcBongd": true, //是否启用kafka计算
+ "EnableCalcBongd": false, //是否启用kafka计算
"ReqClientRiskCheckTopic": "YiLian_ReqClientRiskCheck", //客户风控检查
"ReqClientRiskCheckConsumerTopic": "YiLian_OnRspClientRiskCheck", //客户风控检查消费者
- "ReqClientRiskCheckTopicGroupId": "YiLian_ReqClientRiskCheckConsumer", //客户风控检查消费者
- "ReqCounterPartyInfoInsertTopic": "ReqCounterPartyInfoInsert", //交易对手信息导入请求
- "OnRspCounterPartyInsertTopic": "OnRspCounterPartyInsert", //交易对手信息导入请求响应
- "OnRspCounterPartyInsertTopicGroupId": "OnRspCounterPartyInsertConsumer", //交易对手信息导入请求响应消费组
- "ReqCounterPartyCashAccoutInsertTopic": "ReqCounterPartyCashAccoutInsert", //交易对手资金账户信息导入请求
- "OnRspCounterPartyCashAccoutInsertTopic": "OnRspCounterPartyCashAccoutInsert", //交易对手资金账户信息请求响应
- "OnRspCounterPartyCashAccoutInsertTopicGroupId": "OnRspCounterPartyCashAccoutInsertConsumer", //交易对手资金账户信息请求响应消费组
- "RtnInterestRateSwapTopic": "RtnlnterestRateSwap", //收益互换回执消费
- "RtnInterestRateSwapTopicGroupId": "RtnInterestRateSwapConsumer", //收益互换回执消费组
- "RtnAssetSwapTopic": "RtnAssetSwap", //互换资产交易回执消费
- "RtnAssetSwapTopicGroupId": "RtnAssetSwapConsumer", //互换资产交易回执消费组
- "RtnMarginTopic": "RtnMargin", //预付金交易回执消费
- "RtnMarginTopicGroupId": "RtnMarginConsumer", //预付金交易回执消费组
- "RtnAcctSwapTerminateTopic": "RtnAcctSwapTerminate", //合约终止回执消费
- "RtnAcctSwapTerminateTopicGroupId": "RtnAcctSwapTerminateConsumer", //合约终止回执消费组
- "RtnInterestRateSwapAccountTopic": "RtnInterestRateSwapAccount", //收益互换日终资金流水回执消费
- "RtnInterestRateSwapAccountTopicGroupId": "RtnInterestRateSwapAccountConsumer", //收益互换日终资金流水回执消费组
+ "ReqClientRiskCheckTopicGroupId": "YiLian_ReqClientRiskCheckConsumer1", //客户风控检查消费者
"ReqClientMonitorTopic": "YiLian_ReqClientMonitor", //客户资金监控
"OnRspClientMonitorConsumerTopic": "YiLian_OnRspClientMonitor", //客户资金监控消费者
- "ReqClientMonitorTopicGroupId": "YiLian_ReqClientMonitorConsumer", //客户资金监控消费组
+ "ReqClientMonitorTopicGroupId": "YiLian_ReqClientMonitorConsumer1", //客户资金监控消费组
"ReqClientMonitorSingleTopic": "YiLian_ReqClientMonitorSingle", //单个客户资金监控
"OnRspClientMonitorSingleConsumerTopic": "YiLian_OnRspClientMonitorSingle", //单个客户资金监控
- "ReqClientMonitorSingleTopicGroupId": "YiLian_ReqClientMonitorSingleConsumer", //单个客户资金监控
- "ExchangeTradeConsumerTopic": "RtnAssetSwapDb", //对冲交易消费 topic
- "ExchangeTradeConsumerTopicGroupId": "RtnAssetSwapDbGroup", //对冲交易消费 Group
+ "ReqClientMonitorSingleTopicGroupId": "YiLian_ReqClientMonitorSingleConsumer1", //单个客户资金监控
"TrsExchangeTradeConsumerTopic": "YiLian_HedgingOrder", //TRS对冲交易消费 topic
- "TrsExchangeTradeConsumerTopicGroupId": "YiLian_HedgingOrderGroup", //TRS对冲交易消费 Group
+ "TrsExchangeTradeConsumerTopicGroupId": "YiLian_HedgingOrderGroup1", //TRS对冲交易消费 Group
"YiLian_ReqHedgingOrderCancelTopic": "YiLian_ReqHedgingOrderCancel", //TRS对冲交易撤单请求消费 topic
- "YiLian_ReqHedgingOrderCancelTopicGroupId": "YiLian_ReqHedgingOrderCancelGroup", //TRS对冲交易撤单请求消费 Group
+ "YiLian_ReqHedgingOrderCancelTopicGroupId": "YiLian_ReqHedgingOrderCancelGroup1", //TRS对冲交易撤单请求消费 Group
"YiLian_RespHedgingOrderCancelTopic": "YiLian_RespHedgingOrderCancel", //TRS对冲交易撤单请求回应 topic
"YiLian_ClientInfoChangeTopic": "YiLian_ClientInfoChangeTopic", //客户信息变更通知客户端 topic
"YiLian_CashCalcConsumerTopic": "YiLian_CashCalc", //客户资金计算 topic
- "YiLian_CashCalcConsumerGroup": "YiLian_CashCalcGroup", //客户资金计算消费组 topic
+ "YiLian_CashCalcConsumerGroup": "YiLian_CashCalcGroup1", //客户资金计算消费组 topic
"YiLian_CashNoticeConsumerTopic": "YiLian_CashNotice", //客户资金通知 topic
"YiLian_CashNoticeConsumerGroup": "YiLian_CashNoticeGroup", //客户资金通知消费组 topic
"YiLian_HolidayResetTopic": "YiLian_HolidayReset", //交易日历缓存重新加载 topic
- "YiLian_HolidayResetGroupId": "YiLian_HedgingOrderGroup" //交易日历缓存重新加载消费 Group
+ "YiLian_HolidayResetGroupId": "YiLian_HedgingOrderGroup1", //交易日历缓存重新加载消费 Group
+ "YiLian_SwapFlowTopic": "YiLian_SwapFlow", //交易端同步流水
+ "YiLian_SwapFlowGroup": "YiLian_SwapFlowGroup1" //交易端同步流水消费组
},
"BondOmsInterface": {
"BaseUrl": "http://localhost:8887"