diff --git a/Src/Asp.NetCore2/SqlSugar.TDengineCore/SqlSugar.TDengineCore.csproj b/Src/Asp.NetCore2/SqlSugar.TDengineCore/SqlSugar.TDengineCore.csproj index 9e5b2ddf2..271943fdc 100644 --- a/Src/Asp.NetCore2/SqlSugar.TDengineCore/SqlSugar.TDengineCore.csproj +++ b/Src/Asp.NetCore2/SqlSugar.TDengineCore/SqlSugar.TDengineCore.csproj @@ -6,7 +6,7 @@ - + diff --git a/Src/Asp.NetCore2/SqlSugar.TDengineCore/TDengine/SqlBuilder/TDengineExpressionContext.cs b/Src/Asp.NetCore2/SqlSugar.TDengineCore/TDengine/SqlBuilder/TDengineExpressionContext.cs index 860e5e481..6b466a7fd 100644 --- a/Src/Asp.NetCore2/SqlSugar.TDengineCore/TDengine/SqlBuilder/TDengineExpressionContext.cs +++ b/Src/Asp.NetCore2/SqlSugar.TDengineCore/TDengine/SqlBuilder/TDengineExpressionContext.cs @@ -229,21 +229,21 @@ namespace SqlSugar.TDengine { var parameter = model.Args[0]; var parameter2 = model.Args[1]; - return string.Format(" ({0} like concat('%',{1},'%')) ", parameter.MemberName, parameter2.MemberName ); + return string.Format(" ({0} like {1} ) ", parameter.MemberName, ("%"+parameter2.MemberValue+"%").ToSqlValue() ); } public override string StartsWith(MethodCallExpressionModel model) { var parameter = model.Args[0]; var parameter2 = model.Args[1]; - return string.Format(" ({0} like concat({1},'%')) ", parameter.MemberName, parameter2.MemberName); + return string.Format(" ({0} like {1} ) ", parameter.MemberName, ("%" + parameter2.MemberValue ).ToSqlValue()); } public override string EndsWith(MethodCallExpressionModel model) { var parameter = model.Args[0]; var parameter2 = model.Args[1]; - return string.Format(" ({0} like concat('%',{1}))", parameter.MemberName,parameter2.MemberName); + return string.Format("({0} like {1} ) ", parameter.MemberName, ( parameter2.MemberValue + "%").ToSqlValue()); } public override string DateIsSameDay(MethodCallExpressionModel model) diff --git a/Src/Asp.NetCore2/TDengineTest/Demo/ORMTest.cs b/Src/Asp.NetCore2/TDengineTest/Demo/ORMTest.cs index 709c6a85c..084298a0d 100644 --- a/Src/Asp.NetCore2/TDengineTest/Demo/ORMTest.cs +++ b/Src/Asp.NetCore2/TDengineTest/Demo/ORMTest.cs @@ -41,7 +41,7 @@ namespace OrmTest //查询子表 - var dt = db.Ado.GetDataTable("SHOW DATABASES"); + var dt = db.Ado.GetDataTable("select * from MyTable02 "); //插入子表 @@ -60,14 +60,25 @@ namespace OrmTest db.Insertable(new List() { new MyTable02() { - ts = DateTime.Now, + ts = DateTime.Now.AddDays(-1), current = Convert.ToSingle(1.1), groupId = 1, - isdelete = true, - name = "haha", - location = "aa", + isdelete = false, + name = "测试1", + location = "false", phase = Convert.ToSingle(1.1), - voltage = 11 + voltage = 222 + }, + new MyTable02() + { + ts = DateTime.Now.AddDays(-2), + current = Convert.ToSingle(1.1), + groupId = 1, + isdelete = false, + name = "测试2", + location = "false", + phase = Convert.ToSingle(1.1), + voltage = 222 }, new MyTable02() { @@ -75,21 +86,33 @@ namespace OrmTest current = Convert.ToSingle(1.1), groupId = 1, isdelete = true, - name = "haha", - location = "aa", + name = "测试3", + location = "true", phase = Convert.ToSingle(1.1), - voltage = 11 + voltage = 111 } }).ExecuteCommand(); //查询子表(主表字段也能查出来) - var list = db.Queryable().ToList(); - + var list = db.Queryable().OrderBy(it=>it.ts).ToList(); + + //条件查询 + var list2 = db.Queryable().Where(it=>it.voltage==111).ToList(); + + + //模糊查询 + var list3 = db.Queryable().Where(it => it.name.Contains("a")).ToList(); + + + //分页 + var list4 = db.Queryable().Where(it => it.voltage == 111) + .ToPageList(1,2); //删除子表 var ts = list.First().ts; - var count=db.Deleteable().Where(it=>it.ts==ts).ExecuteCommand(); + var de = DateTime.Now.AddYears(-1); + var count=db.Deleteable().Where(it=>it.ts>de).ExecuteCommand(); } public class MyTable02