开始使用mysql表来控制RBSA计算所覆盖的指数集（原来是hard-coded)

modules/operationDataPuller.dos

@@ -657,3 +657,28 @@ def get_fund_manager_mapping(fund_ids) {
 
     return t;
 }
+
+/*
+ *  获取对应RBSA或资产诊断的指数/因子集
+ *  
+ *  Example：get_asset_type_index_mapping('AS000000HL', 'GBA_Sector', 0);
+ *  		 get_asset_type_index_mapping(NULL, NULL, NULL);
+ * 
+ */
+def get_asset_type_index_mapping(asset_plan_id, asset_type_id, is_health_score_only) {
+
+	plan_id = iif(asset_plan_id == null, 'NULL', "'" + asset_plan_id + "'");
+	type_id = iif(asset_type_id == null, 'NULL', "'" + asset_type_id + "'");
+	score_only = iif(is_health_score_only == null, 0, is_health_score_only);
+
+    s_query = "CALL pfdb.sp_get_asset_type_index_mapping(" + plan_id + ", " + type_id + ", " + score_only + ")";
+
+    conn = connect_mysql();
+
+    t = odbc::query(conn, s_query);
+
+    conn.close();
+
+    return t;
+	
+}

modules/rbsaCalculator.dos

@@ -258,6 +258,9 @@ def cal_entity_RBSA(entity_type, entity_ret, index_ret, freq='w', start_day=1900
 	level = 1
 	alternative_id = NULL;
 	if(tb_entity_ret.isVoid() || tb_entity_ret.size() < window) {
+		// 因为经常遇见SQL链接中断的问题，暂时将下面的逻辑取消 2025-03-25
+		return tb_result;
+		/*
 		if(entity_type IN ['MF', 'HF']) {
 
 			fund_info = get_fund_info(tb_entity_ret.entity_id);
@@ -275,6 +278,7 @@ def cal_entity_RBSA(entity_type, entity_ret, index_ret, freq='w', start_day=1900
 				return tb_result;
 			}
 		} 
+		*/
 	}
 
 	tb_entity_ret.addColumn('effective_date', STRING);

modules/sqlUtilities.dos

@@ -110,8 +110,8 @@ def get_entity_id_info() {
 }
 
 /*
- *   返回标准RBSA的几组指数集
- * 
+ *   【RETIRED】返回标准RBSA的几组指数集
+ *   
  */
 def get_rbsa_index() {
 
@@ -124,6 +124,9 @@ def get_rbsa_index() {
 	d['CSI11'] = ['IN0000000Y', 'IN0000000Z','IN00000010', 'IN00000011', 'IN00000012', 'IN00000013', 'IN00000014', 'IN00000015', 'IN00000016', 'IN00000017', 'IN0000007G'];
 	d['CSI5'] = ['FA00000VML', 'FA00000VMM','FA00000VMN', 'FA00000VMO', 'IN0000007G'];
 	d['Large4Assets'] = ['IN00000008', 'IN00000077','IN0000007G', 'IN0000009M'];
+	d['GBA7Asset'] = ['IN00000008', 'IN000002EZ', 'IN00000077', 'IN000002F4', 'IN0000009M', 'IN0000007G', 'IN000002HO'];
+	d['GBA4Style'] = ['IN00000008', 'IN0000008O', 'IN000002L2', 'IN000002L5', 'IN000002HO'];
+	d['GBA4Sector'] = ['FA00000WKI', 'FA00000WKN', 'FA00000WKK', 'FA00000WKL', 'IN000002HO'];
 
 	return d;
 }

modules/task_weeklyPerformance.dos

@@ -20,13 +20,13 @@ use fundit::dataSaver;
  *         portfolio 未测试
  * 
  *   Example: CalEntityRBSATask('MF', ['MF00003PW1'], 2024.10.14T10:00:00);
- *            CalEntityRBSATask('MF', NULL, 2025.01.23);
+ *            CalEntityRBSATask('MF', NULL, 2025.02.20);
  *            CalEntityRBSATask('PF', NULL, 2025.01.23);
  */
 def CalEntityRBSATask(entityType, entityIds, updateTime) {
-// entityType = 'PF'
+// entityType = 'MF'
 //entityIds = NULL
-//updateTime = 2025.01.10T10:00:00
+//updateTime = 2025.03.21T10:00:00
 
 	t_cal = get_entity_list_by_latest_return_updatetime(entityType, entityIds, updateTime, true);
 
@@ -35,10 +35,12 @@ def CalEntityRBSATask(entityType, entityIds, updateTime) {
 
 	if(t_cal.isVoid() || t_cal.size() == 0) return;
 
-	d_rbsa = get_rbsa_index();
-
 	// 拿到所有指数ID
-	v_index = d_rbsa.values().flatten().distinct();
+	t_asset_index_map = get_asset_type_index_mapping(NULL, NULL, NULL);
+	if(t_asset_index_map.isVoid() || t_asset_index_map.size() == 0) return;
+	
+	v_asset = t_asset_index_map.asset_type_id.distinct();
+	v_index = t_asset_index_map.index_id.distinct();
 	
     // 因为用来做基准指数的可能是指数、因子、基金等等任何时间序列数据，所以不用填 entity_type
     t_index_ret = get_entity_return(NULL, v_index, 'w', t_cal.price_date.min().temporalAdd(-window, 'w'), today(), true);
@@ -64,12 +66,16 @@ def CalEntityRBSATask(entityType, entityIds, updateTime) {
 		}
 
 		for(entity in t) {
-
+//entity=t[0]
 			entity_ret = SELECT * FROM t_entity_ret WHERE entity_id = entity.entity_id;
 
-			for(asset_type in d_rbsa.keys()) {
-//asset_type=d_rbsa.keys()[0]
-				index_ret = SELECT entity_id, price_date, ret FROM t_index_ret WHERE entity_id IN d_rbsa[asset_type] AND price_date IS NOT NULL;
+			for(asset in v_asset) {
+//asset=v_asset[0]
+				index_ret = SELECT entity_id, price_date, ret 
+				            FROM t_index_ret r
+				            INNER JOIN t_asset_index_map m ON r.entity_id = m.index_id
+				            WHERE m.asset_type_id = asset
+				              AND r.price_date IS NOT NULL;
 
 				// 起始日期是最早更新日期再向前推一个时间窗口
 				res = cal_entity_RBSA(entityType, entity_ret, index_ret, 'w', 
@@ -80,7 +86,7 @@ def CalEntityRBSATask(entityType, entityIds, updateTime) {
 				// 每日任务只负责更新最新的rbsa结果
 				latest_date = (EXEC price_date.max() AS price_date FROM res)[0];
 	
-				tb_result.tableInsert(SELECT entity_id, asset_type, index_id, price_date, level, alternative_id, weights 
+				tb_result.tableInsert(SELECT entity_id, asset, index_id, price_date, level, alternative_id, weights 
 				                      FROM res WHERE price_date = latest_date);
 		
 			}
@@ -106,11 +112,11 @@ def CalEntityRBSATask(entityType, entityIds, updateTime) {
  * 
  *   TODO: max_r2 表在哪里被用到了？应该和基金推荐有关系
  *   
- *   Example: MatchEntityBFITask('PF', 2025.01.01);
+ *   Example: MatchEntityBFITask('MF', 2025.02.21);
  */
 def MatchEntityBFITask(entityType, date) {
 //entityType = 'MF'
-//date = 2025.01.23
+//date = 2025.02.21
 
 	rt = '';