diff --git a/OpenAuth.App/BaseApp/AppManager/AppManager.cs b/OpenAuth.App/BaseApp/AppManager/AppManager.cs index ff95b0f..4f8f054 100644 --- a/OpenAuth.App/BaseApp/AppManager/AppManager.cs +++ b/OpenAuth.App/BaseApp/AppManager/AppManager.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; using OpenAuth.App.Interface; using OpenAuth.App.Request; using OpenAuth.Repository; diff --git a/OpenAuth.App/BaseApp/AuthStrategies/NormalAuthStrategy.cs b/OpenAuth.App/BaseApp/AuthStrategies/NormalAuthStrategy.cs index 9ddec30..6a1d985 100644 --- a/OpenAuth.App/BaseApp/AuthStrategies/NormalAuthStrategy.cs +++ b/OpenAuth.App/BaseApp/AuthStrategies/NormalAuthStrategy.cs @@ -5,7 +5,7 @@ using System.Linq; using Infrastructure; using Infrastructure.Extensions; using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; using OpenAuth.App.BasicQueryService; using OpenAuth.App.Response; using OpenAuth.Repository; diff --git a/OpenAuth.App/BaseApp/AuthStrategies/SystemAuthStrategy.cs b/OpenAuth.App/BaseApp/AuthStrategies/SystemAuthStrategy.cs index 648275e..051860c 100644 --- a/OpenAuth.App/BaseApp/AuthStrategies/SystemAuthStrategy.cs +++ b/OpenAuth.App/BaseApp/AuthStrategies/SystemAuthStrategy.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using Infrastructure; using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; using OpenAuth.App.Response; using OpenAuth.Repository; using OpenAuth.Repository.Domain; diff --git a/OpenAuth.App/BaseApp/Base/SqlSugarBaseApp.cs b/OpenAuth.App/BaseApp/Base/SqlSugarBaseApp.cs index 7817199..fa74518 100644 --- a/OpenAuth.App/BaseApp/Base/SqlSugarBaseApp.cs +++ b/OpenAuth.App/BaseApp/Base/SqlSugarBaseApp.cs @@ -3,7 +3,7 @@ using OpenAuth.App.FormScheme.FormHelpers; using OpenAuth.App.Interface; using SqlSugar; -namespace OpenAuth.App.BaseApp.Base +namespace OpenAuth.App { public abstract class SqlSugarBaseApp where T : class, new() diff --git a/OpenAuth.App/BaseApp/Base/Tree/TreeApp.cs b/OpenAuth.App/BaseApp/Base/Tree/TreeApp.cs index 2f50aed..287befb 100644 --- a/OpenAuth.App/BaseApp/Base/Tree/TreeApp.cs +++ b/OpenAuth.App/BaseApp/Base/Tree/TreeApp.cs @@ -11,7 +11,7 @@ using System.Linq; using System.Reflection; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; namespace OpenAuth.App.Base { diff --git a/OpenAuth.App/BaseApp/Category/CategoryApp.cs b/OpenAuth.App/BaseApp/Category/CategoryApp.cs index 9c607cd..d7756bd 100644 --- a/OpenAuth.App/BaseApp/Category/CategoryApp.cs +++ b/OpenAuth.App/BaseApp/Category/CategoryApp.cs @@ -1,6 +1,6 @@ using Infrastructure; using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; using OpenAuth.App.Interface; using OpenAuth.App.Request; using OpenAuth.App.Response; diff --git a/OpenAuth.App/BaseApp/Category/CategoryTypeApp.cs b/OpenAuth.App/BaseApp/Category/CategoryTypeApp.cs index 55b810a..0532c38 100644 --- a/OpenAuth.App/BaseApp/Category/CategoryTypeApp.cs +++ b/OpenAuth.App/BaseApp/Category/CategoryTypeApp.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Infrastructure; using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; using OpenAuth.App.Interface; using OpenAuth.App.Request; using OpenAuth.App.Response; diff --git a/OpenAuth.App/BaseApp/CodeTable/CodeColumnsApp.cs b/OpenAuth.App/BaseApp/CodeTable/CodeColumnsApp.cs index 99758d4..c19fe77 100644 --- a/OpenAuth.App/BaseApp/CodeTable/CodeColumnsApp.cs +++ b/OpenAuth.App/BaseApp/CodeTable/CodeColumnsApp.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; namespace OpenAuth.App.CodeTable { diff --git a/OpenAuth.App/BaseApp/CodeTable/CodeTableApp.cs b/OpenAuth.App/BaseApp/CodeTable/CodeTableApp.cs index 3874698..7e19e7a 100644 --- a/OpenAuth.App/BaseApp/CodeTable/CodeTableApp.cs +++ b/OpenAuth.App/BaseApp/CodeTable/CodeTableApp.cs @@ -14,7 +14,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; using static Microsoft.Extensions.Logging.EventSource.LoggingEventSource; namespace OpenAuth.App.CodeTable diff --git a/OpenAuth.App/BaseApp/CreateTable/TableRecordApp.cs b/OpenAuth.App/BaseApp/CreateTable/TableRecordApp.cs index 960fade..e9934d2 100644 --- a/OpenAuth.App/BaseApp/CreateTable/TableRecordApp.cs +++ b/OpenAuth.App/BaseApp/CreateTable/TableRecordApp.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/DataCodeRule/CodeRuleApp.cs b/OpenAuth.App/BaseApp/DataCodeRule/CodeRuleApp.cs index 0191a68..e866984 100644 --- a/OpenAuth.App/BaseApp/DataCodeRule/CodeRuleApp.cs +++ b/OpenAuth.App/BaseApp/DataCodeRule/CodeRuleApp.cs @@ -10,7 +10,7 @@ using System.Text; using System.Threading.Tasks; using Infrastructure.Extensions; using Infrastructure.Cache; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; namespace OpenAuth.App.DataCodeRule { diff --git a/OpenAuth.App/BaseApp/DataSource/DataSourceApp.cs b/OpenAuth.App/BaseApp/DataSource/DataSourceApp.cs index 6b709d9..f5839e9 100644 --- a/OpenAuth.App/BaseApp/DataSource/DataSourceApp.cs +++ b/OpenAuth.App/BaseApp/DataSource/DataSourceApp.cs @@ -11,7 +11,7 @@ using System.Data; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; namespace OpenAuth.App.DataSource { diff --git a/OpenAuth.App/BaseApp/DbTable/DbTableApp.cs b/OpenAuth.App/BaseApp/DbTable/DbTableApp.cs index 79f7b49..4016d93 100644 --- a/OpenAuth.App/BaseApp/DbTable/DbTableApp.cs +++ b/OpenAuth.App/BaseApp/DbTable/DbTableApp.cs @@ -13,7 +13,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; using static Dm.net.buffer.ByteArrayBuffer; namespace OpenAuth.App.DbTable diff --git a/OpenAuth.App/BaseApp/Files/FileApp.cs b/OpenAuth.App/BaseApp/Files/FileApp.cs index 93db12b..6f8c804 100644 --- a/OpenAuth.App/BaseApp/Files/FileApp.cs +++ b/OpenAuth.App/BaseApp/Files/FileApp.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; using OpenAuth.App.Interface; using OpenAuth.App.Request; using OpenAuth.App.Response; diff --git a/OpenAuth.App/BaseApp/FormModule/FormModuleApp.cs b/OpenAuth.App/BaseApp/FormModule/FormModuleApp.cs index cc15f16..e259ad5 100644 --- a/OpenAuth.App/BaseApp/FormModule/FormModuleApp.cs +++ b/OpenAuth.App/BaseApp/FormModule/FormModuleApp.cs @@ -13,7 +13,7 @@ using System.Linq.Expressions; using System.Text; using Castle.Core.Internal; using DocumentFormat.OpenXml.Drawing.Charts; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; namespace OpenAuth.App.FormModule { diff --git a/OpenAuth.App/BaseApp/FormScheme/FormSchemeApp.cs b/OpenAuth.App/BaseApp/FormScheme/FormSchemeApp.cs index 9531ec3..52f548d 100644 --- a/OpenAuth.App/BaseApp/FormScheme/FormSchemeApp.cs +++ b/OpenAuth.App/BaseApp/FormScheme/FormSchemeApp.cs @@ -34,7 +34,7 @@ using NPOI.HSSF.UserModel; using NPOI.SS.UserModel; using OpenAuth.App.FormModule; using Microsoft.Extensions.Logging; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; using Castle.Core.Internal; namespace OpenAuth.App.FormScheme diff --git a/OpenAuth.App/BaseApp/ImMsgManager/ImMsgApp.cs b/OpenAuth.App/BaseApp/ImMsgManager/ImMsgApp.cs index 188a368..256cf8f 100644 --- a/OpenAuth.App/BaseApp/ImMsgManager/ImMsgApp.cs +++ b/OpenAuth.App/BaseApp/ImMsgManager/ImMsgApp.cs @@ -16,7 +16,7 @@ using OpenAuth.App.BaseApp.WFTask; using OpenAuth.App.BaseApp.ImMsgManager; using Microsoft.Extensions.Configuration; using DocumentFormat.OpenXml.EMMA; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; namespace OpenAuth.App.BaseApp { diff --git a/OpenAuth.App/BaseApp/Import/ImportApp.cs b/OpenAuth.App/BaseApp/Import/ImportApp.cs index aa1f133..1ba658e 100644 --- a/OpenAuth.App/BaseApp/Import/ImportApp.cs +++ b/OpenAuth.App/BaseApp/Import/ImportApp.cs @@ -11,7 +11,6 @@ using System.Data; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; namespace OpenAuth.App.Import { diff --git a/OpenAuth.App/BaseApp/Jobs/OpenJobApp.cs b/OpenAuth.App/BaseApp/Jobs/OpenJobApp.cs index 0e73753..78514fc 100644 --- a/OpenAuth.App/BaseApp/Jobs/OpenJobApp.cs +++ b/OpenAuth.App/BaseApp/Jobs/OpenJobApp.cs @@ -7,7 +7,6 @@ using Infrastructure.Const; using Infrastructure.Extensions; using Microsoft.Extensions.Logging; using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; using OpenAuth.App.Extensions; using OpenAuth.App.Interface; using OpenAuth.App.Request; diff --git a/OpenAuth.App/BaseApp/Permission/BaseDataAuthorizeApp.cs b/OpenAuth.App/BaseApp/Permission/BaseDataAuthorizeApp.cs index 8420223..c30f334 100644 --- a/OpenAuth.App/BaseApp/Permission/BaseDataAuthorizeApp.cs +++ b/OpenAuth.App/BaseApp/Permission/BaseDataAuthorizeApp.cs @@ -1,7 +1,7 @@ using System.Text; using Infrastructure; using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; using OpenAuth.App.Interface; using OpenAuth.App.Permission.Request; using OpenAuth.Repository; diff --git a/OpenAuth.App/BaseApp/Relevance/RevelanceManagerApp.cs b/OpenAuth.App/BaseApp/Relevance/RevelanceManagerApp.cs index 35c3b54..22c3f1b 100644 --- a/OpenAuth.App/BaseApp/Relevance/RevelanceManagerApp.cs +++ b/OpenAuth.App/BaseApp/Relevance/RevelanceManagerApp.cs @@ -4,7 +4,7 @@ using System.Linq; using Infrastructure; using Microsoft.Extensions.Logging; using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; using OpenAuth.App.Interface; using OpenAuth.App.Request; using OpenAuth.Repository; diff --git a/OpenAuth.App/BaseApp/Resources/ResourceApp.cs b/OpenAuth.App/BaseApp/Resources/ResourceApp.cs index 8b6ccc3..89c03f3 100644 --- a/OpenAuth.App/BaseApp/Resources/ResourceApp.cs +++ b/OpenAuth.App/BaseApp/Resources/ResourceApp.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Infrastructure; using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; using OpenAuth.App.Interface; using OpenAuth.Repository; using OpenAuth.Repository.Domain; diff --git a/OpenAuth.App/BaseApp/RoleManager/RoleApp.cs b/OpenAuth.App/BaseApp/RoleManager/RoleApp.cs index 62fd41c..1ec0bf4 100644 --- a/OpenAuth.App/BaseApp/RoleManager/RoleApp.cs +++ b/OpenAuth.App/BaseApp/RoleManager/RoleApp.cs @@ -6,7 +6,7 @@ using OpenAuth.App.Request; using OpenAuth.Repository; using SqlSugar; using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; using OpenAuth.App.BasicQueryService; namespace OpenAuth.App diff --git a/OpenAuth.App/BaseApp/SysAppFiles/SysAppFilesApp.cs b/OpenAuth.App/BaseApp/SysAppFiles/SysAppFilesApp.cs index a0820be..6e5594d 100644 --- a/OpenAuth.App/BaseApp/SysAppFiles/SysAppFilesApp.cs +++ b/OpenAuth.App/BaseApp/SysAppFiles/SysAppFilesApp.cs @@ -10,7 +10,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/SysDataItem/SysDataItemApp.cs b/OpenAuth.App/BaseApp/SysDataItem/SysDataItemApp.cs index e4a58cd..8831932 100644 --- a/OpenAuth.App/BaseApp/SysDataItem/SysDataItemApp.cs +++ b/OpenAuth.App/BaseApp/SysDataItem/SysDataItemApp.cs @@ -4,7 +4,7 @@ using OpenAuth.Repository; using SqlSugar; using OpenAuth.App.Interface; using Infrastructure; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/SysDataItemDetail/SysDataItemDetailApp.cs b/OpenAuth.App/BaseApp/SysDataItemDetail/SysDataItemDetailApp.cs index 16d790c..8c8772e 100644 --- a/OpenAuth.App/BaseApp/SysDataItemDetail/SysDataItemDetailApp.cs +++ b/OpenAuth.App/BaseApp/SysDataItemDetail/SysDataItemDetailApp.cs @@ -10,7 +10,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; using System.Web; namespace OpenAuth.App diff --git a/OpenAuth.App/BaseApp/SysDatabaseLink/SysDatabaseLinkApp.cs b/OpenAuth.App/BaseApp/SysDatabaseLink/SysDatabaseLinkApp.cs index b837ffd..214a34b 100644 --- a/OpenAuth.App/BaseApp/SysDatabaseLink/SysDatabaseLinkApp.cs +++ b/OpenAuth.App/BaseApp/SysDatabaseLink/SysDatabaseLinkApp.cs @@ -12,7 +12,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; namespace OpenAuth.App.SysDatabaseLink { diff --git a/OpenAuth.App/BaseApp/SysLogs/SysLogApp.cs b/OpenAuth.App/BaseApp/SysLogs/SysLogApp.cs index 5fa8592..0cbb7a0 100644 --- a/OpenAuth.App/BaseApp/SysLogs/SysLogApp.cs +++ b/OpenAuth.App/BaseApp/SysLogs/SysLogApp.cs @@ -1,7 +1,6 @@ using System.Reflection; using System.Threading.Tasks; using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; using OpenAuth.App.Request; using OpenAuth.App.Response; using OpenAuth.Repository; diff --git a/OpenAuth.App/BaseApp/SysMessage/SysMessageApp.cs b/OpenAuth.App/BaseApp/SysMessage/SysMessageApp.cs index f3edc3f..fdedd38 100644 --- a/OpenAuth.App/BaseApp/SysMessage/SysMessageApp.cs +++ b/OpenAuth.App/BaseApp/SysMessage/SysMessageApp.cs @@ -1,7 +1,7 @@ using Infrastructure; using Microsoft.Extensions.Logging; using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; using OpenAuth.App.Interface; using OpenAuth.App.Request; using OpenAuth.App.Response; diff --git a/OpenAuth.App/BaseApp/SysPosGroup/SysPosGroupApp.cs b/OpenAuth.App/BaseApp/SysPosGroup/SysPosGroupApp.cs index ff2f208..a259ce2 100644 --- a/OpenAuth.App/BaseApp/SysPosGroup/SysPosGroupApp.cs +++ b/OpenAuth.App/BaseApp/SysPosGroup/SysPosGroupApp.cs @@ -10,7 +10,6 @@ using SqlSugar; using OpenAuth.App.Interface; using Infrastructure; using OpenAuth.App; -using OpenAuth.App.BaseApp.Base; using OpenAuth.App.Request; namespace OpenAuth.App diff --git a/OpenAuth.App/BaseApp/SysPosition/SysPositionApp.cs b/OpenAuth.App/BaseApp/SysPosition/SysPositionApp.cs index aabd0e0..7e24762 100644 --- a/OpenAuth.App/BaseApp/SysPosition/SysPositionApp.cs +++ b/OpenAuth.App/BaseApp/SysPosition/SysPositionApp.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using SqlSugar; using OpenAuth.App.Interface; using Infrastructure; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; using OpenAuth.Repository.Core; using Oracle.ManagedDataAccess.Types; diff --git a/OpenAuth.App/BaseApp/UserManager/UserManagerApp.cs b/OpenAuth.App/BaseApp/UserManager/UserManagerApp.cs index 2bcbf99..34a9376 100644 --- a/OpenAuth.App/BaseApp/UserManager/UserManagerApp.cs +++ b/OpenAuth.App/BaseApp/UserManager/UserManagerApp.cs @@ -15,7 +15,7 @@ using NPOI.SS.Formula.Functions; using NPOI.SS.UserModel; using NPOI.XSSF.UserModel; using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; using OpenAuth.App.Config; using OpenAuth.App.Interface; using OpenAuth.App.Request; diff --git a/OpenAuth.App/BaseApp/WFDelegate/WFDelegateApp.cs b/OpenAuth.App/BaseApp/WFDelegate/WFDelegateApp.cs index f689450..bd1d900 100644 --- a/OpenAuth.App/BaseApp/WFDelegate/WFDelegateApp.cs +++ b/OpenAuth.App/BaseApp/WFDelegate/WFDelegateApp.cs @@ -11,7 +11,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/WFProcess/WFProcessApp.cs b/OpenAuth.App/BaseApp/WFProcess/WFProcessApp.cs index e0e2253..8222401 100644 --- a/OpenAuth.App/BaseApp/WFProcess/WFProcessApp.cs +++ b/OpenAuth.App/BaseApp/WFProcess/WFProcessApp.cs @@ -19,7 +19,7 @@ using OpenAuth.App.BaseApp.Jobs; using System.Text; using DocumentFormat.OpenXml.Spreadsheet; using Infrastructure.Utilities; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; using System.Diagnostics; using NPOI.Util; diff --git a/OpenAuth.App/BaseApp/WFSchemeInfo/WFSchemeApp.cs b/OpenAuth.App/BaseApp/WFSchemeInfo/WFSchemeApp.cs index 53d781b..8dfb039 100644 --- a/OpenAuth.App/BaseApp/WFSchemeInfo/WFSchemeApp.cs +++ b/OpenAuth.App/BaseApp/WFSchemeInfo/WFSchemeApp.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using SqlSugar; using OpenAuth.App.Interface; using Infrastructure; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; using OpenAuth.App.Request; namespace OpenAuth.App diff --git a/OpenAuth.App/BaseApp/WFSchemeInfo/WFSchemeInfoApp.cs b/OpenAuth.App/BaseApp/WFSchemeInfo/WFSchemeInfoApp.cs index b872f97..7245b57 100644 --- a/OpenAuth.App/BaseApp/WFSchemeInfo/WFSchemeInfoApp.cs +++ b/OpenAuth.App/BaseApp/WFSchemeInfo/WFSchemeInfoApp.cs @@ -1,7 +1,7 @@ using Infrastructure; using Infrastructure.Helpers; using Microsoft.Extensions.Configuration; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; using OpenAuth.App.Interface; using OpenAuth.App.Request; using OpenAuth.Repository; diff --git a/OpenAuth.App/BaseApp/WFStamp/WFStampApp.cs b/OpenAuth.App/BaseApp/WFStamp/WFStampApp.cs index f13ef01..b58499f 100644 --- a/OpenAuth.App/BaseApp/WFStamp/WFStampApp.cs +++ b/OpenAuth.App/BaseApp/WFStamp/WFStampApp.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.App; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/WFTask/WFTaskApp.cs b/OpenAuth.App/BaseApp/WFTask/WFTaskApp.cs index 1323844..d756a25 100644 --- a/OpenAuth.App/BaseApp/WFTask/WFTaskApp.cs +++ b/OpenAuth.App/BaseApp/WFTask/WFTaskApp.cs @@ -8,7 +8,6 @@ using Moq; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NPOI.SS.Formula.Functions; -using OpenAuth.App.BaseApp.Base; using OpenAuth.App.BaseApp.WFTask.Response; using OpenAuth.App.FormScheme; using OpenAuth.App.FormScheme.Response; diff --git a/OpenAuth.App/ServiceApp/IdleFarming/IdleFarmingApp.cs b/OpenAuth.App/ServiceApp/IdleFarming/IdleFarmingApp.cs new file mode 100644 index 0000000..d916ce1 --- /dev/null +++ b/OpenAuth.App/ServiceApp/IdleFarming/IdleFarmingApp.cs @@ -0,0 +1,47 @@ + +using OpenAuth.App.Interface; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; +using Infrastructure; +using OpenAuth.App.Request; +using OpenAuth.Repository; +using SqlSugar; + +namespace OpenAuth.App +{ + public class IdleFarmingApp : SqlSugarBaseApp + { + public IdleFarmingApp( + ISugarUnitOfWork unitWork, + ISimpleClient repository, + IAuth auth + ) : base(unitWork, repository, auth) + { + + } + + #region 查询 + /// + /// 分页 + /// + public async Task>>> LoadPage(PageReq request) + { + RefAsync totalCount = 0; + var result = new PageInfo(); + var list = await base.Repository.AsQueryable() + .WhereIF(!string.IsNullOrEmpty(request.key),a=>a.SerialNumber.Contains(request.key)) + .ToPageListAsync(request.page, request.limit, totalCount); + + return new Response>> + { + Result = new PageInfo> + { + Items = list, + Total = totalCount + } + }; + } + #endregion + + } +} \ No newline at end of file diff --git a/OpenAuth.App/ServiceApp/IdleHouse/IdleHouseApp.cs b/OpenAuth.App/ServiceApp/IdleHouse/IdleHouseApp.cs new file mode 100644 index 0000000..791e4ea --- /dev/null +++ b/OpenAuth.App/ServiceApp/IdleHouse/IdleHouseApp.cs @@ -0,0 +1,47 @@ + +using OpenAuth.App.Interface; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; +using Infrastructure; +using OpenAuth.App.Request; +using OpenAuth.Repository; +using SqlSugar; + +namespace OpenAuth.App +{ + public class IdleHouseApp : SqlSugarBaseApp + { + public IdleHouseApp( + ISugarUnitOfWork unitWork, + ISimpleClient repository, + IAuth auth + ) : base(unitWork, repository, auth) + { + + } + + #region 查询 + /// + /// 分页 + /// + public async Task>>> LoadPage(PageReq request) + { + RefAsync totalCount = 0; + var result = new PageInfo(); + var list = await base.Repository.AsQueryable() + .WhereIF(!string.IsNullOrEmpty(request.key), a => a.SerialNumber.Contains(request.key)) + .ToPageListAsync(request.page, request.limit, totalCount); + + return new Response>> + { + Result = new PageInfo> + { + Items = list, + Total = totalCount + } + }; + } + #endregion + + } +} \ No newline at end of file diff --git a/OpenAuth.App/ServiceApp/IdleLand/IdleShpApp.cs b/OpenAuth.App/ServiceApp/IdleLand/IdleLandApp.cs similarity index 51% rename from OpenAuth.App/ServiceApp/IdleLand/IdleShpApp.cs rename to OpenAuth.App/ServiceApp/IdleLand/IdleLandApp.cs index 9ad0076..43e698e 100644 --- a/OpenAuth.App/ServiceApp/IdleLand/IdleShpApp.cs +++ b/OpenAuth.App/ServiceApp/IdleLand/IdleLandApp.cs @@ -1,5 +1,9 @@ -using OpenAuth.App.BasicQueryService; +using Infrastructure; +using OpenAuth.App.BasicQueryService; +using OpenAuth.App.Interface; using OpenAuth.App.Request; +using OpenAuth.Repository; +using OpenAuth.Repository.Domain; using SqlSugar; using System; using System.Collections.Generic; @@ -9,14 +13,40 @@ using System.Threading.Tasks; namespace OpenAuth.App { - public class IdleLandApp + public class IdleLandApp : SqlSugarBaseApp { ISqlSugarClient client; - public IdleLandApp(ISqlSugarClient sqlSugarClient) + public IdleLandApp(ISqlSugarClient sqlSugarClient, ISugarUnitOfWork unitWork, + ISimpleClient repository, + IAuth auth) : base(unitWork, repository, auth) { client = sqlSugarClient; } + + #region 查询 + /// + /// 分页 + /// + public async Task>>> LoadPage(PageReq request) + { + RefAsync totalCount = 0; + var result = new PageInfo(); + var list = await base.Repository.AsQueryable() + .WhereIF(!string.IsNullOrEmpty(request.key), a => a.SerialNumber.Contains(request.key)) + .ToPageListAsync(request.page, request.limit, totalCount); + + return new Response>> + { + Result = new PageInfo> + { + Items = list, + Total = totalCount + } + }; + } + #endregion + public byte[] VectorTile(VectorTileSearchModel req) { req.Init(); diff --git a/OpenAuth.App/ServiceApp/IdleNongJi/IdleNongjiApp.cs b/OpenAuth.App/ServiceApp/IdleNongJi/IdleNongjiApp.cs new file mode 100644 index 0000000..9a552b8 --- /dev/null +++ b/OpenAuth.App/ServiceApp/IdleNongJi/IdleNongjiApp.cs @@ -0,0 +1,57 @@ + +using OpenAuth.App.Interface; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; +using Infrastructure; +using OpenAuth.App.Request; +using OpenAuth.Repository; +using SqlSugar; + +namespace OpenAuth.App +{ + public class IdleNongjiApp : SqlSugarBaseApp + { + public IdleNongjiApp( + ISugarUnitOfWork unitWork, + ISimpleClient repository, + IAuth auth + ) : base(unitWork, repository, auth) + { + + } + + #region 查询 + /// + /// 分页 + /// + public async Task>>> LoadPage(PageReq request) + { + RefAsync totalCount = 0; + var result = new PageInfo(); + var list = await base.Repository.AsQueryable() + .WhereIF(!string.IsNullOrEmpty(request.key), a => a.Id.Contains(request.key)) + .ToPageListAsync(request.page, request.limit, totalCount); + + return new Response>> + { + Result = new PageInfo> + { + Items = list, + Total = totalCount + } + }; + } + #endregion + + + + + + + + + + + + } +} \ No newline at end of file diff --git a/OpenAuth.App/ServiceApp/IdleWaters/IdleWatersApp.cs b/OpenAuth.App/ServiceApp/IdleWaters/IdleWatersApp.cs new file mode 100644 index 0000000..eb8f734 --- /dev/null +++ b/OpenAuth.App/ServiceApp/IdleWaters/IdleWatersApp.cs @@ -0,0 +1,46 @@ + +using OpenAuth.App.Interface; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; +using Infrastructure; +using OpenAuth.App.Request; +using OpenAuth.Repository; +using SqlSugar; + +namespace OpenAuth.App +{ + public class IdleWatersApp : SqlSugarBaseApp + { + public IdleWatersApp( + ISugarUnitOfWork unitWork, + ISimpleClient repository, + IAuth auth + ) : base(unitWork, repository, auth) + { + + } + + #region 查询 + /// + /// 分页 + /// + public async Task>>> LoadPage(PageReq request) + { + RefAsync totalCount = 0; + var result = new PageInfo(); + var list = await base.Repository.AsQueryable() + .WhereIF(!string.IsNullOrEmpty(request.key), a => a.SerialNumber.Contains(request.key)) + .ToPageListAsync(request.page, request.limit, totalCount); + + return new Response>> + { + Result = new PageInfo> + { + Items = list, + Total = totalCount + } + }; + } + #endregion + } +} \ No newline at end of file diff --git a/OpenAuth.Repository/Domain/IdleFarming.cs b/OpenAuth.Repository/Domain/IdleFarming.cs new file mode 100644 index 0000000..845b98b --- /dev/null +++ b/OpenAuth.Repository/Domain/IdleFarming.cs @@ -0,0 +1,187 @@ +using SqlSugar; +using System; +using System.Linq; +using System.Linq.Expressions; +using System.Text; + +namespace OpenAuth.Repository.Domain +{ + [SugarTable("idle_farming")] + public partial class IdleFarming + { + public IdleFarming() + { + + + } + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(IsPrimaryKey = true)] + public string Id { get; set; } + + /// + /// Desc:编号 + /// Default: + /// Nullable:True + /// + public string SerialNumber { get; set; } + + /// + /// Desc:状态 + /// Default: + /// Nullable:True + /// + public int? Status { get; set; } + + /// + /// Desc:设施类型 + /// Default: + /// Nullable:True + /// + public string SpecificNature { get; set; } + + /// + /// Desc:数量 + /// Default: + /// Nullable:True + /// + public decimal? Area { get; set; } + + /// + /// Desc:期限 + /// Default: + /// Nullable:True + /// + public string LandUseTerm { get; set; } + + /// + /// Desc:流转期限 + /// Default: + /// Nullable:True + /// + public string CirculationTerm { get; set; } + + /// + /// Desc:价格(元) + /// Default: + /// Nullable:True + /// + public decimal? Price { get; set; } + + /// + /// Desc:现状描述 + /// Default: + /// Nullable:True + /// + public string CurrentStatusDescription { get; set; } + + /// + /// Desc:权属人 + /// Default: + /// Nullable:True + /// + public string Owner { get; set; } + + /// + /// Desc:联系电话 + /// Default: + /// Nullable:True + /// + public decimal? ContactNumber { get; set; } + + /// + /// Desc:备注 + /// Default: + /// Nullable:True + /// + public string Remarks { get; set; } + + /// + /// Desc:创建人 + /// Default: + /// Nullable:True + /// + public string CreatedBy { get; set; } + + /// + /// Desc:创建时间 + /// Default: + /// Nullable:True + /// + public DateTime? CreationTime { get; set; } + + /// + /// Desc:修改人 + /// Default: + /// Nullable:True + /// + public string ModifiedBy { get; set; } + + /// + /// Desc:修改时间 + /// Default: + /// Nullable:True + /// + public DateTime? ModificationTime { get; set; } + + /// + /// Desc:详细位置 + /// Default: + /// Nullable:True + /// + public string DetailedLocation { get; set; } + + /// + /// Desc:是否删除 + /// Default: + /// Nullable:True + /// + public int? IsDeleted { get; set; } + + /// + /// Desc:东至 + /// Default: + /// Nullable:True + /// + public string dongzhi { get; set; } + + /// + /// Desc:西至 + /// Default: + /// Nullable:True + /// + public string xizhi { get; set; } + + /// + /// Desc:南至 + /// Default: + /// Nullable:True + /// + public string nanzhi { get; set; } + + /// + /// Desc:北至 + /// Default: + /// Nullable:True + /// + public string beizhi { get; set; } + + /// + /// Desc:照片 + /// Default: + /// Nullable:True + /// + public string zhaopian { get; set; } + + /// + /// Desc:视频 + /// Default: + /// Nullable:True + /// + public string shipin { get; set; } + + } +} diff --git a/OpenAuth.Repository/Domain/IdleFiles.cs b/OpenAuth.Repository/Domain/IdleFiles.cs new file mode 100644 index 0000000..f9dd0a3 --- /dev/null +++ b/OpenAuth.Repository/Domain/IdleFiles.cs @@ -0,0 +1,111 @@ +using SqlSugar; +using System; +using System.Linq; +using System.Text; + +namespace OpenAuth.Repository.Domain +{ + /// + /// + /// + [SugarTable("idle_files")] + public partial class IdleFiles + { + public IdleFiles(){ + + + } + /// + /// Desc: + /// Default: + /// Nullable:True + /// + [SugarColumn(IsPrimaryKey = true)] + public string Id {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string Type {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string Path {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string RelationType {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string CreateTime {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string CreateUser {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string FileName {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string FileSize {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string RelationId {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string Lng {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string Lat {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string Angle {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string Tag {get;set;} + + } +} diff --git a/OpenAuth.Repository/Domain/IdleHouse.cs b/OpenAuth.Repository/Domain/IdleHouse.cs new file mode 100644 index 0000000..35bc95d --- /dev/null +++ b/OpenAuth.Repository/Domain/IdleHouse.cs @@ -0,0 +1,195 @@ +using SqlSugar; +using System; +using System.Linq; +using System.Text; + +namespace OpenAuth.Repository.Domain +{ + /// + /// + /// + [SugarTable("idle_house")] + public partial class IdleHouse + { + public IdleHouse(){ + + + } + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(IsPrimaryKey = true)] + public string Id {get;set;} + + /// + /// Desc:编号 + /// Default: + /// Nullable:True + /// + public string SerialNumber {get;set;} + + /// + /// Desc:状态 + /// Default: + /// Nullable:True + /// + public int? Status {get;set;} + + /// + /// Desc:具体性质 + /// Default: + /// Nullable:True + /// + public string SpecificNature {get;set;} + + /// + /// Desc:面积(㎡) + /// Default: + /// Nullable:True + /// + public decimal? Area {get;set;} + + /// + /// Desc:土地使用期限(剩余期限) + /// Default: + /// Nullable:True + /// + public string LandUseTerm {get;set;} + + /// + /// Desc:流转期限 + /// Default: + /// Nullable:True + /// + public string CirculationTerm {get;set;} + + /// + /// Desc:价格(元/年) + /// Default: + /// Nullable:True + /// + public decimal? Price {get;set;} + + /// + /// Desc:现状描述 + /// Default: + /// Nullable:True + /// + public string CurrentStatusDescription {get;set;} + + /// + /// Desc:权属人 + /// Default: + /// Nullable:True + /// + public string Owner {get;set;} + + /// + /// Desc:联系电话 + /// Default: + /// Nullable:True + /// + public decimal? ContactNumber {get;set;} + + /// + /// Desc:备注 + /// Default: + /// Nullable:True + /// + public string Remarks {get;set;} + + /// + /// Desc:创建人 + /// Default: + /// Nullable:True + /// + public string CreatedBy {get;set;} + + /// + /// Desc:创建时间 + /// Default: + /// Nullable:True + /// + public DateTime? CreationTime {get;set;} + + /// + /// Desc:修改人 + /// Default: + /// Nullable:True + /// + public string ModifiedBy {get;set;} + + /// + /// Desc:修改时间 + /// Default: + /// Nullable:True + /// + public DateTime? ModificationTime {get;set;} + + /// + /// Desc:详细位置 + /// Default: + /// Nullable:True + /// + public string DetailedLocation {get;set;} + + /// + /// Desc:是否删除 + /// Default: + /// Nullable:True + /// + public int? IsDeleted {get;set;} + + /// + /// Desc:东至 + /// Default: + /// Nullable:True + /// + public string dongzhi {get;set;} + + /// + /// Desc:西至 + /// Default: + /// Nullable:True + /// + public string xizhi {get;set;} + + /// + /// Desc:南至 + /// Default: + /// Nullable:True + /// + public string nanzhi {get;set;} + + /// + /// Desc:北至 + /// Default: + /// Nullable:True + /// + public string beizhi {get;set;} + + /// + /// Desc:照片 + /// Default: + /// Nullable:True + /// + public string zhaopian {get;set;} + + /// + /// Desc:视频 + /// Default: + /// Nullable:True + /// + public string shipin {get;set;} + + /// + /// Desc:房屋结构 + /// Default: + /// Nullable:True + /// + public string fangwujg {get;set;} + + } +} diff --git a/OpenAuth.Repository/Domain/IdleLand.cs b/OpenAuth.Repository/Domain/IdleLand.cs new file mode 100644 index 0000000..efa7540 --- /dev/null +++ b/OpenAuth.Repository/Domain/IdleLand.cs @@ -0,0 +1,188 @@ +using SqlSugar; +using System; +using System.Linq; +using System.Text; + +namespace OpenAuth.Repository.Domain +{ + /// + /// + /// + [SugarTable("idle_land")] + public partial class IdleLand + { + public IdleLand(){ + + + } + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(IsPrimaryKey = true)] + public string Id {get;set;} + + /// + /// Desc:编号 + /// Default: + /// Nullable:True + /// + public string SerialNumber {get;set;} + + /// + /// Desc:状态 + /// Default: + /// Nullable:True + /// + public int? Status {get;set;} + + /// + /// Desc:具体性质 + /// Default: + /// Nullable:True + /// + public string SpecificNature {get;set;} + + /// + /// Desc:面积(亩) + /// Default: + /// Nullable:True + /// + public decimal? Area {get;set;} + + /// + /// Desc:土地使用期限(剩余期限) + /// Default: + /// Nullable:True + /// + public string LandUseTerm {get;set;} + + /// + /// Desc:流转期限 + /// Default: + /// Nullable:True + /// + public string CirculationTerm {get;set;} + + /// + /// Desc:价格(元/亩/年) + /// Default: + /// Nullable:True + /// + public decimal? Price {get;set;} + + /// + /// Desc:现状描述 + /// Default: + /// Nullable:True + /// + public string CurrentStatusDescription {get;set;} + + /// + /// Desc:权属人 + /// Default: + /// Nullable:True + /// + public string Owner {get;set;} + + /// + /// Desc:联系电话 + /// Default: + /// Nullable:True + /// + public decimal? ContactNumber {get;set;} + + /// + /// Desc:备注 + /// Default: + /// Nullable:True + /// + public string Remarks {get;set;} + + /// + /// Desc:创建人 + /// Default: + /// Nullable:True + /// + public string CreatedBy {get;set;} + + /// + /// Desc:创建时间 + /// Default: + /// Nullable:True + /// + public DateTime? CreationTime {get;set;} + + /// + /// Desc:修改人 + /// Default: + /// Nullable:True + /// + public string ModifiedBy {get;set;} + + /// + /// Desc:修改时间 + /// Default: + /// Nullable:True + /// + public DateTime? ModificationTime {get;set;} + + /// + /// Desc:详细位置 + /// Default: + /// Nullable:True + /// + public string DetailedLocation {get;set;} + + /// + /// Desc:是否删除 + /// Default: + /// Nullable:True + /// + public int? IsDeleted {get;set;} + + /// + /// Desc:东至 + /// Default: + /// Nullable:True + /// + public string dongzhi {get;set;} + + /// + /// Desc:西至 + /// Default: + /// Nullable:True + /// + public string xizhi {get;set;} + + /// + /// Desc:南至 + /// Default: + /// Nullable:True + /// + public string nanzhi {get;set;} + + /// + /// Desc:北至 + /// Default: + /// Nullable:True + /// + public string beizhi {get;set;} + + /// + /// Desc:照片 + /// Default: + /// Nullable:True + /// + public string zhaopian {get;set;} + + /// + /// Desc:视频 + /// Default: + /// Nullable:True + /// + public string shipin {get;set;} + + } +} diff --git a/OpenAuth.Repository/Domain/IdleNongji.cs b/OpenAuth.Repository/Domain/IdleNongji.cs new file mode 100644 index 0000000..e5ecfb5 --- /dev/null +++ b/OpenAuth.Repository/Domain/IdleNongji.cs @@ -0,0 +1,155 @@ +using SqlSugar; +using System; +using System.Linq; +using System.Text; + +namespace OpenAuth.Repository.Domain +{ + /// + /// + /// + [SugarTable("idle_nongji")] + public partial class IdleNongji + { + public IdleNongji() + { + + + } + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(IsPrimaryKey = true)] + public string Id { get; set; } + + /// + /// Desc:合作社名称 + /// Default: + /// Nullable:True + /// + public string hezuoshemc { get; set; } + + /// + /// Desc:状态 + /// Default: + /// Nullable:True + /// + public int? Status { get; set; } + + /// + /// Desc:社会信用代码 + /// Default: + /// Nullable:True + /// + public string shehuixydm { get; set; } + + /// + /// Desc:农机数量 + /// Default: + /// Nullable:True + /// + public decimal? nongjishuliang { get; set; } + + /// + /// Desc:地址 + /// Default: + /// Nullable:True + /// + public string Area { get; set; } + + /// + /// Desc:年农业生产社会化服务面积(亩) + /// Default: + /// Nullable:True + /// + public decimal? nianfuwu { get; set; } + + /// + /// Desc:2024年服务面积 + /// Default: + /// Nullable:True + /// + [SugarColumn(ColumnName = "2024nianfuwu")] + public decimal? nj_2024nianfuwu { get; set; } + + /// + /// Desc:服务项目 + /// Default: + /// Nullable:True + /// + public string fuwuxiangmu { get; set; } + + /// + /// Desc:联系人 + /// Default: + /// Nullable:True + /// + public string lainxiren { get; set; } + + /// + /// Desc:联系电话 + /// Default: + /// Nullable:True + /// + public string lianxirendh { get; set; } + + /// + /// Desc:服务地域范围 + /// Default: + /// Nullable:True + /// + public string fuwufanwei { get; set; } + + /// + /// Desc:创建人 + /// Default: + /// Nullable:True + /// + public string CreatedBy { get; set; } + + /// + /// Desc:创建时间 + /// Default: + /// Nullable:True + /// + public DateTime? CreationTime { get; set; } + + /// + /// Desc:修改人 + /// Default: + /// Nullable:True + /// + public string ModifiedBy { get; set; } + + /// + /// Desc:修改时间 + /// Default: + /// Nullable:True + /// + public DateTime? ModificationTime { get; set; } + + /// + /// Desc:详细位置 + /// Default: + /// Nullable:True + /// + public string dianwei { get; set; } + + /// + /// Desc:是否删除 + /// Default: + /// Nullable:True + /// + public int? IsDeleted { get; set; } + + /// + /// Desc:照片 + /// Default: + /// Nullable:True + /// + public string zhaopian { get; set; } + + } +} diff --git a/OpenAuth.Repository/Domain/IdleShp.cs b/OpenAuth.Repository/Domain/IdleShp.cs new file mode 100644 index 0000000..cd0d4af --- /dev/null +++ b/OpenAuth.Repository/Domain/IdleShp.cs @@ -0,0 +1,69 @@ +using SqlSugar; +using System; +using System.Linq; +using System.Text; + +namespace OpenAuth.Repository.Domain +{ + /// + /// + /// + [SugarTable("idle_shp")] + public partial class IdleShp + { + public IdleShp(){ + + + } + /// + /// Desc: + /// Default: + /// Nullable:True + /// + [SugarColumn(IsPrimaryKey = true)] + public string Id {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string RelationId {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string RelationType {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string CreateUser {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string CreateTime {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string Area {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string Geom {get;set;} + + } +} diff --git a/OpenAuth.Repository/Domain/IdleWaters.cs b/OpenAuth.Repository/Domain/IdleWaters.cs new file mode 100644 index 0000000..6fc6386 --- /dev/null +++ b/OpenAuth.Repository/Domain/IdleWaters.cs @@ -0,0 +1,196 @@ +using SqlSugar; +using System; +using System.Linq; +using System.Text; + +namespace OpenAuth.Repository.Domain +{ + /// + /// + /// + [SugarTable("idle_waters")] + public partial class IdleWaters + { + public IdleWaters() + { + + + } + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(IsPrimaryKey = true)] + public string Id { get; set; } + + /// + /// Desc:编号 + /// Default: + /// Nullable:True + /// + public string SerialNumber { get; set; } + + /// + /// Desc:状态 + /// Default: + /// Nullable:True + /// + public int? Status { get; set; } + + /// + /// Desc:具体性质 + /// Default: + /// Nullable:True + /// + public string SpecificNature { get; set; } + + /// + /// Desc:面积(㎡) + /// Default: + /// Nullable:True + /// + public decimal? Area { get; set; } + + /// + /// Desc:水域使用期限 + /// Default: + /// Nullable:True + /// + public string LandUseTerm { get; set; } + + /// + /// Desc:流转期限 + /// Default: + /// Nullable:True + /// + public string CirculationTerm { get; set; } + + /// + /// Desc:价格(元/年) + /// Default: + /// Nullable:True + /// + public decimal? Price { get; set; } + + /// + /// Desc:现状描述 + /// Default: + /// Nullable:True + /// + public string CurrentStatusDescription { get; set; } + + /// + /// Desc:权属人 + /// Default: + /// Nullable:True + /// + public string Owner { get; set; } + + /// + /// Desc:联系电话 + /// Default: + /// Nullable:True + /// + public decimal? ContactNumber { get; set; } + + /// + /// Desc:备注 + /// Default: + /// Nullable:True + /// + public string Remarks { get; set; } + + /// + /// Desc:创建人 + /// Default: + /// Nullable:True + /// + public string CreatedBy { get; set; } + + /// + /// Desc:创建时间 + /// Default: + /// Nullable:True + /// + public DateTime? CreationTime { get; set; } + + /// + /// Desc:修改人 + /// Default: + /// Nullable:True + /// + public string ModifiedBy { get; set; } + + /// + /// Desc:修改时间 + /// Default: + /// Nullable:True + /// + public DateTime? ModificationTime { get; set; } + + /// + /// Desc:详细位置 + /// Default: + /// Nullable:True + /// + public string DetailedLocation { get; set; } + + /// + /// Desc:是否删除 + /// Default: + /// Nullable:True + /// + public int? IsDeleted { get; set; } + + /// + /// Desc:东至 + /// Default: + /// Nullable:True + /// + public string dongzhi { get; set; } + + /// + /// Desc:西至 + /// Default: + /// Nullable:True + /// + public string xizhi { get; set; } + + /// + /// Desc:南至 + /// Default: + /// Nullable:True + /// + public string nanzhi { get; set; } + + /// + /// Desc:北至 + /// Default: + /// Nullable:True + /// + public string beizhi { get; set; } + + /// + /// Desc:照片 + /// Default: + /// Nullable:True + /// + public string zhaopian { get; set; } + + /// + /// Desc:视频 + /// Default: + /// Nullable:True + /// + public string shipin { get; set; } + + /// + /// Desc:储水量(立方米) + /// Default: + /// Nullable:True + /// + public decimal? chushuiliang { get; set; } + + } +} diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/IdleFarmingController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/IdleFarmingController.cs new file mode 100644 index 0000000..7e6c469 --- /dev/null +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/IdleFarmingController.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Infrastructure; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using OpenAuth.App; +using OpenAuth.App.Request; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; + +namespace OpenAuth.WebApi.Controllers +{ + /// + /// 农业生产设施 + /// + + [Route("api/[controller]/[action]")] + [ApiController] + public class IdleFarmingController : ControllerBase + { + private readonly IdleFarmingApp _app; + public IdleFarmingController(IdleFarmingApp app) + { + _app = app; + } + + #region 查询 + + #region 分页 + /// + /// 分页 + /// + [HttpGet] + public async Task>>> LoadPage([FromQuery] PageReq request) + { + return await _app.LoadPage(request); + } + #endregion + + + #endregion + + + } +} \ No newline at end of file diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/IdleHouseController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/IdleHouseController.cs new file mode 100644 index 0000000..23cac9a --- /dev/null +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/IdleHouseController.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Infrastructure; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using OpenAuth.App; +using OpenAuth.App.Request; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; + +namespace OpenAuth.WebApi.Controllers +{ + /// + /// 房屋 + /// + [Route("api/[controller]/[action]")] + [ApiController] + public class IdleHouseController : ControllerBase + { + private readonly IdleHouseApp _app; + public IdleHouseController(IdleHouseApp app) + { + _app = app; + } + + #region 查询 + + #region 分页 + /// + /// 分页 + /// + [HttpGet] + public async Task>>> LoadPage([FromQuery] PageReq request) + { + return await _app.LoadPage(request); + } + + #endregion + + #endregion + + } +} \ No newline at end of file diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/IdleShpController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/IdleLandController.cs similarity index 71% rename from OpenAuth.WebApi/Controllers/ServiceControllers/IdleShpController.cs rename to OpenAuth.WebApi/Controllers/ServiceControllers/IdleLandController.cs index ae67f81..72fb893 100644 --- a/OpenAuth.WebApi/Controllers/ServiceControllers/IdleShpController.cs +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/IdleLandController.cs @@ -4,9 +4,13 @@ using Microsoft.AspNetCore.Mvc; using OpenAuth.App.Request; using OpenAuth.App; using Infrastructure; +using OpenAuth.Repository.Domain; namespace OpenAuth.WebApi.Controllers { + /// + /// 土地 + /// [Route("api/[controller]/[action]")] [ApiController] public class IdleLandController : ControllerBase @@ -17,6 +21,17 @@ namespace OpenAuth.WebApi.Controllers app = _app; } + #region 分页 + /// + /// 分页 + /// + [HttpGet] + public async Task>>> LoadPage([FromQuery] PageReq request) + { + return await app.LoadPage(request); + } + #endregion + /// /// 查图层 /// diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/IdleNongjiController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/IdleNongjiController.cs new file mode 100644 index 0000000..3206df1 --- /dev/null +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/IdleNongjiController.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Infrastructure; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using OpenAuth.App; +using OpenAuth.App.Request; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; + +namespace OpenAuth.WebApi.Controllers +{ + /// + /// 农机 + /// + [Route("api/[controller]/[action]")] + [ApiController] + public class IdleNongjiController : ControllerBase + { + private readonly IdleNongjiApp _app; + public IdleNongjiController(IdleNongjiApp app) + { + _app = app; + } + + #region 查询 + + #region 分页 + /// + /// 分页 + /// + [HttpGet] + public async Task>>> LoadPage([FromQuery] PageReq request) + { + return await _app.LoadPage(request); + } + + #endregion + + #endregion + + } +} \ No newline at end of file diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/IdleWatersController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/IdleWatersController.cs new file mode 100644 index 0000000..6ab8bba --- /dev/null +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/IdleWatersController.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Infrastructure; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using OpenAuth.App; +using OpenAuth.App.Request; +using OpenAuth.App.Response; +using OpenAuth.Repository.Domain; + +namespace OpenAuth.WebApi.Controllers +{ + /// + /// 水域 + /// + [Route("api/[controller]/[action]")] + [ApiController] + public class IdleWatersController : ControllerBase + { + private readonly IdleWatersApp _app; + public IdleWatersController(IdleWatersApp app) + { + _app = app; + } + + #region 查询 + + #region 分页 + /// + /// 分页 + /// + [HttpGet] + public async Task>>> LoadPage([FromQuery] PageReq request) + { + return await _app.LoadPage(request); + } + + #endregion + #endregion + } +} \ No newline at end of file