From 0a48aec6a38d34db6e9194920aac7d2d19cadcb3 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 04 四月 2024 16:22:01 +0800
Subject: [PATCH] 升级更新
---
IStation.Entry.SZJT/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
IStation.Service.SZJT/01-entity/04-tree/LogicTreeSaveTree.cs | 0
IStation.Application.SZJT/05-logic-dma/1-mgr/LogicDma_Controller.cs | 14
IStation.Service.SZJT/04-dal/04-tree/LogicTree.cs | 5
IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairDayCountDto.cs | 18
IStation.Application.SZJT/99-logic/11-big-screen/BigScreen_LogicController.cs | 623 +++++++++++++++++++++
IStation.Service.SZJT/03-settings/paras/Paras_SZJT_DataBase.cs | 0
IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-repair-statistics/BigScreenAllStationRepairMonthCountDto.cs | 23
IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairStatisticsInfoDto.cs | 19
IStation.Application.SZJT/02-logic-area/2-std/LogicArea_StdController.cs | 4
IStation.Application.SZJT/05-logic-dma/2-std/LogicDma_StdController.cs | 2
IStation.Service.SZJT/05-service/03-site/Cache/LogicSiteCacheHelper.cs | 0
IStation.Service.SZJT/02-model/04-tree/LogicTree.cs | 5
IStation.Application.SZJT/99-logic/08-flow-meter-map/FlowMeterMap_LogicController.cs | 2
IStation.Service.SZJT/01-entity/03-site/LogicSite.cs | 5
IStation.Service.SZJT/04-dal/01-policy/LogicPolicy.cs | 22
IStation.Application.SZJT/99-logic/07-dma-analy/DmaAnaly_LogicController.cs | 10
IStation.Service.SZJT/04-dal/02-area/LogicArea.cs | 34 +
IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-repair-statistics/BigScreenAllStationRepairDayCountDto.cs | 20
IStation.Service.SZJT/03-settings/helper/SZJTFileHelper.cs | 0
IStation.Service.SZJT/05-service/03-site/LogicSite_Instance.cs | 0
IStation.Service.SZJT/05-service/05-dma/Cache/LogicDmaCacheHelper.cs | 0
IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-list/BigScreenAllStationListKpiItemDto.cs | 23
IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station/BigScreenAllStationKpiItemDto.cs | 23
IStation.Service.SZJT/02-model/03-site/LogicSite.cs | 5
IStation.Service.SZJT/03-settings/paras/Paras_SZJT_Task.cs | 0
IStation.Service.SZJT/05-service/02-area/Cache/LogicAreaCacheHelper.cs | 0
IStation.Application.SZJT/99-logic/09-press-meter-map/PressMeterMap_LogicController.cs | 2
IStation.Application.SZJT/99-logic/02-equipmnet-org/AssetsOrg_LogicController.cs | 2
IStation.Service.SZJT/02-model/04-tree/LogicTreeSaveTree.cs | 0
IStation.Service.SZJT/02-model/04-tree/LogicTreeSaveItem.cs | 0
IStation.TopShelf.SZJT/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
IStation.Service.SZJT/01-entity/04-tree/LogicTreeSaveItem.cs | 0
IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-quota/BigScreenSingleStationQuotaItemDto.cs | 24
IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station/BigScreenSingleStationKpiItemDto.cs | 23
IStation.Application.SZJT/03-logic-site/2-std/LogicSite_StdController.cs | 2
IStation.Application.SZJT/02-logic-area/1-mgr/LogicArea_Controller.cs | 16
IStation.TopShelf.SZJT/IStation.TopShelf.SZJT.csproj | 2
IStation.Application.SZJT/99-logic/02-equipmnet-org/dto/EquipmentFullLogicalTreeDto.cs | 2
IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/StationAssets_MobileController.cs | 4
IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-quota/BigScreenSingleStationQuotaKpiDto.cs | 18
IStation.Application.SZJT/04-logic-tree/1-mgr/LogicTree_Controller.cs | 20
IStation.Server.SZJT/IStation.Server.SZJT.csproj | 7
IStation.Application.SZJT/99-logic/01-monitor-org/dto/MonitorFullLogicalTreeDto.cs | 2
IStation.Application.SZJT/01-logic-policy/2-std/LogicPolicy_StdController.cs | 2
IStation.Service.SZJT/02-model/02-area/LogicArea.cs | 5
IStation.Service.SZJT/01-entity/05-dma/LogicDma.cs | 5
IStation.Service.SZJT/02-model/05-dma/LogicDma.cs | 5
IStation.Application.SZJT/99-logic/10-mobile/08-station-statistics/StationStatistics_MobileController.cs | 2
IStation.Application.SZJT/IStation.Application.SZJT.csproj | 12
IStation.Service.SZJT/00-core/ConfigHelper.cs | 0
IStation.Entry.SZJT/IStation.Entry.SZJT.csproj | 22
IStation.Service.SZJT/05-service/01-policy/LogicPolicy.cs | 0
IStation.Service.SZJT/03-settings/paras/Paras_SZJT.cs | 0
IStation.Service.SZJT/GlobalUsings.cs | 1
IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-repair/BigScreenAllStationRepairKpiDto.cs | 44 +
IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair/BigScreenSingleStationRepairKpiDto.cs | 44 +
IStation.Service.SZJT/01-entity/01-policy/LogicPolicy.cs | 5
IStation.Service.SZJT/05-service/04-tree/LogicTree.cs | 0
IStation.Application.SZJT/GlobalUsings.cs | 1
IStation.Service.SZJT/02-model/04-tree/LogicTreeEx.cs | 8
IStation.Service.SZJT/05-service/00-core/LogicHelper.cs | 0
IStation.Service.SZJT/05-service/04-tree/Cache/LogicTreeCacheHelper.cs | 0
IStation.Service.SZJT/05-service/05-dma/LogicDma.cs | 0
IStation.Service.SZJT/03-settings/paras/SZJTParas.cs | 0
IStation.WebApi.SZJT/IStation.WebApi.SZJT.csproj | 3
IStation.Service.SZJT/05-service/02-area/LogicArea.cs | 0
IStation.Service.SZJT/05-service/01-policy/LogicPolicy_Instance.cs | 0
IStation.WebApi.SZJT/Result/XnRestfulResultProvider.cs | 38
IStation.Application.SZJT/99-logic/01-monitor-org/MonitorOrg_LogicController.cs | 2
IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairEnginePumpCountDto.cs | 20
IStation.Application.SZJT/99-logic/10-mobile/01-station-list/StationList_LogicController.cs | 2
IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-alarm/BigScreenSingleStationAlarmItemDto.cs | 23
IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairEnginePumpStatisticsInfoDto.cs | 23
IStation.Application.SZJT/99-logic/10-mobile/05-map/Map_MobileController.cs | 32
IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station/BigScreenSingleStationKpiRunItemDto.cs | 18
IStation.Service.SZJT/IStation.Service.SZJT.csproj | 4
IStation.Service.SZJT/05-service/00-core/Extensions.cs | 0
IStation.Service.SZJT/03-settings/helper/SZJTParasHelper.cs | 0
IStation.Service.SZJT/01-entity/02-area/LogicArea.cs | 5
IStation.Service.SZJT/00-core/Flags.cs | 0
IStation.Service.SZJT/05-service/00-core/CacheHelper.cs | 2
IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station/BigScreenSingleStationKpiDto.cs | 35 +
IStation.Service.SZJT/05-service/05-dma/LogicDma_Instance.cs | 0
IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-list/BigScreenAllStationListItemDto.cs | 29 +
IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station/BigScreenAllStationKpiDto.cs | 48 +
IStation.Service.SZJT/00-core/Catalog.cs | 0
IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-engine-pump-list/BigScreenSingleStationEnginePumpListKpiItemDto.cs | 23
IStation.Application.SZJT/04-logic-tree/2-std/LogicTree_StdController.cs | 4
IStation.Service.SZJT/04-dal/05-dma/LogicDma.cs | 22
IStation.Application.SZJT/01-logic-policy/1-mgr/LogicPolicy_Controller.cs | 14
IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-engine-pump-list/BigScreenSingleStationEnginePumpListItemDto.cs | 35 +
IStation.Service.SZJT/00-core/MemoryCacheKey.cs | 0
IStation.Service.SZJT/05-service/01-policy/Cache/LogicPolicyCacheHelper.cs | 0
IStation.Application.SZJT/03-logic-site/1-mgr/LogicSite_Controller.cs | 14
IStation.Service.SZJT/01-entity/04-tree/LogicTree.cs | 5
IStation.Service.SZJT/04-dal/03-site/LogicSite.cs | 22
IStation.Service.SZJT/05-service/04-tree/LogicTree_Instance.cs | 0
/dev/null | 43 -
IStation.Service.SZJT/02-model/01-policy/LogicPolicy.cs | 5
IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-alarm/BigScreenAllStationAlarmItemDto.cs | 23
IStation.Application.SZJT/99-logic/10-mobile/02-meter-list/MeterList_MobileController.cs | 2
IStation.Service.SZJT/00-core/DataType.cs | 0
IStation.WebApi.SZJT/Handlers/JwtHandler.cs | 22
IStation.Service.SZJT/05-service/03-site/LogicSite.cs | 0
IStation.Service.SZJT/05-service/02-area/LogicArea_Instance.cs | 0
IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairMonthCountDto.cs | 23
107 files changed, 1,489 insertions(+), 193 deletions(-)
diff --git a/IStation.Application.SZJT/01-logic-policy/1-mgr/LogicPolicy_Controller.cs b/IStation.Application.SZJT/01-logic-policy/1-mgr/LogicPolicy_Controller.cs
index 68d4082..126edcf 100644
--- a/IStation.Application.SZJT/01-logic-policy/1-mgr/LogicPolicy_Controller.cs
+++ b/IStation.Application.SZJT/01-logic-policy/1-mgr/LogicPolicy_Controller.cs
@@ -64,14 +64,14 @@
{
if (_service.IsExistCode(input.Code))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code}", "缂栫爜宸插瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "缂栫爜宸插瓨鍦�");
}
}
if (!string.IsNullOrEmpty(input.TagName))
{
if (_service.IsExistTagName(input.TagName))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪宸插瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪宸插瓨鍦�");
}
}
var model = input.Adapt<AddLogicPolicyInput, Model.LogicPolicy>();
@@ -94,20 +94,20 @@
var model = _service.GetByID(input.ID);
if (model == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
}
if (!string.IsNullOrEmpty(input.Code))
{
if (_service.IsExistCodeExceptID(input.Code, input.ID))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code}", "缂栫爜宸插瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "缂栫爜宸插瓨鍦�");
}
}
if (!string.IsNullOrEmpty(input.TagName))
{
if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪宸插瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪宸插瓨鍦�");
}
}
var rhs = new Model.LogicPolicy(model);
@@ -176,7 +176,7 @@
{
if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
{
- throw Oops.Oh(ErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪鍚嶇О宸插瓨鍦�");
+ throw Oops.Oh(InternalErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪鍚嶇О宸插瓨鍦�");
}
}
var bol = _service.UpdateTagName(input.ID, input.TagName);
@@ -257,7 +257,7 @@
var bol = _service.DeleteByID(input.ID, out string Msg);
if (!bol)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, Msg);
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, Msg);
}
return bol;
}
diff --git a/IStation.Application.SZJT/01-logic-policy/2-std/LogicPolicy_StdController.cs b/IStation.Application.SZJT/01-logic-policy/2-std/LogicPolicy_StdController.cs
index a138bd1..53794b6 100644
--- a/IStation.Application.SZJT/01-logic-policy/2-std/LogicPolicy_StdController.cs
+++ b/IStation.Application.SZJT/01-logic-policy/2-std/LogicPolicy_StdController.cs
@@ -24,7 +24,7 @@
Service.LogicPolicy.PublishCache(cacheKey);
var vmList = all?.Select(x => new LogicPolicyStdDto(x)).ToList();
return vmList;
- }, CacheHelper.CacheLevel1);
+ }, Yw.Service.ConfigHelper.CacheLevel1);
return vm_list;
}
diff --git a/IStation.Application.SZJT/02-logic-area/1-mgr/LogicArea_Controller.cs b/IStation.Application.SZJT/02-logic-area/1-mgr/LogicArea_Controller.cs
index 847eb82..87f3910 100644
--- a/IStation.Application.SZJT/02-logic-area/1-mgr/LogicArea_Controller.cs
+++ b/IStation.Application.SZJT/02-logic-area/1-mgr/LogicArea_Controller.cs
@@ -75,20 +75,20 @@
var policy = new Service.LogicPolicy().GetByID(input.PolicyID);
if (policy == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"PolicyID:{input.PolicyID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"PolicyID:{input.PolicyID} 鏁版嵁涓嶅瓨鍦�");
}
if (!string.IsNullOrEmpty(input.Code))
{
if (_service.IsExistCode(input.Code))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code}", "缂栫爜宸插瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "缂栫爜宸插瓨鍦�");
}
}
if (!string.IsNullOrEmpty(input.TagName))
{
if (_service.IsExistTagName(input.TagName))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪宸插瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪宸插瓨鍦�");
}
}
var model = input.Adapt<AddLogicAreaInput, Model.LogicArea>();
@@ -111,20 +111,20 @@
var model = _service.GetByID(input.ID);
if (model == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
}
if (!string.IsNullOrEmpty(input.Code))
{
if (_service.IsExistCodeExceptID(input.Code, input.ID))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code}", "缂栫爜宸插瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "缂栫爜宸插瓨鍦�");
}
}
if (!string.IsNullOrEmpty(input.TagName))
{
if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪宸插瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪宸插瓨鍦�");
}
}
var rhs = new Model.LogicArea(model);
@@ -193,7 +193,7 @@
{
if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
{
- throw Oops.Oh(ErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪鍚嶇О宸插瓨鍦�");
+ throw Oops.Oh(InternalErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪鍚嶇О宸插瓨鍦�");
}
}
var bol = _service.UpdateTagName(input.ID, input.TagName);
@@ -274,7 +274,7 @@
var bol = _service.DeleteByID(input.ID, out string Msg);
if (!bol)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, Msg);
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, Msg);
}
return bol;
}
diff --git a/IStation.Application.SZJT/02-logic-area/2-std/LogicArea_StdController.cs b/IStation.Application.SZJT/02-logic-area/2-std/LogicArea_StdController.cs
index 1bc3e3c..bf796cb 100644
--- a/IStation.Application.SZJT/02-logic-area/2-std/LogicArea_StdController.cs
+++ b/IStation.Application.SZJT/02-logic-area/2-std/LogicArea_StdController.cs
@@ -25,7 +25,7 @@
Service.LogicArea.PublishCache(cacheKey);
var vmList = all?.Select(x => new LogicAreaStdDto(x)).ToList();
return vmList;
- }, CacheHelper.CacheLevel5);
+ }, Yw.Service.ConfigHelper.CacheLevel5);
return vm_list;
}
@@ -45,7 +45,7 @@
Service.LogicArea.PublishCache(cacheKey);
var vmList = all?.Select(x => new LogicAreaStdDto(x)).ToList();
return vmList;
- }, CacheHelper.CacheLevel5);
+ }, Yw.Service.ConfigHelper.CacheLevel5);
return vm_list;
}
diff --git a/IStation.Application.SZJT/03-logic-site/1-mgr/LogicSite_Controller.cs b/IStation.Application.SZJT/03-logic-site/1-mgr/LogicSite_Controller.cs
index 44455fe..8ed30bb 100644
--- a/IStation.Application.SZJT/03-logic-site/1-mgr/LogicSite_Controller.cs
+++ b/IStation.Application.SZJT/03-logic-site/1-mgr/LogicSite_Controller.cs
@@ -64,14 +64,14 @@
{
if (_service.IsExistCode(input.Code))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code}", "缂栫爜宸插瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "缂栫爜宸插瓨鍦�");
}
}
if (!string.IsNullOrEmpty(input.TagName))
{
if (_service.IsExistTagName(input.TagName))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪宸插瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪宸插瓨鍦�");
}
}
var model = input.Adapt<AddLogicSiteInput, Model.LogicSite>();
@@ -94,20 +94,20 @@
var model = _service.GetByID(input.ID);
if (model == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
}
if (!string.IsNullOrEmpty(input.Code))
{
if (_service.IsExistCodeExceptID(input.Code, input.ID))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code}", "缂栫爜宸插瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "缂栫爜宸插瓨鍦�");
}
}
if (!string.IsNullOrEmpty(input.TagName))
{
if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪宸插瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪宸插瓨鍦�");
}
}
var rhs = new Model.LogicSite(model);
@@ -176,7 +176,7 @@
{
if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
{
- throw Oops.Oh(ErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪鍚嶇О宸插瓨鍦�");
+ throw Oops.Oh(InternalErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪鍚嶇О宸插瓨鍦�");
}
}
var bol = _service.UpdateTagName(input.ID, input.TagName);
@@ -257,7 +257,7 @@
var bol = _service.DeleteByID(input.ID, out string Msg);
if (!bol)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, Msg);
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, Msg);
}
return bol;
}
diff --git a/IStation.Application.SZJT/03-logic-site/2-std/LogicSite_StdController.cs b/IStation.Application.SZJT/03-logic-site/2-std/LogicSite_StdController.cs
index ae7d77d..ab2f7e6 100644
--- a/IStation.Application.SZJT/03-logic-site/2-std/LogicSite_StdController.cs
+++ b/IStation.Application.SZJT/03-logic-site/2-std/LogicSite_StdController.cs
@@ -25,7 +25,7 @@
Service.LogicSite.PublishCache(cacheKey);
var vmList = all?.Select(x => new LogicSiteStdDto(x)).ToList();
return vmList;
- }, CacheHelper.CacheLevel1);
+ }, Yw.Service.ConfigHelper.CacheLevel1);
return vm_list;
}
diff --git a/IStation.Application.SZJT/04-logic-tree/1-mgr/LogicTree_Controller.cs b/IStation.Application.SZJT/04-logic-tree/1-mgr/LogicTree_Controller.cs
index 65ee447..ffccc2e 100644
--- a/IStation.Application.SZJT/04-logic-tree/1-mgr/LogicTree_Controller.cs
+++ b/IStation.Application.SZJT/04-logic-tree/1-mgr/LogicTree_Controller.cs
@@ -98,11 +98,11 @@
var policy = new Service.LogicPolicy().GetByID(input.PolicyID);
if (policy == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"PolicyID:{input.PolicyID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"PolicyID:{input.PolicyID} 鏁版嵁涓嶅瓨鍦�");
}
if (_service.IsExist(input.PolicyID, input.LogicType, input.LogicID))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"LogicType:{input.LogicType}锛孡ogicID:{input.LogicID} 宸插瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"LogicType:{input.LogicType}锛孡ogicID:{input.LogicID} 宸插瓨鍦�");
}
var parentIds = new List<long>();
if (input.ParentID > 0)
@@ -110,11 +110,11 @@
var parent = _service.GetByID(input.ParentID);
if (parent == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ParentID:{input.ParentID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ParentID:{input.ParentID} 鏁版嵁涓嶅瓨鍦�");
}
if (parent.PolicyID != input.PolicyID)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"ParentID:{input.ParentID} 涓� PolicyID:{input.PolicyID} 涓嶅尮閰�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"ParentID:{input.ParentID} 涓� PolicyID:{input.PolicyID} 涓嶅尮閰�");
}
parentIds = TreeParentIdsHelper.GetChildParentIds(parent.ID, parent.ParentIds);
}
@@ -162,7 +162,7 @@
var model = _service.GetByID(input.ID);
if (model == null)
{
- throw Oops.Oh(ErrorCodes.D001, $"ID:{input.ID}");
+ throw Oops.Oh(InternalErrorCodes.D001, $"ID:{input.ID}");
}
var parentIds = new List<long>();
if (input.ParentID > 0)
@@ -170,7 +170,7 @@
var parent = _service.GetByID(input.ParentID);
if (parent == null)
{
- throw Oops.Oh(ErrorCodes.D001, $"ParentID:{input.ParentID}");
+ throw Oops.Oh(InternalErrorCodes.D001, $"ParentID:{input.ParentID}");
}
parentIds = TreeParentIdsHelper.GetChildParentIds(parent.ID, parent.ParentIds);
}
@@ -235,7 +235,7 @@
var bol = _service.DeleteByID(input.ID, out string Msg);
if (!bol)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, Msg);
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, Msg);
}
return bol;
}
@@ -254,7 +254,7 @@
var policy = new Service.LogicPolicy().GetByID(input.PolicyID);
if (policy == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"PolicyID:{input.PolicyID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"PolicyID:{input.PolicyID} 鏁版嵁涓嶅瓨鍦�");
}
if (input.TreeList != null && input.TreeList.Count > 0)
{
@@ -268,13 +268,13 @@
if (tempList.Exists(x => x.LogicType == IStation.DataType.LogicSite && x.Children != null && x.Children.Count > 0))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"鑺傜偣閫昏緫鍏崇郴閿欒锛岃妫�鏌ュ悗閲嶈瘯锛�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"鑺傜偣閫昏緫鍏崇郴閿欒锛岃妫�鏌ュ悗閲嶈瘯锛�");
}
var groupTreeList = tempList.GroupBy(x => new { x.LogicType, x.LogicID }).ToList();
if (groupTreeList.Exists(x => x.Count() > 1))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"鑺傜偣涓嶈兘閲嶅锛岃妫�鏌ュ悗閲嶈瘯锛�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"鑺傜偣涓嶈兘閲嶅锛岃妫�鏌ュ悗閲嶈瘯锛�");
}
}
diff --git a/IStation.Application.SZJT/04-logic-tree/2-std/LogicTree_StdController.cs b/IStation.Application.SZJT/04-logic-tree/2-std/LogicTree_StdController.cs
index f9fda77..ce473c2 100644
--- a/IStation.Application.SZJT/04-logic-tree/2-std/LogicTree_StdController.cs
+++ b/IStation.Application.SZJT/04-logic-tree/2-std/LogicTree_StdController.cs
@@ -25,7 +25,7 @@
Service.LogicTree.PublishCache(cacheKey);
var vmList = list?.Select(x => new LogicTreeItemDto(x)).ToList();
return vmList;
- }, CacheHelper.CacheLevel5);
+ }, Yw.Service.ConfigHelper.CacheLevel5);
return vm_list;
}
@@ -65,7 +65,7 @@
tempList.Add(vm);
}
return vmList;
- }, CacheHelper.CacheLevel5);
+ }, Yw.Service.ConfigHelper.CacheLevel5);
return vm_list;
}
diff --git a/IStation.Application.SZJT/05-logic-dma/1-mgr/LogicDma_Controller.cs b/IStation.Application.SZJT/05-logic-dma/1-mgr/LogicDma_Controller.cs
index a8190c3..25d6081 100644
--- a/IStation.Application.SZJT/05-logic-dma/1-mgr/LogicDma_Controller.cs
+++ b/IStation.Application.SZJT/05-logic-dma/1-mgr/LogicDma_Controller.cs
@@ -64,14 +64,14 @@
{
if (_service.IsExistCode(input.Code))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code}", "缂栫爜宸插瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "缂栫爜宸插瓨鍦�");
}
}
if (!string.IsNullOrEmpty(input.TagName))
{
if (_service.IsExistTagName(input.TagName))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪宸插瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪宸插瓨鍦�");
}
}
var model = input.Adapt<AddLogicDmaInput, Model.LogicDma>();
@@ -94,20 +94,20 @@
var model = _service.GetByID(input.ID);
if (model == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
}
if (!string.IsNullOrEmpty(input.Code))
{
if (_service.IsExistCodeExceptID(input.Code, input.ID))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code}", "缂栫爜宸插瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "缂栫爜宸插瓨鍦�");
}
}
if (!string.IsNullOrEmpty(input.TagName))
{
if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪宸插瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪宸插瓨鍦�");
}
}
var rhs = new Model.LogicDma(model);
@@ -176,7 +176,7 @@
{
if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
{
- throw Oops.Oh(ErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪鍚嶇О宸插瓨鍦�");
+ throw Oops.Oh(InternalErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪鍚嶇О宸插瓨鍦�");
}
}
var bol = _service.UpdateTagName(input.ID, input.TagName);
@@ -257,7 +257,7 @@
var bol = _service.DeleteByID(input.ID, out string Msg);
if (!bol)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, Msg);
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, Msg);
}
return bol;
}
diff --git a/IStation.Application.SZJT/05-logic-dma/2-std/LogicDma_StdController.cs b/IStation.Application.SZJT/05-logic-dma/2-std/LogicDma_StdController.cs
index bce5e01..9f32853 100644
--- a/IStation.Application.SZJT/05-logic-dma/2-std/LogicDma_StdController.cs
+++ b/IStation.Application.SZJT/05-logic-dma/2-std/LogicDma_StdController.cs
@@ -25,7 +25,7 @@
Service.LogicDma.PublishCache(cacheKey);
var vmList = all?.Select(x => new LogicDmaStdDto(x)).ToList();
return vmList;
- }, CacheHelper.CacheLevel1);
+ }, Yw.Service.ConfigHelper.CacheLevel1);
return vm_list;
}
diff --git a/IStation.Application.SZJT/99-logic/01-monitor-org/MonitorOrg_LogicController.cs b/IStation.Application.SZJT/99-logic/01-monitor-org/MonitorOrg_LogicController.cs
index 86ebba8..3f055e5 100644
--- a/IStation.Application.SZJT/99-logic/01-monitor-org/MonitorOrg_LogicController.cs
+++ b/IStation.Application.SZJT/99-logic/01-monitor-org/MonitorOrg_LogicController.cs
@@ -54,7 +54,7 @@
}
}
return vmList;
- }, CacheHelper.CacheLevel5);
+ }, Yw.Service.ConfigHelper.CacheLevel5);
return vm_list;
}
diff --git a/IStation.Application.SZJT/99-logic/01-monitor-org/dto/MonitorFullLogicalTreeDto.cs b/IStation.Application.SZJT/99-logic/01-monitor-org/dto/MonitorFullLogicalTreeDto.cs
index 4a2e26c..ac2d217 100644
--- a/IStation.Application.SZJT/99-logic/01-monitor-org/dto/MonitorFullLogicalTreeDto.cs
+++ b/IStation.Application.SZJT/99-logic/01-monitor-org/dto/MonitorFullLogicalTreeDto.cs
@@ -3,7 +3,7 @@
/// <summary>
///
/// </summary>
- public class MonitorFullLogicalTreeDto : Yw.Application.LogicalTreeDto
+ public class MonitorFullLogicalTreeDto : Yw.Dto.LogicalTreeDto
{
/// <summary>
///
diff --git a/IStation.Application.SZJT/99-logic/02-equipmnet-org/AssetsOrg_LogicController.cs b/IStation.Application.SZJT/99-logic/02-equipmnet-org/AssetsOrg_LogicController.cs
index 6458163..88f0ff0 100644
--- a/IStation.Application.SZJT/99-logic/02-equipmnet-org/AssetsOrg_LogicController.cs
+++ b/IStation.Application.SZJT/99-logic/02-equipmnet-org/AssetsOrg_LogicController.cs
@@ -47,7 +47,7 @@
}
return vmList;
- }, CacheHelper.CacheLevel5);
+ }, Yw.Service.ConfigHelper.CacheLevel5);
return vm_list;
}
diff --git a/IStation.Application.SZJT/99-logic/02-equipmnet-org/dto/EquipmentFullLogicalTreeDto.cs b/IStation.Application.SZJT/99-logic/02-equipmnet-org/dto/EquipmentFullLogicalTreeDto.cs
index f4f430d..c1fc021 100644
--- a/IStation.Application.SZJT/99-logic/02-equipmnet-org/dto/EquipmentFullLogicalTreeDto.cs
+++ b/IStation.Application.SZJT/99-logic/02-equipmnet-org/dto/EquipmentFullLogicalTreeDto.cs
@@ -3,7 +3,7 @@
/// <summary>
///
/// </summary>
- public class EquipmentFullLogicalTreeDto : Yw.Application.LogicalTreeDto
+ public class EquipmentFullLogicalTreeDto : Yw.Dto.LogicalTreeDto
{
/// <summary>
///
diff --git a/IStation.Application.SZJT/99-logic/07-dma-analy/DmaAnaly_LogicController.cs b/IStation.Application.SZJT/99-logic/07-dma-analy/DmaAnaly_LogicController.cs
index 0ff834c..b341d67 100644
--- a/IStation.Application.SZJT/99-logic/07-dma-analy/DmaAnaly_LogicController.cs
+++ b/IStation.Application.SZJT/99-logic/07-dma-analy/DmaAnaly_LogicController.cs
@@ -88,7 +88,7 @@
var model = new Yw.Service.DmaArea().GetByID(input.ID);
if (model == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
}
var vm = new DmaAnalyAreaDetailDto(model);
@@ -213,7 +213,7 @@
var site = new Yw.Service.DmaSite().GetByID(input.ID);
if (site == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
}
var vm = new DmaAnalySiteDetailDto(site);
@@ -241,7 +241,7 @@
var site = new Yw.Service.DmaSite().GetByID(input.ID);
if (site == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
}
var binding = new Yw.Service.DmaSiteBinding().GetValidBySiteID(site.ID);
if (binding == null)
@@ -367,7 +367,7 @@
var catalogList = new Yw.Service.SysCatalog().GetChildAndSelfByCode(IStation.Catalog.FlowMeter);
if (catalogList == null || catalogList.Count < 1)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, "娴侀噺璁″垎绫荤紪鐮侀獙璇佸け璐�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, "娴侀噺璁″垎绫荤紪鐮侀獙璇佸け璐�");
}
var catalogIds = catalogList.Select(x => x.ID).Distinct().ToList();
@@ -475,7 +475,7 @@
var catalogList = new Yw.Service.SysCatalog().GetChildAndSelfByCode(IStation.Catalog.PressMeter);
if (catalogList == null || catalogList.Count < 1)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, "鍘嬪姏璁″垎绫荤紪鐮侀獙璇佸け璐�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, "鍘嬪姏璁″垎绫荤紪鐮侀獙璇佸け璐�");
}
var catalogIds = catalogList.Select(x => x.ID).Distinct().ToList();
diff --git a/IStation.Application.SZJT/99-logic/08-flow-meter-map/FlowMeterMap_LogicController.cs b/IStation.Application.SZJT/99-logic/08-flow-meter-map/FlowMeterMap_LogicController.cs
index d7c4167..44a48ee 100644
--- a/IStation.Application.SZJT/99-logic/08-flow-meter-map/FlowMeterMap_LogicController.cs
+++ b/IStation.Application.SZJT/99-logic/08-flow-meter-map/FlowMeterMap_LogicController.cs
@@ -18,7 +18,7 @@
var catalogList = new Yw.Service.SysCatalog().GetChildAndSelfByCode(IStation.Catalog.FlowMeter);
if (catalogList == null || catalogList.Count < 1)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, "娴侀噺璁″垎绫荤紪鐮侀獙璇佸け璐�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, "娴侀噺璁″垎绫荤紪鐮侀獙璇佸け璐�");
}
var catalogIds = catalogList.Select(x => x.ID).Distinct().ToList();
diff --git a/IStation.Application.SZJT/99-logic/09-press-meter-map/PressMeterMap_LogicController.cs b/IStation.Application.SZJT/99-logic/09-press-meter-map/PressMeterMap_LogicController.cs
index e7e843d..fdf88b4 100644
--- a/IStation.Application.SZJT/99-logic/09-press-meter-map/PressMeterMap_LogicController.cs
+++ b/IStation.Application.SZJT/99-logic/09-press-meter-map/PressMeterMap_LogicController.cs
@@ -18,7 +18,7 @@
var catalogList = new Yw.Service.SysCatalog().GetChildAndSelfByCode(IStation.Catalog.PressMeter);
if (catalogList == null || catalogList.Count < 1)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, "鍘嬪姏璁″垎绫荤紪鐮侀獙璇佸け璐�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, "鍘嬪姏璁″垎绫荤紪鐮侀獙璇佸け璐�");
}
var catalogIds = catalogList.Select(x => x.ID).Distinct().ToList();
diff --git a/IStation.Application.SZJT/99-logic/10-mobile/01-station-list/StationList_LogicController.cs b/IStation.Application.SZJT/99-logic/10-mobile/01-station-list/StationList_LogicController.cs
index b032cfd..49aedf2 100644
--- a/IStation.Application.SZJT/99-logic/10-mobile/01-station-list/StationList_LogicController.cs
+++ b/IStation.Application.SZJT/99-logic/10-mobile/01-station-list/StationList_LogicController.cs
@@ -96,7 +96,7 @@
return vmList;
- }, CacheHelper.CacheLevel1);
+ }, Yw.Service.ConfigHelper.CacheLevel1);
return vm_list;
}
diff --git a/IStation.Application.SZJT/99-logic/10-mobile/02-meter-list/MeterList_MobileController.cs b/IStation.Application.SZJT/99-logic/10-mobile/02-meter-list/MeterList_MobileController.cs
index 6b644cc..31d375a 100644
--- a/IStation.Application.SZJT/99-logic/10-mobile/02-meter-list/MeterList_MobileController.cs
+++ b/IStation.Application.SZJT/99-logic/10-mobile/02-meter-list/MeterList_MobileController.cs
@@ -135,7 +135,7 @@
#endregion
return vmList;
- }, CacheHelper.CacheLevel1);
+ }, Yw.Service.ConfigHelper.CacheLevel1);
return vm_list;
}
diff --git a/IStation.Application.SZJT/99-logic/10-mobile/05-map/Map_MobileController.cs b/IStation.Application.SZJT/99-logic/10-mobile/05-map/Map_MobileController.cs
index 544929c..8f0957f 100644
--- a/IStation.Application.SZJT/99-logic/10-mobile/05-map/Map_MobileController.cs
+++ b/IStation.Application.SZJT/99-logic/10-mobile/05-map/Map_MobileController.cs
@@ -42,7 +42,7 @@
}
return vmList;
- }, CacheHelper.CacheLevel3);
+ }, Yw.Service.ConfigHelper.CacheLevel3);
return vm_list;
}
@@ -56,7 +56,7 @@
var station = new Service.LogicSite().GetByID(input.StationID);
if (station == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"StationID:{input.StationID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"StationID:{input.StationID} 鏁版嵁涓嶅瓨鍦�");
}
var vm = new StationMapMonitorKpiInfoMobileDto(station);
@@ -109,7 +109,7 @@
Yw.Service.SysCatalog.PublishCache(cacheKey);
if (catalogList == null || catalogList.Count < 1)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, "娴侀噺璁″垎绫荤紪鐮侀獙璇佸け璐�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, "娴侀噺璁″垎绫荤紪鐮侀獙璇佸け璐�");
}
var catalogIds = catalogList.Select(x => x.ID).Distinct().ToList();
@@ -139,7 +139,7 @@
return vmList;
- }, CacheHelper.CacheLevel3);
+ }, Yw.Service.ConfigHelper.CacheLevel3);
return vm_list;
}
@@ -153,17 +153,17 @@
var equipment = new Yw.Service.Equipment().GetByID(input.FlowMeterID);
if (equipment == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"FlowMeterID:{input.FlowMeterID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"FlowMeterID:{input.FlowMeterID} 鏁版嵁涓嶅瓨鍦�");
}
var catalogList = new Yw.Service.SysCatalog().GetChildAndSelfByCode(IStation.Catalog.FlowMeter);
if (catalogList == null || catalogList.Count < 1)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, "娴侀噺璁″垎绫荤紪鐮侀獙璇佸け璐�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, "娴侀噺璁″垎绫荤紪鐮侀獙璇佸け璐�");
}
var catalogIds = catalogList.Select(x => x.ID).Distinct().ToList();
if (!catalogIds.Contains(equipment.CatalogID))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"FlowMeterID:{input.FlowMeterID} 璇疯緭鍏ユ纭祦閲忚id");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"FlowMeterID:{input.FlowMeterID} 璇疯緭鍏ユ纭祦閲忚id");
}
var vm = new FlowMeterMapMonitorKpiInfoMobileDto();
@@ -235,7 +235,7 @@
Yw.Service.SysCatalog.PublishCache(cacheKey);
if (catalogList == null || catalogList.Count < 1)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, "鍘嬪姏璁″垎绫荤紪鐮侀獙璇佸け璐�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, "鍘嬪姏璁″垎绫荤紪鐮侀獙璇佸け璐�");
}
var catalogIds = catalogList.Select(x => x.ID).Distinct().ToList();
@@ -265,7 +265,7 @@
return vmList;
- }, CacheHelper.CacheLevel3);
+ }, Yw.Service.ConfigHelper.CacheLevel3);
return vm_list;
}
@@ -279,17 +279,17 @@
var equipment = new Yw.Service.Equipment().GetByID(input.PressMeterID);
if (equipment == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"PressMeterID:{input.PressMeterID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"PressMeterID:{input.PressMeterID} 鏁版嵁涓嶅瓨鍦�");
}
var catalogList = new Yw.Service.SysCatalog().GetChildAndSelfByCode(IStation.Catalog.PressMeter);
if (catalogList == null || catalogList.Count < 1)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, "鍘嬪姏璁″垎绫荤紪鐮侀獙璇佸け璐�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, "鍘嬪姏璁″垎绫荤紪鐮侀獙璇佸け璐�");
}
var catalogIds = catalogList.Select(x => x.ID).Distinct().ToList();
if (!catalogIds.Contains(equipment.CatalogID))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"PressMeterID:{input.PressMeterID} 璇疯緭鍏ユ纭帇鍔涜id");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"PressMeterID:{input.PressMeterID} 璇疯緭鍏ユ纭帇鍔涜id");
}
var vm = new PressMeterMapMonitorKpiInfoMobileDto();
@@ -377,7 +377,7 @@
var request = new Yw.Service.RepairRequestForm().GetByID(FormID);
if (request == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"FormID:{FormID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"FormID:{FormID} 鏁版嵁涓嶅瓨鍦�");
}
return new RepairMapStatusMobileDto(request);
}
@@ -386,12 +386,12 @@
var task = new Yw.Service.RepairTaskForm().GetByID(FormID);
if (task == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"FormID:{FormID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"FormID:{FormID} 鏁版嵁涓嶅瓨鍦�");
}
return new RepairMapStatusMobileDto(task);
}
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"FormType 鍙傛暟閿欒");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"FormType 鍙傛暟閿欒");
}
@@ -430,7 +430,7 @@
}
return vm_list;
- }, CacheHelper.CacheLevel3);
+ }, Yw.Service.ConfigHelper.CacheLevel3);
return vm_list;
}
diff --git a/IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/StationAssets_MobileController.cs b/IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/StationAssets_MobileController.cs
index ff56f46..8209cd2 100644
--- a/IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/StationAssets_MobileController.cs
+++ b/IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/StationAssets_MobileController.cs
@@ -35,7 +35,7 @@
vmList.Add(vm);
}
return vmList;
- }, CacheHelper.CacheLevel3);
+ }, Yw.Service.ConfigHelper.CacheLevel3);
if (vm_list != null && vm_list.Count > 0)
{
@@ -63,7 +63,7 @@
var equipment = service_equipment.GetByID(input.ID);
if (equipment == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
}
var supplier = new Yw.Service.Supplier().GetByID(equipment.SupplierID);
diff --git a/IStation.Application.SZJT/99-logic/10-mobile/08-station-statistics/StationStatistics_MobileController.cs b/IStation.Application.SZJT/99-logic/10-mobile/08-station-statistics/StationStatistics_MobileController.cs
index 2f1493c..de53c49 100644
--- a/IStation.Application.SZJT/99-logic/10-mobile/08-station-statistics/StationStatistics_MobileController.cs
+++ b/IStation.Application.SZJT/99-logic/10-mobile/08-station-statistics/StationStatistics_MobileController.cs
@@ -99,7 +99,7 @@
}
return monthRecord;
- }, CacheHelper.CacheLevel1);
+ }, Yw.Service.ConfigHelper.CacheLevel1);
return vm_list;
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/BigScreen_LogicController.cs b/IStation.Application.SZJT/99-logic/11-big-screen/BigScreen_LogicController.cs
new file mode 100644
index 0000000..54a6b81
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/BigScreen_LogicController.cs
@@ -0,0 +1,623 @@
+锘縩amespace IStation.Application
+{
+ /// <summary>
+ /// BigScreen
+ /// </summary>
+ [Route("SZJT/Big/Screen/Logic")]
+ [ApiDescriptionSettings("SZJT", Name = "澶у睆(Logic)", Order = 1000)]
+ public class BigScreen_LogicController : IDynamicApiController
+ {
+
+ #region 鎵�鏈�
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夋车绔檏pi淇℃伅
+ /// </summary>
+ [Route("GetAllStationKpiInfo@V1.0")]
+ [HttpGet]
+ public BigScreenAllStationKpiDto GetAllStationKpiInfo()
+ {
+ var vm = new BigScreenAllStationKpiDto();
+ vm.Lws = new BigScreenAllStationKpiItemDto()
+ {
+ Name = "褰撴棩绱渚涙按閲�",
+ Value = "1120",
+ UnitName = "m鲁"
+ };
+ vm.Lps = new BigScreenAllStationKpiItemDto()
+ {
+ Name = "褰撴棩绱鐢ㄧ數閲�",
+ Value = "2300",
+ UnitName = "kW鈥"
+ };
+ vm.Sws = new BigScreenAllStationKpiItemDto()
+ {
+ Name = "褰撳墠鐬椂鎬绘祦閲�",
+ Value = "2300.2",
+ UnitName = "m鲁/h"
+ };
+ vm.Sps = new BigScreenAllStationKpiItemDto()
+ {
+ Name = "褰撳墠鐬椂鎬诲姛鐜�",
+ Value = "2600.2",
+ UnitName = "kW"
+ };
+ vm.Tsc = new BigScreenAllStationKpiItemDto()
+ {
+ Name = "娉电珯鎬绘暟閲�",
+ Value = "13",
+ UnitName = "搴�"
+ };
+ vm.Rsc = new BigScreenAllStationKpiItemDto()
+ {
+ Name = "杩愯娉电珯鏁伴噺",
+ Value = "10",
+ UnitName = "搴�"
+ };
+ vm.Tpc = new BigScreenAllStationKpiItemDto()
+ {
+ Name = "鏈虹粍鎬绘暟",
+ Value = "50",
+ UnitName = "鍙�"
+ };
+ vm.Rpc = new BigScreenAllStationKpiItemDto()
+ {
+ Name = "杩愯鏈虹粍鏁伴噺",
+ Value = "40",
+ UnitName = "鍙�"
+ };
+ return vm;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夋车绔欓」鍒楄〃
+ /// </summary>
+ [Route("GetAllStationItemList@V1.0")]
+ [HttpGet]
+ public List<BigScreenAllStationListItemDto> GetAllStationItemList()
+ {
+ var allStationList = new Service.LogicSite().GetAll();
+ if (allStationList == null || allStationList.Count < 1)
+ {
+ return default;
+ }
+
+ var service_monitor = new Lazy<Yw.Service.MonitorPoint>(() => new Yw.Service.MonitorPoint());
+ var service_monitor_record = new Lazy<Yw.Service.MonitorRealRecord>(() => new Yw.Service.MonitorRealRecord());
+
+ var vmList = new List<BigScreenAllStationListItemDto>();
+ foreach (var station in allStationList)
+ {
+ var vm = new BigScreenAllStationListItemDto();
+ vm.ID = station.ID;
+ vm.Name = station.Name;
+ vmList.Add(vm);
+ var allMonitorList = service_monitor.Value.GetExSignalWithSignalTypeByBelongTypeAndBelongID(IStation.DataType.LogicSite, station.ID, Yw.Monitor.eCronType.Real);
+ if (allMonitorList != null && allMonitorList.Count > 0)
+ {
+ var monitorQ = allMonitorList.Find(x => x.SignalList.Exists(t => t.SignalType.Code == Yw.Monitor.SignalType.鐬椂娴侀噺));
+ if (monitorQ != null)
+ {
+ var signalQ = monitorQ.SignalList.Find(x => x.SignalType.Code == Yw.Monitor.SignalType.鐬椂娴侀噺);
+ vm.Qk = new BigScreenAllStationListKpiItemDto()
+ {
+ Name = "鐬椂娴侀噺",
+ Value = null,
+ UnitName = signalQ.GetDisplayUnitName()
+ };
+ var recordQ = service_monitor_record.Value.GetLastRecord(signalQ.ID);
+ if (recordQ != null)
+ {
+ vm.Qk.Value = signalQ.GetDisplayValue(recordQ.DataValue);
+ }
+ }
+
+ var monitorPr = allMonitorList.Find(x => x.Flags.Contains(Yw.Monitor.Flags.鍑哄彛) && x.SignalList.Exists(t => t.SignalType.Code == Yw.Monitor.SignalType.鍘嬪姏));
+ if (monitorPr != null)
+ {
+ var signalPr = monitorPr.SignalList.Find(x => x.SignalType.Code == Yw.Monitor.SignalType.鍘嬪姏);
+ vm.Prk = new BigScreenAllStationListKpiItemDto()
+ {
+ Name = "鍑哄彛鍘嬪姏",
+ Value = null,
+ UnitName = signalPr.GetDisplayUnitName()
+ };
+ var recordPr = service_monitor_record.Value.GetLastRecord(signalPr.ID);
+ if (recordPr != null)
+ {
+ vm.Prk.Value = signalPr.GetDisplayValue(recordPr.DataValue);
+ }
+ }
+ }
+ }
+
+ return vmList;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夋车绔欏伐鍗昁pi淇℃伅
+ /// </summary>
+ [Route("GetAllStationRepairKpiInfo@V1.0")]
+ [HttpGet]
+ public BigScreenAllStationRepairKpiDto GetAllStationRepairKpiInfo()
+ {
+ var vm = new BigScreenAllStationRepairKpiDto();
+ vm.Cd = 10;
+ vm.Cm = 235;
+ vm.Cy = 1230;
+ vm.Pending = 5;
+ vm.Accepted = 5;
+ vm.Progress = 35;
+ vm.Checked = 680;
+ return vm;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夋车绔欏伐鍗曟棩缁熻锛堟渶杩戜竴鏈堬級
+ /// </summary>
+ [Route("GetAllStationRepairDayStatisticsInfo@V1.0")]
+ [HttpGet]
+ public List<BigScreenAllStationRepairDayCountDto> GetAllStationRepairDayStatisticsInfo()
+ {
+ var dtEnd = DateTime.Now.Date;
+ var dtStart = dtEnd.AddMonths(-1);
+ var vmList = new List<BigScreenAllStationRepairDayCountDto>();
+ for (DateTime dt = dtStart; dt <= dtEnd; dt = dt.AddDays(1))
+ {
+ var vm = new BigScreenAllStationRepairDayCountDto();
+ vm.Day = dt;
+ vm.Count = Yw.Untity.RandomHelper.Random(10, 100);
+ vmList.Add(vm);
+ }
+ return vmList;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夋车绔欏伐鍗曟湀缁熻锛堟渶杩戜竴骞达級
+ /// </summary>
+ [Route("GetAllStationRepairMonthStatisticsInfo@V1.0")]
+ [HttpGet]
+ public List<BigScreenAllStationRepairMonthCountDto> GetAllStationRepairMonthStatisticsInfo()
+ {
+ var dtNow = DateTime.Now;
+ var dtEnd = new DateTime(dtNow.Year, dtNow.Month, 1);
+ var dtStart = dtEnd.AddMonths(-11);
+ var vmList = new List<BigScreenAllStationRepairMonthCountDto>();
+ for (DateTime dt = dtStart; dt <= dtEnd; dt = dt.AddMonths(1))
+ {
+ var vm = new BigScreenAllStationRepairMonthCountDto();
+ vm.Year = dt.Year;
+ vm.Month = dt.Month;
+ vm.Count = Yw.Untity.RandomHelper.Random(100, 1000);
+ vmList.Add(vm);
+ }
+ return vmList;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夋车绔欐姤璀︿俊鎭�
+ /// </summary>
+ [Route("GetAllStationAlarmInfo@V1.0")]
+ [HttpGet]
+ public List<BigScreenAllStationAlarmItemDto> GetAllStationAlarmInfo()
+ {
+ var vmList = new List<BigScreenAllStationAlarmItemDto>();
+ vmList.Add(new BigScreenAllStationAlarmItemDto()
+ {
+ ID = 1,
+ Name = "閲戝涵涓叞娉电珯",
+ Content = "1#鏈虹粍鍑哄彛鍘嬪姏杩囦綆锛岃鍏虫敞鐘舵�佸彉鍖�"
+ });
+ vmList.Add(new BigScreenAllStationAlarmItemDto()
+ {
+ ID = 2,
+ Name = "鍑硥涓�浣撳寲鍔犲帇娉电珯",
+ Content = "2#鐬椂娴侀噺鏁版嵁寮傚父锛岃妫�淇�"
+ });
+ vmList.Add(new BigScreenAllStationAlarmItemDto()
+ {
+ ID = 3,
+ Name = "鍑硥涓�浣撳寲鍔犲帇娉电珯",
+ Content = "2#鐬椂娴侀噺鏁版嵁寮傚父锛岃妫�淇�"
+ });
+ vmList.Add(new BigScreenAllStationAlarmItemDto()
+ {
+ ID = 4,
+ Name = "鍑硥涓�浣撳寲鍔犲帇娉电珯",
+ Content = "2#鐬椂娴侀噺鏁版嵁寮傚父锛岃妫�淇�"
+ });
+ vmList.Add(new BigScreenAllStationAlarmItemDto()
+ {
+ ID = 5,
+ Name = "鍑硥涓�浣撳寲鍔犲帇娉电珯",
+ Content = "2#鐬椂娴侀噺鏁版嵁寮傚父锛岃妫�淇�"
+ });
+ vmList.Add(new BigScreenAllStationAlarmItemDto()
+ {
+ ID = 6,
+ Name = "鍑硥涓�浣撳寲鍔犲帇娉电珯",
+ Content = "2#鐬椂娴侀噺鏁版嵁寮傚父锛岃妫�淇�"
+ });
+ return vmList;
+ }
+
+ #endregion
+
+
+ #region 鍗曠珯
+
+ /// <summary>
+ /// 鑾峰彇鍗曟车绔檏pi淇℃伅
+ /// </summary>
+ [Route("GetSingleStationKpiInfo@V1.0")]
+ [HttpGet]
+ public BigScreenSingleStationKpiDto GetSingleStationKpiInfo([FromQuery][Required] StationIDInput input)
+ {
+ var vm = new BigScreenSingleStationKpiDto();
+
+ var service_monitor = new Lazy<Yw.Service.MonitorPoint>(() => new Yw.Service.MonitorPoint());
+ var service_monitor_record = new Lazy<Yw.Service.MonitorRealRecord>(() => new Yw.Service.MonitorRealRecord());
+ var service_equipment = new Lazy<Yw.Service.Equipment>(() => new Yw.Service.Equipment());
+ var service_run_record = new Lazy<Yw.Service.RunRealRecord>(() => new Yw.Service.RunRealRecord());
+
+ var allMonitorList = service_monitor.Value.GetExSignalWithSignalTypeByBelongTypeAndBelongID(IStation.DataType.LogicSite, input.StationID, Yw.Monitor.eCronType.Real);
+ if (allMonitorList != null && allMonitorList.Count > 0)
+ {
+ var monitorQ = allMonitorList.Find(x => x.SignalList.Exists(t => t.SignalType.Code == Yw.Monitor.SignalType.鐬椂娴侀噺));
+ if (monitorQ != null)
+ {
+ var signalQ = monitorQ.SignalList.Find(x => x.SignalType.Code == Yw.Monitor.SignalType.鐬椂娴侀噺);
+ vm.Q = new BigScreenSingleStationKpiItemDto()
+ {
+ Name = "鐬椂娴侀噺",
+ Value = null,
+ UnitName = signalQ.GetDisplayUnitName()
+ };
+ var recordQ = service_monitor_record.Value.GetLastRecord(signalQ.ID);
+ if (recordQ != null)
+ {
+ vm.Q.Value = signalQ.GetDisplayValue(recordQ.DataValue);
+ }
+ }
+
+ var monitorPr = allMonitorList.Find(x => x.Flags.Contains(Yw.Monitor.Flags.鍑哄彛) && x.SignalList.Exists(t => t.SignalType.Code == Yw.Monitor.SignalType.鍘嬪姏));
+ if (monitorPr != null)
+ {
+ var signalPr = monitorPr.SignalList.Find(x => x.SignalType.Code == Yw.Monitor.SignalType.鍘嬪姏);
+ vm.Pr = new BigScreenSingleStationKpiItemDto()
+ {
+ Name = "鍑哄彛鍘嬪姏",
+ Value = null,
+ UnitName = signalPr.GetDisplayUnitName()
+ };
+ var recordPr = service_monitor_record.Value.GetLastRecord(signalPr.ID);
+ if (recordPr != null)
+ {
+ vm.Pr.Value = signalPr.GetDisplayValue(recordPr.DataValue);
+ }
+ }
+
+ var monitorZD = allMonitorList.Find(x => x.SignalList.Exists(t => t.SignalType.Code == Yw.Monitor.SignalType.娴婂害));
+ if (monitorZD != null)
+ {
+ var signalZD = monitorZD.SignalList.Find(x => x.SignalType.Code == Yw.Monitor.SignalType.娴婂害);
+ vm.ZD = new BigScreenSingleStationKpiItemDto()
+ {
+ Name = "娴婂害",
+ Value = null,
+ UnitName = signalZD.GetDisplayUnitName()
+ };
+ var recordZD = service_monitor_record.Value.GetLastRecord(signalZD.ID);
+ if (recordZD != null)
+ {
+ vm.ZD.Value = signalZD.GetDisplayValue(recordZD.DataValue);
+ }
+ }
+
+ var monitorYL = allMonitorList.Find(x => x.SignalList.Exists(t => t.SignalType.Code == Yw.Monitor.SignalType.浣欐隘));
+ if (monitorYL != null)
+ {
+ var signalYL = monitorYL.SignalList.Find(x => x.SignalType.Code == Yw.Monitor.SignalType.浣欐隘);
+ vm.YL = new BigScreenSingleStationKpiItemDto()
+ {
+ Name = "浣欐隘",
+ Value = null,
+ UnitName = signalYL.GetDisplayUnitName()
+ };
+ var recordYL = service_monitor_record.Value.GetLastRecord(signalYL.ID);
+ if (recordYL != null)
+ {
+ vm.YL.Value = signalYL.GetDisplayValue(recordYL.DataValue);
+ }
+ }
+
+ }
+
+ var allEquipmentList = service_equipment.Value.GetByBelongTypeAndBelongID(IStation.DataType.LogicSite, input.StationID);
+ allEquipmentList = allEquipmentList?.Where(x => x.Flags.Contains(IStation.Flags.鏈虹粍)).ToList();
+ if (allEquipmentList != null && allEquipmentList.Count > 0)
+ {
+ vm.RunList = new List<BigScreenSingleStationKpiRunItemDto>();
+ foreach (var equipment in allEquipmentList)
+ {
+ var vm_run = new BigScreenSingleStationKpiRunItemDto()
+ {
+ Name = equipment.Name,
+ RunStatus = 0
+ };
+ var run_record = service_run_record.Value.GetLastRecord(Yw.Assets.DataType.Equipment, equipment.ID);
+ if (run_record != null)
+ {
+ vm_run.RunStatus = run_record.RSa;
+ }
+ vm.RunList.Add(vm_run);
+ }
+ }
+
+ return vm;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍗曟车绔欐寚鏍囦俊鎭�
+ /// </summary>
+ [Route("GetSingleStationQuotaInfo@V1.0")]
+ [HttpGet]
+ public BigScreenSingleStationQuotaKpiDto GetSingleStationQuotaInfo([FromQuery][Required] StationIDInput input)
+ {
+ var vm = new BigScreenSingleStationQuotaKpiDto();
+ vm.Ws = new List<BigScreenSingleStationQuotaItemDto>();
+ vm.Ps = new List<BigScreenSingleStationQuotaItemDto>();
+
+ var dtEnd = DateTime.Now.Date;
+ var dtStart = dtEnd.AddMonths(-1);
+ for (DateTime dt = dtStart; dt <= dtEnd; dt = dt.AddDays(1))
+ {
+ vm.Ws.Add(new BigScreenSingleStationQuotaItemDto()
+ {
+ Day = dt,
+ Value = RandomHelper.Random(1000, 10000).ToString(),
+ UnitName = "m鲁"
+ });
+ vm.Ps.Add(new BigScreenSingleStationQuotaItemDto()
+ {
+ Day = dt,
+ Value = RandomHelper.Random(2000, 3000).ToString(),
+ UnitName = "kW鈥"
+ });
+ }
+ return vm;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍗曟车绔欐満缁勯」鍒楄〃
+ /// </summary>
+ [Route("GetSingleStationEnginePumpItemList@V1.0")]
+ [HttpGet]
+ public List<BigScreenSingleStationEnginePumpListItemDto> GetSingleStationEnginePumpItemList([FromQuery][Required] StationIDInput input)
+ {
+ var service_equipment = new Yw.Service.Equipment();
+ var allEnginePumpList = service_equipment.GetByBelongTypeAndBelongID(IStation.DataType.LogicSite, input.StationID);
+ allEnginePumpList = allEnginePumpList?.Where(x => x.Flags.Contains(IStation.Flags.鏈虹粍)).ToList();
+ if (allEnginePumpList == null || allEnginePumpList.Count < 1)
+ {
+ return default;
+ }
+
+ var service_monitor_mapping = new Lazy<Yw.Service.EquipmentMonitorMapping>(() => new Yw.Service.EquipmentMonitorMapping());
+ var service_monitor = new Lazy<Yw.Service.MonitorPoint>(() => new Yw.Service.MonitorPoint());
+ var service_monitor_record = new Lazy<Yw.Service.MonitorRealRecord>(() => new Yw.Service.MonitorRealRecord());
+
+ var vmList = new List<BigScreenSingleStationEnginePumpListItemDto>();
+ foreach (var enginePump in allEnginePumpList)
+ {
+ var vm = new BigScreenSingleStationEnginePumpListItemDto();
+ vm.ID = enginePump.ID;
+ vm.Name = enginePump.Name;
+ vmList.Add(vm);
+
+ var allChildEquipmentList = service_equipment.GetChildAndSelfByID(enginePump.ID);
+ if (allChildEquipmentList != null && allChildEquipmentList.Count > 0)
+ {
+ var allChildEquipmentIds = allChildEquipmentList.Select(x => x.ID).Distinct().ToList();
+ var allMappingList = service_monitor_mapping.Value.GetByEquipmentIds(allChildEquipmentIds);
+ if (allMappingList != null && allMappingList.Count > 0)
+ {
+ var allMonitorIds = allMappingList.Select(x => x.MonitorPointID).Distinct().ToList();
+ var allMonitorList = service_monitor.Value.GetExSignalWithSignalTypeByIds(allMonitorIds);
+ if (allMonitorList != null && allMonitorList.Count > 0)
+ {
+ var monitorRs = allMonitorList.Find(x => x.SignalList.Exists(t => t.SignalType.Code == Yw.Monitor.SignalType.杩愯鐘舵��));
+ if (monitorRs != null)
+ {
+ var signalRs = monitorRs.SignalList.Find(x => x.SignalType.Code == Yw.Monitor.SignalType.杩愯鐘舵��);
+ vm.Rs = new BigScreenSingleStationEnginePumpListKpiItemDto()
+ {
+ Name = "鐘舵��",
+ Value = null,
+ UnitName = null
+ };
+ var recordRs = service_monitor_record.Value.GetLastRecord(signalRs.ID);
+ if (recordRs != null)
+ {
+ vm.Rs.Value = recordRs.DataValue;
+ }
+ }
+
+ var monitorHz = allMonitorList.Find(x => x.SignalList.Exists(t => t.SignalType.Code == Yw.Monitor.SignalType.棰戠巼));
+ if (monitorHz != null)
+ {
+ var signalHz = monitorHz.SignalList.Find(x => x.SignalType.Code == Yw.Monitor.SignalType.棰戠巼);
+ vm.Hz = new BigScreenSingleStationEnginePumpListKpiItemDto()
+ {
+ Name = "棰戠巼",
+ Value = null,
+ UnitName = signalHz.GetDisplayUnitName()
+ };
+ var recordHz = service_monitor_record.Value.GetLastRecord(signalHz.ID);
+ if (recordHz != null)
+ {
+ vm.Hz.Value = signalHz.GetDisplayValue(recordHz.DataValue);
+ }
+ }
+
+ var monitorP = allMonitorList.Find(x => x.SignalList.Exists(t => t.SignalType.Code == Yw.Monitor.SignalType.鏈夊姛鍔熺巼));
+ if (monitorP != null)
+ {
+ var signalP = monitorP.SignalList.Find(x => x.SignalType.Code == Yw.Monitor.SignalType.鏈夊姛鍔熺巼);
+ vm.P = new BigScreenSingleStationEnginePumpListKpiItemDto()
+ {
+ Name = "鍔熺巼",
+ Value = null,
+ UnitName = signalP.GetDisplayUnitName()
+ };
+ var recordP = service_monitor_record.Value.GetLastRecord(signalP.ID);
+ if (recordP != null)
+ {
+ vm.P.Value = signalP.GetDisplayValue(recordP.DataValue);
+ }
+ }
+
+ }
+ }
+ }
+ }
+
+ return vmList;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍗曟车绔欏伐鍗昁pi淇℃伅
+ /// </summary>
+ [Route("GetSingleStationRepairKpiInfo@V1.0")]
+ [HttpGet]
+ public BigScreenSingleStationRepairKpiDto GetSingleStationRepairKpiInfo([FromQuery][Required] StationIDInput input)
+ {
+ var vm = new BigScreenSingleStationRepairKpiDto();
+ vm.Cd = 10;
+ vm.Cm = 235;
+ vm.Cy = 1230;
+ vm.Pending = 5;
+ vm.Accepted = 5;
+ vm.Progress = 35;
+ vm.Checked = 680;
+ return vm;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍗曟车绔欏伐鍗曠粺璁′俊鎭�
+ /// </summary>
+ [Route("GetSingleStationRepairStatisticsInfo@V1.0")]
+ [HttpGet]
+ public BigScreenSingleStationRepairStatisticsInfoDto GetSingleStationRepairStatisticsInfo([FromQuery][Required] StationIDInput input)
+ {
+ var vm = new BigScreenSingleStationRepairStatisticsInfoDto();
+ vm.LastMonth = new List<BigScreenSingleStationRepairDayCountDto>();
+
+ var dtEnd = DateTime.Now.Date;
+ var dtStart = dtEnd.AddMonths(-1);
+ for (DateTime dt = dtStart; dt <= dtEnd; dt = dt.AddDays(1))
+ {
+ var vm_day = new BigScreenSingleStationRepairDayCountDto();
+ vm_day.Day = dt;
+ vm_day.Count = Yw.Untity.RandomHelper.Random(10, 100);
+ vm.LastMonth.Add(vm_day);
+ }
+
+ vm.LastYear = new List<BigScreenSingleStationRepairMonthCountDto>();
+ var dtNow = DateTime.Now;
+ dtEnd = new DateTime(dtNow.Year, dtNow.Month, 1);
+ dtStart = dtEnd.AddMonths(-11);
+ for (DateTime dt = dtStart; dt <= dtEnd; dt = dt.AddMonths(1))
+ {
+ var vm_month = new BigScreenSingleStationRepairMonthCountDto();
+ vm_month.Year = dt.Year;
+ vm_month.Month = dt.Month;
+ vm_month.Count = Yw.Untity.RandomHelper.Random(100, 1000);
+ vm.LastYear.Add(vm_month);
+ }
+ return vm;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍗曟车绔欐満缁勫伐鍗曠粺璁′俊鎭�
+ /// </summary>
+ [Route("GetSingleStationRepairEnginePumpStatisticsInfo@V1.0")]
+ [HttpGet]
+ public BigScreenSingleStationRepairEnginePumpStatisticsInfoDto GetSingleStationRepairEnginePumpStatisticsInfo([FromQuery][Required] StationIDInput input)
+ {
+ var vm = new BigScreenSingleStationRepairEnginePumpStatisticsInfoDto();
+ vm.Cd = new List<BigScreenSingleStationRepairEnginePumpCountDto>()
+ {
+ new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="1#鏈虹粍",Count=1},
+ new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="2#鏈虹粍",Count=3},
+ new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="3#鏈虹粍",Count=0},
+ new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="4#鏈虹粍",Count=1}
+ };
+ vm.Cm = new List<BigScreenSingleStationRepairEnginePumpCountDto>()
+ {
+ new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="1#鏈虹粍",Count=10},
+ new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="2#鏈虹粍",Count=32},
+ new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="3#鏈虹粍",Count=4},
+ new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="4#鏈虹粍",Count=18}
+ };
+ vm.Cm = new List<BigScreenSingleStationRepairEnginePumpCountDto>()
+ {
+ new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="1#鏈虹粍",Count=123},
+ new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="2#鏈虹粍",Count=45},
+ new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="3#鏈虹粍",Count=8},
+ new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="4#鏈虹粍",Count=23}
+ };
+ return vm;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍗曟车绔欐姤璀︿俊鎭�
+ /// </summary>
+ [Route("GetSingleStationAlarmInfo@V1.0")]
+ [HttpGet]
+ public List<BigScreenSingleStationAlarmItemDto> GetSingleStationAlarmInfo([FromQuery][Required] StationIDInput input)
+ {
+ var vmList = new List<BigScreenSingleStationAlarmItemDto>();
+ vmList.Add(new BigScreenSingleStationAlarmItemDto()
+ {
+ ID = 1,
+ Name = "1#鏈虹粍",
+ Content = "鍑哄彛鍘嬪姏杩囦綆锛岃鍏虫敞鐘舵�佸彉鍖�"
+ });
+ vmList.Add(new BigScreenSingleStationAlarmItemDto()
+ {
+ ID = 2,
+ Name = "2#鏈虹粍",
+ Content = "鐬椂娴侀噺鏁版嵁寮傚父锛岃妫�淇�"
+ });
+ vmList.Add(new BigScreenSingleStationAlarmItemDto()
+ {
+ ID = 3,
+ Name = "2#鏈虹粍",
+ Content = "鐬椂娴侀噺鏁版嵁寮傚父锛岃妫�淇�"
+ });
+ vmList.Add(new BigScreenSingleStationAlarmItemDto()
+ {
+ ID = 4,
+ Name = "2#鏈虹粍",
+ Content = "鐬椂娴侀噺鏁版嵁寮傚父锛岃妫�淇�"
+ });
+ vmList.Add(new BigScreenSingleStationAlarmItemDto()
+ {
+ ID = 5,
+ Name = "2#鏈虹粍",
+ Content = "鐬椂娴侀噺鏁版嵁寮傚父锛岃妫�淇�"
+ });
+ vmList.Add(new BigScreenSingleStationAlarmItemDto()
+ {
+ ID = 6,
+ Name = "2#鏈虹粍",
+ Content = "鐬椂娴侀噺鏁版嵁寮傚父锛岃妫�淇�"
+ });
+ return vmList;
+ }
+
+ #endregion
+
+ }
+}
\ No newline at end of file
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-alarm/BigScreenAllStationAlarmItemDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-alarm/BigScreenAllStationAlarmItemDto.cs
new file mode 100644
index 0000000..9b7e25f
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-alarm/BigScreenAllStationAlarmItemDto.cs
@@ -0,0 +1,23 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ /// 娉电珯鎶ヨ椤�
+ /// </summary>
+ public class BigScreenAllStationAlarmItemDto
+ {
+ /// <summary>
+ /// id
+ /// </summary>
+ public long ID { get; set; }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 鍐呭
+ /// </summary>
+ public string Content { get; set; }
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-list/BigScreenAllStationListItemDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-list/BigScreenAllStationListItemDto.cs
new file mode 100644
index 0000000..c10d253
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-list/BigScreenAllStationListItemDto.cs
@@ -0,0 +1,29 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ /// 娉电珯鍒楄〃椤�
+ /// </summary>
+ public class BigScreenAllStationListItemDto
+ {
+ /// <summary>
+ /// id
+ /// </summary>
+ public long ID { get; set; }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 娴侀噺
+ /// </summary>
+ public BigScreenAllStationListKpiItemDto Qk { get; set; }
+
+ /// <summary>
+ /// 鍘嬪姏
+ /// </summary>
+ public BigScreenAllStationListKpiItemDto Prk { get; set; }
+
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-list/BigScreenAllStationListKpiItemDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-list/BigScreenAllStationListKpiItemDto.cs
new file mode 100644
index 0000000..a84d940
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-list/BigScreenAllStationListKpiItemDto.cs
@@ -0,0 +1,23 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class BigScreenAllStationListKpiItemDto
+ {
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 鍊�
+ /// </summary>
+ public string Value { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ public string UnitName { get; set; }
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-repair-statistics/BigScreenAllStationRepairDayCountDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-repair-statistics/BigScreenAllStationRepairDayCountDto.cs
new file mode 100644
index 0000000..a8d1cfd
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-repair-statistics/BigScreenAllStationRepairDayCountDto.cs
@@ -0,0 +1,20 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class BigScreenAllStationRepairDayCountDto
+ {
+ /// <summary>
+ /// 鏃ユ湡
+ /// </summary>
+ public DateTime Day { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public int Count { get; set; }
+
+
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-repair-statistics/BigScreenAllStationRepairMonthCountDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-repair-statistics/BigScreenAllStationRepairMonthCountDto.cs
new file mode 100644
index 0000000..9826797
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-repair-statistics/BigScreenAllStationRepairMonthCountDto.cs
@@ -0,0 +1,23 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class BigScreenAllStationRepairMonthCountDto
+ {
+ /// <summary>
+ /// 骞翠唤
+ /// </summary>
+ public int Year { get; set; }
+
+ /// <summary>
+ /// 鏈堜唤
+ /// </summary>
+ public int Month { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public int Count { get; set; }
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-repair/BigScreenAllStationRepairKpiDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-repair/BigScreenAllStationRepairKpiDto.cs
new file mode 100644
index 0000000..7e71f01
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-repair/BigScreenAllStationRepairKpiDto.cs
@@ -0,0 +1,44 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class BigScreenAllStationRepairKpiDto
+ {
+ /// <summary>
+ /// 褰撴棩鏁伴噺
+ /// </summary>
+ public int Cd { get; set; }
+
+ /// <summary>
+ /// 褰撴湀鏁伴噺
+ /// </summary>
+ public int Cm { get; set; }
+
+ /// <summary>
+ /// 褰撳勾鏁伴噺
+ /// </summary>
+ public int Cy { get; set; }
+
+ /// <summary>
+ /// 寰呭彈鐞�
+ /// </summary>
+ public int Pending { get; set; }
+
+ /// <summary>
+ /// 宸插彈鐞�
+ /// </summary>
+ public int Accepted { get; set; }
+
+ /// <summary>
+ /// 杩涜涓�
+ /// </summary>
+ public int Progress { get; set; }
+
+ /// <summary>
+ /// 宸查獙鏀�
+ /// </summary>
+ public int Checked { get; set; }
+
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station/BigScreenAllStationKpiDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station/BigScreenAllStationKpiDto.cs
new file mode 100644
index 0000000..0270e58
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station/BigScreenAllStationKpiDto.cs
@@ -0,0 +1,48 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class BigScreenAllStationKpiDto
+ {
+ /// <summary>
+ /// 褰撴棩绱渚涙按閲�
+ /// </summary>
+ public BigScreenAllStationKpiItemDto Lws { get; set; }
+
+ /// <summary>
+ /// 褰撴棩绱鐢ㄧ數閲�
+ /// </summary>
+ public BigScreenAllStationKpiItemDto Lps { get; set; }
+
+ /// <summary>
+ /// 褰撳墠鐬椂鎬绘祦閲�
+ /// </summary>
+ public BigScreenAllStationKpiItemDto Sws { get; set; }
+
+ /// <summary>
+ /// 褰撳墠鐬椂鎬诲姛鐜�
+ /// </summary>
+ public BigScreenAllStationKpiItemDto Sps { get; set; }
+
+ /// <summary>
+ /// 鎬绘车绔欐暟閲�
+ /// </summary>
+ public BigScreenAllStationKpiItemDto Tsc { get; set; }
+
+ /// <summary>
+ /// 杩愯娉电珯鏁伴噺
+ /// </summary>
+ public BigScreenAllStationKpiItemDto Rsc { get; set; }
+
+ /// <summary>
+ /// 鎬绘満缁勬暟閲�
+ /// </summary>
+ public BigScreenAllStationKpiItemDto Tpc { get; set; }
+
+ /// <summary>
+ /// 杩愯鏈虹粍鏁伴噺
+ /// </summary>
+ public BigScreenAllStationKpiItemDto Rpc { get; set; }
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station/BigScreenAllStationKpiItemDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station/BigScreenAllStationKpiItemDto.cs
new file mode 100644
index 0000000..d42464f
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station/BigScreenAllStationKpiItemDto.cs
@@ -0,0 +1,23 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ /// 鎵�鏈夋车绔檏pi椤� dto
+ /// </summary>
+ public class BigScreenAllStationKpiItemDto
+ {
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 鍊�
+ /// </summary>
+ public string Value { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ public string UnitName { get; set; }
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-alarm/BigScreenSingleStationAlarmItemDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-alarm/BigScreenSingleStationAlarmItemDto.cs
new file mode 100644
index 0000000..f8a611b
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-alarm/BigScreenSingleStationAlarmItemDto.cs
@@ -0,0 +1,23 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ /// 娉电珯鎶ヨ椤�
+ /// </summary>
+ public class BigScreenSingleStationAlarmItemDto
+ {
+ /// <summary>
+ /// id
+ /// </summary>
+ public long ID { get; set; }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 鍐呭
+ /// </summary>
+ public string Content { get; set; }
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-engine-pump-list/BigScreenSingleStationEnginePumpListItemDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-engine-pump-list/BigScreenSingleStationEnginePumpListItemDto.cs
new file mode 100644
index 0000000..ec746d3
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-engine-pump-list/BigScreenSingleStationEnginePumpListItemDto.cs
@@ -0,0 +1,35 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ /// 娉电珯鍒楄〃椤�
+ /// </summary>
+ public class BigScreenSingleStationEnginePumpListItemDto
+ {
+ /// <summary>
+ /// id
+ /// </summary>
+ public long ID { get; set; }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 鐘舵��
+ /// </summary>
+ public BigScreenSingleStationEnginePumpListKpiItemDto Rs { get; set; }
+
+ /// <summary>
+ /// 棰戠巼
+ /// </summary>
+ public BigScreenSingleStationEnginePumpListKpiItemDto Hz { get; set; }
+
+ /// <summary>
+ /// 鍔熺巼
+ /// </summary>
+ public BigScreenSingleStationEnginePumpListKpiItemDto P { get; set; }
+
+
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-engine-pump-list/BigScreenSingleStationEnginePumpListKpiItemDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-engine-pump-list/BigScreenSingleStationEnginePumpListKpiItemDto.cs
new file mode 100644
index 0000000..5577437
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-engine-pump-list/BigScreenSingleStationEnginePumpListKpiItemDto.cs
@@ -0,0 +1,23 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class BigScreenSingleStationEnginePumpListKpiItemDto
+ {
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 鍊�
+ /// </summary>
+ public string Value { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ public string UnitName { get; set; }
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-quota/BigScreenSingleStationQuotaItemDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-quota/BigScreenSingleStationQuotaItemDto.cs
new file mode 100644
index 0000000..fa2599c
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-quota/BigScreenSingleStationQuotaItemDto.cs
@@ -0,0 +1,24 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class BigScreenSingleStationQuotaItemDto
+ {
+
+ /// <summary>
+ /// 鏃ユ湡
+ /// </summary>
+ public DateTime Day { get; set; }
+
+ /// <summary>
+ /// 鏃ユ湡
+ /// </summary>
+ public string Value { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ public string UnitName { get; set; }
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-quota/BigScreenSingleStationQuotaKpiDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-quota/BigScreenSingleStationQuotaKpiDto.cs
new file mode 100644
index 0000000..1148e8c
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-quota/BigScreenSingleStationQuotaKpiDto.cs
@@ -0,0 +1,18 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class BigScreenSingleStationQuotaKpiDto
+ {
+ /// <summary>
+ /// 渚涙按閲�
+ /// </summary>
+ public List<BigScreenSingleStationQuotaItemDto> Ws { get; set; }
+
+ /// <summary>
+ /// 鐢ㄧ數閲�
+ /// </summary>
+ public List<BigScreenSingleStationQuotaItemDto> Ps { get; set; }
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairDayCountDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairDayCountDto.cs
new file mode 100644
index 0000000..1857826
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairDayCountDto.cs
@@ -0,0 +1,18 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class BigScreenSingleStationRepairDayCountDto
+ {
+ /// <summary>
+ /// 鏃ユ湡
+ /// </summary>
+ public DateTime Day { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public int Count { get; set; }
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairEnginePumpCountDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairEnginePumpCountDto.cs
new file mode 100644
index 0000000..3394ec4
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairEnginePumpCountDto.cs
@@ -0,0 +1,20 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class BigScreenSingleStationRepairEnginePumpCountDto
+ {
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public int Count { get; set; }
+
+
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairEnginePumpStatisticsInfoDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairEnginePumpStatisticsInfoDto.cs
new file mode 100644
index 0000000..b0cb81d
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairEnginePumpStatisticsInfoDto.cs
@@ -0,0 +1,23 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class BigScreenSingleStationRepairEnginePumpStatisticsInfoDto
+ {
+ /// <summary>
+ /// 褰撴棩
+ /// </summary>
+ public List<BigScreenSingleStationRepairEnginePumpCountDto> Cd { get; set; }
+
+ /// <summary>
+ /// 褰撴湀
+ /// </summary>
+ public List<BigScreenSingleStationRepairEnginePumpCountDto> Cm { get; set; }
+
+ /// <summary>
+ /// 褰撳勾
+ /// </summary>
+ public List<BigScreenSingleStationRepairEnginePumpCountDto> Cy { get; set; }
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairMonthCountDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairMonthCountDto.cs
new file mode 100644
index 0000000..23432d5
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairMonthCountDto.cs
@@ -0,0 +1,23 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class BigScreenSingleStationRepairMonthCountDto
+ {
+ /// <summary>
+ /// 骞翠唤
+ /// </summary>
+ public int Year { get; set; }
+
+ /// <summary>
+ /// 鏈堜唤
+ /// </summary>
+ public int Month { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public int Count { get; set; }
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairStatisticsInfoDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairStatisticsInfoDto.cs
new file mode 100644
index 0000000..13a9384
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairStatisticsInfoDto.cs
@@ -0,0 +1,19 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class BigScreenSingleStationRepairStatisticsInfoDto
+ {
+ /// <summary>
+ /// 鏈�杩戜竴鏈�
+ /// </summary>
+ public List<BigScreenSingleStationRepairDayCountDto> LastMonth { get; set; }
+
+ /// <summary>
+ /// 鏈�杩戜竴骞�
+ /// </summary>
+ public List<BigScreenSingleStationRepairMonthCountDto> LastYear { get; set; }
+
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair/BigScreenSingleStationRepairKpiDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair/BigScreenSingleStationRepairKpiDto.cs
new file mode 100644
index 0000000..b775bf8
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair/BigScreenSingleStationRepairKpiDto.cs
@@ -0,0 +1,44 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class BigScreenSingleStationRepairKpiDto
+ {
+ /// <summary>
+ /// 褰撴棩鏁伴噺
+ /// </summary>
+ public int Cd { get; set; }
+
+ /// <summary>
+ /// 褰撴湀鏁伴噺
+ /// </summary>
+ public int Cm { get; set; }
+
+ /// <summary>
+ /// 褰撳勾鏁伴噺
+ /// </summary>
+ public int Cy { get; set; }
+
+ /// <summary>
+ /// 寰呭彈鐞�
+ /// </summary>
+ public int Pending { get; set; }
+
+ /// <summary>
+ /// 宸插彈鐞�
+ /// </summary>
+ public int Accepted { get; set; }
+
+ /// <summary>
+ /// 杩涜涓�
+ /// </summary>
+ public int Progress { get; set; }
+
+ /// <summary>
+ /// 宸查獙鏀�
+ /// </summary>
+ public int Checked { get; set; }
+
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station/BigScreenSingleStationKpiDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station/BigScreenSingleStationKpiDto.cs
new file mode 100644
index 0000000..e2fb220
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station/BigScreenSingleStationKpiDto.cs
@@ -0,0 +1,35 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class BigScreenSingleStationKpiDto
+ {
+ /// <summary>
+ /// 鐬椂娴侀噺
+ /// </summary>
+ public BigScreenSingleStationKpiItemDto Q { get; set; }
+
+ /// <summary>
+ /// 鍑哄彛鍘嬪姏
+ /// </summary>
+ public BigScreenSingleStationKpiItemDto Pr { get; set; }
+
+ /// <summary>
+ /// 娴婂害
+ /// </summary>
+ public BigScreenSingleStationKpiItemDto ZD { get; set; }
+
+ /// <summary>
+ /// 浣欐隘
+ /// </summary>
+ public BigScreenSingleStationKpiItemDto YL { get; set; }
+
+ /// <summary>
+ /// 杩愯鍒楄〃
+ /// </summary>
+ public List<BigScreenSingleStationKpiRunItemDto> RunList { get; set; }
+
+
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station/BigScreenSingleStationKpiItemDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station/BigScreenSingleStationKpiItemDto.cs
new file mode 100644
index 0000000..98be8fd
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station/BigScreenSingleStationKpiItemDto.cs
@@ -0,0 +1,23 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ /// 鍗曟车绔檏pi椤� dto
+ /// </summary>
+ public class BigScreenSingleStationKpiItemDto
+ {
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 鍊�
+ /// </summary>
+ public string Value { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ public string UnitName { get; set; }
+ }
+}
diff --git a/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station/BigScreenSingleStationKpiRunItemDto.cs b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station/BigScreenSingleStationKpiRunItemDto.cs
new file mode 100644
index 0000000..dcb4389
--- /dev/null
+++ b/IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station/BigScreenSingleStationKpiRunItemDto.cs
@@ -0,0 +1,18 @@
+锘縩amespace IStation.Application.SZJT
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class BigScreenSingleStationKpiRunItemDto
+ {
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 杩愯鐘舵�� 0-鍋滄満 1-寮�鏈�
+ /// </summary>
+ public int RunStatus { get; set; }
+ }
+}
diff --git a/IStation.Application.SZJT/GlobalUsings.cs b/IStation.Application.SZJT/GlobalUsings.cs
index 00d588e..c1975e7 100644
--- a/IStation.Application.SZJT/GlobalUsings.cs
+++ b/IStation.Application.SZJT/GlobalUsings.cs
@@ -13,3 +13,4 @@
global using Yw.Service.Monitor;
global using IStation.Application.SZJT;
global using Microsoft.AspNetCore.Authorization;
+global using Yw.Dto;
diff --git a/IStation.Application.SZJT/IStation.Application.SZJT.csproj b/IStation.Application.SZJT/IStation.Application.SZJT.csproj
index 19c2f77..7404eac 100644
--- a/IStation.Application.SZJT/IStation.Application.SZJT.csproj
+++ b/IStation.Application.SZJT/IStation.Application.SZJT.csproj
@@ -31,13 +31,11 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Yw.Application.Core" Version="1.3.9" />
- <PackageReference Include="Yw.Service.Assets.Core" Version="1.2.9" />
- <PackageReference Include="Yw.Service.DMA.Core" Version="1.0.5" />
- <PackageReference Include="Yw.Service.Map.Core" Version="1.0.4" />
- <PackageReference Include="Yw.Service.Monitor.Core" Version="2.1.5" />
- <PackageReference Include="Yw.Service.Repair.Core" Version="1.0.2" />
- <PackageReference Include="Yw.Service.Run.Core" Version="1.0.4" />
+ <PackageReference Include="Yw.Application.Core" Version="3.0.5" />
+ <PackageReference Include="Yw.Service.DMA.Core" Version="3.0.1" />
+ <PackageReference Include="Yw.Service.Map.Core" Version="3.0.3" />
+ <PackageReference Include="Yw.Service.Repair.Core" Version="3.0.1" />
+ <PackageReference Include="Yw.Service.Run.Core" Version="3.0.1" />
</ItemGroup>
<ItemGroup>
diff --git a/IStation.Entry.SZJT/IStation.Entry.SZJT.csproj b/IStation.Entry.SZJT/IStation.Entry.SZJT.csproj
index c878ab3..a36fe6b 100644
--- a/IStation.Entry.SZJT/IStation.Entry.SZJT.csproj
+++ b/IStation.Entry.SZJT/IStation.Entry.SZJT.csproj
@@ -13,17 +13,17 @@
<ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
<ItemGroup>
- <PackageReference Include="Yw.Application.ArtImage.Core" Version="1.1.4" />
- <PackageReference Include="Yw.Application.Assets.Core" Version="2.0.5" />
- <PackageReference Include="Yw.Application.Basic.Core" Version="1.2.8" />
- <PackageReference Include="Yw.Application.Bimface.Core" Version="1.0.5" />
- <PackageReference Include="Yw.Application.Dict.Core" Version="1.1.6" />
- <PackageReference Include="Yw.Application.DMA.Core" Version="1.0.6" />
- <PackageReference Include="Yw.Application.DOCS.Core" Version="1.0.2" />
- <PackageReference Include="Yw.Application.Map.Core" Version="1.0.5" />
- <PackageReference Include="Yw.Application.Monitor.Core" Version="2.2.3" />
- <PackageReference Include="Yw.Application.Repair.Core" Version="1.0.3" />
- <PackageReference Include="Yw.Application.Unit.Core" Version="1.1.7" />
+ <PackageReference Include="Yw.Application.ArtImage.Core" Version="3.0.2" />
+ <PackageReference Include="Yw.Application.Assets.Core" Version="3.0.5" />
+ <PackageReference Include="Yw.Application.Basic.Core" Version="3.0.5" />
+ <PackageReference Include="Yw.Application.Bimface.Core" Version="3.0.1" />
+ <PackageReference Include="Yw.Application.Dict.Core" Version="3.0.1" />
+ <PackageReference Include="Yw.Application.DMA.Core" Version="3.0.2" />
+ <PackageReference Include="Yw.Application.DOCS.Core" Version="3.0.2" />
+ <PackageReference Include="Yw.Application.Map.Core" Version="3.0.3" />
+ <PackageReference Include="Yw.Application.Monitor.Core" Version="3.0.6" />
+ <PackageReference Include="Yw.Application.Repair.Core" Version="3.0.1" />
+ <PackageReference Include="Yw.Application.Unit.Core" Version="3.0.2" />
</ItemGroup>
<ItemGroup>
diff --git a/IStation.Entry.SZJT/Properties/PublishProfiles/FolderProfile.pubxml.user b/IStation.Entry.SZJT/Properties/PublishProfiles/FolderProfile.pubxml.user
index 6780f9a..810237f 100644
--- a/IStation.Entry.SZJT/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/IStation.Entry.SZJT/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,6 +5,6 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>D:\WorkData\git\istation\szjt\IStation.Entry.SZJT\bin\Release\net6.0\publish\</_PublishTargetUrl>
- <History>True|2024-01-27T03:33:20.6165535Z;True|2024-01-18T15:02:34.3492480+08:00;True|2024-01-15T18:07:28.9717635+08:00;True|2024-01-13T18:33:12.9427731+08:00;True|2024-01-03T12:04:02.7753609+08:00;True|2024-01-03T11:08:38.0680764+08:00;True|2024-01-03T10:52:12.8371853+08:00;True|2024-01-03T10:03:29.0482464+08:00;True|2023-12-28T09:09:43.7988141+08:00;True|2023-12-26T11:51:52.4664582+08:00;True|2023-12-26T10:49:59.5124896+08:00;True|2023-12-26T10:10:53.5396234+08:00;True|2023-12-25T15:30:59.3409132+08:00;True|2023-12-25T15:26:43.1943347+08:00;True|2023-12-25T10:08:29.7964560+08:00;True|2023-12-21T10:30:55.0589855+08:00;True|2023-12-19T21:25:45.9098277+08:00;True|2023-12-16T12:52:46.7024463+08:00;True|2023-12-14T16:16:02.6188884+08:00;True|2023-12-14T16:03:53.1458158+08:00;True|2023-12-14T15:59:33.3947428+08:00;True|2023-12-14T15:53:09.8869780+08:00;True|2023-12-14T14:17:07.2707485+08:00;True|2023-12-14T11:49:15.9699053+08:00;False|2023-12-14T11:48:41.4121185+08:00;True|2023-12-13T17:28:38.2180193+08:00;True|2023-12-13T14:47:22.2493536+08:00;True|2023-12-13T14:31:45.6098784+08:00;True|2023-12-13T14:05:08.5014675+08:00;True|2023-12-13T14:01:37.7165974+08:00;True|2023-12-13T13:50:57.4832531+08:00;True|2023-12-13T13:20:55.2902900+08:00;True|2023-12-13T12:01:09.6397101+08:00;True|2023-12-13T11:53:51.3171154+08:00;True|2023-12-13T11:18:29.2505125+08:00;True|2023-12-13T09:48:22.2436154+08:00;True|2023-12-12T11:49:25.2723311+08:00;True|2023-12-11T14:05:58.1086840+08:00;True|2023-12-11T09:31:35.0365077+08:00;True|2023-12-05T18:00:29.7005601+08:00;True|2023-12-05T17:35:46.7846869+08:00;True|2023-12-05T17:29:36.5936716+08:00;True|2023-12-04T19:50:38.7216121+08:00;True|2023-12-02T14:06:28.8643257+08:00;True|2023-11-30T16:54:56.0879009+08:00;True|2023-11-30T15:49:27.5213126+08:00;True|2023-11-30T13:42:14.9061099+08:00;False|2023-11-30T13:41:50.2796105+08:00;False|2023-11-30T13:41:42.4700953+08:00;True|2023-11-30T10:23:50.6226599+08:00;True|2023-11-30T09:22:54.2133326+08:00;True|2023-11-29T16:32:53.3651373+08:00;True|2023-11-29T09:19:39.1127566+08:00;True|2023-11-28T17:25:14.9642204+08:00;True|2023-11-28T16:53:30.7550754+08:00;True|2023-11-28T09:57:02.3264015+08:00;True|2023-11-27T14:26:33.6153027+08:00;True|2023-11-27T13:33:46.1964012+08:00;True|2023-11-27T13:21:38.2133314+08:00;True|2023-11-24T14:12:06.2053905+08:00;True|2023-11-23T15:38:30.0872291+08:00;True|2023-11-15T19:27:36.4861114+08:00;True|2023-11-15T14:16:33.6004541+08:00;True|2023-11-15T14:02:06.1224051+08:00;True|2023-11-15T09:35:35.1770813+08:00;True|2023-11-10T14:06:46.1528992+08:00;True|2023-11-08T14:07:13.3792249+08:00;True|2023-11-08T13:58:21.2455396+08:00;True|2023-11-08T13:34:05.8131818+08:00;True|2023-11-08T11:58:01.9187650+08:00;True|2023-11-07T14:11:15.6278203+08:00;True|2023-11-07T14:05:43.3330586+08:00;True|2023-10-27T08:30:17.2959726+08:00;True|2023-10-27T08:23:59.8360129+08:00;True|2023-10-25T20:36:54.7517897+08:00;True|2023-10-24T23:27:01.1980187+08:00;True|2023-10-24T22:57:21.3872591+08:00;True|2023-10-17T09:26:15.4157626+08:00;True|2023-10-16T16:44:05.1411215+08:00;True|2023-10-10T14:24:00.3649304+08:00;True|2023-10-10T14:12:16.4050462+08:00;True|2023-10-10T13:43:17.4397783+08:00;True|2023-10-08T16:16:16.4721892+08:00;True|2023-10-08T14:27:40.6092129+08:00;True|2023-10-08T13:36:44.2969175+08:00;True|2023-10-08T13:21:21.1105671+08:00;True|2023-10-08T11:41:25.6876188+08:00;True|2023-10-08T09:39:46.1146411+08:00;True|2023-09-26T14:26:57.6168193+08:00;True|2023-09-21T13:54:19.1780900+08:00;True|2023-09-21T13:16:00.2957740+08:00;True|2023-09-21T11:28:36.3091944+08:00;True|2023-09-21T11:18:20.1060798+08:00;True|2023-09-13T16:00:49.4080881+08:00;True|2023-09-11T13:53:38.8582724+08:00;True|2023-09-01T10:32:37.4923361+08:00;True|2023-08-30T16:52:43.1952609+08:00;True|2023-08-30T13:41:35.0430741+08:00;True|2023-08-28T14:53:24.2454140+08:00;True|2023-08-28T13:50:55.9362462+08:00;True|2023-08-28T10:00:17.0366755+08:00;True|2023-08-25T15:41:23.8727088+08:00;True|2023-08-24T16:47:54.1391198+08:00;True|2023-08-24T16:40:29.0473991+08:00;True|2023-08-22T15:02:27.5312918+08:00;True|2023-08-22T11:18:43.6918732+08:00;True|2023-08-21T15:10:42.9223597+08:00;True|2023-08-21T14:21:08.1887373+08:00;True|2023-08-21T11:56:07.5304445+08:00;True|2023-08-18T16:57:57.0506312+08:00;True|2023-08-18T13:51:54.9145260+08:00;True|2023-08-17T14:52:44.6557301+08:00;True|2023-08-17T14:15:19.8255432+08:00;True|2023-08-17T14:03:01.1586247+08:00;True|2023-08-17T11:46:51.6685579+08:00;True|2023-08-16T11:12:27.1684542+08:00;True|2023-08-15T16:59:09.4901359+08:00;True|2023-08-10T14:08:04.8032876+08:00;True|2023-08-10T13:55:01.9698355+08:00;True|2023-08-10T10:43:44.0440039+08:00;True|2023-08-10T10:12:03.9359243+08:00;True|2023-08-09T15:07:46.6906781+08:00;True|2023-08-09T13:12:06.7912004+08:00;True|2023-08-09T10:23:24.5864225+08:00;True|2023-08-08T17:38:10.4753030+08:00;True|2023-08-08T12:56:08.9783211+08:00;True|2023-08-06T09:18:33.3703637+08:00;True|2023-08-03T11:01:58.9814864+08:00;True|2023-08-03T10:26:08.4681748+08:00;True|2023-08-02T20:33:35.0425049+08:00;True|2023-08-02T17:31:18.4675932+08:00;True|2023-08-02T16:04:16.8761862+08:00;True|2023-08-02T13:48:38.9129192+08:00;True|2023-08-02T13:45:00.6546267+08:00;True|2023-08-01T15:26:25.0389689+08:00;True|2023-08-01T14:08:10.9121758+08:00;True|2023-07-31T13:35:10.1220213+08:00;True|2023-07-31T09:20:11.2607880+08:00;True|2023-07-28T13:44:35.4317136+08:00;True|2023-07-27T10:40:46.5453757+08:00;True|2023-07-27T09:16:57.7421426+08:00;True|2023-07-26T17:10:56.0976913+08:00;True|2023-07-26T12:01:33.5766311+08:00;True|2023-07-25T18:07:38.5726960+08:00;True|2023-07-25T17:42:39.3625959+08:00;True|2023-07-25T17:04:09.8723273+08:00;True|2023-07-25T16:28:14.1819137+08:00;True|2023-07-24T14:11:28.2113907+08:00;True|2023-07-24T12:05:09.0376032+08:00;True|2023-07-24T09:36:39.6541522+08:00;True|2023-07-19T12:25:56.9887829+08:00;True|2023-07-17T13:00:04.0123733+08:00;True|2023-07-13T12:13:14.7927242+08:00;True|2023-07-13T11:46:24.1368807+08:00;True|2023-07-13T10:24:33.1684712+08:00;True|2023-06-26T11:38:29.6648988+08:00;True|2023-06-21T16:17:40.6226554+08:00;True|2023-06-21T13:30:18.8163322+08:00;True|2023-06-21T13:19:43.9290154+08:00;True|2023-06-21T11:35:28.3376504+08:00;</History>
+ <History>True|2024-04-04T03:28:14.8768964Z;True|2024-04-04T09:39:21.6552156+08:00;True|2024-03-11T16:36:41.1901368+08:00;True|2024-01-27T11:33:20.6165535+08:00;True|2024-01-18T15:02:34.3492480+08:00;True|2024-01-15T18:07:28.9717635+08:00;True|2024-01-13T18:33:12.9427731+08:00;True|2024-01-03T12:04:02.7753609+08:00;True|2024-01-03T11:08:38.0680764+08:00;True|2024-01-03T10:52:12.8371853+08:00;True|2024-01-03T10:03:29.0482464+08:00;True|2023-12-28T09:09:43.7988141+08:00;True|2023-12-26T11:51:52.4664582+08:00;True|2023-12-26T10:49:59.5124896+08:00;True|2023-12-26T10:10:53.5396234+08:00;True|2023-12-25T15:30:59.3409132+08:00;True|2023-12-25T15:26:43.1943347+08:00;True|2023-12-25T10:08:29.7964560+08:00;True|2023-12-21T10:30:55.0589855+08:00;True|2023-12-19T21:25:45.9098277+08:00;True|2023-12-16T12:52:46.7024463+08:00;True|2023-12-14T16:16:02.6188884+08:00;True|2023-12-14T16:03:53.1458158+08:00;True|2023-12-14T15:59:33.3947428+08:00;True|2023-12-14T15:53:09.8869780+08:00;True|2023-12-14T14:17:07.2707485+08:00;True|2023-12-14T11:49:15.9699053+08:00;False|2023-12-14T11:48:41.4121185+08:00;True|2023-12-13T17:28:38.2180193+08:00;True|2023-12-13T14:47:22.2493536+08:00;True|2023-12-13T14:31:45.6098784+08:00;True|2023-12-13T14:05:08.5014675+08:00;True|2023-12-13T14:01:37.7165974+08:00;True|2023-12-13T13:50:57.4832531+08:00;True|2023-12-13T13:20:55.2902900+08:00;True|2023-12-13T12:01:09.6397101+08:00;True|2023-12-13T11:53:51.3171154+08:00;True|2023-12-13T11:18:29.2505125+08:00;True|2023-12-13T09:48:22.2436154+08:00;True|2023-12-12T11:49:25.2723311+08:00;True|2023-12-11T14:05:58.1086840+08:00;True|2023-12-11T09:31:35.0365077+08:00;True|2023-12-05T18:00:29.7005601+08:00;True|2023-12-05T17:35:46.7846869+08:00;True|2023-12-05T17:29:36.5936716+08:00;True|2023-12-04T19:50:38.7216121+08:00;True|2023-12-02T14:06:28.8643257+08:00;True|2023-11-30T16:54:56.0879009+08:00;True|2023-11-30T15:49:27.5213126+08:00;True|2023-11-30T13:42:14.9061099+08:00;False|2023-11-30T13:41:50.2796105+08:00;False|2023-11-30T13:41:42.4700953+08:00;True|2023-11-30T10:23:50.6226599+08:00;True|2023-11-30T09:22:54.2133326+08:00;True|2023-11-29T16:32:53.3651373+08:00;True|2023-11-29T09:19:39.1127566+08:00;True|2023-11-28T17:25:14.9642204+08:00;True|2023-11-28T16:53:30.7550754+08:00;True|2023-11-28T09:57:02.3264015+08:00;True|2023-11-27T14:26:33.6153027+08:00;True|2023-11-27T13:33:46.1964012+08:00;True|2023-11-27T13:21:38.2133314+08:00;True|2023-11-24T14:12:06.2053905+08:00;True|2023-11-23T15:38:30.0872291+08:00;True|2023-11-15T19:27:36.4861114+08:00;True|2023-11-15T14:16:33.6004541+08:00;True|2023-11-15T14:02:06.1224051+08:00;True|2023-11-15T09:35:35.1770813+08:00;True|2023-11-10T14:06:46.1528992+08:00;True|2023-11-08T14:07:13.3792249+08:00;True|2023-11-08T13:58:21.2455396+08:00;True|2023-11-08T13:34:05.8131818+08:00;True|2023-11-08T11:58:01.9187650+08:00;True|2023-11-07T14:11:15.6278203+08:00;True|2023-11-07T14:05:43.3330586+08:00;True|2023-10-27T08:30:17.2959726+08:00;True|2023-10-27T08:23:59.8360129+08:00;True|2023-10-25T20:36:54.7517897+08:00;True|2023-10-24T23:27:01.1980187+08:00;True|2023-10-24T22:57:21.3872591+08:00;True|2023-10-17T09:26:15.4157626+08:00;True|2023-10-16T16:44:05.1411215+08:00;True|2023-10-10T14:24:00.3649304+08:00;True|2023-10-10T14:12:16.4050462+08:00;True|2023-10-10T13:43:17.4397783+08:00;True|2023-10-08T16:16:16.4721892+08:00;True|2023-10-08T14:27:40.6092129+08:00;True|2023-10-08T13:36:44.2969175+08:00;True|2023-10-08T13:21:21.1105671+08:00;True|2023-10-08T11:41:25.6876188+08:00;True|2023-10-08T09:39:46.1146411+08:00;True|2023-09-26T14:26:57.6168193+08:00;True|2023-09-21T13:54:19.1780900+08:00;True|2023-09-21T13:16:00.2957740+08:00;True|2023-09-21T11:28:36.3091944+08:00;True|2023-09-21T11:18:20.1060798+08:00;True|2023-09-13T16:00:49.4080881+08:00;True|2023-09-11T13:53:38.8582724+08:00;True|2023-09-01T10:32:37.4923361+08:00;True|2023-08-30T16:52:43.1952609+08:00;True|2023-08-30T13:41:35.0430741+08:00;True|2023-08-28T14:53:24.2454140+08:00;True|2023-08-28T13:50:55.9362462+08:00;True|2023-08-28T10:00:17.0366755+08:00;True|2023-08-25T15:41:23.8727088+08:00;True|2023-08-24T16:47:54.1391198+08:00;True|2023-08-24T16:40:29.0473991+08:00;True|2023-08-22T15:02:27.5312918+08:00;True|2023-08-22T11:18:43.6918732+08:00;True|2023-08-21T15:10:42.9223597+08:00;True|2023-08-21T14:21:08.1887373+08:00;True|2023-08-21T11:56:07.5304445+08:00;True|2023-08-18T16:57:57.0506312+08:00;True|2023-08-18T13:51:54.9145260+08:00;True|2023-08-17T14:52:44.6557301+08:00;True|2023-08-17T14:15:19.8255432+08:00;True|2023-08-17T14:03:01.1586247+08:00;True|2023-08-17T11:46:51.6685579+08:00;True|2023-08-16T11:12:27.1684542+08:00;True|2023-08-15T16:59:09.4901359+08:00;True|2023-08-10T14:08:04.8032876+08:00;True|2023-08-10T13:55:01.9698355+08:00;True|2023-08-10T10:43:44.0440039+08:00;True|2023-08-10T10:12:03.9359243+08:00;True|2023-08-09T15:07:46.6906781+08:00;True|2023-08-09T13:12:06.7912004+08:00;True|2023-08-09T10:23:24.5864225+08:00;True|2023-08-08T17:38:10.4753030+08:00;True|2023-08-08T12:56:08.9783211+08:00;True|2023-08-06T09:18:33.3703637+08:00;True|2023-08-03T11:01:58.9814864+08:00;True|2023-08-03T10:26:08.4681748+08:00;True|2023-08-02T20:33:35.0425049+08:00;True|2023-08-02T17:31:18.4675932+08:00;True|2023-08-02T16:04:16.8761862+08:00;True|2023-08-02T13:48:38.9129192+08:00;True|2023-08-02T13:45:00.6546267+08:00;True|2023-08-01T15:26:25.0389689+08:00;True|2023-08-01T14:08:10.9121758+08:00;True|2023-07-31T13:35:10.1220213+08:00;True|2023-07-31T09:20:11.2607880+08:00;True|2023-07-28T13:44:35.4317136+08:00;True|2023-07-27T10:40:46.5453757+08:00;True|2023-07-27T09:16:57.7421426+08:00;True|2023-07-26T17:10:56.0976913+08:00;True|2023-07-26T12:01:33.5766311+08:00;True|2023-07-25T18:07:38.5726960+08:00;True|2023-07-25T17:42:39.3625959+08:00;True|2023-07-25T17:04:09.8723273+08:00;True|2023-07-25T16:28:14.1819137+08:00;True|2023-07-24T14:11:28.2113907+08:00;True|2023-07-24T12:05:09.0376032+08:00;True|2023-07-24T09:36:39.6541522+08:00;True|2023-07-19T12:25:56.9887829+08:00;True|2023-07-17T13:00:04.0123733+08:00;True|2023-07-13T12:13:14.7927242+08:00;True|2023-07-13T11:46:24.1368807+08:00;True|2023-07-13T10:24:33.1684712+08:00;True|2023-06-26T11:38:29.6648988+08:00;True|2023-06-21T16:17:40.6226554+08:00;True|2023-06-21T13:30:18.8163322+08:00;True|2023-06-21T13:19:43.9290154+08:00;True|2023-06-21T11:35:28.3376504+08:00;</History>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/IStation.Server.SZJT/IStation.Server.SZJT.csproj b/IStation.Server.SZJT/IStation.Server.SZJT.csproj
index 0cae0fd..99b09fe 100644
--- a/IStation.Server.SZJT/IStation.Server.SZJT.csproj
+++ b/IStation.Server.SZJT/IStation.Server.SZJT.csproj
@@ -8,11 +8,8 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Yw.Log4Net.Core" Version="1.0.0" />
- <PackageReference Include="Yw.Quartz.Core" Version="1.0.0" />
- <PackageReference Include="Yw.Service.Assets.Core" Version="1.1.5" />
- <PackageReference Include="Yw.Service.Monitor.Core" Version="1.4.0" />
- <PackageReference Include="Yw.Service.Run.Core" Version="1.0.2" />
+ <PackageReference Include="Yw.Quartz.Core" Version="3.0.0" />
+ <PackageReference Include="Yw.Service.Run.Core" Version="3.0.1" />
</ItemGroup>
<ItemGroup>
diff --git a/IStation.Service.SZJT/0-core/Catalog.cs b/IStation.Service.SZJT/00-core/Catalog.cs
similarity index 100%
rename from IStation.Service.SZJT/0-core/Catalog.cs
rename to IStation.Service.SZJT/00-core/Catalog.cs
diff --git a/IStation.Service.SZJT/0-core/ConfigHelper.cs b/IStation.Service.SZJT/00-core/ConfigHelper.cs
similarity index 100%
rename from IStation.Service.SZJT/0-core/ConfigHelper.cs
rename to IStation.Service.SZJT/00-core/ConfigHelper.cs
diff --git a/IStation.Service.SZJT/0-core/DataType.cs b/IStation.Service.SZJT/00-core/DataType.cs
similarity index 100%
rename from IStation.Service.SZJT/0-core/DataType.cs
rename to IStation.Service.SZJT/00-core/DataType.cs
diff --git a/IStation.Service.SZJT/0-core/Flags.cs b/IStation.Service.SZJT/00-core/Flags.cs
similarity index 100%
rename from IStation.Service.SZJT/0-core/Flags.cs
rename to IStation.Service.SZJT/00-core/Flags.cs
diff --git a/IStation.Service.SZJT/0-core/MemoryCacheKey.cs b/IStation.Service.SZJT/00-core/MemoryCacheKey.cs
similarity index 100%
rename from IStation.Service.SZJT/0-core/MemoryCacheKey.cs
rename to IStation.Service.SZJT/00-core/MemoryCacheKey.cs
diff --git a/IStation.Service.SZJT/1-entity/1-policy/LogicPolicy.cs b/IStation.Service.SZJT/01-entity/01-policy/LogicPolicy.cs
similarity index 89%
rename from IStation.Service.SZJT/1-entity/1-policy/LogicPolicy.cs
rename to IStation.Service.SZJT/01-entity/01-policy/LogicPolicy.cs
index 866e5ff..3bedc2a 100644
--- a/IStation.Service.SZJT/1-entity/1-policy/LogicPolicy.cs
+++ b/IStation.Service.SZJT/01-entity/01-policy/LogicPolicy.cs
@@ -1,10 +1,11 @@
-锘縩amespace IStation.Entity
+锘縰sing Yw.Entity;
+namespace IStation.Entity
{
/// <summary>
/// 涓氬姟绛栫暐
/// </summary>
[SugarTable("logic_policy")]
- public class LogicPolicy : Yw.Entity.BaseEntity, Yw.Entity.ICode, Yw.Entity.ISorter, Yw.Entity.IParas, Yw.Entity.IFlags, Yw.Entity.IUseStatus, Yw.Entity.ITagName, System.ICloneable
+ public class LogicPolicy : BaseEntity, ICode, IParas, IFlags, ITagName, ISorter, IUseStatus, System.ICloneable
{
/// <summary>
///
diff --git a/IStation.Service.SZJT/1-entity/2-area/LogicArea.cs b/IStation.Service.SZJT/01-entity/02-area/LogicArea.cs
similarity index 90%
rename from IStation.Service.SZJT/1-entity/2-area/LogicArea.cs
rename to IStation.Service.SZJT/01-entity/02-area/LogicArea.cs
index 74caae3..f29bccd 100644
--- a/IStation.Service.SZJT/1-entity/2-area/LogicArea.cs
+++ b/IStation.Service.SZJT/01-entity/02-area/LogicArea.cs
@@ -1,10 +1,11 @@
-锘縩amespace IStation.Entity
+锘縰sing Yw.Entity;
+namespace IStation.Entity
{
/// <summary>
/// 涓氬姟鍖哄煙
/// </summary>
[SugarTable("logic_area")]
- public class LogicArea : Yw.Entity.BaseEntity, Yw.Entity.ISorter, Yw.Entity.ICode, Yw.Entity.IParas, Yw.Entity.IFlags, Yw.Entity.ITagName, Yw.Entity.IUseStatus, System.ICloneable
+ public class LogicArea : BaseEntity, ICode, IParas, IFlags, ITagName, ISorter, IUseStatus, System.ICloneable
{
/// <summary>
///
diff --git a/IStation.Service.SZJT/1-entity/3-site/LogicSite.cs b/IStation.Service.SZJT/01-entity/03-site/LogicSite.cs
similarity index 89%
rename from IStation.Service.SZJT/1-entity/3-site/LogicSite.cs
rename to IStation.Service.SZJT/01-entity/03-site/LogicSite.cs
index a20c97d..8894ba5 100644
--- a/IStation.Service.SZJT/1-entity/3-site/LogicSite.cs
+++ b/IStation.Service.SZJT/01-entity/03-site/LogicSite.cs
@@ -1,10 +1,11 @@
-锘縩amespace IStation.Entity
+锘縰sing Yw.Entity;
+namespace IStation.Entity
{
/// <summary>
/// 涓氬姟绔�
/// </summary>
[SugarTable("logic_site")]
- public class LogicSite : Yw.Entity.BaseEntity, Yw.Entity.ICode, Yw.Entity.ISorter, Yw.Entity.IFlags, Yw.Entity.IParas, Yw.Entity.ITagName, Yw.Entity.IUseStatus, System.ICloneable
+ public class LogicSite : BaseEntity, ICode, IParas, IFlags, ITagName, ISorter, IUseStatus, System.ICloneable
{
/// <summary>
///
diff --git a/IStation.Service.SZJT/1-entity/4-tree/LogicTree.cs b/IStation.Service.SZJT/01-entity/04-tree/LogicTree.cs
similarity index 91%
rename from IStation.Service.SZJT/1-entity/4-tree/LogicTree.cs
rename to IStation.Service.SZJT/01-entity/04-tree/LogicTree.cs
index 589ce1b..a545271 100644
--- a/IStation.Service.SZJT/1-entity/4-tree/LogicTree.cs
+++ b/IStation.Service.SZJT/01-entity/04-tree/LogicTree.cs
@@ -1,10 +1,11 @@
-锘縩amespace IStation.Entity
+锘縰sing Yw.Entity;
+namespace IStation.Entity
{
/// <summary>
/// 涓氬姟娓呭崟
/// </summary>
[SugarTable("logic_tree")]
- public class LogicTree : Yw.Entity.BaseEntity, Yw.Entity.ITreeSorter, System.ICloneable
+ public class LogicTree : BaseEntity, ITreeSorter, System.ICloneable
{
/// <summary>
///
diff --git a/IStation.Service.SZJT/1-entity/4-tree/LogicTreeSaveItem.cs b/IStation.Service.SZJT/01-entity/04-tree/LogicTreeSaveItem.cs
similarity index 100%
rename from IStation.Service.SZJT/1-entity/4-tree/LogicTreeSaveItem.cs
rename to IStation.Service.SZJT/01-entity/04-tree/LogicTreeSaveItem.cs
diff --git a/IStation.Service.SZJT/1-entity/4-tree/LogicTreeSaveTree.cs b/IStation.Service.SZJT/01-entity/04-tree/LogicTreeSaveTree.cs
similarity index 100%
rename from IStation.Service.SZJT/1-entity/4-tree/LogicTreeSaveTree.cs
rename to IStation.Service.SZJT/01-entity/04-tree/LogicTreeSaveTree.cs
diff --git a/IStation.Service.SZJT/1-entity/5-dma/LogicDma.cs b/IStation.Service.SZJT/01-entity/05-dma/LogicDma.cs
similarity index 89%
rename from IStation.Service.SZJT/1-entity/5-dma/LogicDma.cs
rename to IStation.Service.SZJT/01-entity/05-dma/LogicDma.cs
index 5d244c3..7f3c8e1 100644
--- a/IStation.Service.SZJT/1-entity/5-dma/LogicDma.cs
+++ b/IStation.Service.SZJT/01-entity/05-dma/LogicDma.cs
@@ -1,10 +1,11 @@
-锘縩amespace IStation.Entity
+锘縰sing Yw.Entity;
+namespace IStation.Entity
{
/// <summary>
/// 涓氬姟dma
/// </summary>
[SugarTable("logic_dma")]
- public class LogicDma : Yw.Entity.BaseEntity, Yw.Entity.ICode, Yw.Entity.ISorter, Yw.Entity.IFlags, Yw.Entity.IParas, Yw.Entity.ITagName, Yw.Entity.IUseStatus, System.ICloneable
+ public class LogicDma : BaseEntity, ICode, IParas, IFlags, ITagName, ISorter, IUseStatus, System.ICloneable
{
/// <summary>
///
diff --git a/IStation.Service.SZJT/2-model/1-policy/LogicPolicy.cs b/IStation.Service.SZJT/02-model/01-policy/LogicPolicy.cs
similarity index 93%
rename from IStation.Service.SZJT/2-model/1-policy/LogicPolicy.cs
rename to IStation.Service.SZJT/02-model/01-policy/LogicPolicy.cs
index 762a6d8..21ca7f8 100644
--- a/IStation.Service.SZJT/2-model/1-policy/LogicPolicy.cs
+++ b/IStation.Service.SZJT/02-model/01-policy/LogicPolicy.cs
@@ -1,9 +1,10 @@
-锘縩amespace IStation.Model
+锘縰sing Yw.Model;
+namespace IStation.Model
{
/// <summary>
/// 涓氬姟绛栫暐
/// </summary>
- public class LogicPolicy : Yw.Model.BaseModel, System.ICloneable
+ public class LogicPolicy : BaseModel, ICode, IParas, IFlags, ITagName, ISorter, IUseStatus, System.ICloneable
{
/// <summary>
///
diff --git a/IStation.Service.SZJT/2-model/2-area/LogicArea.cs b/IStation.Service.SZJT/02-model/02-area/LogicArea.cs
similarity index 94%
rename from IStation.Service.SZJT/2-model/2-area/LogicArea.cs
rename to IStation.Service.SZJT/02-model/02-area/LogicArea.cs
index 58d7092..398fb82 100644
--- a/IStation.Service.SZJT/2-model/2-area/LogicArea.cs
+++ b/IStation.Service.SZJT/02-model/02-area/LogicArea.cs
@@ -1,9 +1,10 @@
-锘縩amespace IStation.Model
+锘縰sing Yw.Model;
+namespace IStation.Model
{
/// <summary>
/// 涓氬姟鍖哄煙
/// </summary>
- public class LogicArea : Yw.Model.BaseModel, System.ICloneable
+ public class LogicArea : BaseModel, ICode, IParas, IFlags, ITagName, ISorter, IUseStatus, System.ICloneable
{
/// <summary>
///
diff --git a/IStation.Service.SZJT/2-model/3-site/LogicSite.cs b/IStation.Service.SZJT/02-model/03-site/LogicSite.cs
similarity index 93%
rename from IStation.Service.SZJT/2-model/3-site/LogicSite.cs
rename to IStation.Service.SZJT/02-model/03-site/LogicSite.cs
index 1d2b40c..927503c 100644
--- a/IStation.Service.SZJT/2-model/3-site/LogicSite.cs
+++ b/IStation.Service.SZJT/02-model/03-site/LogicSite.cs
@@ -1,9 +1,10 @@
-锘縩amespace IStation.Model
+锘縰sing Yw.Model;
+namespace IStation.Model
{
/// <summary>
/// 涓氬姟绔�
/// </summary>
- public partial class LogicSite : Yw.Model.BaseModel, System.ICloneable
+ public partial class LogicSite : BaseModel, ICode, IParas, IFlags, ITagName, ISorter, IUseStatus, System.ICloneable
{
/// <summary>
///
diff --git a/IStation.Service.SZJT/2-model/4-tree/LogicTree.cs b/IStation.Service.SZJT/02-model/04-tree/LogicTree.cs
similarity index 93%
rename from IStation.Service.SZJT/2-model/4-tree/LogicTree.cs
rename to IStation.Service.SZJT/02-model/04-tree/LogicTree.cs
index 7408b03..027678e 100644
--- a/IStation.Service.SZJT/2-model/4-tree/LogicTree.cs
+++ b/IStation.Service.SZJT/02-model/04-tree/LogicTree.cs
@@ -1,9 +1,10 @@
-锘縩amespace IStation.Model
+锘縰sing Yw.Model;
+namespace IStation.Model
{
/// <summary>
/// 涓氬姟娓呭崟
/// </summary>
- public class LogicTree : Yw.Model.BaseModel, System.ICloneable
+ public class LogicTree : BaseModel, ITreeSorter, System.ICloneable
{
/// <summary>
///
diff --git a/IStation.Service.SZJT/2-model/4-tree/LogicTreeEx.cs b/IStation.Service.SZJT/02-model/04-tree/LogicTreeEx.cs
similarity index 87%
rename from IStation.Service.SZJT/2-model/4-tree/LogicTreeEx.cs
rename to IStation.Service.SZJT/02-model/04-tree/LogicTreeEx.cs
index 2238874..6871d79 100644
--- a/IStation.Service.SZJT/2-model/4-tree/LogicTreeEx.cs
+++ b/IStation.Service.SZJT/02-model/04-tree/LogicTreeEx.cs
@@ -1,4 +1,10 @@
-锘縩amespace IStation.Model
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IStation.Model
{
/// <summary>
///
diff --git a/IStation.Service.SZJT/2-model/4-tree/LogicTreeSaveItem.cs b/IStation.Service.SZJT/02-model/04-tree/LogicTreeSaveItem.cs
similarity index 100%
rename from IStation.Service.SZJT/2-model/4-tree/LogicTreeSaveItem.cs
rename to IStation.Service.SZJT/02-model/04-tree/LogicTreeSaveItem.cs
diff --git a/IStation.Service.SZJT/2-model/4-tree/LogicTreeSaveTree.cs b/IStation.Service.SZJT/02-model/04-tree/LogicTreeSaveTree.cs
similarity index 100%
rename from IStation.Service.SZJT/2-model/4-tree/LogicTreeSaveTree.cs
rename to IStation.Service.SZJT/02-model/04-tree/LogicTreeSaveTree.cs
diff --git a/IStation.Service.SZJT/2-model/5-dma/LogicDma.cs b/IStation.Service.SZJT/02-model/05-dma/LogicDma.cs
similarity index 93%
rename from IStation.Service.SZJT/2-model/5-dma/LogicDma.cs
rename to IStation.Service.SZJT/02-model/05-dma/LogicDma.cs
index 44b7b1a..cc956ac 100644
--- a/IStation.Service.SZJT/2-model/5-dma/LogicDma.cs
+++ b/IStation.Service.SZJT/02-model/05-dma/LogicDma.cs
@@ -1,9 +1,10 @@
-锘縩amespace IStation.Model
+锘縰sing Yw.Model;
+namespace IStation.Model
{
/// <summary>
/// 涓氬姟dma
/// </summary>
- public partial class LogicDma : Yw.Model.BaseModel, System.ICloneable
+ public partial class LogicDma : BaseModel, ICode, IParas, IFlags, ITagName, ISorter, IUseStatus, System.ICloneable
{
/// <summary>
///
diff --git a/IStation.Service.SZJT/3-settings/helper/SZJTFileHelper.cs b/IStation.Service.SZJT/03-settings/helper/SZJTFileHelper.cs
similarity index 100%
rename from IStation.Service.SZJT/3-settings/helper/SZJTFileHelper.cs
rename to IStation.Service.SZJT/03-settings/helper/SZJTFileHelper.cs
diff --git a/IStation.Service.SZJT/3-settings/helper/SZJTParasHelper.cs b/IStation.Service.SZJT/03-settings/helper/SZJTParasHelper.cs
similarity index 100%
rename from IStation.Service.SZJT/3-settings/helper/SZJTParasHelper.cs
rename to IStation.Service.SZJT/03-settings/helper/SZJTParasHelper.cs
diff --git a/IStation.Service.SZJT/3-settings/paras/Paras_SZJT.cs b/IStation.Service.SZJT/03-settings/paras/Paras_SZJT.cs
similarity index 100%
rename from IStation.Service.SZJT/3-settings/paras/Paras_SZJT.cs
rename to IStation.Service.SZJT/03-settings/paras/Paras_SZJT.cs
diff --git a/IStation.Service.SZJT/3-settings/paras/Paras_SZJT_DataBase.cs b/IStation.Service.SZJT/03-settings/paras/Paras_SZJT_DataBase.cs
similarity index 100%
rename from IStation.Service.SZJT/3-settings/paras/Paras_SZJT_DataBase.cs
rename to IStation.Service.SZJT/03-settings/paras/Paras_SZJT_DataBase.cs
diff --git a/IStation.Service.SZJT/3-settings/paras/Paras_SZJT_Task.cs b/IStation.Service.SZJT/03-settings/paras/Paras_SZJT_Task.cs
similarity index 100%
rename from IStation.Service.SZJT/3-settings/paras/Paras_SZJT_Task.cs
rename to IStation.Service.SZJT/03-settings/paras/Paras_SZJT_Task.cs
diff --git a/IStation.Service.SZJT/3-settings/paras/SZJTParas.cs b/IStation.Service.SZJT/03-settings/paras/SZJTParas.cs
similarity index 100%
rename from IStation.Service.SZJT/3-settings/paras/SZJTParas.cs
rename to IStation.Service.SZJT/03-settings/paras/SZJTParas.cs
diff --git a/IStation.Service.SZJT/04-dal/01-policy/LogicPolicy.cs b/IStation.Service.SZJT/04-dal/01-policy/LogicPolicy.cs
new file mode 100644
index 0000000..63178bd
--- /dev/null
+++ b/IStation.Service.SZJT/04-dal/01-policy/LogicPolicy.cs
@@ -0,0 +1,22 @@
+锘縰sing Yw.DAL.PostgreSql;
+namespace IStation.DAL
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public partial class LogicPolicy : BaseDAL_Code_Paras_Flags_TagName_Sorter_UseStatus<Entity.LogicPolicy>
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ public override ConnectionConfig ConnectionConfig
+ {
+ get { return ConfigHelper.DefaultConnectionConfig; }
+ }
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/IStation.Service.SZJT/04-dal/02-area/LogicArea.cs b/IStation.Service.SZJT/04-dal/02-area/LogicArea.cs
new file mode 100644
index 0000000..6aef138
--- /dev/null
+++ b/IStation.Service.SZJT/04-dal/02-area/LogicArea.cs
@@ -0,0 +1,34 @@
+锘縰sing Yw.DAL.PostgreSql;
+namespace IStation.DAL
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public partial class LogicArea : BaseDAL_Code_Paras_Flags_TagName_Sorter_UseStatus<Entity.LogicArea>
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ public override ConnectionConfig ConnectionConfig
+ {
+ get { return ConfigHelper.DefaultConnectionConfig; }
+ }
+
+ /// <summary>
+ /// 閫氳繃 PolicyID 鑾峰彇
+ /// </summary>
+ public List<Entity.LogicArea> GetByPolicyID(long PolicyID)
+ {
+ using (var db = new SqlSugarClient(ConnectionConfig))
+ {
+ return db.Queryable<Entity.LogicArea>()
+ .Where(x => x.PolicyID == PolicyID)
+ .OrderBy(x => x.SortCode).ToList();
+ }
+ }
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/IStation.Service.SZJT/04-dal/03-site/LogicSite.cs b/IStation.Service.SZJT/04-dal/03-site/LogicSite.cs
new file mode 100644
index 0000000..16d355d
--- /dev/null
+++ b/IStation.Service.SZJT/04-dal/03-site/LogicSite.cs
@@ -0,0 +1,22 @@
+锘縰sing Yw.DAL.PostgreSql;
+namespace IStation.DAL
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public partial class LogicSite : BaseDAL_Code_Paras_Flags_TagName_Sorter_UseStatus<Entity.LogicSite>
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ public override ConnectionConfig ConnectionConfig
+ {
+ get { return ConfigHelper.DefaultConnectionConfig; }
+ }
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/IStation.Service.SZJT/4-dal/4-tree/LogicTree.cs b/IStation.Service.SZJT/04-dal/04-tree/LogicTree.cs
similarity index 97%
rename from IStation.Service.SZJT/4-dal/4-tree/LogicTree.cs
rename to IStation.Service.SZJT/04-dal/04-tree/LogicTree.cs
index 0ae0903..d6000db 100644
--- a/IStation.Service.SZJT/4-dal/4-tree/LogicTree.cs
+++ b/IStation.Service.SZJT/04-dal/04-tree/LogicTree.cs
@@ -1,9 +1,10 @@
-锘縩amespace IStation.DAL
+锘縰sing Yw.DAL.PostgreSql;
+namespace IStation.DAL
{
/// <summary>
/// 涓氬姟娓呭崟
/// </summary>
- public partial class LogicTree : Yw.DAL.BaseDAL_TreeSorter<Entity.LogicTree>
+ public partial class LogicTree : BaseDAL_TreeSorter<Entity.LogicTree>
{
/// <summary>
///
diff --git a/IStation.Service.SZJT/04-dal/05-dma/LogicDma.cs b/IStation.Service.SZJT/04-dal/05-dma/LogicDma.cs
new file mode 100644
index 0000000..7316a85
--- /dev/null
+++ b/IStation.Service.SZJT/04-dal/05-dma/LogicDma.cs
@@ -0,0 +1,22 @@
+锘縰sing Yw.DAL.PostgreSql;
+namespace IStation.DAL
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public partial class LogicDma : BaseDAL_Code_Paras_Flags_TagName_Sorter_UseStatus<Entity.LogicDma>
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ public override ConnectionConfig ConnectionConfig
+ {
+ get { return ConfigHelper.DefaultConnectionConfig; }
+ }
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/IStation.Service.SZJT/5-service/0-helper/CacheHelper.cs b/IStation.Service.SZJT/05-service/00-core/CacheHelper.cs
similarity index 91%
rename from IStation.Service.SZJT/5-service/0-helper/CacheHelper.cs
rename to IStation.Service.SZJT/05-service/00-core/CacheHelper.cs
index ec9a479..59d1ae4 100644
--- a/IStation.Service.SZJT/5-service/0-helper/CacheHelper.cs
+++ b/IStation.Service.SZJT/05-service/00-core/CacheHelper.cs
@@ -5,7 +5,7 @@
/// </summary>
internal class CacheHelper
{
- private const string _cacheKeyPrefix = "Phm";//缂撳瓨閿墠缂�
+ private const string _cacheKeyPrefix = "szjt";//缂撳瓨閿墠缂�
/// <summary>
/// 鑾峰彇缂撳瓨閿�
diff --git a/IStation.Service.SZJT/5-service/0-helper/Extensions.cs b/IStation.Service.SZJT/05-service/00-core/Extensions.cs
similarity index 100%
rename from IStation.Service.SZJT/5-service/0-helper/Extensions.cs
rename to IStation.Service.SZJT/05-service/00-core/Extensions.cs
diff --git a/IStation.Service.SZJT/5-service/0-helper/LogicHelper.cs b/IStation.Service.SZJT/05-service/00-core/LogicHelper.cs
similarity index 100%
rename from IStation.Service.SZJT/5-service/0-helper/LogicHelper.cs
rename to IStation.Service.SZJT/05-service/00-core/LogicHelper.cs
diff --git a/IStation.Service.SZJT/5-service/1-policy/Cache/LogicPolicyCacheHelper.cs b/IStation.Service.SZJT/05-service/01-policy/Cache/LogicPolicyCacheHelper.cs
similarity index 100%
rename from IStation.Service.SZJT/5-service/1-policy/Cache/LogicPolicyCacheHelper.cs
rename to IStation.Service.SZJT/05-service/01-policy/Cache/LogicPolicyCacheHelper.cs
diff --git a/IStation.Service.SZJT/5-service/1-policy/LogicPolicy.cs b/IStation.Service.SZJT/05-service/01-policy/LogicPolicy.cs
similarity index 100%
rename from IStation.Service.SZJT/5-service/1-policy/LogicPolicy.cs
rename to IStation.Service.SZJT/05-service/01-policy/LogicPolicy.cs
diff --git a/IStation.Service.SZJT/5-service/1-policy/LogicPolicy_Instance.cs b/IStation.Service.SZJT/05-service/01-policy/LogicPolicy_Instance.cs
similarity index 100%
rename from IStation.Service.SZJT/5-service/1-policy/LogicPolicy_Instance.cs
rename to IStation.Service.SZJT/05-service/01-policy/LogicPolicy_Instance.cs
diff --git a/IStation.Service.SZJT/5-service/2-area/Cache/LogicAreaCacheHelper.cs b/IStation.Service.SZJT/05-service/02-area/Cache/LogicAreaCacheHelper.cs
similarity index 100%
rename from IStation.Service.SZJT/5-service/2-area/Cache/LogicAreaCacheHelper.cs
rename to IStation.Service.SZJT/05-service/02-area/Cache/LogicAreaCacheHelper.cs
diff --git a/IStation.Service.SZJT/5-service/2-area/LogicArea.cs b/IStation.Service.SZJT/05-service/02-area/LogicArea.cs
similarity index 100%
rename from IStation.Service.SZJT/5-service/2-area/LogicArea.cs
rename to IStation.Service.SZJT/05-service/02-area/LogicArea.cs
diff --git a/IStation.Service.SZJT/5-service/2-area/LogicArea_Instance.cs b/IStation.Service.SZJT/05-service/02-area/LogicArea_Instance.cs
similarity index 100%
rename from IStation.Service.SZJT/5-service/2-area/LogicArea_Instance.cs
rename to IStation.Service.SZJT/05-service/02-area/LogicArea_Instance.cs
diff --git a/IStation.Service.SZJT/5-service/3-site/Cache/LogicSiteCacheHelper.cs b/IStation.Service.SZJT/05-service/03-site/Cache/LogicSiteCacheHelper.cs
similarity index 100%
rename from IStation.Service.SZJT/5-service/3-site/Cache/LogicSiteCacheHelper.cs
rename to IStation.Service.SZJT/05-service/03-site/Cache/LogicSiteCacheHelper.cs
diff --git a/IStation.Service.SZJT/5-service/3-site/LogicSite.cs b/IStation.Service.SZJT/05-service/03-site/LogicSite.cs
similarity index 100%
rename from IStation.Service.SZJT/5-service/3-site/LogicSite.cs
rename to IStation.Service.SZJT/05-service/03-site/LogicSite.cs
diff --git a/IStation.Service.SZJT/5-service/3-site/LogicSite_Instance.cs b/IStation.Service.SZJT/05-service/03-site/LogicSite_Instance.cs
similarity index 100%
rename from IStation.Service.SZJT/5-service/3-site/LogicSite_Instance.cs
rename to IStation.Service.SZJT/05-service/03-site/LogicSite_Instance.cs
diff --git a/IStation.Service.SZJT/5-service/4-tree/Cache/LogicTreeCacheHelper.cs b/IStation.Service.SZJT/05-service/04-tree/Cache/LogicTreeCacheHelper.cs
similarity index 100%
rename from IStation.Service.SZJT/5-service/4-tree/Cache/LogicTreeCacheHelper.cs
rename to IStation.Service.SZJT/05-service/04-tree/Cache/LogicTreeCacheHelper.cs
diff --git a/IStation.Service.SZJT/5-service/4-tree/LogicTree.cs b/IStation.Service.SZJT/05-service/04-tree/LogicTree.cs
similarity index 100%
rename from IStation.Service.SZJT/5-service/4-tree/LogicTree.cs
rename to IStation.Service.SZJT/05-service/04-tree/LogicTree.cs
diff --git a/IStation.Service.SZJT/5-service/4-tree/LogicTree_Instance.cs b/IStation.Service.SZJT/05-service/04-tree/LogicTree_Instance.cs
similarity index 100%
rename from IStation.Service.SZJT/5-service/4-tree/LogicTree_Instance.cs
rename to IStation.Service.SZJT/05-service/04-tree/LogicTree_Instance.cs
diff --git a/IStation.Service.SZJT/5-service/5-dma/Cache/LogicDmaCacheHelper.cs b/IStation.Service.SZJT/05-service/05-dma/Cache/LogicDmaCacheHelper.cs
similarity index 100%
rename from IStation.Service.SZJT/5-service/5-dma/Cache/LogicDmaCacheHelper.cs
rename to IStation.Service.SZJT/05-service/05-dma/Cache/LogicDmaCacheHelper.cs
diff --git a/IStation.Service.SZJT/5-service/5-dma/LogicDma.cs b/IStation.Service.SZJT/05-service/05-dma/LogicDma.cs
similarity index 100%
rename from IStation.Service.SZJT/5-service/5-dma/LogicDma.cs
rename to IStation.Service.SZJT/05-service/05-dma/LogicDma.cs
diff --git a/IStation.Service.SZJT/5-service/5-dma/LogicDma_Instance.cs b/IStation.Service.SZJT/05-service/05-dma/LogicDma_Instance.cs
similarity index 100%
rename from IStation.Service.SZJT/5-service/5-dma/LogicDma_Instance.cs
rename to IStation.Service.SZJT/05-service/05-dma/LogicDma_Instance.cs
diff --git a/IStation.Service.SZJT/4-dal/1-policy/LogicPolicy.cs b/IStation.Service.SZJT/4-dal/1-policy/LogicPolicy.cs
deleted file mode 100644
index 277841e..0000000
--- a/IStation.Service.SZJT/4-dal/1-policy/LogicPolicy.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-锘縩amespace IStation.DAL
-{
- /// <summary>
- ///
- /// </summary>
- public partial class LogicPolicy : Yw.DAL.BaseDAL_Sorter_Paras_Flags_TagName_UseStatus<Entity.LogicPolicy>
- {
- /// <summary>
- ///
- /// </summary>
- public override ConnectionConfig ConnectionConfig
- {
- get { return ConfigHelper.DefaultConnectionConfig; }
- }
-
- /// <summary>
- /// 鏇存柊 Code
- /// </summary>
- public bool UpdateCode(long ID, string Code)
- {
- using (var db = new SqlSugarClient(ConnectionConfig))
- {
- return db.Updateable<Entity.LogicPolicy>()
- .SetColumns(x => x.Code == Code)
- .Where(x => x.ID == ID)
- .ExecuteCommandHasChange();
- }
- }
-
-
-
- }
-}
\ No newline at end of file
diff --git a/IStation.Service.SZJT/4-dal/2-area/LogicArea.cs b/IStation.Service.SZJT/4-dal/2-area/LogicArea.cs
deleted file mode 100644
index f2750a8..0000000
--- a/IStation.Service.SZJT/4-dal/2-area/LogicArea.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-锘縩amespace IStation.DAL
-{
- /// <summary>
- ///
- /// </summary>
- public partial class LogicArea : Yw.DAL.BaseDAL_Sorter_Paras_Flags_TagName_UseStatus<Entity.LogicArea>
- {
- /// <summary>
- ///
- /// </summary>
- public override ConnectionConfig ConnectionConfig
- {
- get { return ConfigHelper.DefaultConnectionConfig; }
- }
-
- /// <summary>
- /// 閫氳繃 PolicyID 鑾峰彇
- /// </summary>
- public List<Entity.LogicArea> GetByPolicyID(long PolicyID)
- {
- using (var db = new SqlSugarClient(ConnectionConfig))
- {
- return db.Queryable<Entity.LogicArea>()
- .Where(x => x.PolicyID == PolicyID)
- .OrderBy(x => x.SortCode).ToList();
- }
- }
-
- /// <summary>
- /// 鏇存柊 Code
- /// </summary>
- public bool UpdateCode(long ID, string Code)
- {
- using (var db = new SqlSugarClient(ConnectionConfig))
- {
- return db.Updateable<Entity.LogicArea>()
- .SetColumns(x => x.Code == Code)
- .Where(x => x.ID == ID)
- .ExecuteCommandHasChange();
- }
- }
-
-
-
- }
-}
\ No newline at end of file
diff --git a/IStation.Service.SZJT/4-dal/3-site/LogicSite.cs b/IStation.Service.SZJT/4-dal/3-site/LogicSite.cs
deleted file mode 100644
index 946ff09..0000000
--- a/IStation.Service.SZJT/4-dal/3-site/LogicSite.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-锘縩amespace IStation.DAL
-{
- /// <summary>
- ///
- /// </summary>
- public partial class LogicSite : Yw.DAL.BaseDAL_Sorter_Paras_Flags_TagName_UseStatus<Entity.LogicSite>
- {
- /// <summary>
- ///
- /// </summary>
- public override ConnectionConfig ConnectionConfig
- {
- get { return ConfigHelper.DefaultConnectionConfig; }
- }
-
- /// <summary>
- /// 鏇存柊 Code
- /// </summary>
- public bool UpdateCode(long ID, string Code)
- {
- using (var db = new SqlSugarClient(ConnectionConfig))
- {
- return db.Updateable<Entity.LogicSite>()
- .SetColumns(x => x.Code == Code)
- .Where(x => x.ID == ID)
- .ExecuteCommandHasChange();
- }
- }
-
-
-
- }
-}
\ No newline at end of file
diff --git a/IStation.Service.SZJT/4-dal/5-dma/LogicDma.cs b/IStation.Service.SZJT/4-dal/5-dma/LogicDma.cs
deleted file mode 100644
index a4e9eef..0000000
--- a/IStation.Service.SZJT/4-dal/5-dma/LogicDma.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-锘縩amespace IStation.DAL
-{
- /// <summary>
- ///
- /// </summary>
- public partial class LogicDma : Yw.DAL.BaseDAL_Sorter_Paras_Flags_TagName_UseStatus<Entity.LogicDma>
- {
- /// <summary>
- ///
- /// </summary>
- public override ConnectionConfig ConnectionConfig
- {
- get { return ConfigHelper.DefaultConnectionConfig; }
- }
-
- /// <summary>
- /// 鏇存柊 Code
- /// </summary>
- public bool UpdateCode(long ID, string Code)
- {
- using (var db = new SqlSugarClient(ConnectionConfig))
- {
- return db.Updateable<Entity.LogicDma>()
- .SetColumns(x => x.Code == Code)
- .Where(x => x.ID == ID)
- .ExecuteCommandHasChange();
- }
- }
-
-
-
- }
-}
\ No newline at end of file
diff --git a/IStation.Service.SZJT/GlobalUsings.cs b/IStation.Service.SZJT/GlobalUsings.cs
index 373a001..c0739a7 100644
--- a/IStation.Service.SZJT/GlobalUsings.cs
+++ b/IStation.Service.SZJT/GlobalUsings.cs
@@ -7,7 +7,6 @@
global using System.Collections;
global using SqlSugar;
global using AutoMapper;
-global using Yw.Newtonsoft;
global using Yw.Settings;
global using Yw.Untity;
global using Yw;
diff --git a/IStation.Service.SZJT/IStation.Service.SZJT.csproj b/IStation.Service.SZJT/IStation.Service.SZJT.csproj
index cbbc12d..8bb926d 100644
--- a/IStation.Service.SZJT/IStation.Service.SZJT.csproj
+++ b/IStation.Service.SZJT/IStation.Service.SZJT.csproj
@@ -38,7 +38,9 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Yw.Service.Basic.Core" Version="1.3.3" />
+ <PackageReference Include="Yw.Service.Assets.Core" Version="3.0.5" />
+ <PackageReference Include="Yw.Service.Basic.Core" Version="3.0.3" />
+ <PackageReference Include="Yw.Service.Monitor.Core" Version="3.0.5" />
</ItemGroup>
</Project>
diff --git a/IStation.TopShelf.SZJT/IStation.TopShelf.SZJT.csproj b/IStation.TopShelf.SZJT/IStation.TopShelf.SZJT.csproj
index d354b70..fcbe647 100644
--- a/IStation.TopShelf.SZJT/IStation.TopShelf.SZJT.csproj
+++ b/IStation.TopShelf.SZJT/IStation.TopShelf.SZJT.csproj
@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Yw.TopShelf" Version="1.0.0" />
+ <PackageReference Include="Yw.TopShelf" Version="3.0.0" />
</ItemGroup>
<ItemGroup>
diff --git a/IStation.TopShelf.SZJT/Properties/PublishProfiles/FolderProfile.pubxml.user b/IStation.TopShelf.SZJT/Properties/PublishProfiles/FolderProfile.pubxml.user
index e16c388..0f6a9d2 100644
--- a/IStation.TopShelf.SZJT/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/IStation.TopShelf.SZJT/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,6 +4,6 @@
-->
<Project>
<PropertyGroup>
- <History>True|2023-12-26T02:39:19.5076776Z;True|2023-12-15T09:43:55.2219318+08:00;True|2023-11-29T15:11:51.9151157+08:00;True|2023-11-29T14:58:05.0127775+08:00;</History>
+ <History>True|2024-04-04T01:42:40.4553718Z;True|2023-12-26T10:39:19.5076776+08:00;True|2023-12-15T09:43:55.2219318+08:00;True|2023-11-29T15:11:51.9151157+08:00;True|2023-11-29T14:58:05.0127775+08:00;</History>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/IStation.WebApi.SZJT/Handlers/JwtHandler.cs b/IStation.WebApi.SZJT/Handlers/JwtHandler.cs
index e989929..ff633f9 100644
--- a/IStation.WebApi.SZJT/Handlers/JwtHandler.cs
+++ b/IStation.WebApi.SZJT/Handlers/JwtHandler.cs
@@ -1,6 +1,8 @@
锘縰sing Furion.Authorization;
+using Furion.DataEncryption;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
+
namespace IStation.WebApi
{
@@ -10,6 +12,26 @@
public class JwtHandler : AppAuthorizeHandler
{
/// <summary>
+ /// 鑷姩鍒锋柊Token
+ /// </summary>
+ /// <param name="context"></param>
+ /// <returns></returns>
+ public override async Task HandleAsync(AuthorizationHandlerContext context)
+ {
+ var accessTokenExpire = Yw.Settings.AuthParasHelper.Auth.JWT.AccessTokenExpire;
+ var refreshTokenExpire = Yw.Settings.AuthParasHelper.Auth.JWT.RefreshTokenExpire;
+
+ if (JWTEncryption.AutoRefreshToken(context, context.GetCurrentHttpContext(), accessTokenExpire, refreshTokenExpire))
+ {
+ await AuthorizeHandleAsync(context);
+ }
+ else
+ {
+ context.Fail(); // 鎺堟潈澶辫触
+ }
+ }
+
+ /// <summary>
/// 璇锋眰绠￠亾
/// </summary>
/// <param name="context"></param>
diff --git a/IStation.WebApi.SZJT/IStation.WebApi.SZJT.csproj b/IStation.WebApi.SZJT/IStation.WebApi.SZJT.csproj
index 486762d..745fa19 100644
--- a/IStation.WebApi.SZJT/IStation.WebApi.SZJT.csproj
+++ b/IStation.WebApi.SZJT/IStation.WebApi.SZJT.csproj
@@ -22,7 +22,8 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Yw.Knife4jUI.Core" Version="1.0.0" />
+ <PackageReference Include="Yw.Knife4jUI.Core" Version="3.0.0" />
+ <PackageReference Include="Yw.Service.Auth.Core" Version="3.0.2" />
</ItemGroup>
<ItemGroup>
diff --git a/IStation.WebApi.SZJT/Result/XnRestfulResult.cs b/IStation.WebApi.SZJT/Result/XnRestfulResult.cs
deleted file mode 100644
index 9cd740b..0000000
--- a/IStation.WebApi.SZJT/Result/XnRestfulResult.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-锘縰sing Furion.DependencyInjection;
-
-namespace IStation.WebApi
-{
- /// <summary>
- /// RESTful椋庢牸---XIAONUO杩斿洖鏍煎紡
- /// </summary>
- /// <typeparam name="T"></typeparam>
- [SuppressSniffer]
- public class XnRestfulResult<T>
- {
-
- /// <summary>
- /// 鐘舵�佺爜
- /// </summary>
- public int Code { get; set; }
-
- /// <summary>
- /// 閿欒鐮�
- /// </summary>
- public object Error { get; set; }
-
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public object Message { get; set; }
-
- /// <summary>
- /// 鏁版嵁
- /// </summary>
- public T Data { get; set; }
-
- /// <summary>
- /// 闄勫姞鏁版嵁
- /// </summary>
- public object Extras { get; set; }
-
- /// <summary>
- /// 鏃堕棿鎴�
- /// </summary>
- public DateTime Timestamp { get; set; }
- }
-}
diff --git a/IStation.WebApi.SZJT/Result/XnRestfulResultProvider.cs b/IStation.WebApi.SZJT/Result/XnRestfulResultProvider.cs
index 5d7a377..ccaba95 100644
--- a/IStation.WebApi.SZJT/Result/XnRestfulResultProvider.cs
+++ b/IStation.WebApi.SZJT/Result/XnRestfulResultProvider.cs
@@ -9,16 +9,16 @@
using System.Net;
using Yw.Untity;
using Yw.Application;
+using Yw.Dto;
namespace IStation.WebApi
{
/// <summary>
/// 瑙勮寖鍖朢ESTful椋庢牸杩斿洖鍊�
/// </summary>
- [SuppressSniffer, UnifyModel(typeof(XnRestfulResult<>))]
+ [SuppressSniffer, UnifyModel(typeof(Result<>))]
public class XnRestfulResultProvider : IUnifyResultProvider
{
-
/// <summary>
/// 寮傚父
/// </summary>
@@ -27,14 +27,14 @@
// 瑙ｆ瀽寮傚父淇℃伅
//var exceptionMetadata = UnifyContext.GetExceptionMetadata(context);
- XnRestfulResult<object> result = null;
+ Result<object> result = null;
//furion寮傚父
if (context.Exception is AppFriendlyException friendException)
{
- result = new XnRestfulResult<object>
+ result = new Result<object>
{
- Code = (int)eResultCode.Alert,
+ Code = eResultCode.Alert,
Error = friendException.ErrorCode,
Message = friendException.ErrorMessage,
Data = null,
@@ -44,9 +44,9 @@
}
//api寮傚父
- else if (context.Exception is ApiException apiException)
+ else if (context.Exception is InternalException apiException)
{
- result = new XnRestfulResult<object>
+ result = new Result<object>
{
Code = apiException.ResultCode,
Error = apiException.ErrorCode,
@@ -59,9 +59,9 @@
else
{
- result = new XnRestfulResult<object>
+ result = new Result<object>
{
- Code = (int)eResultCode.Error,
+ Code = eResultCode.Error,
Error = "绯荤粺寮傚父",
Message = context.Exception.StackTrace,
Data = null,
@@ -70,9 +70,9 @@
};
}
- if (result.Code == (int)eResultCode.Error)
+ if (result.Code == eResultCode.Error)
{
- LogHelper.Error($"閿欒鐮侊細{result.Error}锛岄敊璇俊鎭細{result.Message}");
+ Yw.LogHelper.Error($"閿欒鐮侊細{result.Error}锛岄敊璇俊鎭細{result.Message}");
}
return new JsonResult(result);
@@ -100,9 +100,9 @@
return null;
}
- return new JsonResult(new XnRestfulResult<object>
+ return new JsonResult(new Result<object>
{
- Code = (int)eResultCode.Success,
+ Code = eResultCode.Success,
Error = null,
Message = "璇锋眰鎴愬姛",
Data = data,
@@ -116,10 +116,10 @@
/// </summary>
public IActionResult OnValidateFailed(ActionExecutingContext context, ValidationMetadata metadata)
{
- return new JsonResult(new XnRestfulResult<object>
+ return new JsonResult(new Result<object>
{
- Code = (int)eResultCode.Prompt,
- Error = ErrorCodes.V001.ToString(),
+ Code = eResultCode.Prompt,
+ Error = InternalErrorCodes.V001.ToString(),
Message = metadata.Message,
Data = null,
Extras = UnifyContext.Take(),
@@ -137,10 +137,10 @@
if (Enum.IsDefined(typeof(HttpStatusCode), (HttpStatusCode)statusCode))
{
- await context.Response.WriteAsJsonAsync(new XnRestfulResult<object>
+ await context.Response.WriteAsJsonAsync(new Result<object>
{
- Code = (int)eResultCode.Confirm,
- Error = ErrorCodes.A099.ToString(),
+ Code = eResultCode.Confirm,
+ Error = InternalErrorCodes.A099.ToString(),
Message = "鏉冮檺楠岃瘉澶辫触",
Data = null,
Extras = UnifyContext.Take(),
--
Gitblit v1.9.3