From 1791040715eafb6110ec0e2ceb19bf7cc1b77b0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B4=81=20=E4=BB=BB?= Date: Wed, 13 Nov 2024 14:56:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseApp/UserManager/UserManagerApp.cs | 8 +- OpenAuth.Repository/Domain/InsAishp.cs | 104 ++++++++++++++++++ OpenAuth.Repository/Domain/InsTask.cs | 83 ++++++++++++++ OpenAuth.Repository/Domain/InsTaskgroup.cs | 97 ++++++++++++++++ .../Domain/InsTaskshpdetail.cs | 62 +++++++++++ OpenAuth.Repository/Domain/InsTasktif.cs | 43 ++++++++ OpenAuth.Repository/Domain/InsTif.cs | 97 ++++++++++++++++ OpenAuth.WebApi/appsettings.Production.json | 2 +- OpenAuth.WebApi/appsettings.json | 2 +- 9 files changed, 492 insertions(+), 6 deletions(-) create mode 100644 OpenAuth.Repository/Domain/InsAishp.cs create mode 100644 OpenAuth.Repository/Domain/InsTask.cs create mode 100644 OpenAuth.Repository/Domain/InsTaskgroup.cs create mode 100644 OpenAuth.Repository/Domain/InsTaskshpdetail.cs create mode 100644 OpenAuth.Repository/Domain/InsTasktif.cs create mode 100644 OpenAuth.Repository/Domain/InsTif.cs diff --git a/OpenAuth.App/BaseApp/UserManager/UserManagerApp.cs b/OpenAuth.App/BaseApp/UserManager/UserManagerApp.cs index 2bcbf99..4b53dba 100644 --- a/OpenAuth.App/BaseApp/UserManager/UserManagerApp.cs +++ b/OpenAuth.App/BaseApp/UserManager/UserManagerApp.cs @@ -512,17 +512,17 @@ namespace OpenAuth.App { using (var uow = base.UnitWork.CreateContext()) { - foreach (var item in uow.Db.DbMaintenance.GetTableInfoList().Where(r => r.Name.ToLower().StartsWith("drone_caseinfo_sthx"))) + foreach (var item in uow.Db.DbMaintenance.GetTableInfoList().Where(r => r.Name.ToLower().StartsWith("ins_"))) { - //string entityName = item.Name.Substring(0, 1).ToUpper() + item.Name.Substring(1, 7).ToLower() + item.Name.Substring(9, 1).ToUpper() + item.Name.Substring(10).ToLower();/*实体名大写*/ - string entityName = "DroneCaseInfoSTHX"; + string entityName = item.Name.Substring(0, 1).ToUpper() + item.Name.Substring(1, 2).ToLower() + item.Name.Substring(4, 1).ToUpper() + item.Name.Substring(5).ToLower();/*实体名大写*/ + //string entityName = "DroneCaseInfoSTHX"; uow.Db.MappingTables.Add(entityName, item.Name); //foreach (var col in db.DbMaintenance.GetColumnInfosByTableName(item.Name)) //{ // db.MappingColumns.Add(col.DbColumnName.ToUpper() /*类的属性大写*/, col.DbColumnName, entityName); //} } - uow.Db.DbFirst.Where(r => r.ToLower().StartsWith("drone_caseinfo_sthx")).IsCreateAttribute().CreateClassFile("E:\\天空地\\codeLinyi\\Project1\\OpenAuth.Repository\\Domain", "OpenAuth.Repository.Domain"); + uow.Db.DbFirst.Where(r => r.ToLower().StartsWith("ins_")).IsCreateAttribute().CreateClassFile("E:\\数据中心系统\\codegit\\OpenAuth.Repository\\Domain", "OpenAuth.Repository.Domain"); uow.Commit(); } return "更新实体成功"; diff --git a/OpenAuth.Repository/Domain/InsAishp.cs b/OpenAuth.Repository/Domain/InsAishp.cs new file mode 100644 index 0000000..e9c64c7 --- /dev/null +++ b/OpenAuth.Repository/Domain/InsAishp.cs @@ -0,0 +1,104 @@ +using System; +using System.Linq; +using System.Text; +using SqlSugar; + +namespace OpenAuth.Repository.Domain +{ + /// + ///ai 解译成果信息 + /// + [SugarTable("ins_aishp")] + public partial class InsAishp + { + public InsAishp(){ + + + } + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(IsPrimaryKey=true)] + public string Id {get;set;} + + /// + /// Desc:Shp名称 + /// Default: + /// Nullable:False + /// + public string ShpName {get;set;} + + /// + /// Desc:Shp存储路径 + /// Default: + /// Nullable:False + /// + public string ShpPath {get;set;} + + /// + /// Desc:日期 + /// Default: + /// Nullable:False + /// + public DateTime ShpDate {get;set;} + + /// + /// Desc:面积（平方米） + /// Default: + /// Nullable:False + /// + public decimal AreaNum {get;set;} + + /// + /// Desc:地块名称 + /// Default: + /// Nullable:False + /// + public string PlotName {get;set;} + + /// + /// Desc:地区Id + /// Default: + /// Nullable:True + /// + public string AreaId {get;set;} + + /// + /// Desc:地区名称 + /// Default: + /// Nullable:False + /// + public string AreaName {get;set;} + + /// + /// Desc:shp 包含图斑数量 + /// Default: + /// Nullable:True + /// + public int? ShpCount {get;set;} + + /// + /// Desc:创建时间 + /// Default: + /// Nullable:False + /// + public DateTime CreateTime {get;set;} + + /// + /// Desc:最后一次修改时间 + /// Default: + /// Nullable:False + /// + public DateTime UpdateTime {get;set;} + + /// + /// Desc:备注 + /// Default: + /// Nullable:True + /// + public string Remark {get;set;} + + } +} diff --git a/OpenAuth.Repository/Domain/InsTask.cs b/OpenAuth.Repository/Domain/InsTask.cs new file mode 100644 index 0000000..d9651b9 --- /dev/null +++ b/OpenAuth.Repository/Domain/InsTask.cs @@ -0,0 +1,83 @@ +using System; +using System.Linq; +using System.Text; +using SqlSugar; + +namespace OpenAuth.Repository.Domain +{ + /// + ///任务表 + /// + [SugarTable("ins_task")] + public partial class InsTask + { + public InsTask(){ + + + } + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(IsPrimaryKey=true)] + public string Id {get;set;} + + /// + /// Desc:任务名称 + /// Default: + /// Nullable:False + /// + public string TaskName {get;set;} + + /// + /// Desc:ai 解析shp Id + /// Default: + /// Nullable:False + /// + public string ShpId {get;set;} + + /// + /// Desc:备注 + /// Default: + /// Nullable:True + /// + public string Remark {get;set;} + + /// + /// Desc:创建时间 + /// Default: + /// Nullable:False + /// + public DateTime CreateTime {get;set;} + + /// + /// Desc:创建人 + /// Default: + /// Nullable:False + /// + public string CreateUser {get;set;} + + /// + /// Desc:修改时间 + /// Default: + /// Nullable:False + /// + public DateTime UpdateTime {get;set;} + + /// + /// Desc:修改人 + /// Default: + /// Nullable:False + /// + public string UpdateUser {get;set;} + + /// + /// Desc:0待领取 1领取中 2已领完 + /// Default: + /// Nullable:False + /// + public short State {get;set;} + + } +} diff --git a/OpenAuth.Repository/Domain/InsTaskgroup.cs b/OpenAuth.Repository/Domain/InsTaskgroup.cs new file mode 100644 index 0000000..75ce602 --- /dev/null +++ b/OpenAuth.Repository/Domain/InsTaskgroup.cs @@ -0,0 +1,97 @@ +using System; +using System.Linq; +using System.Text; +using SqlSugar; + +namespace OpenAuth.Repository.Domain +{ + /// + ///任务分组表 + /// + [SugarTable("ins_taskgroup")] + public partial class InsTaskgroup + { + public InsTaskgroup(){ + + + } + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(IsPrimaryKey=true)] + public string Id {get;set;} + + /// + /// Desc:分组名称 + /// Default: + /// Nullable:False + /// + public string GroupName {get;set;} + + /// + /// Desc:分组排序 + /// Default: + /// Nullable:False + /// + public int Sort {get;set;} + + /// + /// Desc:起始编号 + /// Default: + /// Nullable:False + /// + public int BeginNum {get;set;} + + /// + /// Desc:结束编号 + /// Default: + /// Nullable:False + /// + public int EndNum {get;set;} + + /// + /// Desc:任务 Id + /// Default: + /// Nullable:False + /// + public string TaskId {get;set;} + + /// + /// Desc:创建时间 + /// Default: + /// Nullable:False + /// + public DateTime CreateTime {get;set;} + + /// + /// Desc:领取时间 + /// Default: + /// Nullable:True + /// + public DateTime? ReciveTime {get;set;} + + /// + /// Desc:领取人 + /// Default: + /// Nullable:True + /// + public string ReciveUserId {get;set;} + + /// + /// Desc:是否完成 + /// Default: + /// Nullable:False + /// + public bool IsComplate {get;set;} + + /// + /// Desc:备注 + /// Default: + /// Nullable:True + /// + public string Remark {get;set;} + + } +} diff --git a/OpenAuth.Repository/Domain/InsTaskshpdetail.cs b/OpenAuth.Repository/Domain/InsTaskshpdetail.cs new file mode 100644 index 0000000..fd26865 --- /dev/null +++ b/OpenAuth.Repository/Domain/InsTaskshpdetail.cs @@ -0,0 +1,62 @@ +using System; +using System.Linq; +using System.Text; +using SqlSugar; + +namespace OpenAuth.Repository.Domain +{ + /// + ///任务下图斑信息 + /// + [SugarTable("ins_taskshpdetail")] + public partial class InsTaskshpdetail + { + public InsTaskshpdetail(){ + + + } + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(IsPrimaryKey=true)] + public string Id {get;set;} + + /// + /// Desc:任务Id + /// Default: + /// Nullable:False + /// + public string TaskId {get;set;} + + /// + /// Desc:任务下分组Id + /// Default: + /// Nullable:False + /// + public string TaskGroupId {get;set;} + + /// + /// Desc:对应分组内的编号 + /// Default: + /// Nullable:False + /// + public int Num {get;set;} + + /// + /// Desc:对应图斑 + /// Default: + /// Nullable:True + /// + public string Geom {get;set;} + + /// + /// Desc:具体图斑信息，后续根据提供的 shp 进行拓展 + /// Default: + /// Nullable:True + /// + public string Other {get;set;} + + } +} diff --git a/OpenAuth.Repository/Domain/InsTasktif.cs b/OpenAuth.Repository/Domain/InsTasktif.cs new file mode 100644 index 0000000..79a96ea --- /dev/null +++ b/OpenAuth.Repository/Domain/InsTasktif.cs @@ -0,0 +1,43 @@ +using System; +using System.Linq; +using System.Text; +using SqlSugar; + +namespace OpenAuth.Repository.Domain +{ + /// + ///任务关联前后时像 + /// + [SugarTable("ins_tasktif")] + public partial class InsTasktif + { + public InsTasktif(){ + + + } + /// + /// Desc:任务主键 + /// Default: + /// Nullable:False + /// + [SugarColumn(IsPrimaryKey=true)] + public string TaskId {get;set;} + + /// + /// Desc:影像主键 + /// Default: + /// Nullable:False + /// + [SugarColumn(IsPrimaryKey=true)] + public string TifId {get;set;} + + /// + /// Desc:0前时像 1后时像 + /// Default: + /// Nullable:False + /// + [SugarColumn(IsPrimaryKey=true)] + public short TifType {get;set;} + + } +} diff --git a/OpenAuth.Repository/Domain/InsTif.cs b/OpenAuth.Repository/Domain/InsTif.cs new file mode 100644 index 0000000..c752eaa --- /dev/null +++ b/OpenAuth.Repository/Domain/InsTif.cs @@ -0,0 +1,97 @@ +using System; +using System.Linq; +using System.Text; +using SqlSugar; + +namespace OpenAuth.Repository.Domain +{ + /// + ///影像表 + /// + [SugarTable("ins_tif")] + public partial class InsTif + { + public InsTif(){ + + + } + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(IsPrimaryKey=true)] + public string Id {get;set;} + + /// + /// Desc:影像名称 + /// Default: + /// Nullable:False + /// + public string TifName {get;set;} + + /// + /// Desc:影像存储路径 + /// Default: + /// Nullable:False + /// + public string TifPath {get;set;} + + /// + /// Desc:日期 + /// Default: + /// Nullable:False + /// + public DateTime TifDate {get;set;} + + /// + /// Desc:面积（平方米） + /// Default: + /// Nullable:False + /// + public decimal AreaNum {get;set;} + + /// + /// Desc:地块名称 + /// Default: + /// Nullable:False + /// + public string PlotName {get;set;} + + /// + /// Desc:地区Id + /// Default: + /// Nullable:True + /// + public string AreaId {get;set;} + + /// + /// Desc:地区名称 + /// Default: + /// Nullable:False + /// + public string AreaName {get;set;} + + /// + /// Desc:创建时间 + /// Default: + /// Nullable:False + /// + public DateTime CreateTime {get;set;} + + /// + /// Desc:最后一次修改时间 + /// Default: + /// Nullable:False + /// + public DateTime UpdateTime {get;set;} + + /// + /// Desc:备注 + /// Default: + /// Nullable:True + /// + public string Remark {get;set;} + + } +} diff --git a/OpenAuth.WebApi/appsettings.Production.json b/OpenAuth.WebApi/appsettings.Production.json index 39ae716..23bed33 100644 --- a/OpenAuth.WebApi/appsettings.Production.json +++ b/OpenAuth.WebApi/appsettings.Production.json @@ -7,7 +7,7 @@ "AllowedHosts": "*", "DataProtection": "temp-keys/", "ConnectionStrings": { - "OpenAuthDBContext": "PORT=5432;Database=openauthbasedb;HOST=localhost;PASSWORD=123456;USER ID=postgres;" + "OpenAuthDBContext": "PORT=5432;Database=drone_enforcement_lib;HOST=192.168.10.125;PASSWORD=123456;USER ID=postgres;" //"OpenAuthDBContext": "PORT=5432;Database=unattended1;HOST=192.168.10.115;PASSWORD=123456;USER ID=postgres;Pooling=False" //PostgreSQL }, "AppSetting": { diff --git a/OpenAuth.WebApi/appsettings.json b/OpenAuth.WebApi/appsettings.json index af5779a..e64f2a0 100644 --- a/OpenAuth.WebApi/appsettings.json +++ b/OpenAuth.WebApi/appsettings.json @@ -8,7 +8,7 @@ "DataProtection": "temp-keys/", "ConnectionStrings": { //"OpenAuthDBContext": "PORT=5432;Database=hopetrycore;HOST=192.168.10.124;PASSWORD=123456;USER ID=postgres;", - "OpenAuthDBContext": "PORT=5432;Database=openauthbasedb;HOST=localhost;PASSWORD=123456;USER ID=postgres;" + "OpenAuthDBContext": "PORT=5432;Database=drone_enforcement_lib;HOST=192.168.10.125;PASSWORD=123456;USER ID=postgres;" //"OpenAuthDBContext": "PORT=5432;Database=;HOST=192.168.10.131;PASSWORD=123456;USER ID=postgres;" }, "AppSetting": {