From 8abfeb5923fba67ec77ce39abdeeb83c11d6b4c1 Mon Sep 17 00:00:00 2001 From: Kimdiego2098 <2248356998@qq.com> Date: Thu, 7 Mar 2024 12:11:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sqldb=20oracle11=20?= =?UTF-8?q?=E6=A0=87=E8=AF=86=E7=AC=A6=E8=BF=87=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ThingsGateway.Plugin.SqlDB/SqlDB/SQLRealValue.cs | 6 +++--- .../SqlDB/SqlDBBusinessDatabaseUtil.cs | 7 +++++++ .../ThingsGateway.Plugin.SqlDB/SqlDB/SqlDBProducer.cs | 6 ++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/plugin/ThingsGateway.Plugin.SqlDB/SqlDB/SQLRealValue.cs b/src/plugin/ThingsGateway.Plugin.SqlDB/SqlDB/SQLRealValue.cs index cd96f2bd8..29bd91d3d 100644 --- a/src/plugin/ThingsGateway.Plugin.SqlDB/SqlDB/SQLRealValue.cs +++ b/src/plugin/ThingsGateway.Plugin.SqlDB/SqlDB/SQLRealValue.cs @@ -15,9 +15,9 @@ using ThingsGateway.Core; namespace ThingsGateway.Plugin.SqlDB; [SugarTable(TableDescription = "设备采集实时表")] -[SugarIndex("index_Name", nameof(SQLHistoryValue.Name), OrderByType.Desc)] -[SugarIndex("index_DeviceName", nameof(SQLHistoryValue.DeviceName), OrderByType.Desc)] -[SugarIndex("index_CollectTime", nameof(SQLHistoryValue.CollectTime), OrderByType.Desc)] +[SugarIndex("{table}_index_Name", nameof(SQLRealValue.Name), OrderByType.Desc)] +[SugarIndex("{table}_index_DeviceName", nameof(SQLRealValue.DeviceName), OrderByType.Desc)] +[SugarIndex("{table}_index_CollectTime", nameof(SQLRealValue.CollectTime), OrderByType.Desc)] public class SQLRealValue : IPrimaryIdEntity { [SugarColumn(ColumnDescription = "Id", IsPrimaryKey = true)] diff --git a/src/plugin/ThingsGateway.Plugin.SqlDB/SqlDB/SqlDBBusinessDatabaseUtil.cs b/src/plugin/ThingsGateway.Plugin.SqlDB/SqlDB/SqlDBBusinessDatabaseUtil.cs index 680c7aa53..2e06ecb56 100644 --- a/src/plugin/ThingsGateway.Plugin.SqlDB/SqlDB/SqlDBBusinessDatabaseUtil.cs +++ b/src/plugin/ThingsGateway.Plugin.SqlDB/SqlDB/SqlDBBusinessDatabaseUtil.cs @@ -49,6 +49,13 @@ public static class SqlDBBusinessDatabaseUtil ConfigureExternalServices = configureExternalServices, } ); + if (sqlSugarClient.CurrentConnectionConfig.DbType == DbType.Oracle) + { + sqlSugarClient.CurrentConnectionConfig.MoreSettings = new() + { + MaxParameterNameLength = 30 + }; + } DbContext.AopSetting(sqlSugarClient);//aop配置 return sqlSugarClient; } diff --git a/src/plugin/ThingsGateway.Plugin.SqlDB/SqlDB/SqlDBProducer.cs b/src/plugin/ThingsGateway.Plugin.SqlDB/SqlDB/SqlDBProducer.cs index 924971007..be6946ad0 100644 --- a/src/plugin/ThingsGateway.Plugin.SqlDB/SqlDB/SqlDBProducer.cs +++ b/src/plugin/ThingsGateway.Plugin.SqlDB/SqlDB/SqlDBProducer.cs @@ -61,8 +61,10 @@ YitIdHelper.NextId()) { var db = SqlDBBusinessDatabaseUtil.GetDb(_driverPropertys); db.CodeFirst.InitTables(typeof(SQLHistoryValue)); - db.MappingTables.Add(nameof(SQLRealValue), _driverPropertys.ReadDBTableName); - db.CodeFirst.InitTables(typeof(SQLRealValue)); + //新功能 5.0.2.3 + db.CodeFirst.As(_driverPropertys.ReadDBTableName).InitTables(); + //该功能索引名要加占位符 + //[SugarIndex("{table}index_codetable1_name",nameof(CodeFirstTable1.Name),OrderByType.Asc)] await base.ProtectedBeforStartAsync(cancellationToken); }