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>
[Description("附件")]
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("图片视频")]
public virtual T_PF_BIVIDEOIMG Nav_BIFile { get; set; }
/// <summary>
/// 附件类型
/// </summary>
[Description("附件类型")]
[FormFieldTable]
[FormFieldQuery]
[FormFieldEdit]
public FILETYPEEnum TYPE { get; set; }
[Description("文件ID")]
[DataFieldForeignKey("Nav_ImgFile")]
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()
.HasColumnType("uniqueidentifier");
b.Property<int>("TYPE")
.HasColumnType("int");
b.Property<Guid>("VIDEOIMG_ID")
.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.DESCRIBE).HasMaxLength(600);
builder.HasOne(t => t.Nav_User).WithMany().HasForeignKey(t => t.USER_ID_CREATER).OnDelete(DeleteBehavior.Restrict);
builder.Ignore(t => t.Nav_FilesImg);
}
}
#endregion

View File

@ -476,7 +476,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>

View File

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

View File

@ -1831,7 +1831,8 @@ namespace APT.BS.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>

View File

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

View File

@ -6131,5 +6131,5 @@ using APT.BaseData.Domain.Entities;
}
#endregion
}
}

View File

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

View File

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

View File

@ -1380,7 +1380,8 @@ namespace APT.HM.WebApi.Controllers.Api
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>

View File

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

View File

@ -29,6 +29,7 @@ namespace APT.LG.WebApi.Controllers.Api
{
using APT.BaseData.Domain.Entities.LG;
#region Oprate-
/// <summary>
/// 表单操作日志表
@ -137,6 +138,8 @@ namespace APT.LG.WebApi.Controllers.Api
}
}
#endregion
}

View File

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

View File

@ -137,7 +137,8 @@ namespace APT.NW.WebApi.Controllers.Api
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>

View File

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

View File

@ -8,6 +8,12 @@
//------------------------------------------------------------------------------
// T4模板文件基础接口类
// 此代码由T4模板自动生成
@ -23,6 +29,7 @@ namespace APT.OP.WebApi.Controllers.Api
{
using APT.BaseData.Domain.Entities.OP;
#region Alluser-()
/// <summary>
/// 用户表(租户平台)
@ -131,9 +138,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region BillingRule-
/// <summary>
/// 计费规则表
@ -242,9 +251,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region BillingRuleVersion-
/// <summary>
/// 计费规则子表
@ -353,9 +364,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region ChargeTimeSet-
/// <summary>
/// 充电时长配置
@ -464,9 +477,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region Client-
/// <summary>
/// 客户表
@ -575,9 +590,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region ClinetOpenid-OpenId
/// <summary>
/// 客户表OpenId
@ -686,9 +703,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region CommonQuestion-
/// <summary>
/// 常见问题
@ -797,9 +816,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region FileFirmware-
/// <summary>
/// 充电桩固件表
@ -908,9 +929,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region Member-
/// <summary>
/// 会员表
@ -1019,9 +1042,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region Menu-()
/// <summary>
/// 菜单表(租户平台)
@ -1129,7 +1154,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>
@ -1140,9 +1166,11 @@ namespace APT.OP.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
#region Notice-
/// <summary>
/// 公告表
@ -1251,9 +1279,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region NoticeDetail-
/// <summary>
/// 公告内容
@ -1362,9 +1392,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region PeakValleyConfig-
/// <summary>
/// 峰谷配置表
@ -1473,9 +1505,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region RechargeCard-
/// <summary>
/// 充值卡
@ -1584,9 +1618,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region RechargeOrder-
/// <summary>
/// 充值订单
@ -1695,9 +1731,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region RechargeSetting-
/// <summary>
/// 充值金额配置
@ -1806,9 +1844,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region RfidCard-RFID卡
/// <summary>
/// RFID卡
@ -1917,9 +1957,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region RoleMenu-
/// <summary>
/// 租户权限表
@ -2028,9 +2070,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region Tenant-
/// <summary>
/// 租户表
@ -2139,9 +2183,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region TenantDbConn-
/// <summary>
/// 租户数据库表
@ -2250,9 +2296,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region TenantDomain-
/// <summary>
/// 租户域名表
@ -2361,9 +2409,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region TenantExpiration-
/// <summary>
/// 租户租期表
@ -2472,9 +2522,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region User-()
/// <summary>
/// 用户表(租户平台)
@ -2583,9 +2635,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region Version-
/// <summary>
/// 版本升级表
@ -2694,9 +2748,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region VersionMenu-
/// <summary>
/// 菜单版本升级表
@ -2805,9 +2861,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region VersionTenant-
/// <summary>
/// 租户版本升级表
@ -2916,6 +2974,8 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
}

View File

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

View File

@ -45,34 +45,18 @@ namespace APT.PF.WebApiControllers.Api.PF
T_PF_BIVIDEOIMG check = null;
var Nav_Files = entity.Nav_Files;
entity.Nav_Files = null;
var Nav_FilesImg = entity.Nav_FilesImg;
entity.Nav_FilesImg = null;
if (string.IsNullOrEmpty(entity.TITLE))
{
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)
{
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)
{
check = GetEntity<T_PF_BIVIDEOIMG>(e => e.STATUS == STATEEnum.release);
@ -111,44 +95,9 @@ namespace APT.PF.WebApiControllers.Api.PF
UpdateEntityNoCommit(entity);
if (Nav_Files != null && Nav_Files.Count() > 0)
BantchSaveEntityNoCommit(Nav_Files);
if (Nav_FilesImg != null && Nav_FilesImg.Count() > 0)
BantchSaveEntityNoCommit(Nav_FilesImg);
});
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;
});
}
}
}

View File

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

View File

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

View File

@ -3642,7 +3642,8 @@ using APT.MS.Domain.Entities.HM;
{
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>
@ -23817,7 +23818,8 @@ using APT.MS.Domain.Entities.HM;
{
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>
@ -37670,7 +37672,8 @@ using APT.MS.Domain.Entities.HM;
{
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>

View File

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

View File

@ -11776,7 +11776,8 @@ namespace APT.SK.WebApi.Controllers.Api
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>

View File

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