From a794808d49c617469b312f1c31112917ffcdf04f Mon Sep 17 00:00:00 2001 From: "jay.chang" Date: Tue, 4 Feb 2025 11:22:50 +0800 Subject: [PATCH] =?UTF-8?q?[WebApi]=E4=BF=AE=E6=94=B9=E8=A8=AD=E5=82=99?= =?UTF-8?q?=E9=BB=9E=E4=BD=8D=E6=98=AF=E5=90=A6=E9=A1=AF=E7=A4=BA=E5=9C=A8?= =?UTF-8?q?=E6=AD=B7=E5=8F=B2=E7=B4=80=E9=8C=84=E7=9A=84=E9=82=8F=E8=BC=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FrontendWebApi/ApiControllers/HistoryController.cs | 2 +- .../Implement/NiagaraDataSynchronizeRepository.cs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/FrontendWebApi/ApiControllers/HistoryController.cs b/FrontendWebApi/ApiControllers/HistoryController.cs index 830a948..fdacbad 100644 --- a/FrontendWebApi/ApiControllers/HistoryController.cs +++ b/FrontendWebApi/ApiControllers/HistoryController.cs @@ -637,7 +637,7 @@ namespace FrontendWebApi.ApiControllers and a.device_building_tag COLLATE utf8mb4_unicode_ci = b.device_building_tag and a.device_name_tag COLLATE utf8mb4_unicode_ci = b.device_name_tag join building c on c.building_tag = b.device_building_tag - join import_niagara_item_history h on b.device_number = h.device_number and a.points = h.device_point_name + -- join import_niagara_item_history h on b.device_number = h.device_number and a.points = h.device_point_name join variable v1 on v1.system_value = b.device_system_tag and v1.deleted = 0 and v1.system_type = 'device_system_category_layer2' join variable v2 on v2.system_value = b.device_name_tag and v2.deleted = 0 and v2.system_type = 'device_system_category_layer3' where a.deleted = 0 and b.deleted = 0 and v2.deleted = 0 and v1.deleted = 0 diff --git a/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs b/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs index a0d10f8..ce4d1aa 100644 --- a/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs +++ b/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs @@ -951,8 +951,7 @@ namespace Repository.BackendRepository.Implement AND d.device_name_tag = subquery.device_name_tag AND d.points = subquery.device_point_name AND d.device_building_tag = subquery.device_building_tag - SET d.is_show_history = CASE WHEN subquery.device_point_name IS NULL THEN 0 ELSE 1 END - where date(d.created_at) = subquery.created_at;"); + SET d.is_show_history = CASE WHEN subquery.device_point_name IS NULL THEN 0 ELSE 1 END"); using (TransactionScope scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled)) {