diff --git a/HT.Cloud.Code/Model/SystemConfig.cs b/HT.Cloud.Code/Model/SystemConfig.cs index 29c61e4..9facdbb 100644 --- a/HT.Cloud.Code/Model/SystemConfig.cs +++ b/HT.Cloud.Code/Model/SystemConfig.cs @@ -75,6 +75,11 @@ namespace HT.Cloud.Code.Model /// public string MainDbNumber { get; set; } + /// + /// 数据仓库数据库编号 + /// + public string DataDBNumber { get; set; } + /// /// 是否开启定时任务 /// diff --git a/HT.Cloud.Domain/Entity/ChartsManage/HT_HISTORY_CHARTEntity.cs b/HT.Cloud.Domain/Entity/ChartsManage/HT_HISTORY_CHARTEntity.cs index 537bb45..d993ff0 100644 --- a/HT.Cloud.Domain/Entity/ChartsManage/HT_HISTORY_CHARTEntity.cs +++ b/HT.Cloud.Domain/Entity/ChartsManage/HT_HISTORY_CHARTEntity.cs @@ -10,7 +10,8 @@ namespace HT.Cloud.Domain.ChartsManage /// 描 述： 趋势变量表实体类 /// [SugarTable("HT_HISTORY_CHART")] - public class HT_HISTORY_CHARTEntity + [TenantAttribute("1")] + public class HT_HISTORY_CHARTEntity { /// /// diff --git a/HT.Cloud.Domain/Entity/ChartsManage/HistoryChartsEntity.cs b/HT.Cloud.Domain/Entity/ChartsManage/HistoryChartsEntity.cs index 2e710e2..f34f6ea 100644 --- a/HT.Cloud.Domain/Entity/ChartsManage/HistoryChartsEntity.cs +++ b/HT.Cloud.Domain/Entity/ChartsManage/HistoryChartsEntity.cs @@ -10,7 +10,8 @@ namespace HT.Cloud.Domain.ChartsManage /// 描 述：历史趋势实体类 /// [SugarTable("htb_historycharts")] - public class HistoryChartsEntity + [TenantAttribute("1")] + public class HistoryChartsEntity { /// /// ID diff --git a/HT.Cloud.Domain/Entity/ChartsManage/HistoryTechChartsEntity.cs b/HT.Cloud.Domain/Entity/ChartsManage/HistoryTechChartsEntity.cs index 8ed7369..f20df13 100644 --- a/HT.Cloud.Domain/Entity/ChartsManage/HistoryTechChartsEntity.cs +++ b/HT.Cloud.Domain/Entity/ChartsManage/HistoryTechChartsEntity.cs @@ -10,7 +10,8 @@ namespace HT.Cloud.Domain.ChartsManage /// 描 述：历史趋势实体类 /// [SugarTable("htb_historytechcharts")] - public class HistoryTechChartsEntity + [TenantAttribute("1")] + public class HistoryTechChartsEntity { /// /// ID diff --git a/HT.Cloud.Domain/Entity/ChartsManage/RtTechChartsEntity.cs b/HT.Cloud.Domain/Entity/ChartsManage/RtTechChartsEntity.cs index 1299c35..184e948 100644 --- a/HT.Cloud.Domain/Entity/ChartsManage/RtTechChartsEntity.cs +++ b/HT.Cloud.Domain/Entity/ChartsManage/RtTechChartsEntity.cs @@ -10,7 +10,8 @@ namespace HT.Cloud.Domain.ChartsManage /// 描 述：历史趋势实体类 /// [SugarTable("htb_rttechcharts")] - public class RtTechChartsEntity + [TenantAttribute("1")] + public class RtTechChartsEntity { /// /// ID diff --git a/HT.Cloud.Domain/Entity/ChartsManage/RtchartsEntity.cs b/HT.Cloud.Domain/Entity/ChartsManage/RtchartsEntity.cs index bd8add7..486bbfc 100644 --- a/HT.Cloud.Domain/Entity/ChartsManage/RtchartsEntity.cs +++ b/HT.Cloud.Domain/Entity/ChartsManage/RtchartsEntity.cs @@ -10,7 +10,8 @@ namespace HT.Cloud.Domain.ChartsManage /// 描 述：实时趋势实体类 /// [SugarTable("htb_rtcharts")] - public class RtchartsEntity + [TenantAttribute("1")] + public class RtchartsEntity { /// /// ID diff --git a/HT.Cloud.Domain/Entity/ContentManage/ArticleCategoryEntity.cs b/HT.Cloud.Domain/Entity/ContentManage/ArticleCategoryEntity.cs index 4ecd157..7e17a72 100644 --- a/HT.Cloud.Domain/Entity/ContentManage/ArticleCategoryEntity.cs +++ b/HT.Cloud.Domain/Entity/ContentManage/ArticleCategoryEntity.cs @@ -10,6 +10,7 @@ namespace HT.Cloud.Domain.ContentManage /// 描 述：新闻类别实体类 /// [SugarTable("cms_articlecategory")] + [TenantAttribute("0")] public class ArticleCategoryEntity : IEntity, ICreationAudited, IModificationAudited, IDeleteAudited { /// diff --git a/HT.Cloud.Domain/Entity/ContentManage/ArticleNewsEntity.cs b/HT.Cloud.Domain/Entity/ContentManage/ArticleNewsEntity.cs index d72de2c..67143f3 100644 --- a/HT.Cloud.Domain/Entity/ContentManage/ArticleNewsEntity.cs +++ b/HT.Cloud.Domain/Entity/ContentManage/ArticleNewsEntity.cs @@ -10,6 +10,7 @@ namespace HT.Cloud.Domain.ContentManage /// 描 述：新闻管理实体类 /// [SugarTable("cms_articlenews")] + [TenantAttribute("0")] public class ArticleNewsEntity : IEntity, ICreationAudited, IModificationAudited, IDeleteAudited { /// diff --git a/HT.Cloud.Domain/Entity/DevicesManage/ArgumentEntity.cs b/HT.Cloud.Domain/Entity/DevicesManage/ArgumentEntity.cs index 49aade6..e1bd6bb 100644 --- a/HT.Cloud.Domain/Entity/DevicesManage/ArgumentEntity.cs +++ b/HT.Cloud.Domain/Entity/DevicesManage/ArgumentEntity.cs @@ -10,7 +10,8 @@ namespace HT.Cloud.Domain.DevicesManage /// 描 述：设备硬件连接参数表实体类 /// [SugarTable("Argument")] - public class ArgumentEntity + [TenantAttribute("1")] + public class ArgumentEntity { /// /// diff --git a/HT.Cloud.Domain/Entity/DevicesManage/MetaDriverEntity.cs b/HT.Cloud.Domain/Entity/DevicesManage/MetaDriverEntity.cs index 90ef15b..7e11287 100644 --- a/HT.Cloud.Domain/Entity/DevicesManage/MetaDriverEntity.cs +++ b/HT.Cloud.Domain/Entity/DevicesManage/MetaDriverEntity.cs @@ -10,7 +10,8 @@ namespace HT.Cloud.Domain.DevicesManage /// 描 述：设备信息列表实体类 /// [SugarTable("Meta_Driver")] - public class MetaDriverEntity + [TenantAttribute("1")] + public class MetaDriverEntity { /// /// diff --git a/HT.Cloud.Domain/Entity/DevicesManage/MetaGroupEntity.cs b/HT.Cloud.Domain/Entity/DevicesManage/MetaGroupEntity.cs index 0d08898..584397f 100644 --- a/HT.Cloud.Domain/Entity/DevicesManage/MetaGroupEntity.cs +++ b/HT.Cloud.Domain/Entity/DevicesManage/MetaGroupEntity.cs @@ -10,7 +10,8 @@ namespace HT.Cloud.Domain.DevicesManage /// 描 述：变量组信息表实体类 /// [SugarTable("Meta_Group")] - public class MetaGroupEntity + [TenantAttribute("1")] + public class MetaGroupEntity { /// /// diff --git a/HT.Cloud.Domain/Entity/DevicesManage/MetaTagEntity.cs b/HT.Cloud.Domain/Entity/DevicesManage/MetaTagEntity.cs index e5c9f43..3d5f49f 100644 --- a/HT.Cloud.Domain/Entity/DevicesManage/MetaTagEntity.cs +++ b/HT.Cloud.Domain/Entity/DevicesManage/MetaTagEntity.cs @@ -10,7 +10,8 @@ namespace HT.Cloud.Domain.DevicesManage /// 描 述：变量信息表实体类 /// [SugarTable("Meta_Tag")] - public class MetaTagEntity + [TenantAttribute("1")] + public class MetaTagEntity { /// /// diff --git a/HT.Cloud.Domain/Entity/DevicesManage/MetaTagScopeEntity.cs b/HT.Cloud.Domain/Entity/DevicesManage/MetaTagScopeEntity.cs index e61514b..92ac0f0 100644 --- a/HT.Cloud.Domain/Entity/DevicesManage/MetaTagScopeEntity.cs +++ b/HT.Cloud.Domain/Entity/DevicesManage/MetaTagScopeEntity.cs @@ -10,7 +10,8 @@ namespace HT.Cloud.Domain.DevicesManage /// 描 述：设备报警信息实体类 /// [SugarTable("Meta_Tag_Scope")] - public class MetaTagScopeEntity + [TenantAttribute("1")] + public class MetaTagScopeEntity { /// /// TagID diff --git a/HT.Cloud.Domain/Entity/FileManage/UploadfileEntity.cs b/HT.Cloud.Domain/Entity/FileManage/UploadfileEntity.cs index edea65b..4ebf396 100644 --- a/HT.Cloud.Domain/Entity/FileManage/UploadfileEntity.cs +++ b/HT.Cloud.Domain/Entity/FileManage/UploadfileEntity.cs @@ -9,6 +9,7 @@ namespace HT.Cloud.Domain.FileManage /// 描 述：文件管理实体类 /// [SugarTable("oms_uploadfile")] + [TenantAttribute("0")] public class UploadfileEntity : IEntity, ICreationAudited { /// diff --git a/HT.Cloud.Domain/Entity/FlowManage/FlowInstanceOperationHistory.cs b/HT.Cloud.Domain/Entity/FlowManage/FlowInstanceOperationHistory.cs index b36e145..245d5c8 100644 --- a/HT.Cloud.Domain/Entity/FlowManage/FlowInstanceOperationHistory.cs +++ b/HT.Cloud.Domain/Entity/FlowManage/FlowInstanceOperationHistory.cs @@ -16,6 +16,7 @@ namespace HT.Cloud.Domain.FlowManage /// 工作流实例操作记录 /// [SugarTable("oms_flowinstanceinfo")] + [TenantAttribute("0")] public class FlowInstanceOperationHistory { /// diff --git a/HT.Cloud.Domain/Entity/FlowManage/FlowInstanceTransitionHistory.cs b/HT.Cloud.Domain/Entity/FlowManage/FlowInstanceTransitionHistory.cs index 8ad8eec..ea45017 100644 --- a/HT.Cloud.Domain/Entity/FlowManage/FlowInstanceTransitionHistory.cs +++ b/HT.Cloud.Domain/Entity/FlowManage/FlowInstanceTransitionHistory.cs @@ -16,6 +16,7 @@ namespace HT.Cloud.Domain.FlowManage /// 工作流实例流转历史记录 /// [SugarTable("oms_flowinstancehis")] + [TenantAttribute("0")] public class FlowInstanceTransitionHistory { /// diff --git a/HT.Cloud.Domain/Entity/FlowManage/FlowinstanceEntity.cs b/HT.Cloud.Domain/Entity/FlowManage/FlowinstanceEntity.cs index ae29cc2..2922461 100644 --- a/HT.Cloud.Domain/Entity/FlowManage/FlowinstanceEntity.cs +++ b/HT.Cloud.Domain/Entity/FlowManage/FlowinstanceEntity.cs @@ -10,6 +10,7 @@ namespace HT.Cloud.Domain.FlowManage /// 描 述：我的流程实体类 /// [SugarTable("oms_flowinstance")] + [TenantAttribute("0")] public class FlowinstanceEntity : IEntity, ICreationAudited { /// diff --git a/HT.Cloud.Domain/Entity/FlowManage/FormTestEntity.cs b/HT.Cloud.Domain/Entity/FlowManage/FormTestEntity.cs index 03ed9b3..51737a9 100644 --- a/HT.Cloud.Domain/Entity/FlowManage/FormTestEntity.cs +++ b/HT.Cloud.Domain/Entity/FlowManage/FormTestEntity.cs @@ -11,6 +11,7 @@ using System; namespace HT.Cloud.Domain.FlowManage { [SugarTable("oms_formtest")] + [TenantAttribute("0")] public class FormTestEntity : IEntity, ICreationAudited { [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true, ColumnDescription = "主键Id")] diff --git a/HT.Cloud.Domain/Entity/InfoManage/MessageEntity.cs b/HT.Cloud.Domain/Entity/InfoManage/MessageEntity.cs index c4de7c3..1bd20ab 100644 --- a/HT.Cloud.Domain/Entity/InfoManage/MessageEntity.cs +++ b/HT.Cloud.Domain/Entity/InfoManage/MessageEntity.cs @@ -10,6 +10,7 @@ namespace HT.Cloud.Domain.InfoManage /// 描 述：通知管理实体类 /// [SugarTable("oms_message")] + [TenantAttribute("0")] public class MessageEntity : IEntity, ICreationAudited { /// diff --git a/HT.Cloud.Domain/Entity/InfoManage/MessageHistoryEntity.cs b/HT.Cloud.Domain/Entity/InfoManage/MessageHistoryEntity.cs index 3a61537..f189470 100644 --- a/HT.Cloud.Domain/Entity/InfoManage/MessageHistoryEntity.cs +++ b/HT.Cloud.Domain/Entity/InfoManage/MessageHistoryEntity.cs @@ -9,6 +9,7 @@ namespace HT.Cloud.Domain.InfoManage /// 描 述：信息历史实体类 /// [SugarTable("oms_messagehis")] + [TenantAttribute("0")] public class MessageHistoryEntity : IEntity, ICreationAudited { /// diff --git a/HT.Cloud.Domain/Entity/OrderManagement/OrderDetailEntity.cs b/HT.Cloud.Domain/Entity/OrderManagement/OrderDetailEntity.cs index 33ad35d..25fcdb8 100644 --- a/HT.Cloud.Domain/Entity/OrderManagement/OrderDetailEntity.cs +++ b/HT.Cloud.Domain/Entity/OrderManagement/OrderDetailEntity.cs @@ -9,6 +9,7 @@ namespace HT.Cloud.Domain.OrderManagement /// 描 述：订单明细实体类 /// [SugarTable("crm_orderdetail")] + [TenantAttribute("0")] public class OrderDetailEntity : IEntity, ICreationAudited { /// diff --git a/HT.Cloud.Domain/Entity/OrderManagement/OrderEntity.cs b/HT.Cloud.Domain/Entity/OrderManagement/OrderEntity.cs index 4edbc18..7a7c543 100644 --- a/HT.Cloud.Domain/Entity/OrderManagement/OrderEntity.cs +++ b/HT.Cloud.Domain/Entity/OrderManagement/OrderEntity.cs @@ -10,6 +10,7 @@ namespace HT.Cloud.Domain.OrderManagement /// 描 述：订单管理实体类 /// [SugarTable("crm_order")] + [TenantAttribute("0")] public class OrderEntity : IEntity, ICreationAudited, IModificationAudited, IDeleteAudited { /// diff --git a/HT.Cloud.Domain/Entity/ReportManage/HistoryAlarmEntity.cs b/HT.Cloud.Domain/Entity/ReportManage/HistoryAlarmEntity.cs index 32b8603..fa18125 100644 --- a/HT.Cloud.Domain/Entity/ReportManage/HistoryAlarmEntity.cs +++ b/HT.Cloud.Domain/Entity/ReportManage/HistoryAlarmEntity.cs @@ -10,7 +10,8 @@ namespace HT.Cloud.Domain.ReportManage /// 描 述：报警信息变量表实体类 /// [SugarTable("HT_HISTORY_ALARM")] - public class HistoryAlarmEntity + [TenantAttribute("1")] + public class HistoryAlarmEntity { /// /// diff --git a/HT.Cloud.Domain/Entity/ReportManage/HistoryReportEntity.cs b/HT.Cloud.Domain/Entity/ReportManage/HistoryReportEntity.cs index d066de2..2ade8f7 100644 --- a/HT.Cloud.Domain/Entity/ReportManage/HistoryReportEntity.cs +++ b/HT.Cloud.Domain/Entity/ReportManage/HistoryReportEntity.cs @@ -10,7 +10,8 @@ namespace HT.Cloud.Domain.ReportManage /// 描 述：历史报表实体类 /// [SugarTable("htb_historyreport")] - public class HistoryReportEntity + [TenantAttribute("1")] + public class HistoryReportEntity { /// /// ID diff --git a/HT.Cloud.Domain/Entity/ReportManage/Ht_History_ReportEntity.cs b/HT.Cloud.Domain/Entity/ReportManage/Ht_History_ReportEntity.cs index 962ade7..769cc34 100644 --- a/HT.Cloud.Domain/Entity/ReportManage/Ht_History_ReportEntity.cs +++ b/HT.Cloud.Domain/Entity/ReportManage/Ht_History_ReportEntity.cs @@ -10,7 +10,8 @@ namespace HT.Cloud.Domain.ReportManage /// 描 述：历史信息表实体类 /// [SugarTable("HT_HISTORY_REPORT")] - public class Ht_History_ReportEntity + [TenantAttribute("1")] + public class Ht_History_ReportEntity { /// /// diff --git a/HT.Cloud.Domain/Entity/ReportManage/MetaTagAlarmEntity.cs b/HT.Cloud.Domain/Entity/ReportManage/MetaTagAlarmEntity.cs index fb58eef..64072d7 100644 --- a/HT.Cloud.Domain/Entity/ReportManage/MetaTagAlarmEntity.cs +++ b/HT.Cloud.Domain/Entity/ReportManage/MetaTagAlarmEntity.cs @@ -10,7 +10,8 @@ namespace HT.Cloud.Domain.ReportManage /// 描 述：报警变量表实体类 /// [SugarTable("Meta_Tag_Alarm")] - public class MetaTagAlarmEntity + [TenantAttribute("1")] + public class MetaTagAlarmEntity { /// /// diff --git a/HT.Cloud.Domain/Entity/ReportManage/RtReportEntity.cs b/HT.Cloud.Domain/Entity/ReportManage/RtReportEntity.cs index 851df53..de5ac45 100644 --- a/HT.Cloud.Domain/Entity/ReportManage/RtReportEntity.cs +++ b/HT.Cloud.Domain/Entity/ReportManage/RtReportEntity.cs @@ -10,7 +10,8 @@ namespace HT.Cloud.Domain.ReportManage /// 描 述：实时报表SQL转换实体类 /// [SugarTable("HT_RT_REPORT")] - public class RtReportEntity + [TenantAttribute("1")] + public class RtReportEntity { /// /// diff --git a/HT.Cloud.Domain/Entity/SystemManage/AreaEntity.cs b/HT.Cloud.Domain/Entity/SystemManage/AreaEntity.cs index 33c5242..ed57138 100644 --- a/HT.Cloud.Domain/Entity/SystemManage/AreaEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemManage/AreaEntity.cs @@ -12,6 +12,7 @@ using System.ComponentModel.DataAnnotations; namespace HT.Cloud.Domain.SystemManage { [SugarTable("sys_area")] + [TenantAttribute("0")] public class AreaEntity : IEntity, ICreationAudited, IDeleteAudited, IModificationAudited { /// diff --git a/HT.Cloud.Domain/Entity/SystemManage/CodegeneratelogEntity.cs b/HT.Cloud.Domain/Entity/SystemManage/CodegeneratelogEntity.cs index 2d73930..453b2bf 100644 --- a/HT.Cloud.Domain/Entity/SystemManage/CodegeneratelogEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemManage/CodegeneratelogEntity.cs @@ -9,7 +9,8 @@ namespace HT.Cloud.Domain.SystemManage /// 描 述：条码生成记录实体类 /// [SugarTable("sys_codegeneratelog")] - public class CodegeneratelogEntity : IEntity,ICreationAudited,IModificationAudited,IDeleteAudited + [TenantAttribute("0")] + public class CodegeneratelogEntity : IEntity,ICreationAudited,IModificationAudited,IDeleteAudited { /// /// 主键 diff --git a/HT.Cloud.Domain/Entity/SystemManage/CoderuleEntity.cs b/HT.Cloud.Domain/Entity/SystemManage/CoderuleEntity.cs index 83b82c9..9d57129 100644 --- a/HT.Cloud.Domain/Entity/SystemManage/CoderuleEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemManage/CoderuleEntity.cs @@ -9,7 +9,8 @@ namespace HT.Cloud.Domain.SystemManage /// 描 述：条码规则实体类 /// [SugarTable("sys_coderule")] - public class CoderuleEntity : IEntity,ICreationAudited,IModificationAudited,IDeleteAudited + [TenantAttribute("0")] + public class CoderuleEntity : IEntity,ICreationAudited,IModificationAudited,IDeleteAudited { /// /// 主键 diff --git a/HT.Cloud.Domain/Entity/SystemManage/CoderulelogEntity.cs b/HT.Cloud.Domain/Entity/SystemManage/CoderulelogEntity.cs index 07221e1..7ba5259 100644 --- a/HT.Cloud.Domain/Entity/SystemManage/CoderulelogEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemManage/CoderulelogEntity.cs @@ -10,7 +10,8 @@ namespace HT.Cloud.Domain.SystemManage /// 描 述：条码规则计数实体类 /// [SugarTable("sys_coderulelog")] - public class CoderulelogEntity + [TenantAttribute("0")] + public class CoderulelogEntity { /// /// 主键 diff --git a/HT.Cloud.Domain/Entity/SystemManage/FlowschemeEntity.cs b/HT.Cloud.Domain/Entity/SystemManage/FlowschemeEntity.cs index e39bcc5..92d8929 100644 --- a/HT.Cloud.Domain/Entity/SystemManage/FlowschemeEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemManage/FlowschemeEntity.cs @@ -10,6 +10,7 @@ namespace HT.Cloud.Domain.SystemManage /// 描 述：流程设计实体类 /// [SugarTable("sys_flowscheme")] + [TenantAttribute("0")] public class FlowschemeEntity : IEntity, ICreationAudited, IModificationAudited, IDeleteAudited { /// diff --git a/HT.Cloud.Domain/Entity/SystemManage/FormEntity.cs b/HT.Cloud.Domain/Entity/SystemManage/FormEntity.cs index 6fae90f..da85642 100644 --- a/HT.Cloud.Domain/Entity/SystemManage/FormEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemManage/FormEntity.cs @@ -10,6 +10,7 @@ namespace HT.Cloud.Domain.SystemManage /// 描 述：表单设计实体类 /// [SugarTable("sys_form")] + [TenantAttribute("0")] public class FormEntity : IEntity, ICreationAudited, IModificationAudited, IDeleteAudited { /// diff --git a/HT.Cloud.Domain/Entity/SystemManage/ItemsDetailEntity.cs b/HT.Cloud.Domain/Entity/SystemManage/ItemsDetailEntity.cs index 07b6e32..863ef1e 100644 --- a/HT.Cloud.Domain/Entity/SystemManage/ItemsDetailEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemManage/ItemsDetailEntity.cs @@ -12,6 +12,7 @@ using System.ComponentModel.DataAnnotations; namespace HT.Cloud.Domain.SystemManage { [SugarTable("sys_itemsdetail")] + [TenantAttribute("0")] public class ItemsDetailEntity : IEntity, ICreationAudited, IDeleteAudited, IModificationAudited { /// diff --git a/HT.Cloud.Domain/Entity/SystemManage/ItemsEntity.cs b/HT.Cloud.Domain/Entity/SystemManage/ItemsEntity.cs index d3ce202..45db129 100644 --- a/HT.Cloud.Domain/Entity/SystemManage/ItemsEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemManage/ItemsEntity.cs @@ -12,6 +12,7 @@ using System.ComponentModel.DataAnnotations; namespace HT.Cloud.Domain.SystemManage { [SugarTable("sys_items")] + [TenantAttribute("0")] public class ItemsEntity : IEntity, ICreationAudited, IDeleteAudited, IModificationAudited { /// diff --git a/HT.Cloud.Domain/Entity/SystemManage/ModuleButtonEntity.cs b/HT.Cloud.Domain/Entity/SystemManage/ModuleButtonEntity.cs index 3757943..8eea6c0 100644 --- a/HT.Cloud.Domain/Entity/SystemManage/ModuleButtonEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemManage/ModuleButtonEntity.cs @@ -12,6 +12,7 @@ using System.ComponentModel.DataAnnotations; namespace HT.Cloud.Domain.SystemManage { [SugarTable("sys_modulebutton")] + [TenantAttribute("0")] public class ModuleButtonEntity : IEntity, ICreationAudited, IDeleteAudited, IModificationAudited { /// diff --git a/HT.Cloud.Domain/Entity/SystemManage/ModuleEntity.cs b/HT.Cloud.Domain/Entity/SystemManage/ModuleEntity.cs index 3d7ed72..51b28d6 100644 --- a/HT.Cloud.Domain/Entity/SystemManage/ModuleEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemManage/ModuleEntity.cs @@ -12,6 +12,7 @@ using System.ComponentModel.DataAnnotations; namespace HT.Cloud.Domain.SystemManage { [SugarTable("sys_module")] + [TenantAttribute("0")] public class ModuleEntity : IEntity, ICreationAudited, IModificationAudited, IDeleteAudited { /// diff --git a/HT.Cloud.Domain/Entity/SystemManage/ModuleFieldsEntity.cs b/HT.Cloud.Domain/Entity/SystemManage/ModuleFieldsEntity.cs index 10d72fe..9c0abaa 100644 --- a/HT.Cloud.Domain/Entity/SystemManage/ModuleFieldsEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemManage/ModuleFieldsEntity.cs @@ -10,6 +10,7 @@ namespace HT.Cloud.Domain.SystemManage /// 描 述：字段管理实体类 /// [SugarTable("sys_modulefields")] + [TenantAttribute("0")] public class ModuleFieldsEntity : IEntity, ICreationAudited, IModificationAudited, IDeleteAudited { /// diff --git a/HT.Cloud.Domain/Entity/SystemManage/QuickModuleEntity.cs b/HT.Cloud.Domain/Entity/SystemManage/QuickModuleEntity.cs index 78f1ce1..1c5461c 100644 --- a/HT.Cloud.Domain/Entity/SystemManage/QuickModuleEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemManage/QuickModuleEntity.cs @@ -16,6 +16,7 @@ namespace HT.Cloud.Domain.SystemManage /// QuickModule Entity Model /// [SugarTable("sys_quickmodule")] + [TenantAttribute("0")] public class QuickModuleEntity : IEntity, ICreationAudited, IDeleteAudited, IModificationAudited { /// diff --git a/HT.Cloud.Domain/Entity/SystemManage/TemplateEntity.cs b/HT.Cloud.Domain/Entity/SystemManage/TemplateEntity.cs index e2f44db..6dbc181 100644 --- a/HT.Cloud.Domain/Entity/SystemManage/TemplateEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemManage/TemplateEntity.cs @@ -9,7 +9,8 @@ namespace HT.Cloud.Domain.SystemManage /// 描 述：打印模板实体类 /// [SugarTable("sys_template")] - public class TemplateEntity : IEntity,ICreationAudited,IModificationAudited,IDeleteAudited + [TenantAttribute("0")] + public class TemplateEntity : IEntity,ICreationAudited,IModificationAudited,IDeleteAudited { /// /// 主键 diff --git a/HT.Cloud.Domain/Entity/SystemOrganize/DataPrivilegeRuleEntity.cs b/HT.Cloud.Domain/Entity/SystemOrganize/DataPrivilegeRuleEntity.cs index acf77e0..3554e9a 100644 --- a/HT.Cloud.Domain/Entity/SystemOrganize/DataPrivilegeRuleEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemOrganize/DataPrivilegeRuleEntity.cs @@ -10,6 +10,7 @@ namespace HT.Cloud.Domain.SystemOrganize /// 描 述：数据权限实体类 /// [SugarTable("sys_dataprivilegerule")] + [TenantAttribute("0")] public class DataPrivilegeRuleEntity : IEntity, ICreationAudited, IModificationAudited, IDeleteAudited { /// diff --git a/HT.Cloud.Domain/Entity/SystemOrganize/Extend/RoleExtend.cs b/HT.Cloud.Domain/Entity/SystemOrganize/Extend/RoleExtend.cs index 8046a4b..7bb9f00 100644 --- a/HT.Cloud.Domain/Entity/SystemOrganize/Extend/RoleExtend.cs +++ b/HT.Cloud.Domain/Entity/SystemOrganize/Extend/RoleExtend.cs @@ -8,6 +8,7 @@ namespace HT.Cloud.Domain.SystemOrganize /// 描 述：角色类别实体扩展类 /// [SugarTable("sys_role")] + [TenantAttribute("0")] public class RoleExtend : RoleEntity { //使用导入错误信息 diff --git a/HT.Cloud.Domain/Entity/SystemOrganize/Extend/UserExtend.cs b/HT.Cloud.Domain/Entity/SystemOrganize/Extend/UserExtend.cs index 4f07bb3..c9609a3 100644 --- a/HT.Cloud.Domain/Entity/SystemOrganize/Extend/UserExtend.cs +++ b/HT.Cloud.Domain/Entity/SystemOrganize/Extend/UserExtend.cs @@ -8,6 +8,7 @@ namespace HT.Cloud.Domain.SystemOrganize /// 描 述：用户实体扩展类 /// [SugarTable("sys_user")] + [TenantAttribute("0")] public class UserExtend : UserEntity { //使用导入错误信息 diff --git a/HT.Cloud.Domain/Entity/SystemOrganize/NoticeEntity.cs b/HT.Cloud.Domain/Entity/SystemOrganize/NoticeEntity.cs index 65afd35..c19c4d7 100644 --- a/HT.Cloud.Domain/Entity/SystemOrganize/NoticeEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemOrganize/NoticeEntity.cs @@ -17,6 +17,7 @@ namespace HT.Cloud.Domain.SystemOrganize /// Notice Entity Model /// [SugarTable("sys_notice")] + [TenantAttribute("0")] public class NoticeEntity : IEntity, ICreationAudited, IDeleteAudited, IModificationAudited { /// diff --git a/HT.Cloud.Domain/Entity/SystemOrganize/OrganizeEntity.cs b/HT.Cloud.Domain/Entity/SystemOrganize/OrganizeEntity.cs index f94b7e9..e55d8b8 100644 --- a/HT.Cloud.Domain/Entity/SystemOrganize/OrganizeEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemOrganize/OrganizeEntity.cs @@ -15,6 +15,7 @@ namespace HT.Cloud.Domain.SystemOrganize /// 机构实体 /// [SugarTable("sys_organize")] + [TenantAttribute("0")] public class OrganizeEntity : IEntity, ICreationAudited, IDeleteAudited, IModificationAudited { /// diff --git a/HT.Cloud.Domain/Entity/SystemOrganize/RoleAuthorizeEntity.cs b/HT.Cloud.Domain/Entity/SystemOrganize/RoleAuthorizeEntity.cs index 06e25f7..e0fae4d 100644 --- a/HT.Cloud.Domain/Entity/SystemOrganize/RoleAuthorizeEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemOrganize/RoleAuthorizeEntity.cs @@ -14,6 +14,7 @@ namespace HT.Cloud.Domain.SystemOrganize /// 角色权限实体 /// [SugarTable("sys_roleauthorize")] + [TenantAttribute("0")] public class RoleAuthorizeEntity : IEntity, ICreationAudited { /// diff --git a/HT.Cloud.Domain/Entity/SystemOrganize/RoleEntity.cs b/HT.Cloud.Domain/Entity/SystemOrganize/RoleEntity.cs index 708edb8..8b7c091 100644 --- a/HT.Cloud.Domain/Entity/SystemOrganize/RoleEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemOrganize/RoleEntity.cs @@ -16,6 +16,7 @@ namespace HT.Cloud.Domain.SystemOrganize /// 角色实体 /// [SugarTable("sys_role")] + [TenantAttribute("0")] public class RoleEntity : IEntity, ICreationAudited, IDeleteAudited, IModificationAudited { /// diff --git a/HT.Cloud.Domain/Entity/SystemOrganize/SystemSetEntity.cs b/HT.Cloud.Domain/Entity/SystemOrganize/SystemSetEntity.cs index 9cccd79..1fa06f8 100644 --- a/HT.Cloud.Domain/Entity/SystemOrganize/SystemSetEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemOrganize/SystemSetEntity.cs @@ -10,6 +10,7 @@ namespace HT.Cloud.Domain.SystemOrganize /// 描 述：系统设置实体类 /// [SugarTable("sys_systemset")] + [TenantAttribute("0")] public class SystemSetEntity : IEntity, ICreationAudited, IModificationAudited, IDeleteAudited { /// diff --git a/HT.Cloud.Domain/Entity/SystemOrganize/UserEntity.cs b/HT.Cloud.Domain/Entity/SystemOrganize/UserEntity.cs index caed7ab..01f6868 100644 --- a/HT.Cloud.Domain/Entity/SystemOrganize/UserEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemOrganize/UserEntity.cs @@ -15,6 +15,7 @@ namespace HT.Cloud.Domain.SystemOrganize /// 用户实体 /// [SugarTable("sys_user")] + [TenantAttribute("0")] public class UserEntity : IEntity, ICreationAudited, IDeleteAudited, IModificationAudited { /// diff --git a/HT.Cloud.Domain/Entity/SystemOrganize/UserLogOnEntity.cs b/HT.Cloud.Domain/Entity/SystemOrganize/UserLogOnEntity.cs index 4460345..77dee2f 100644 --- a/HT.Cloud.Domain/Entity/SystemOrganize/UserLogOnEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemOrganize/UserLogOnEntity.cs @@ -12,6 +12,7 @@ using System.ComponentModel.DataAnnotations; namespace HT.Cloud.Domain.SystemOrganize { [SugarTable("sys_userlogon")] + [TenantAttribute("0")] public class UserLogOnEntity { /// diff --git a/HT.Cloud.Domain/Entity/SystemSecurity/FilterIPEntity.cs b/HT.Cloud.Domain/Entity/SystemSecurity/FilterIPEntity.cs index add4ffa..f501047 100644 --- a/HT.Cloud.Domain/Entity/SystemSecurity/FilterIPEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemSecurity/FilterIPEntity.cs @@ -15,6 +15,7 @@ namespace HT.Cloud.Domain.SystemSecurity /// IP过滤实体 /// [SugarTable("sys_filterip")] + [TenantAttribute("0")] public class FilterIPEntity : IEntity, ICreationAudited, IDeleteAudited, IModificationAudited { /// diff --git a/HT.Cloud.Domain/Entity/SystemSecurity/LogEntity.cs b/HT.Cloud.Domain/Entity/SystemSecurity/LogEntity.cs index e3af2da..82f7714 100644 --- a/HT.Cloud.Domain/Entity/SystemSecurity/LogEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemSecurity/LogEntity.cs @@ -14,6 +14,7 @@ namespace HT.Cloud.Domain.SystemSecurity /// 日志实体 /// [SugarTable("sys_log")] + [TenantAttribute("0")] public class LogEntity : IEntity, ICreationAudited { /// diff --git a/HT.Cloud.Domain/Entity/SystemSecurity/OpenJobEntity.cs b/HT.Cloud.Domain/Entity/SystemSecurity/OpenJobEntity.cs index 294dbc0..0ad6706 100644 --- a/HT.Cloud.Domain/Entity/SystemSecurity/OpenJobEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemSecurity/OpenJobEntity.cs @@ -19,6 +19,7 @@ namespace HT.Cloud.Domain.SystemSecurity /// [SugarTable("sys_openjob")] [Tenant("0")] + //[TenantAttribute("0")] public partial class OpenJobEntity : IEntity, ICreationAudited, IDeleteAudited, IModificationAudited { [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true, ColumnDescription = "主键Id")] diff --git a/HT.Cloud.Domain/Entity/SystemSecurity/OpenJobLogEntity.cs b/HT.Cloud.Domain/Entity/SystemSecurity/OpenJobLogEntity.cs index e5f66be..1f1213a 100644 --- a/HT.Cloud.Domain/Entity/SystemSecurity/OpenJobLogEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemSecurity/OpenJobLogEntity.cs @@ -17,6 +17,7 @@ namespace HT.Cloud.Domain.SystemSecurity /// [SugarTable("sys_openjoblog")] [Tenant("0")] + //[TenantAttribute("0")] public partial class OpenJobLogEntity : IEntity { [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true, ColumnDescription = "主键Id")] diff --git a/HT.Cloud.Domain/Entity/SystemSecurity/ServerStateEntity.cs b/HT.Cloud.Domain/Entity/SystemSecurity/ServerStateEntity.cs index b2d7714..c6435fb 100644 --- a/HT.Cloud.Domain/Entity/SystemSecurity/ServerStateEntity.cs +++ b/HT.Cloud.Domain/Entity/SystemSecurity/ServerStateEntity.cs @@ -16,6 +16,7 @@ namespace HT.Cloud.Domain.SystemSecurity /// ServerState Entity Model /// [SugarTable("sys_serverstate")] + [TenantAttribute("0")] public class ServerStateEntity : IEntity { /// diff --git a/HT.Cloud.Service/ChartsManage/HistoryChartsService.cs b/HT.Cloud.Service/ChartsManage/HistoryChartsService.cs index 5a163ef..d9df8df 100644 --- a/HT.Cloud.Service/ChartsManage/HistoryChartsService.cs +++ b/HT.Cloud.Service/ChartsManage/HistoryChartsService.cs @@ -20,14 +20,19 @@ namespace HT.Cloud.Service.ChartsManage /// public class HistoryChartsService : BaseService, IDenpendency { - public HistoryChartsService(ISqlSugarClient context) : base(context) + /// + /// 绑定数据仓库的数据库ID + /// + private string dataDBNumber = GlobalContext.SystemConfig.DataDBNumber; + + public HistoryChartsService(ISqlSugarClient context) : base(context) { } public async Task GetDriverGroupList() { List subsystems = new List(); - var list_group = _context.Queryable().ToList(); + var list_group = _context.AsTenant().QueryableWithAttr().ToList(); int i = 0; foreach (var group in list_group) { @@ -40,8 +45,8 @@ namespace HT.Cloud.Service.ChartsManage public async Task GetGroupSubsystemTag(string groupDescription) { List subsystems = new List(); - var groupId = _context.Queryable().Where(x => x.GroupDescription == groupDescription).First().GroupID; - var grouped = _context.Queryable().ToList().Where(x=>x.GroupID==groupId); + var groupId = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == groupDescription).First().GroupID; + var grouped = _context.AsTenant().QueryableWithAttr().ToList().Where(x=>x.GroupID==groupId); List list_name_two = grouped.Select(t => t.Subsystem).GroupBy(c => c).Select(c => c.First()).ToList(); int i = 0; foreach (var Meta_Tag in list_name_two) @@ -55,8 +60,8 @@ namespace HT.Cloud.Service.ChartsManage public async Task GetAllSubsystemTag(string groupDescription) { List subsystems = new List(); - var groupId = _context.Queryable().Where(x => x.GroupDescription == groupDescription).First().GroupID; - var grouped = _context.Queryable().ToList().Where(x => x.GroupID == groupId); + var groupId = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == groupDescription).First().GroupID; + var grouped = _context.AsTenant().QueryableWithAttr().ToList().Where(x => x.GroupID == groupId); List list_name_two = grouped.Select(t => t.Subsystem).GroupBy(c => c).Select(c => c.First()).ToList(); int i = 0; foreach (var Meta_Tag in list_name_two) @@ -71,8 +76,8 @@ namespace HT.Cloud.Service.ChartsManage { var subsysname = subsysytemName; - var groupId = _context.Queryable().Where(x => x.GroupDescription == groupDescription).First().GroupID; - var response = _context.Queryable().Where(x => x.Subsystem == subsysname&&x.GroupID == groupId).Select(x => new { x.TagID, x.Description, x.Units }).ToList(); + var groupId = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == groupDescription).First().GroupID; + var response = _context.AsTenant().QueryableWithAttr().Where(x => x.Subsystem == subsysname&&x.GroupID == groupId).Select(x => new { x.TagID, x.Description, x.Units }).ToList(); var reList = new List(); foreach (var subsystem in response) { @@ -97,7 +102,7 @@ namespace HT.Cloud.Service.ChartsManage new SugarParameter("@startdt",startdt), new SugarParameter("@timeinterval",timeinterval) }; - var dt = _context.Ado.UseStoredProcedure().GetDataTable("Query_Group_Tag", sqlParameters); + var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Group_Tag", sqlParameters); //* //var ds = db.SqlQuery("Query_Report_Period", sqlParameters);/// diff --git a/HT.Cloud.Service/ChartsManage/HistoryTechChartsService.cs b/HT.Cloud.Service/ChartsManage/HistoryTechChartsService.cs index 13f7e58..ac54a7d 100644 --- a/HT.Cloud.Service/ChartsManage/HistoryTechChartsService.cs +++ b/HT.Cloud.Service/ChartsManage/HistoryTechChartsService.cs @@ -12,6 +12,7 @@ using HT.Cloud.Domain.DevicesManage; using Microsoft.AspNetCore.Mvc; using HT.Cloud.Domain.ReportManage; using Quartz; +using Serenity.Data; namespace HT.Cloud.Service.ChartsManage { @@ -22,25 +23,29 @@ namespace HT.Cloud.Service.ChartsManage /// public class HistoryTechChartsService : BaseService, IDenpendency { - public HistoryTechChartsService(ISqlSugarClient context) : base(context) + /// + /// 绑定数据仓库的数据库ID + /// + private string dataDBNumber = GlobalContext.SystemConfig.DataDBNumber; + + public HistoryTechChartsService(ISqlSugarClient context) : base(context) { } public async Task GetAllTagList(string systemName, string chartTagType) { - - - var groupName = _context.Queryable().Where(x => x.GroupDescription == systemName).First().GroupName; - var driverId = _context.Queryable().Where(x => x.GroupDescription == systemName).First().DriverID; - var driverName = _context.Queryable().Where(x => x.DriverID == driverId).First().DriverName; - var list = _context.Ado.SqlQuery($"SELECT * FROM HT_{driverName}_{groupName}_CHART WHERE ChartTagType = '{chartTagType}'"); + + var groupName = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().GroupName; + var driverId = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().DriverID; + var driverName = _context.AsTenant().QueryableWithAttr().Where(x => x.DriverID == driverId).First().DriverName; + var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery($"SELECT * FROM HT_{driverName}_{groupName}_CHART WHERE ChartTagType = '{chartTagType}'"); return list.ToJson(); } public async Task GetDriverGroupList() { List subsystems = new List(); - var list_group = _context.Queryable().ToList(); + var list_group = _context.AsTenant().QueryableWithAttr().ToList(); int i = 0; foreach (var group in list_group) { @@ -53,8 +58,8 @@ namespace HT.Cloud.Service.ChartsManage public async Task GetGroupSubsystemTag(string groupDescription) { List subsystems = new List(); - var groupId = _context.Queryable().Where(x => x.GroupDescription == groupDescription).First().GroupID; - var grouped = _context.Queryable().ToList().Where(x=>x.GroupID==groupId); + var groupId = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == groupDescription).First().GroupID; + var grouped = _context.AsTenant().QueryableWithAttr().ToList().Where(x=>x.GroupID==groupId); List list_name_two = grouped.Select(t => t.Subsystem).GroupBy(c => c).Select(c => c.First()).ToList(); int i = 0; foreach (var Meta_Tag in list_name_two) @@ -68,7 +73,7 @@ namespace HT.Cloud.Service.ChartsManage public async Task GetAllSubsystemTag() { List subsystems = new List(); - var grouped = _context.Queryable().ToList(); + var grouped = _context.AsTenant().QueryableWithAttr().ToList(); List list_name_two = grouped.Select(t => t.Subsystem).GroupBy(c => c).Select(c => c.First()).ToList(); int i = 0; foreach (var Meta_Tag in list_name_two) @@ -83,8 +88,8 @@ namespace HT.Cloud.Service.ChartsManage { var subsysname = subsysytemName; - var groupId = _context.Queryable().Where(x => x.GroupDescription == groupDescription).First().GroupID; - var response = _context.Queryable().Where(x => x.Subsystem == subsysname&&x.GroupID == groupId).Select(x => new { x.TagID, x.Description, x.Units }).ToList(); + var groupId = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == groupDescription).First().GroupID; + var response = _context.AsTenant().QueryableWithAttr().Where(x => x.Subsystem == subsysname&&x.GroupID == groupId).Select(x => new { x.TagID, x.Description, x.Units }).ToList(); var reList = new List(); foreach (var subsystem in response) { @@ -110,7 +115,7 @@ namespace HT.Cloud.Service.ChartsManage new SugarParameter("@enddt",enddt), new SugarParameter("@timeinterval",timeinterval) }; - var dt = _context.Ado.UseStoredProcedure().GetDataTable("Query_Chart_Tag", sqlParameters); + var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Chart_Tag", sqlParameters); //* //var ds = db.SqlQuery("Query_Report_Period", sqlParameters);/// diff --git a/HT.Cloud.Service/ChartsManage/RtTechChartsService.cs b/HT.Cloud.Service/ChartsManage/RtTechChartsService.cs index 64ff19b..aacd768 100644 --- a/HT.Cloud.Service/ChartsManage/RtTechChartsService.cs +++ b/HT.Cloud.Service/ChartsManage/RtTechChartsService.cs @@ -24,7 +24,12 @@ namespace HT.Cloud.Service.ChartsManage /// public class RtTechChartsService : BaseService, IDenpendency { - public RtTechChartsService(ISqlSugarClient context) : base(context) + /// + /// 绑定数据仓库的数据库ID + /// + private string dataDBNumber = GlobalContext.SystemConfig.DataDBNumber; + + public RtTechChartsService(ISqlSugarClient context) : base(context) { } @@ -32,17 +37,17 @@ namespace HT.Cloud.Service.ChartsManage { - var groupName = _context.Queryable().Where(x => x.GroupDescription == systemName).First().GroupName; - var driverId = _context.Queryable().Where(x => x.GroupDescription == systemName).First().DriverID; - var driverName = _context.Queryable().Where(x => x.DriverID == driverId).First().DriverName; - var list = _context.Ado.SqlQuery($"SELECT * FROM HT_{driverName}_{groupName}_CHART WHERE ChartTagType = '{chartTagType}'"); + var groupName = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().GroupName; + var driverId = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().DriverID; + var driverName = _context.AsTenant().QueryableWithAttr().Where(x => x.DriverID == driverId).First().DriverName; + var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery($"SELECT * FROM HT_{driverName}_{groupName}_CHART WHERE ChartTagType = '{chartTagType}'"); return list.ToJson(); } public async Task GetDriverGroupList() { List subsystems = new List(); - var list_group = _context.Queryable().ToList(); + var list_group = _context.AsTenant().QueryableWithAttr().ToList(); int i = 0; foreach (var group in list_group) { @@ -55,8 +60,8 @@ namespace HT.Cloud.Service.ChartsManage public async Task GetGroupSubsystemTag(string groupDescription) { List subsystems = new List(); - var groupId = _context.Queryable().Where(x => x.GroupDescription == groupDescription).First().GroupID; - var grouped = _context.Queryable().ToList().Where(x=>x.GroupID==groupId); + var groupId = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == groupDescription).First().GroupID; + var grouped = _context.AsTenant().QueryableWithAttr().ToList().Where(x=>x.GroupID==groupId); List list_name_two = grouped.Select(t => t.Subsystem).GroupBy(c => c).Select(c => c.First()).ToList(); int i = 0; foreach (var Meta_Tag in list_name_two) @@ -70,7 +75,7 @@ namespace HT.Cloud.Service.ChartsManage public async Task GetAllSubsystemTag() { List subsystems = new List(); - var grouped = _context.Queryable().ToList(); + var grouped = _context.AsTenant().QueryableWithAttr().ToList(); List list_name_two = grouped.Select(t => t.Subsystem).GroupBy(c => c).Select(c => c.First()).ToList(); int i = 0; foreach (var Meta_Tag in list_name_two) @@ -85,8 +90,8 @@ namespace HT.Cloud.Service.ChartsManage { var subsysname = subsysytemName; - var groupId = _context.Queryable().Where(x => x.GroupDescription == groupDescription).First().GroupID; - var response = _context.Queryable().Where(x => x.Subsystem == subsysname&&x.GroupID == groupId).Select(x => new { x.TagID, x.Description, x.Units }).ToList(); + var groupId = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == groupDescription).First().GroupID; + var response = _context.AsTenant().QueryableWithAttr().Where(x => x.Subsystem == subsysname&&x.GroupID == groupId).Select(x => new { x.TagID, x.Description, x.Units }).ToList(); var reList = new List(); foreach (var subsystem in response) { @@ -108,14 +113,14 @@ namespace HT.Cloud.Service.ChartsManage var result_list = new List>(); - var groupName = _context.Queryable().Where(x => x.GroupDescription == systemName).First().GroupName; + var groupName = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().GroupName; foreach (string tagNameTxt in charts_TagNames) { tagName_list.Add(tagNameTxt); result_list.Add(new List()); } - var remoteRtDataServer = repository.IQueryable().First().remotertdataserver + $"?groupName={groupName}"; + var remoteRtDataServer = _context.AsTenant().QueryableWithAttr().First().remotertdataserver + $"?groupName={groupName}"; for (int i = 0; i < 3; i++) { var responseStr = RemoteHttpRequest.HttpGet(remoteRtDataServer); @@ -154,7 +159,7 @@ namespace HT.Cloud.Service.ChartsManage var result_list = new List>(); - var groupName = _context.Queryable().Where(x => x.GroupDescription == systemName).First().GroupName; + var groupName = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().GroupName; foreach (string tagNameTxt in charts_TagNames) @@ -163,7 +168,7 @@ namespace HT.Cloud.Service.ChartsManage result_list.Add(new List()); } - var remoteRtDataServer = repository.IQueryable().First().remotertdataserver + $"?groupName={groupName}"; ; + var remoteRtDataServer = _context.AsTenant().QueryableWithAttr().First().remotertdataserver + $"?groupName={groupName}"; ; var responseStr = RemoteHttpRequest.HttpGet(remoteRtDataServer); JObject valueJson = JObject.Parse(responseStr); diff --git a/HT.Cloud.Service/ChartsManage/RtchartsService.cs b/HT.Cloud.Service/ChartsManage/RtchartsService.cs index 5991373..26cba3f 100644 --- a/HT.Cloud.Service/ChartsManage/RtchartsService.cs +++ b/HT.Cloud.Service/ChartsManage/RtchartsService.cs @@ -19,18 +19,23 @@ namespace HT.Cloud.Service.ChartsManage /// public class RtchartsService : BaseService, IDenpendency { - public RtchartsService(ISqlSugarClient context) : base(context) + /// + /// 绑定数据仓库的数据库ID + /// + private string dataDBNumber = GlobalContext.SystemConfig.DataDBNumber; + + public RtchartsService(ISqlSugarClient context) : base(context) { } public async Task GetDriverGroupList() { - var list_group = _context.Queryable().ToList(); + var list_group = _context.AsTenant().QueryableWithAttr().ToList(); return list_group.ToJson(); } public async Task GetAllSubsystemTag() { List subsystems = new List(); - var grouped = _context.Queryable().ToList(); + var grouped = _context.AsTenant().QueryableWithAttr().ToList(); List list_name_two = grouped.Select(t => t.Subsystem).GroupBy(c => c).Select(c => c.First()).ToList(); int i = 0; foreach (var Meta_Tag in list_name_two) @@ -45,7 +50,7 @@ namespace HT.Cloud.Service.ChartsManage { var subsysname = subsysytemName; - var response = _context.Queryable().Where(x => x.Subsystem == subsysname).Select(x => new { x.TagID, x.Description, x.Units }).ToList(); + var response = _context.AsTenant().QueryableWithAttr().Where(x => x.Subsystem == subsysname).Select(x => new { x.TagID, x.Description, x.Units }).ToList(); var reList = new List(); foreach (var subsystem in response) { @@ -71,11 +76,11 @@ namespace HT.Cloud.Service.ChartsManage foreach (string tagIDTxt in charts_TagIDs) { var tagID = ushort.Parse(tagIDTxt); - var TagName = _context.Queryable().Where(x => x.TagID == tagID).First().TagName; + var TagName = _context.AsTenant().QueryableWithAttr().Where(x => x.TagID == tagID).First().TagName; tagName_list.Add(TagName); result_list.Add(new List()); } - var remoteRtDataServer = repository.IQueryable().First().remotertdataserver; + var remoteRtDataServer = _context.AsTenant().QueryableWithAttr().First().remotertdataserver; for (int i = 0; i < 3; i++) { var responseStr = RemoteHttpRequest.HttpGet(remoteRtDataServer); @@ -118,12 +123,12 @@ namespace HT.Cloud.Service.ChartsManage foreach (string tagIDTxt in charts_TagIDs) { var tagID = ushort.Parse(tagIDTxt); - var TagName = _context.Queryable().Where(x => x.TagID == tagID).First().TagName; + var TagName = _context.AsTenant().QueryableWithAttr().Where(x => x.TagID == tagID).First().TagName; tagName_list.Add(TagName); result_list.Add(new List()); } - var remoteRtDataServer = repository.IQueryable().First().remotertdataserver; + var remoteRtDataServer = _context.AsTenant().QueryableWithAttr().First().remotertdataserver; var responseStr = RemoteHttpRequest.HttpGet(remoteRtDataServer); JObject valueJson = JObject.Parse(responseStr); diff --git a/HT.Cloud.Service/DevicesManage/MetaTagScopeService.cs b/HT.Cloud.Service/DevicesManage/MetaTagScopeService.cs index b1f29e6..2218c72 100644 --- a/HT.Cloud.Service/DevicesManage/MetaTagScopeService.cs +++ b/HT.Cloud.Service/DevicesManage/MetaTagScopeService.cs @@ -16,7 +16,12 @@ namespace HT.Cloud.Service.DevicesManage /// public class MetaTagScopeService : BaseService, IDenpendency { - public MetaTagScopeService(ISqlSugarClient context) : base(context) + /// + /// 绑定数据仓库的数据库ID + /// + private string dataDBNumber = GlobalContext.SystemConfig.DataDBNumber; + + public MetaTagScopeService(ISqlSugarClient context) : base(context) { } #region 获取数据 diff --git a/HT.Cloud.Service/DevicesManage/MetaTagService.cs b/HT.Cloud.Service/DevicesManage/MetaTagService.cs index 6e59419..a7854ca 100644 --- a/HT.Cloud.Service/DevicesManage/MetaTagService.cs +++ b/HT.Cloud.Service/DevicesManage/MetaTagService.cs @@ -19,6 +19,11 @@ namespace HT.Cloud.Service.DevicesManage /// public class MetaTagService : BaseService, IDenpendency { + /// + /// 绑定数据仓库的数据库ID + /// + private string dataDBNumber = GlobalContext.SystemConfig.DataDBNumber; + public MetaTagService(ISqlSugarClient context) : base(context) { } diff --git a/HT.Cloud.Service/ReportManage/HistoryAlarmService.cs b/HT.Cloud.Service/ReportManage/HistoryAlarmService.cs index 60350fb..53ff0a5 100644 --- a/HT.Cloud.Service/ReportManage/HistoryAlarmService.cs +++ b/HT.Cloud.Service/ReportManage/HistoryAlarmService.cs @@ -15,19 +15,24 @@ namespace HT.Cloud.Service.ReportManage { public class HistoryAlarmService : BaseService, IDenpendency { - public HistoryAlarmService(ISqlSugarClient context) : base(context) + /// + /// 绑定数据仓库的数据库ID + /// + private string dataDBNumber = GlobalContext.SystemConfig.DataDBNumber; + + public HistoryAlarmService(ISqlSugarClient context) : base(context) { } public async Task GetDriverGroupList() { - //var groupName = _context.Queryable().Where(x => x.GroupDescription == systemName).First().GroupName; - //var driverId = _context.Queryable().Where(x => x.GroupDescription == systemName).First().DriverID; - //var driverName = _context.Queryable().Where(x => x.DriverID == driverId).First().DriverName; - //var list = _context.Ado.SqlQuery($"SELECT * FROM HT_{driverName}_{groupName}_ALARM"); + //var groupName = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().GroupName; + //var driverId = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().DriverID; + //var driverName = _context.AsTenant().QueryableWithAttr().Where(x => x.DriverID == driverId).First().DriverName; + //var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery($"SELECT * FROM HT_{driverName}_{groupName}_ALARM"); List subsystems = new List(); - var list_group = _context.Queryable().ToList(); + var list_group = _context.AsTenant().QueryableWithAttr().ToList(); int i = 0; foreach (var group in list_group) { @@ -38,13 +43,13 @@ namespace HT.Cloud.Service.ReportManage } public async Task GetAllSubsystemTag(string systemName) { - var groupName = _context.Queryable().Where(x => x.GroupDescription == systemName).First().GroupName; - var driverId = _context.Queryable().Where(x => x.GroupDescription == systemName).First().DriverID; - var driverName = _context.Queryable().Where(x => x.DriverID == driverId).First().DriverName; - var list = _context.Ado.SqlQuery($"SELECT * FROM HT_{driverName}_{groupName}_ALARM"); + var groupName = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().GroupName; + var driverId = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().DriverID; + var driverName = _context.AsTenant().QueryableWithAttr().Where(x => x.DriverID == driverId).First().DriverName; + var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery($"SELECT * FROM HT_{driverName}_{groupName}_ALARM"); List subsystems = new List(); - //var grouped = repository.IQueryable().ToList(); - List list_name_two = list.Select(t => t.Subsystem).GroupBy(c => c).Select(c => c.First()).ToList(); + //var grouped = _context.AsTenant().QueryableWithAttr().ToList(); + List list_name_two = list.Select(t => t.Subsystem).GroupBy(c => c).Select(c => c.First()).ToList(); int i = 0; foreach (var Meta_Tag in list_name_two) { @@ -55,10 +60,10 @@ namespace HT.Cloud.Service.ReportManage } public async Task GetSubsystemAllTag(string subsysytemName, string systemName) { - var groupName = _context.Queryable().Where(x => x.GroupDescription == systemName).First().GroupName; - var driverId = _context.Queryable().Where(x => x.GroupDescription == systemName).First().DriverID; - var driverName = _context.Queryable().Where(x => x.DriverID == driverId).First().DriverName; - var list = _context.Ado.SqlQuery($"SELECT * FROM HT_{driverName}_{groupName}_ALARM"); + var groupName = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().GroupName; + var driverId = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().DriverID; + var driverName = _context.AsTenant().QueryableWithAttr().Where(x => x.DriverID == driverId).First().DriverName; + var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery($"SELECT * FROM HT_{driverName}_{groupName}_ALARM"); var subsysname = subsysytemName; var response = list.Where(x => x.Subsystem == subsysname).Select(x => new { x.TagID, x.Description, x.Units }).ToList(); @@ -87,7 +92,7 @@ namespace HT.Cloud.Service.ReportManage new SugarParameter("@Htagid",tagid) }; - var dt = _context.Ado.UseStoredProcedure().GetDataTable("Query_Tag_Alarm", sqlParameters); + var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Tag_Alarm", sqlParameters); var valuelist = DataTableConvertModel.ConvertDataTableToList(dt); return valuelist.ToJson(); @@ -142,7 +147,7 @@ namespace HT.Cloud.Service.ReportManage }; - var dt = _context.Ado.UseStoredProcedure().GetDataTable("Query_Tag_Alarm_Count", sqlParameters); + var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Tag_Alarm_Count", sqlParameters); var valuelist = DataTableConvertModel.ConvertDataTableToList(dt); return valuelist.ToJson(); @@ -155,17 +160,17 @@ namespace HT.Cloud.Service.ReportManage { new SugarParameter("@Hhour",Hhour) }; - var dt = _context.Ado.UseStoredProcedure().GetDataTable("Query_Tag_Alarm_History", sqlParameters); + var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Tag_Alarm_History", sqlParameters); var valuelist = DataTableConvertModel.ConvertDataTableToList(dt); return valuelist.ToJson(); } public async Task GetAlarmSubSystem(string alarmName, string systemName) { - var groupName = _context.Queryable().Where(x => x.GroupDescription == systemName).First().GroupName; - var driverId = _context.Queryable().Where(x => x.GroupDescription == systemName).First().DriverID; - var driverName = _context.Queryable().Where(x => x.DriverID == driverId).First().DriverName; - var list = _context.Ado.SqlQuery($"SELECT * FROM HT_{driverName}_{groupName}_ALARM"); + var groupName = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().GroupName; + var driverId = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().DriverID; + var driverName = _context.AsTenant().QueryableWithAttr().Where(x => x.DriverID == driverId).First().DriverName; + var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery($"SELECT * FROM HT_{driverName}_{groupName}_ALARM"); var subSystem = list.Where(x => x.Description == alarmName).First().Subsystem; return subSystem.ToJson(); diff --git a/HT.Cloud.Service/ReportManage/HistoryReportService.cs b/HT.Cloud.Service/ReportManage/HistoryReportService.cs index 92a3ef4..2d88b24 100644 --- a/HT.Cloud.Service/ReportManage/HistoryReportService.cs +++ b/HT.Cloud.Service/ReportManage/HistoryReportService.cs @@ -26,16 +26,18 @@ namespace HT.Cloud.Service.ReportManage { public class HistoryReportService : BaseService, IDenpendency { - //private string Startdt = ""; - //private string Enddt = ""; - //private int Timeinterval = 0; - public HistoryReportService(ISqlSugarClient context) : base(context) + /// + /// 绑定数据仓库的数据库ID + /// + private string dataDBNumber = GlobalContext.SystemConfig.DataDBNumber; + + public HistoryReportService(ISqlSugarClient context) : base(context) { } public async Task GetDriverGroupList() { - var list_group = _context.Queryable().ToList(); + var list_group = _context.AsTenant().QueryableWithAttr().ToList(); return list_group.ToJson(); } @@ -66,7 +68,7 @@ namespace HT.Cloud.Service.ReportManage - var Report = _context.Ado.UseStoredProcedure().GetDataTable("Query_Report_YL", sqlParameters); + var Report = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Report_YL", sqlParameters); Report.TableName = "Report"; @@ -112,7 +114,7 @@ namespace HT.Cloud.Service.ReportManage new SugarParameter("@enddt",enddt), new SugarParameter("@timeinterval",timeinterval) }; - var dt_Counts = _context.Ado.UseStoredProcedure().GetDataTable("Query_Report_YL_COUNT", sqlParameters); + var dt_Counts = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Report_YL_COUNT", sqlParameters); int counts = dt_Counts.Rows[0][0].ToInt(); return counts; } @@ -133,13 +135,13 @@ namespace HT.Cloud.Service.ReportManage } public async Task GetReportNewAsync(string page, string limit, string Startdt, string Enddt, string Timeinterval, string systemName) { - var groupName = _context.Queryable().Where(x => x.GroupDescription == systemName).First().GroupName; + var groupName = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().GroupName; //SugarParameter[] sqlParameters ={ // new SugarParameter("@startdt",Startdt), // new SugarParameter("@enddt",Enddt), // new SugarParameter("@timeinterval",Timeinterval) //}; - //var dt_Counts = _context.Ado.UseStoredProcedure().GetDataTable("Query_Report_YL_COUNT", sqlParameters); + //var dt_Counts = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Report_YL_COUNT", sqlParameters); //int counts = dt_Counts.Rows[0][0].ToInt(); string msg = ""; int code = 0; @@ -151,7 +153,7 @@ namespace HT.Cloud.Service.ReportManage new SugarParameter("@hpage",page.ToInt()), new SugarParameter("@hlimit",limit.ToInt()) }; - var Report = _context.Ado.UseStoredProcedure().GetDataTable("Query_Report_PAGE", sqlReportParameters); + var Report = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Report_PAGE", sqlReportParameters); var jsonResult = JsonConvert.SerializeObject(Report); @@ -176,7 +178,7 @@ namespace HT.Cloud.Service.ReportManage new SugarParameter("@enddt",enddt), new SugarParameter("@timeinterval",timeinterval) }; - var Report = _context.Ado.UseStoredProcedure().GetDataTable("Query_Report_YL", sqlParameters); + var Report = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Report_YL", sqlParameters); Report.TableName = "Report"; //return JsonConvert.SerializeObject(Report); @@ -185,21 +187,21 @@ namespace HT.Cloud.Service.ReportManage } public async Task GetReportFirstHead(string systemName) { - var groupName = _context.Queryable().Where(x=>x.GroupDescription == systemName).First().GroupName; - var driverId = _context.Queryable().Where(x => x.GroupDescription == systemName).First().DriverID; - var driverName = _context.Queryable().Where(x => x.DriverID == driverId).First().DriverName; - var list = _context.Ado.SqlQuery($"SELECT * FROM HT_{driverName}_{groupName}_REPORT"); - //var list = _context.Queryable().ToList(); + var groupName = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().GroupName; + var driverId = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().DriverID; + var driverName = _context.AsTenant().QueryableWithAttr().Where(x => x.DriverID == driverId).First().DriverName; + var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery($"SELECT * FROM HT_{driverName}_{groupName}_REPORT"); + //var list = _context.AsTenant().QueryableWithAttr().ToList(); List list_name_two = list.Select(t => t.HSYS).GroupBy(c => c).Select(c => c.First()).ToList(); return list_name_two.ToJson(); } public async Task GetReportSecondHead(string systemName) { - var groupName = _context.Queryable().Where(x => x.GroupDescription == systemName).First().GroupName; - var driverId = _context.Queryable().Where(x => x.GroupDescription == systemName).First().DriverID; - var driverName = _context.Queryable().Where(x => x.DriverID == driverId).First().DriverName; - var list = _context.Ado.SqlQuery($"SELECT * FROM HT_{driverName}_{groupName}_REPORT"); + var groupName = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().GroupName; + var driverId = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().DriverID; + var driverName = _context.AsTenant().QueryableWithAttr().Where(x => x.DriverID == driverId).First().DriverName; + var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery($"SELECT * FROM HT_{driverName}_{groupName}_REPORT"); List list_name_two = list.Select(t => t.HSYS).GroupBy(c => c).Select(c => c.First()).ToList(); var relist = new List(); foreach(var t in list_name_two) diff --git a/HT.Cloud.Service/ReportManage/MetaTagAlarmService.cs b/HT.Cloud.Service/ReportManage/MetaTagAlarmService.cs index d10aaeb..4f66bef 100644 --- a/HT.Cloud.Service/ReportManage/MetaTagAlarmService.cs +++ b/HT.Cloud.Service/ReportManage/MetaTagAlarmService.cs @@ -14,13 +14,18 @@ namespace HT.Cloud.Service.ReportManage { public class MetaTagAlarmService : BaseService, IDenpendency { - public MetaTagAlarmService(ISqlSugarClient context) : base(context) + /// + /// 绑定数据仓库的数据库ID + /// + private string dataDBNumber = GlobalContext.SystemConfig.DataDBNumber; + + public MetaTagAlarmService(ISqlSugarClient context) : base(context) { } public async Task GetDriverGroupList() { List subsystems = new List(); - var list_group = _context.Queryable().ToList(); + var list_group = _context.AsTenant().QueryableWithAttr().ToList(); int i = 0; foreach (var group in list_group) { @@ -32,7 +37,7 @@ namespace HT.Cloud.Service.ReportManage public async Task GetAllSubsystemTag() { List subsystems = new List(); - var grouped = repository.IQueryable().ToList(); + var grouped = _context.AsTenant().QueryableWithAttr().ToList(); List list_name_two = grouped.Select(t => t.Subsystem).GroupBy(c => c).Select(c => c.First()).ToList(); int i = 0; foreach (var Meta_Tag in list_name_two) @@ -46,7 +51,7 @@ namespace HT.Cloud.Service.ReportManage { var subsysname = subsysytemName; - var response = repository.IQueryable().Where(x => x.Subsystem == subsysname).Select(x => new { x.TagID, x.Description, x.Units }).ToList(); + var response = _context.AsTenant().QueryableWithAttr().Where(x => x.Subsystem == subsysname).Select(x => new { x.TagID, x.Description, x.Units }).ToList(); var reList = new List(); foreach (var subsystem in response) { @@ -72,7 +77,7 @@ namespace HT.Cloud.Service.ReportManage new SugarParameter("@Htagid",tagid) }; - var dt = _context.Ado.UseStoredProcedure().GetDataTable("Query_Tag_Alarm", sqlParameters); + var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Tag_Alarm", sqlParameters); var valuelist = DataTableConvertModel.ConvertDataTableToList(dt); return valuelist.ToJson(); @@ -127,7 +132,7 @@ namespace HT.Cloud.Service.ReportManage }; - var dt = _context.Ado.UseStoredProcedure().GetDataTable("Query_Tag_Alarm_Count", sqlParameters); + var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Tag_Alarm_Count", sqlParameters); var valuelist = DataTableConvertModel.ConvertDataTableToList(dt); return valuelist.ToJson(); @@ -140,14 +145,14 @@ namespace HT.Cloud.Service.ReportManage { new SugarParameter("@Hhour",Hhour) }; - var dt = _context.Ado.UseStoredProcedure().GetDataTable("Query_Tag_Alarm_History", sqlParameters); + var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Tag_Alarm_History", sqlParameters); var valuelist = DataTableConvertModel.ConvertDataTableToList(dt); return valuelist.ToJson(); } public async Task GetAlarmSubSystem(string alarmName) { - var subSystem = repository.IQueryable().Where(x => x.Description == alarmName).First().Subsystem; + var subSystem = _context.AsTenant().QueryableWithAttr().Where(x => x.Description == alarmName).First().Subsystem; return subSystem.ToJson(); } private class AlarmValueCount diff --git a/HT.Cloud.Service/ReportManage/RtReportService.cs b/HT.Cloud.Service/ReportManage/RtReportService.cs index f05df79..d84be59 100644 --- a/HT.Cloud.Service/ReportManage/RtReportService.cs +++ b/HT.Cloud.Service/ReportManage/RtReportService.cs @@ -13,21 +13,27 @@ using Newtonsoft.Json.Linq; using System.Data; using HT.Cloud.Code; using HT.Cloud.Domain.ChartsManage; +using HT.Cloud.Domain.DevicesManage; namespace HT.Cloud.Service.ReportManage { public class RtReportService : BaseService, IDenpendency { - public RtReportService(ISqlSugarClient context) : base(context) + /// + /// 绑定数据仓库的数据库ID + /// + private string dataDBNumber = GlobalContext.SystemConfig.DataDBNumber; + + public RtReportService(ISqlSugarClient context) : base(context) { } public async Task GetRtSubsysTagValue() { - var srcList = repository.IQueryable().ToList(); + var srcList = _context.AsTenant().QueryableWithAttr().ToList(); - var remoteRtDataServer = _context.Queryable().First().remotertdataserver; + var remoteRtDataServer = _context.AsTenant().QueryableWithAttr().First().remotertdataserver; var responseStr = RemoteHttpRequest.HttpGet(remoteRtDataServer); diff --git a/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryCharts/Index.cshtml b/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryCharts/Index.cshtml index 866536e..9b974f4 100644 --- a/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryCharts/Index.cshtml +++ b/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryCharts/Index.cshtml @@ -312,9 +312,9 @@ } else { } }); - GetDriverGroupList(); + //GetDriverGroupList(); - //GetAllSubsystemTag(); + GetAllSubsystemTag(); var starttime = new Date(new Date().setHours(0, 0, 0, 0)); var starttimeString = starttime.getFullYear() + "-" + parseInt(starttime.getMonth() + 1) + "-" + starttime.getDate() + " " + (starttime.getHours()) + ":" + starttime.getMinutes() + ":" + starttime.getSeconds(); @@ -388,60 +388,60 @@ var StaticSelectTagList = new Array(); //获取所有变量组 - async function GetDriverGroupList() { - debugger; - $.ajax({ - url: "/ChartsManage/HistoryCharts/GetDriverGroupList", - type: "Get", - success: function (redata) { - debugger; - var listsubsysname = JSON.parse(redata); - $('#groupselect').combobox({ - data: listsubsysname, - valueField: 'Lable', - textField: 'Value', - value :'请选择系统', - checkOnSelect: true, - selectOnCheck: true - }); - $('#subsystemselect').combobox({ + //async function GetDriverGroupList() { + // debugger; + // $.ajax({ + // url: "/ChartsManage/HistoryCharts/GetDriverGroupList", + // type: "Get", + // success: function (redata) { + // debugger; + // var listsubsysname = JSON.parse(redata); + // $('#groupselect').combobox({ + // data: listsubsysname, + // valueField: 'Lable', + // textField: 'Value', + // value :'请选择系统', + // checkOnSelect: true, + // selectOnCheck: true + // }); + // $('#subsystemselect').combobox({ - value: '请先选择系统', - }); - } - }); - } - var StaticGroupDescription = ""; - updateGroupSelect = async function (data) { - StaticGroupDescription = data.Value; - var para = { "GroupDescription": data.Value } - //var subsystemAllTag = await Call(api.DataHistoryCharts.GetSubsystemAllTag, para); - debugger; - $.ajax({ - url: "/ChartsManage/HistoryCharts/GetGroupSubsystemTag", - type: "Post", - //dataType: "json", - data: para, - success: function (redata) { - var listsubsysname = JSON.parse(redata); - $('#subsystemselect').combobox({ - data: listsubsysname, - valueField: 'Lable', - textField: 'Value', - value: '请选择子系统', - checkOnSelect: true, - selectOnCheck: true - }); - } - }); + // value: '请先选择系统', + // }); + // } + // }); + //} + //var StaticGroupDescription = ""; + //updateGroupSelect = async function (data) { + // StaticGroupDescription = data.Value; + // var para = { "GroupDescription": data.Value } + // //var subsystemAllTag = await Call(api.DataHistoryCharts.GetSubsystemAllTag, para); + // debugger; + // $.ajax({ + // url: "/ChartsManage/HistoryCharts/GetGroupSubsystemTag", + // type: "Post", + // //dataType: "json", + // data: para, + // success: function (redata) { + // var listsubsysname = JSON.parse(redata); + // $('#subsystemselect').combobox({ + // data: listsubsysname, + // valueField: 'Lable', + // textField: 'Value', + // value: '请选择子系统', + // checkOnSelect: true, + // selectOnCheck: true + // }); + // } + // }); - } + //} //获取所有子系统列表ok 废弃 async function GetAllSubsystemTag() { debugger; $.ajax({ - url: "/ChartsManage/HistoryCharts/GetAllSubsystemTag", + url: "/PenMeiChartsManage/PenMeiHistoryCharts/GetAllSubsystemTag", type: "Get", //dataType: "json", //async: false, @@ -463,11 +463,11 @@ //获取选中子系统tag updateSelect = async function (data) { //var groupDescription = ('#groupselect').combobox().getValue(); - var para = { "GroupDescription": StaticGroupDescription, "SubsysytemName": data.Value } + var para = { /*"GroupDescription": StaticGroupDescription,*/ "SubsysytemName": data.Value } //var subsystemAllTag = await Call(api.DataHistoryCharts.GetSubsystemAllTag, para); debugger; myajax = $.ajax({ - url: "/ChartsManage/HistoryCharts/GetSubsystemAllTag", + url: "/PenMeiChartsManage/PenMeiHistoryCharts/GetSubsystemAllTag", type: "Post", //dataType: "json", data: para, @@ -559,7 +559,7 @@ let datapa = { "TagID": StaticSelectTagList[si].TagID, "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)), "Interval": timeInterval }; let result; myajax = await $.ajax({ - url: "/ChartsManage/HistoryCharts/GetChartsTagValue", + url: "/PenMeiChartsManage/PenMeiHistoryCharts/GetChartsTagValue", type: "Post", //dataType: "json", data: datapa, @@ -625,10 +625,10 @@ // min: 0, // 让表格的刻度向靠里侧显示 axisTick: { - inside: false + inside: true }, axisLabel: { - inside: false, + inside: true, align: 'left', verticalAlign: 'bottom', }, @@ -825,8 +825,8 @@ @*
    *@
    -
    -
    + @*
    +
    *@
    + + .layui-table-tool > .layui-table-tool-temp { + padding-right: 0px; + } + + + + + + +
    +
    +
    +
    + @*
      *@ +
      +
      +
      +
      +
      +
      +
      +
      + +
      + +
      +
      +
      +
      + @*
      +
      +
      +
      +
      *@ + +
      +
      +
      +
      + +
      + +
      +
      +
      +
      +
      + +
      + +
      +
      +
      +
      +
      + +
      + + + +
      +
      +
      +
      +
      + +
      + +
      +
      +
      +
      +
      +
      + +
      + +
      +
      + +
      + +
      +
      +
      +
      +
      +
      +
      +
      +
      + + diff --git a/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryTechCharts/Index.cshtml b/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryTechCharts/Index.cshtml index 1bfcbeb..19d8626 100644 --- a/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryTechCharts/Index.cshtml +++ b/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryTechCharts/Index.cshtml @@ -946,7 +946,14 @@ - +
        +
      • 重要数据趋势
        • +
      • 其他数据趋势
        • +
      +
      +
      +
      +
      diff --git a/HT.Cloud.Web/appsettings.json b/HT.Cloud.Web/appsettings.json index a464a9b..1b9ba17 100644 --- a/HT.Cloud.Web/appsettings.json +++ b/HT.Cloud.Web/appsettings.json @@ -12,7 +12,7 @@ "LoginMultiple": false, // 是否允许一个账户在多处登录 "AllowCorsSite": "http://localhost:8058", // 允许的其他站点访问Api "DBProvider": "SqlServer", //SqlServer //Oracle - "DBConnectionString": "Data Source=192.168.110.32;Initial Catalog=HTSCADA;User Id= sa;Password= Sa1qaz;Integrated Security=False;Encrypt=True;TrustServerCertificate=True;", + "DBConnectionString": "Data Source=192.168.110.32;Initial Catalog=HTCLOUD_PM01;User Id= sa;Password= Sa1qaz;Integrated Security=False;Encrypt=True;TrustServerCertificate=True;", "DBCommandTimeout": 180, // 数据库超时时间，单位秒 "CacheProvider": "Memory", // 缓存使用方式 Redis/Memory "RedisConnectionString": "127.0.0.1:6379", //docker部署 172.17.0.1 @@ -20,20 +20,21 @@ "LoginExpire": 12, //登录缓存过期时间(小时) "HomePage": "../Home/Default", //登录主页地址 "MainDbNumber": "0", //主程序数据库 + "DataDBNumber": "1", //数据仓库数据库 "LocalLAN": false, //是否局域网 "OpenQuartz": true, //定时任务开启 - "SqlMode": "TenantSql", //数据库模式多租户或者多库 "MoreSql" + "SqlMode": "MoreSql", //数据库模式多租户或者多库 "MoreSql" "ProjectPrefix": "watercloud", //项目中的前缀 "ReviseSystem": false, //是否重置密码 "LoginErrorCount": 18, //登录错误次数 "IsCluster": false, //集群参数 开启时需要去quartz下载响应数据库 "NeedClear": false, //是否删除定时调度任务 "SqlConfig": [ - //{ - // "DBNumber": "1", - // "DBProvider": "SqlServer", //MySql //Oracle - // "DBConnectionString": "Data Source = .;Initial Catalog = WaterCloudNetDb;User ID=sa;Password=12345678;MultipleActiveResultSets=true;" //Data Source = 192.168.1.252;Initial Catalog = WaterCloudNetDb;User ID=sa;Password=admin@12345;MultipleActiveResultSets=true; - //} + { + "DBNumber": "1", + "DBProvider": "SqlServer", //MySql //Oracle + "DBConnectionString": "Data Source=192.168.110.32;Initial Catalog=HTSCADA;User Id= sa;Password= Sa1qaz;Integrated Security=False;Encrypt=True;TrustServerCertificate=True;" + } ], "RabbitMq": { "Enabled": false,