bugfix 接口地址修改

This commit is contained in:
路 范
2022-03-14 06:12:26 +08:00
parent f2257d72b7
commit 24a5611fe4
3 changed files with 17 additions and 16 deletions

View File

@@ -52,6 +52,7 @@ namespace TempTask.WebEntry.Tools
try try
{ {
var _month = month.ToString().Length == 1 ? ("0" + month) : month.ToString(); var _month = month.ToString().Length == 1 ? ("0" + month) : month.ToString();
var week2 = week < 10 ? ("0" + week) : week.ToString();
int excelTypeInt = (int)excelType; int excelTypeInt = (int)excelType;
string template_name = EnumHelper.GetEnumDescription<ExcelType>(excelType); string template_name = EnumHelper.GetEnumDescription<ExcelType>(excelType);
string excelFilePath = $"{App.WebHostEnvironment.WebRootPath}\\ExcelTemplate\\{template_name}"; string excelFilePath = $"{App.WebHostEnvironment.WebRootPath}\\ExcelTemplate\\{template_name}";
@@ -75,7 +76,7 @@ namespace TempTask.WebEntry.Tools
//{ //{
// sheet = workbook.GetSheet(sheet_name.Value); // sheet = workbook.GetSheet(sheet_name.Value);
//} //}
var api_result = HttpHelper.CallUrl(sheet_item.url, $"months={year}{_month}&w={week}"); var api_result = HttpHelper.CallUrl(sheet_item.url.Replace("{year}", year.ToString()).Replace("{_month}", _month).Replace("{week}", week.ToString()).Replace("{week2}", week2), "");
var obj = JObject.Parse(api_result); var obj = JObject.Parse(api_result);
var datas = obj["data"] as JArray; var datas = obj["data"] as JArray;
//从第几行开始 , 比如 行号是4 , 就写3 //从第几行开始 , 比如 行号是4 , 就写3

View File

@@ -17,7 +17,7 @@
"null_row_count": 12, "null_row_count": 12,
"start_cell": "B", "start_cell": "B",
"null_cell_count": 27, "null_cell_count": 27,
"url": "http://10.19.94.196:81/data-system/api/bigScreen/house/totalKeyRate", "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/totalKeyRate?months={year}{_month}&week={week2}",
"skip_rows": [ 10, 12 ] "skip_rows": [ 10, 12 ]
}, },
{ {
@@ -27,7 +27,7 @@
"null_row_count": 4, "null_row_count": 4,
"start_cell": "B", "start_cell": "B",
"null_cell_count": 19, "null_cell_count": 19,
"url": "http://10.19.94.196:81/data-system/api/bigScreen/house/projectByALL" "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/projectByALL?months={year}{_month}&w={week}"
} }
] ]
}, },
@@ -42,7 +42,7 @@
"null_row_count": 8, "null_row_count": 8,
"start_cell": "D", "start_cell": "D",
"null_cell_count": 27, "null_cell_count": 27,
"url": "http://10.19.94.196:81/data-system/api/bigScreen/house/cityUpdateKeyRate" "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/cityUpdateKeyRate?months={year}{_month}&week={week2}"
}, },
{ {
"sheet_no": 2, "sheet_no": 2,
@@ -51,7 +51,7 @@
"null_row_count": 14, "null_row_count": 14,
"start_cell": "B", "start_cell": "B",
"null_cell_count": 24, "null_cell_count": 24,
"url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate1?type=104,105,106,107,108,109" "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate1?type=104,105,106,107,108,109&months={year}{_month}&week={week2}"
}, },
{ {
"sheet_no": 3, "sheet_no": 3,
@@ -60,7 +60,7 @@
"null_row_count": 6, "null_row_count": 6,
"start_cell": "C", "start_cell": "C",
"null_cell_count": 20, "null_cell_count": 20,
"url": "http://10.19.94.196:81/data-system/api/bigScreen/house/cityProjectByInd" "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/cityProjectByInd?months={year}{_month}&w={week}"
}, },
{ {
"sheet_no": 4, "sheet_no": 4,
@@ -69,7 +69,7 @@
"null_row_count": 14, "null_row_count": 14,
"start_cell": "B", "start_cell": "B",
"null_cell_count": 20, "null_cell_count": 20,
"url": "http://10.19.94.196:81/data-system/api/bigScreen/house/cityProjectByArea" "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/cityProjectByArea?months={year}{_month}&w={week}"
} }
] ]
}, },
@@ -84,7 +84,7 @@
"null_row_count": 7, "null_row_count": 7,
"start_cell": "D", "start_cell": "D",
"null_cell_count": 27, "null_cell_count": 27,
"url": "http://10.19.94.196:81/data-system/api/bigScreen/house/houseInvestKeyRate" "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/houseInvestKeyRate?months={year}{_month}&week={week2}"
}, },
{ {
"sheet_no": 2, "sheet_no": 2,
@@ -93,7 +93,7 @@
"null_row_count": 13, "null_row_count": 13,
"start_cell": "B", "start_cell": "B",
"null_cell_count": 24, "null_cell_count": 24,
"url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate1?type=101,102,103" "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate1?type=101,102,103&months={year}{_month}&week={week2}"
}, },
{ {
"sheet_no": 3, "sheet_no": 3,
@@ -102,7 +102,7 @@
"null_row_count": 13, "null_row_count": 13,
"start_cell": "B", "start_cell": "B",
"null_cell_count": 12, "null_cell_count": 12,
"url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate2?type=301" "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate2?type=301&months={year}{_month}&week={week2}"
}, },
{ {
"sheet_no": 4, "sheet_no": 4,
@@ -111,7 +111,7 @@
"null_row_count": 13, "null_row_count": 13,
"start_cell": "B", "start_cell": "B",
"null_cell_count": 12, "null_cell_count": 12,
"url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate2?type=302" "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate2?type=302&months={year}{_month}&week={week2}"
}, },
{ {
"sheet_no": 5, "sheet_no": 5,
@@ -120,7 +120,7 @@
"null_row_count": 13, "null_row_count": 13,
"start_cell": "B", "start_cell": "B",
"null_cell_count": 12, "null_cell_count": 12,
"url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate2?type=401" "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate2?type=401&months={year}{_month}&week={week2}"
}, },
{ {
"sheet_no": 6, "sheet_no": 6,
@@ -129,7 +129,7 @@
"null_row_count": 13, "null_row_count": 13,
"start_cell": "B", "start_cell": "B",
"null_cell_count": 12, "null_cell_count": 12,
"url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate2?type=402" "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate2?type=402&months={year}{_month}&week={week2}"
}, },
{ {
"sheet_no": 7, "sheet_no": 7,
@@ -138,7 +138,7 @@
"null_row_count": 13, "null_row_count": 13,
"start_cell": "B", "start_cell": "B",
"null_cell_count": 12, "null_cell_count": 12,
"url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate2?type=403" "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate2?type=403&months={year}{_month}&week={week2}"
}, },
{ {
"sheet_no": 8, "sheet_no": 8,
@@ -147,7 +147,7 @@
"null_row_count": 4, "null_row_count": 4,
"start_cell": "C", "start_cell": "C",
"null_cell_count": 20, "null_cell_count": 20,
"url": "http://10.19.94.196:81/data-system/api/bigScreen/house/houseProjectByInd" "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/houseProjectByInd?months={year}{_month}&w={week}"
}, },
{ {
"sheet_no": 9, "sheet_no": 9,
@@ -156,7 +156,7 @@
"null_row_count": 13, "null_row_count": 13,
"start_cell": "B", "start_cell": "B",
"null_cell_count": 20, "null_cell_count": 20,
"url": "http://10.19.94.196:81/data-system/api/bigScreen/house/houseProjectByArea" "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/houseProjectByArea?months={year}{_month}&w={week}"
} }
] ]
} }