Compare commits

..

No commits in common. "564cf0dfc6bad00080fccd1b53c366f9d07b8c69" and "1e3af9a89d3b1eadd5692c050f67fe69de2d796f" have entirely different histories.

31 changed files with 146483 additions and 286243 deletions

View File

@ -73,12 +73,5 @@ namespace APT.BaseData.Domain.Entities
/// </summary> /// </summary>
[Description("附件")] [Description("附件")]
public ICollection<T_PF_BIVIDEOIMG_FILE> Nav_Files { get; set; } public ICollection<T_PF_BIVIDEOIMG_FILE> Nav_Files { get; set; }
/// <summary>
/// 附件
/// </summary>
[Description("附件")]
[DataFieldIngore]
public ICollection<T_PF_BIVIDEOIMG_FILE> Nav_FilesImg { get; set; }
} }
} }

View File

@ -20,15 +20,6 @@ namespace APT.BaseData.Domain.Entities
[Description("图片视频")] [Description("图片视频")]
public virtual T_PF_BIVIDEOIMG Nav_BIFile { get; set; } public virtual T_PF_BIVIDEOIMG Nav_BIFile { get; set; }
/// <summary>
/// 附件类型
/// </summary>
[Description("附件类型")]
[FormFieldTable]
[FormFieldQuery]
[FormFieldEdit]
public FILETYPEEnum TYPE { get; set; }
[Description("文件ID")] [Description("文件ID")]
[DataFieldForeignKey("Nav_ImgFile")] [DataFieldForeignKey("Nav_ImgFile")]
public Guid? IMG_FILE_ID { get; set; } public Guid? IMG_FILE_ID { get; set; }

File diff suppressed because it is too large Load Diff

View File

@ -1,24 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class wyw2026042701 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "TYPE",
table: "T_PF_BIVIDEOIMG_FILE",
type: "int",
nullable: false,
defaultValue: 0);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "TYPE",
table: "T_PF_BIVIDEOIMG_FILE");
}
}
}

View File

@ -12387,9 +12387,6 @@ namespace APT.Data.Migrations.Migrations
.IsRequired() .IsRequired()
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<int>("TYPE")
.HasColumnType("int");
b.Property<Guid>("VIDEOIMG_ID") b.Property<Guid>("VIDEOIMG_ID")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");

View File

@ -16884,7 +16884,6 @@ builder.HasOne(t => t.Nav_User).WithMany().HasForeignKey(t => t.USER_ID_CREATER)
builder.Property(t => t.TITLE).HasMaxLength(300); builder.Property(t => t.TITLE).HasMaxLength(300);
builder.Property(t => t.DESCRIBE).HasMaxLength(600); builder.Property(t => t.DESCRIBE).HasMaxLength(600);
builder.HasOne(t => t.Nav_User).WithMany().HasForeignKey(t => t.USER_ID_CREATER).OnDelete(DeleteBehavior.Restrict); builder.HasOne(t => t.Nav_User).WithMany().HasForeignKey(t => t.USER_ID_CREATER).OnDelete(DeleteBehavior.Restrict);
builder.Ignore(t => t.Nav_FilesImg);
} }
} }
#endregion #endregion

File diff suppressed because it is too large Load Diff

View File

@ -14,12 +14,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件基础接口类 // T4模板文件基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -141,7 +135,6 @@ namespace APT.BD.WebApi.Controllers.Api
#> #>
#region <#= t4.FixName#>-<#= tableDesc#> #region <#= t4.FixName#>-<#= tableDesc#>
/// <summary> /// <summary>
/// <#= tableDesc#> /// <#= tableDesc#>
@ -266,12 +259,10 @@ namespace APT.BD.WebApi.Controllers.Api
} }
#> #>
} }
#endregion #endregion
<#} <#}
#> #>
} }
<#+ <#+

File diff suppressed because it is too large Load Diff

View File

@ -14,12 +14,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件基础接口类 // T4模板文件基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -141,7 +135,6 @@ namespace APT.BS.WebApi.Controllers.Api
#> #>
#region <#= t4.FixName#>-<#= tableDesc#> #region <#= t4.FixName#>-<#= tableDesc#>
/// <summary> /// <summary>
/// <#= tableDesc#> /// <#= tableDesc#>
@ -266,12 +259,10 @@ namespace APT.BS.WebApi.Controllers.Api
#> #>
} }
#endregion #endregion
<#} <#}
#> #>
} }
<#+ <#+

File diff suppressed because it is too large Load Diff

View File

@ -14,12 +14,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件基础接口类 // T4模板文件基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -141,7 +135,6 @@ namespace APT.FM.WebApi.Controllers.Api
#> #>
#region <#= t4.FixName#>-<#= tableDesc#> #region <#= t4.FixName#>-<#= tableDesc#>
/// <summary> /// <summary>
/// <#= tableDesc#> /// <#= tableDesc#>
@ -266,13 +259,11 @@ namespace APT.FM.WebApi.Controllers.Api
} }
#> #>
} }
#endregion #endregion
<#} <#}
#> #>
} }
<#+ <#+
class TableT4 class TableT4

File diff suppressed because it is too large Load Diff

View File

@ -14,12 +14,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件基础接口类 // T4模板文件基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -141,7 +135,6 @@ namespace APT.FO.WebApi.Controllers.Api
#> #>
#region <#= t4.FixName#>-<#= tableDesc#> #region <#= t4.FixName#>-<#= tableDesc#>
/// <summary> /// <summary>
/// <#= tableDesc#> /// <#= tableDesc#>
@ -266,12 +259,10 @@ namespace APT.FO.WebApi.Controllers.Api
} }
#> #>
} }
#endregion #endregion
<#} <#}
#> #>
} }
<#+ <#+

File diff suppressed because it is too large Load Diff

View File

@ -14,12 +14,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件基础接口类 // T4模板文件基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -141,7 +135,6 @@ namespace APT.HM.WebApi.Controllers.Api
#> #>
#region <#= t4.FixName#>-<#= tableDesc#> #region <#= t4.FixName#>-<#= tableDesc#>
/// <summary> /// <summary>
/// <#= tableDesc#> /// <#= tableDesc#>
@ -266,12 +259,10 @@ namespace APT.HM.WebApi.Controllers.Api
} }
#> #>
} }
#endregion #endregion
<#} <#}
#> #>
} }
<#+ <#+

View File

@ -1,142 +1,145 @@
 
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件基础接口类 // T4模板文件基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。 // 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
using APT.Infrastructure.Core; using APT.Infrastructure.Core;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using System.Collections.Generic; using System.Collections.Generic;
using APT.Utility; using APT.Utility;
using APT.Infrastructure.Api; using APT.Infrastructure.Api;
using APT.BaseData.Domain.ApiModel.PF; using APT.BaseData.Domain.ApiModel.PF;
namespace APT.LG.WebApi.Controllers.Api namespace APT.LG.WebApi.Controllers.Api
{ {
using APT.BaseData.Domain.Entities.LG; using APT.BaseData.Domain.Entities.LG;
#region Oprate-
/// <summary> #region Oprate-
/// 表单操作日志表 /// <summary>
/// </summary> /// 表单操作日志表
[Route("api/LG/Oprate")] /// </summary>
public partial class OprateController : AuthorizeApiController<T_LG_OPRATE> [Route("api/LG/Oprate")]
{ public partial class OprateController : AuthorizeApiController<T_LG_OPRATE>
/// <summary> {
/// 查询所有数据 /// <summary>
/// </summary> /// 查询所有数据
/// <param name="filter">过滤实体</param> /// </summary>
/// <returns></returns> /// <param name="filter">过滤实体</param>
[HttpPost, Route("Entities")] /// <returns></returns>
public JsonActionResult<IEnumerable<T_LG_OPRATE>> Entities([FromBody]KeywordFilter filter) [HttpPost, Route("Entities")]
{ public JsonActionResult<IEnumerable<T_LG_OPRATE>> Entities([FromBody]KeywordFilter filter)
return WitEntities(null, filter); {
} return WitEntities(null, filter);
}
/// <summary>
/// 排序查询所有数据 /// <summary>
/// </summary> /// 排序查询所有数据
/// <param name="filter">过滤实体</param> /// </summary>
/// <returns></returns> /// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderEntities")]
public JsonActionResult<IEnumerable<T_LG_OPRATE>> OrderEntities([FromBody]KeywordFilter filter) [HttpPost, Route("OrderEntities")]
{ public JsonActionResult<IEnumerable<T_LG_OPRATE>> OrderEntities([FromBody]KeywordFilter filter)
return WitOrderEntities(null, filter); {
} return WitOrderEntities(null, filter);
}
/// <summary>
/// 分页查询数据 /// <summary>
/// </summary> /// 分页查询数据
/// <param name="pageFilter">分页过滤实体</param> /// </summary>
/// <returns></returns> /// <param name="pageFilter">分页过滤实体</param>
[HttpPost, Route("Paged")] /// <returns></returns>
public PagedActionResult<T_LG_OPRATE> Paged([FromBody]KeywordPageFilter pageFilter) [HttpPost, Route("Paged")]
{ public PagedActionResult<T_LG_OPRATE> Paged([FromBody]KeywordPageFilter pageFilter)
return WitPaged(null, pageFilter); {
} return WitPaged(null, pageFilter);
}
/// <summary>
/// 排序分页查询数据 /// <summary>
/// </summary> /// 排序分页查询数据
/// <param name="pageFilter">分页过滤实体</param> /// </summary>
/// <returns></returns> /// <param name="pageFilter">分页过滤实体</param>
[HttpPost, Route("OrderPaged")] /// <returns></returns>
public PagedActionResult<T_LG_OPRATE> OrderPaged([FromBody]KeywordPageFilter pageFilter) [HttpPost, Route("OrderPaged")]
{ public PagedActionResult<T_LG_OPRATE> OrderPaged([FromBody]KeywordPageFilter pageFilter)
return WitOrderPaged(null, pageFilter); {
} return WitOrderPaged(null, pageFilter);
}
/// <summary>
/// 根据主键删除数据 /// <summary>
/// </summary> /// 根据主键删除数据
/// <param name="id">主键ID</param> /// </summary>
/// <returns></returns> /// <param name="id">主键ID</param>
[HttpGet, Route("Delete")] /// <returns></returns>
public JsonActionResult<bool> Delete(string id) [HttpGet, Route("Delete")]
{ public JsonActionResult<bool> Delete(string id)
return WitRealDelete(id); {
} return WitRealDelete(id);
}
/// <summary>
/// 更新或新增数据 /// <summary>
/// </summary> /// 更新或新增数据
/// <param name="entity">对象实体</param> /// </summary>
/// <returns></returns> /// <param name="entity">对象实体</param>
[HttpPost, Route("Update")] /// <returns></returns>
public JsonActionResult<bool> Update([FromBody]T_LG_OPRATE entity) [HttpPost, Route("Update")]
{ public JsonActionResult<bool> Update([FromBody]T_LG_OPRATE entity)
return WitUpdate(entity); {
} return WitUpdate(entity);
}
/// <summary>
/// 批量更新 /// <summary>
/// </summary> /// 批量更新
/// <param name="entity">对象实体</param> /// </summary>
/// <returns></returns> /// <param name="entity">对象实体</param>
[HttpPost, Route("BatchUpdate")] /// <returns></returns>
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_LG_OPRATE> entity) [HttpPost, Route("BatchUpdate")]
{ public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_LG_OPRATE> entity)
return WitBantchUpdate(entity?.Data); {
} return WitBantchUpdate(entity?.Data);
}
/// <summary>
/// 批量删除数据 /// <summary>
/// </summary> /// 批量删除数据
/// <param name="ids">id字符串id用逗号分隔</param> /// </summary>
/// <returns></returns> /// <param name="ids">id字符串id用逗号分隔</param>
[HttpGet, Route("BatchDelete")] /// <returns></returns>
public JsonActionResult<bool> BatchDelete(string ids) [HttpGet, Route("BatchDelete")]
{ public JsonActionResult<bool> BatchDelete(string ids)
return WitRealBatchDelete(ids); {
} return WitRealBatchDelete(ids);
}
/// <summary>
/// 获得单条实体数据 /// <summary>
/// </summary> /// 获得单条实体数据
/// <param name="filter">过滤实体</param> /// </summary>
/// <returns></returns> /// <param name="filter">过滤实体</param>
[HttpPost, Route("Get")] /// <returns></returns>
public JsonActionResult<T_LG_OPRATE> Get([FromBody] KeywordFilter filter) [HttpPost, Route("Get")]
{ public JsonActionResult<T_LG_OPRATE> Get([FromBody] KeywordFilter filter)
return WitEntity(null, filter); {
} return WitEntity(null, filter);
}
}
#endregion
} }
#endregion
}

View File

@ -14,12 +14,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件基础接口类 // T4模板文件基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成

View File

@ -1,381 +1,382 @@
 
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件基础接口类 // T4模板文件基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。 // 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
using APT.Infrastructure.Core; using APT.Infrastructure.Core;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using System.Collections.Generic; using System.Collections.Generic;
using APT.Utility; using APT.Utility;
using APT.Infrastructure.Api; using APT.Infrastructure.Api;
using APT.BaseData.Domain.ApiModel.PF; using APT.BaseData.Domain.ApiModel.PF;
namespace APT.NW.WebApi.Controllers.Api namespace APT.NW.WebApi.Controllers.Api
{ {
using APT.BaseData.Domain.Entities.NW; using APT.BaseData.Domain.Entities.NW;
#region Enterprise- #region Enterprise-
/// <summary> /// <summary>
/// 子企业表 /// 子企业表
/// </summary> /// </summary>
[Route("api/NW/Enterprise")] [Route("api/NW/Enterprise")]
public partial class EnterpriseController : AuthorizeTreeApiController<T_NW_ENTERPRISE> public partial class EnterpriseController : AuthorizeTreeApiController<T_NW_ENTERPRISE>
{ {
/// <summary> /// <summary>
/// 查询所有数据 /// 查询所有数据
/// </summary> /// </summary>
/// <param name="filter">过滤实体</param> /// <param name="filter">过滤实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("Entities")] [HttpPost, Route("Entities")]
public JsonActionResult<IEnumerable<T_NW_ENTERPRISE>> Entities([FromBody]KeywordFilter filter) public JsonActionResult<IEnumerable<T_NW_ENTERPRISE>> Entities([FromBody]KeywordFilter filter)
{ {
return WitEntities(null, filter); return WitEntities(null, filter);
} }
/// <summary> /// <summary>
/// 排序查询所有数据 /// 排序查询所有数据
/// </summary> /// </summary>
/// <param name="filter">过滤实体</param> /// <param name="filter">过滤实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("OrderEntities")] [HttpPost, Route("OrderEntities")]
public JsonActionResult<IEnumerable<T_NW_ENTERPRISE>> OrderEntities([FromBody]KeywordFilter filter) public JsonActionResult<IEnumerable<T_NW_ENTERPRISE>> OrderEntities([FromBody]KeywordFilter filter)
{ {
return WitOrderEntities(null, filter); return WitOrderEntities(null, filter);
} }
/// <summary> /// <summary>
/// 分页查询数据 /// 分页查询数据
/// </summary> /// </summary>
/// <param name="pageFilter">分页过滤实体</param> /// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("Paged")] [HttpPost, Route("Paged")]
public PagedActionResult<T_NW_ENTERPRISE> Paged([FromBody]KeywordPageFilter pageFilter) public PagedActionResult<T_NW_ENTERPRISE> Paged([FromBody]KeywordPageFilter pageFilter)
{ {
return WitPaged(null, pageFilter); return WitPaged(null, pageFilter);
} }
/// <summary> /// <summary>
/// 排序分页查询数据 /// 排序分页查询数据
/// </summary> /// </summary>
/// <param name="pageFilter">分页过滤实体</param> /// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("OrderPaged")] [HttpPost, Route("OrderPaged")]
public PagedActionResult<T_NW_ENTERPRISE> OrderPaged([FromBody]KeywordPageFilter pageFilter) public PagedActionResult<T_NW_ENTERPRISE> OrderPaged([FromBody]KeywordPageFilter pageFilter)
{ {
return WitOrderPaged(null, pageFilter); return WitOrderPaged(null, pageFilter);
} }
/// <summary> /// <summary>
/// 根据主键删除数据 /// 根据主键删除数据
/// </summary> /// </summary>
/// <param name="id">主键ID</param> /// <param name="id">主键ID</param>
/// <returns></returns> /// <returns></returns>
[HttpGet, Route("Delete")] [HttpGet, Route("Delete")]
public JsonActionResult<bool> Delete(string id) public JsonActionResult<bool> Delete(string id)
{ {
return WitRealDelete(id); return WitRealDelete(id);
} }
/// <summary> /// <summary>
/// 更新或新增数据 /// 更新或新增数据
/// </summary> /// </summary>
/// <param name="entity">对象实体</param> /// <param name="entity">对象实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("Update")] [HttpPost, Route("Update")]
public JsonActionResult<bool> Update([FromBody]T_NW_ENTERPRISE entity) public JsonActionResult<bool> Update([FromBody]T_NW_ENTERPRISE entity)
{ {
return WitUpdate(entity); return WitUpdate(entity);
} }
/// <summary> /// <summary>
/// 批量更新 /// 批量更新
/// </summary> /// </summary>
/// <param name="entity">对象实体</param> /// <param name="entity">对象实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("BatchUpdate")] [HttpPost, Route("BatchUpdate")]
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_NW_ENTERPRISE> entity) public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_NW_ENTERPRISE> entity)
{ {
return WitBantchUpdate(entity?.Data); return WitBantchUpdate(entity?.Data);
} }
/// <summary> /// <summary>
/// 批量删除数据 /// 批量删除数据
/// </summary> /// </summary>
/// <param name="ids">id字符串id用逗号分隔</param> /// <param name="ids">id字符串id用逗号分隔</param>
/// <returns></returns> /// <returns></returns>
[HttpGet, Route("BatchDelete")] [HttpGet, Route("BatchDelete")]
public JsonActionResult<bool> BatchDelete(string ids) public JsonActionResult<bool> BatchDelete(string ids)
{ {
return WitRealBatchDelete(ids); return WitRealBatchDelete(ids);
} }
/// <summary> /// <summary>
/// 获得单条实体数据 /// 获得单条实体数据
/// </summary> /// </summary>
/// <param name="filter">过滤实体</param> /// <param name="filter">过滤实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("Get")] [HttpPost, Route("Get")]
public JsonActionResult<T_NW_ENTERPRISE> Get([FromBody] KeywordFilter filter) public JsonActionResult<T_NW_ENTERPRISE> Get([FromBody] KeywordFilter filter)
{ {
return WitEntity(null, filter); return WitEntity(null, filter);
} }
/// <summary>
/// 获得树形实体数据 /// <summary>
/// </summary> /// 获得树形实体数据
/// <param name="filter"></param> /// </summary>
/// <returns></returns> /// <param name="filter"></param>
[HttpPost, Route("TreeData")] /// <returns></returns>
public JsonActionResult<IEnumerable<TreeNode<T_NW_ENTERPRISE>>> TreeData([FromBody] KeywordFilter filter) [HttpPost, Route("TreeData")]
{ public JsonActionResult<IEnumerable<TreeNode<T_NW_ENTERPRISE>>> TreeData([FromBody] KeywordFilter filter)
return WitTreeOrderEntities(null, filter); {
} return WitTreeOrderEntities(null, filter);
}
}
#endregion }
#endregion
#region RoleDataPerm-
/// <summary> #region RoleDataPerm-
/// 子企业数据权限表 /// <summary>
/// </summary> /// 子企业数据权限表
[Route("api/NW/RoleDataPerm")] /// </summary>
public partial class RoleDataPermController : AuthorizeApiController<T_NW_ROLE_DATA_PERM> [Route("api/NW/RoleDataPerm")]
{ public partial class RoleDataPermController : AuthorizeApiController<T_NW_ROLE_DATA_PERM>
/// <summary> {
/// 查询所有数据 /// <summary>
/// </summary> /// 查询所有数据
/// <param name="filter">过滤实体</param> /// </summary>
/// <returns></returns> /// <param name="filter">过滤实体</param>
[HttpPost, Route("Entities")] /// <returns></returns>
public JsonActionResult<IEnumerable<T_NW_ROLE_DATA_PERM>> Entities([FromBody]KeywordFilter filter) [HttpPost, Route("Entities")]
{ public JsonActionResult<IEnumerable<T_NW_ROLE_DATA_PERM>> Entities([FromBody]KeywordFilter filter)
return WitEntities(null, filter); {
} return WitEntities(null, filter);
}
/// <summary>
/// 排序查询所有数据 /// <summary>
/// </summary> /// 排序查询所有数据
/// <param name="filter">过滤实体</param> /// </summary>
/// <returns></returns> /// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderEntities")]
public JsonActionResult<IEnumerable<T_NW_ROLE_DATA_PERM>> OrderEntities([FromBody]KeywordFilter filter) [HttpPost, Route("OrderEntities")]
{ public JsonActionResult<IEnumerable<T_NW_ROLE_DATA_PERM>> OrderEntities([FromBody]KeywordFilter filter)
return WitOrderEntities(null, filter); {
} return WitOrderEntities(null, filter);
}
/// <summary>
/// 分页查询数据 /// <summary>
/// </summary> /// 分页查询数据
/// <param name="pageFilter">分页过滤实体</param> /// </summary>
/// <returns></returns> /// <param name="pageFilter">分页过滤实体</param>
[HttpPost, Route("Paged")] /// <returns></returns>
public PagedActionResult<T_NW_ROLE_DATA_PERM> Paged([FromBody]KeywordPageFilter pageFilter) [HttpPost, Route("Paged")]
{ public PagedActionResult<T_NW_ROLE_DATA_PERM> Paged([FromBody]KeywordPageFilter pageFilter)
return WitPaged(null, pageFilter); {
} return WitPaged(null, pageFilter);
}
/// <summary>
/// 排序分页查询数据 /// <summary>
/// </summary> /// 排序分页查询数据
/// <param name="pageFilter">分页过滤实体</param> /// </summary>
/// <returns></returns> /// <param name="pageFilter">分页过滤实体</param>
[HttpPost, Route("OrderPaged")] /// <returns></returns>
public PagedActionResult<T_NW_ROLE_DATA_PERM> OrderPaged([FromBody]KeywordPageFilter pageFilter) [HttpPost, Route("OrderPaged")]
{ public PagedActionResult<T_NW_ROLE_DATA_PERM> OrderPaged([FromBody]KeywordPageFilter pageFilter)
return WitOrderPaged(null, pageFilter); {
} return WitOrderPaged(null, pageFilter);
}
/// <summary>
/// 根据主键删除数据 /// <summary>
/// </summary> /// 根据主键删除数据
/// <param name="id">主键ID</param> /// </summary>
/// <returns></returns> /// <param name="id">主键ID</param>
[HttpGet, Route("Delete")] /// <returns></returns>
public JsonActionResult<bool> Delete(string id) [HttpGet, Route("Delete")]
{ public JsonActionResult<bool> Delete(string id)
return WitRealDelete(id); {
} return WitRealDelete(id);
}
/// <summary>
/// 更新或新增数据 /// <summary>
/// </summary> /// 更新或新增数据
/// <param name="entity">对象实体</param> /// </summary>
/// <returns></returns> /// <param name="entity">对象实体</param>
[HttpPost, Route("Update")] /// <returns></returns>
public JsonActionResult<bool> Update([FromBody]T_NW_ROLE_DATA_PERM entity) [HttpPost, Route("Update")]
{ public JsonActionResult<bool> Update([FromBody]T_NW_ROLE_DATA_PERM entity)
return WitUpdate(entity); {
} return WitUpdate(entity);
}
/// <summary>
/// 批量更新 /// <summary>
/// </summary> /// 批量更新
/// <param name="entity">对象实体</param> /// </summary>
/// <returns></returns> /// <param name="entity">对象实体</param>
[HttpPost, Route("BatchUpdate")] /// <returns></returns>
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_NW_ROLE_DATA_PERM> entity) [HttpPost, Route("BatchUpdate")]
{ public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_NW_ROLE_DATA_PERM> entity)
return WitBantchUpdate(entity?.Data); {
} return WitBantchUpdate(entity?.Data);
}
/// <summary>
/// 批量删除数据 /// <summary>
/// </summary> /// 批量删除数据
/// <param name="ids">id字符串id用逗号分隔</param> /// </summary>
/// <returns></returns> /// <param name="ids">id字符串id用逗号分隔</param>
[HttpGet, Route("BatchDelete")] /// <returns></returns>
public JsonActionResult<bool> BatchDelete(string ids) [HttpGet, Route("BatchDelete")]
{ public JsonActionResult<bool> BatchDelete(string ids)
return WitRealBatchDelete(ids); {
} return WitRealBatchDelete(ids);
}
/// <summary>
/// 获得单条实体数据 /// <summary>
/// </summary> /// 获得单条实体数据
/// <param name="filter">过滤实体</param> /// </summary>
/// <returns></returns> /// <param name="filter">过滤实体</param>
[HttpPost, Route("Get")] /// <returns></returns>
public JsonActionResult<T_NW_ROLE_DATA_PERM> Get([FromBody] KeywordFilter filter) [HttpPost, Route("Get")]
{ public JsonActionResult<T_NW_ROLE_DATA_PERM> Get([FromBody] KeywordFilter filter)
return WitEntity(null, filter); {
} return WitEntity(null, filter);
}
}
#endregion }
#endregion
#region RoleMenu-
/// <summary> #region RoleMenu-
/// 子企业权限表 /// <summary>
/// </summary> /// 子企业权限表
[Route("api/NW/RoleMenu")] /// </summary>
public partial class RoleMenuController : AuthorizeApiController<T_NW_ROLE_MENU> [Route("api/NW/RoleMenu")]
{ public partial class RoleMenuController : AuthorizeApiController<T_NW_ROLE_MENU>
/// <summary> {
/// 查询所有数据 /// <summary>
/// </summary> /// 查询所有数据
/// <param name="filter">过滤实体</param> /// </summary>
/// <returns></returns> /// <param name="filter">过滤实体</param>
[HttpPost, Route("Entities")] /// <returns></returns>
public JsonActionResult<IEnumerable<T_NW_ROLE_MENU>> Entities([FromBody]KeywordFilter filter) [HttpPost, Route("Entities")]
{ public JsonActionResult<IEnumerable<T_NW_ROLE_MENU>> Entities([FromBody]KeywordFilter filter)
return WitEntities(null, filter); {
} return WitEntities(null, filter);
}
/// <summary>
/// 排序查询所有数据 /// <summary>
/// </summary> /// 排序查询所有数据
/// <param name="filter">过滤实体</param> /// </summary>
/// <returns></returns> /// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderEntities")]
public JsonActionResult<IEnumerable<T_NW_ROLE_MENU>> OrderEntities([FromBody]KeywordFilter filter) [HttpPost, Route("OrderEntities")]
{ public JsonActionResult<IEnumerable<T_NW_ROLE_MENU>> OrderEntities([FromBody]KeywordFilter filter)
return WitOrderEntities(null, filter); {
} return WitOrderEntities(null, filter);
}
/// <summary>
/// 分页查询数据 /// <summary>
/// </summary> /// 分页查询数据
/// <param name="pageFilter">分页过滤实体</param> /// </summary>
/// <returns></returns> /// <param name="pageFilter">分页过滤实体</param>
[HttpPost, Route("Paged")] /// <returns></returns>
public PagedActionResult<T_NW_ROLE_MENU> Paged([FromBody]KeywordPageFilter pageFilter) [HttpPost, Route("Paged")]
{ public PagedActionResult<T_NW_ROLE_MENU> Paged([FromBody]KeywordPageFilter pageFilter)
return WitPaged(null, pageFilter); {
} return WitPaged(null, pageFilter);
}
/// <summary>
/// 排序分页查询数据 /// <summary>
/// </summary> /// 排序分页查询数据
/// <param name="pageFilter">分页过滤实体</param> /// </summary>
/// <returns></returns> /// <param name="pageFilter">分页过滤实体</param>
[HttpPost, Route("OrderPaged")] /// <returns></returns>
public PagedActionResult<T_NW_ROLE_MENU> OrderPaged([FromBody]KeywordPageFilter pageFilter) [HttpPost, Route("OrderPaged")]
{ public PagedActionResult<T_NW_ROLE_MENU> OrderPaged([FromBody]KeywordPageFilter pageFilter)
return WitOrderPaged(null, pageFilter); {
} return WitOrderPaged(null, pageFilter);
}
/// <summary>
/// 根据主键删除数据 /// <summary>
/// </summary> /// 根据主键删除数据
/// <param name="id">主键ID</param> /// </summary>
/// <returns></returns> /// <param name="id">主键ID</param>
[HttpGet, Route("Delete")] /// <returns></returns>
public JsonActionResult<bool> Delete(string id) [HttpGet, Route("Delete")]
{ public JsonActionResult<bool> Delete(string id)
return WitRealDelete(id); {
} return WitRealDelete(id);
}
/// <summary>
/// 更新或新增数据 /// <summary>
/// </summary> /// 更新或新增数据
/// <param name="entity">对象实体</param> /// </summary>
/// <returns></returns> /// <param name="entity">对象实体</param>
[HttpPost, Route("Update")] /// <returns></returns>
public JsonActionResult<bool> Update([FromBody]T_NW_ROLE_MENU entity) [HttpPost, Route("Update")]
{ public JsonActionResult<bool> Update([FromBody]T_NW_ROLE_MENU entity)
return WitUpdate(entity); {
} return WitUpdate(entity);
}
/// <summary>
/// 批量更新 /// <summary>
/// </summary> /// 批量更新
/// <param name="entity">对象实体</param> /// </summary>
/// <returns></returns> /// <param name="entity">对象实体</param>
[HttpPost, Route("BatchUpdate")] /// <returns></returns>
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_NW_ROLE_MENU> entity) [HttpPost, Route("BatchUpdate")]
{ public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_NW_ROLE_MENU> entity)
return WitBantchUpdate(entity?.Data); {
} return WitBantchUpdate(entity?.Data);
}
/// <summary>
/// 批量删除数据 /// <summary>
/// </summary> /// 批量删除数据
/// <param name="ids">id字符串id用逗号分隔</param> /// </summary>
/// <returns></returns> /// <param name="ids">id字符串id用逗号分隔</param>
[HttpGet, Route("BatchDelete")] /// <returns></returns>
public JsonActionResult<bool> BatchDelete(string ids) [HttpGet, Route("BatchDelete")]
{ public JsonActionResult<bool> BatchDelete(string ids)
return WitRealBatchDelete(ids); {
} return WitRealBatchDelete(ids);
}
/// <summary>
/// 获得单条实体数据 /// <summary>
/// </summary> /// 获得单条实体数据
/// <param name="filter">过滤实体</param> /// </summary>
/// <returns></returns> /// <param name="filter">过滤实体</param>
[HttpPost, Route("Get")] /// <returns></returns>
public JsonActionResult<T_NW_ROLE_MENU> Get([FromBody] KeywordFilter filter) [HttpPost, Route("Get")]
{ public JsonActionResult<T_NW_ROLE_MENU> Get([FromBody] KeywordFilter filter)
return WitEntity(null, filter); {
} return WitEntity(null, filter);
}
}
#endregion }
#endregion
}
}

View File

@ -14,12 +14,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件基础接口类 // T4模板文件基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -141,7 +135,6 @@ namespace APT.NW.WebApi.Controllers.Api
#> #>
#region <#= t4.FixName#>-<#= tableDesc#> #region <#= t4.FixName#>-<#= tableDesc#>
/// <summary> /// <summary>
/// <#= tableDesc#> /// <#= tableDesc#>
@ -266,12 +259,10 @@ namespace APT.NW.WebApi.Controllers.Api
} }
#> #>
} }
#endregion #endregion
<#} <#}
#> #>
} }
<#+ <#+

File diff suppressed because it is too large Load Diff

View File

@ -57,7 +57,6 @@
<ItemGroup> <ItemGroup>
<Compile Remove="App_Start\Startup.Auth.cs" /> <Compile Remove="App_Start\Startup.Auth.cs" />
<Compile Remove="Controllers\Api\HomePageController.cs" /> <Compile Remove="Controllers\Api\HomePageController.cs" />
<Compile Remove="Controllers\Api\PFAnnourcementController - 复制.cs" />
<Compile Remove="Controllers\BaseApiController.cs" /> <Compile Remove="Controllers\BaseApiController.cs" />
</ItemGroup> </ItemGroup>

View File

@ -45,34 +45,18 @@ namespace APT.PF.WebApiControllers.Api.PF
T_PF_BIVIDEOIMG check = null; T_PF_BIVIDEOIMG check = null;
var Nav_Files = entity.Nav_Files; var Nav_Files = entity.Nav_Files;
entity.Nav_Files = null; entity.Nav_Files = null;
var Nav_FilesImg = entity.Nav_FilesImg;
entity.Nav_FilesImg = null;
if (string.IsNullOrEmpty(entity.TITLE)) if (string.IsNullOrEmpty(entity.TITLE))
{ {
throw new Exception("请输入标题后再操作!"); throw new Exception("请输入标题后再操作!");
} }
if ((Nav_Files == null || Nav_Files.Count() < 1) && (Nav_FilesImg == null || Nav_FilesImg.Count() < 1)) if (Nav_Files == null || Nav_Files.Count() < 1)
{ {
throw new Exception("请上传" + (entity.TYPE == FILETYPEEnum.VIDEO ? "视频" : "图片") + "后再操作!"); throw new Exception("请上传图片或附件再操作!");
} }
if (entity.TYPE == FILETYPEEnum.VIDEO && Nav_Files.Where(e => !e.IS_DELETED).Count() > 1) if (entity.TYPE == FILETYPEEnum.VIDEO && Nav_Files.Where(e => !e.IS_DELETED).Count() > 1)
{ {
throw new Exception("只能上传一个视频!"); throw new Exception("只能上传一个视频!");
} }
if (Nav_Files != null && Nav_Files.Count() > 0)
{
foreach (var item in Nav_Files)
{
item.TYPE = entity.TYPE;
}
}
if (Nav_FilesImg != null && Nav_FilesImg.Count() > 0)
{
foreach (var item in Nav_FilesImg)
{
item.TYPE = entity.TYPE;
}
}
if (entity.STATUS == STATEEnum.release) if (entity.STATUS == STATEEnum.release)
{ {
check = GetEntity<T_PF_BIVIDEOIMG>(e => e.STATUS == STATEEnum.release); check = GetEntity<T_PF_BIVIDEOIMG>(e => e.STATUS == STATEEnum.release);
@ -111,44 +95,9 @@ namespace APT.PF.WebApiControllers.Api.PF
UpdateEntityNoCommit(entity); UpdateEntityNoCommit(entity);
if (Nav_Files != null && Nav_Files.Count() > 0) if (Nav_Files != null && Nav_Files.Count() > 0)
BantchSaveEntityNoCommit(Nav_Files); BantchSaveEntityNoCommit(Nav_Files);
if (Nav_FilesImg != null && Nav_FilesImg.Count() > 0)
BantchSaveEntityNoCommit(Nav_FilesImg);
}); });
return true; return true;
}); });
} }
/// <summary>
/// 获得单条实体数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("GetSuit")]
public JsonActionResult<T_PF_BIVIDEOIMG> GetSuit([FromBody] KeywordFilter filter)
{
return SafeExecute(() =>
{
var Include = filter.Include;
if (Include != null && Include.Count() > 0)
{
foreach (var item in Include)
{
if (item.StartsWith("Nav_FilesImg"))
{
filter.Include.Remove(item);
break;
}
}
}
var model = GetEntity<T_PF_BIVIDEOIMG>(null, filter, null);
if (model.TYPE == FILETYPEEnum.IMG)
{
model.Nav_FilesImg = model.Nav_Files;
model.Nav_Files = null;
}
return model;
});
}
} }
} }

File diff suppressed because it is too large Load Diff

View File

@ -14,12 +14,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件基础接口类 // T4模板文件基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -141,7 +135,6 @@ namespace APT.PF.WebApi.Controllers.Api
#> #>
#region <#= t4.FixName#>-<#= tableDesc#> #region <#= t4.FixName#>-<#= tableDesc#>
/// <summary> /// <summary>
/// <#= tableDesc#> /// <#= tableDesc#>
@ -266,12 +259,10 @@ namespace APT.PF.WebApi.Controllers.Api
} }
#> #>
} }
#endregion #endregion
<#} <#}
#> #>
} }
<#+ <#+

View File

@ -1,4 +1,9 @@
 
@ -9,11 +14,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件基础接口类 // T4模板文件基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成

View File

@ -14,12 +14,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件基础接口类 // T4模板文件基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -141,7 +135,6 @@ namespace APT.PP.WebApi.Controllers.Api
#> #>
#region <#= t4.FixName#>-<#= tableDesc#> #region <#= t4.FixName#>-<#= tableDesc#>
/// <summary> /// <summary>
/// <#= tableDesc#> /// <#= tableDesc#>
@ -266,12 +259,10 @@ namespace APT.PP.WebApi.Controllers.Api
} }
#> #>
} }
#endregion #endregion
<#} <#}
#> #>
} }
<#+ <#+

File diff suppressed because it is too large Load Diff

View File

@ -14,12 +14,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件基础接口类 // T4模板文件基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -145,7 +139,6 @@ using APT.BaseData.Domain.ApiModel.PF;
#> #>
#region <#= t4.FixName#>-<#= tableDesc#> #region <#= t4.FixName#>-<#= tableDesc#>
/// <summary> /// <summary>
/// <#= tableDesc#> /// <#= tableDesc#>
@ -267,12 +260,10 @@ using APT.BaseData.Domain.ApiModel.PF;
#> #>
} }
#endregion #endregion
<#} <#}
#> #>
} }
<#+ <#+

File diff suppressed because it is too large Load Diff

View File

@ -14,12 +14,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件基础接口类 // T4模板文件基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -141,7 +135,6 @@ namespace APT.SK.WebApi.Controllers.Api
#> #>
#region <#= t4.FixName#>-<#= tableDesc#> #region <#= t4.FixName#>-<#= tableDesc#>
/// <summary> /// <summary>
/// <#= tableDesc#> /// <#= tableDesc#>
@ -266,12 +259,10 @@ namespace APT.SK.WebApi.Controllers.Api
} }
#> #>
} }
#endregion #endregion
<#} <#}
#> #>
} }
<#+ <#+