From 1d91dc37faed5c68983f886dc4a483d35a50051b Mon Sep 17 00:00:00 2001 From: keke Date: Tue, 22 Aug 2023 16:16:35 +0800 Subject: [PATCH] =?UTF-8?q?[FE=20API]=20=E6=9B=B4=E6=96=B0=E5=A0=B1?= =?UTF-8?q?=E8=A1=A8=E7=AE=A1=E7=90=86=EF=BC=8C=E6=9F=A5=E8=A9=A2=E5=A4=9A?= =?UTF-8?q?=E6=A3=9F=E8=AA=9E=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiControllers/HydroMeterController.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/FrontendWebApi/ApiControllers/HydroMeterController.cs b/FrontendWebApi/ApiControllers/HydroMeterController.cs index 141766d..fb5dd13 100644 --- a/FrontendWebApi/ApiControllers/HydroMeterController.cs +++ b/FrontendWebApi/ApiControllers/HydroMeterController.cs @@ -14,6 +14,7 @@ using System.Linq; using System.Threading.Tasks; using Ionic.Zip; using System.Collections.Immutable; +using System.Text; namespace FrontendWebApi.ApiControllers { @@ -82,10 +83,18 @@ namespace FrontendWebApi.ApiControllers string buildingSql = ""; string tag_quantity = await backendRepository.GetOneAsync("select system_value from variable where system_type = 'obixConfig' and system_key = 'tag_quantity' and deleted = 0"); + string[] parts_buildingTag = input.building_tag.Split(','); + StringBuilder fix_buildingTag = new StringBuilder(); + foreach (string part in parts_buildingTag) + { + fix_buildingTag.Append("'").Append(part.Trim()).Append("', "); + } + input.building_tag = fix_buildingTag.ToString().TrimEnd(',', ' '); + if (tag_quantity == "5") - buildingSql = " and SUBSTRING_INDEX(device_number, '_', 1) in (@building_tag) "; + buildingSql = @$" and SUBSTRING_INDEX(device_number, '_', 1) in ({input.building_tag}) "; else - buildingSql = " and SUBSTRING_INDEX(SUBSTRING_INDEX(device_number, '_', 2), '_', -1) in (@building_tag) "; + buildingSql = @$" and SUBSTRING_INDEX(SUBSTRING_INDEX(device_number, '_', 2), '_', -1) in ({input.building_tag}) "; //if (input.floor_tag.Count > 0) //{