APT.BaseData.Domain/Entities/PF/T_PF_BIVIDEOIMG.cs

@@ -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; }
     }
 }

APT.BaseData.Domain/Entities/PF/T_PF_BIVIDEOIMG_FILE.cs

@@ -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; }

APT.Data.Migrations/Migrations/20260427012532_wyw2026042701.cs

@@ -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");
-        }
-    }
-}

APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs

@@ -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");
 

APT.MS.Data/Mapping/T4/T4Map.cs

@@ -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

APT.MicroApi/APT.BD.WebApi/Controllers/Api/T4/T4Control.cs

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

APT.MicroApi/APT.BD.WebApi/Controllers/Api/T4/T4Control.tt

@@ -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
 <#}
 	#>
-
  }
 <#+  
  

APT.MicroApi/APT.BS.WebApi/Controllers/Api/T4/T4Control.cs

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

APT.MicroApi/APT.BS.WebApi/Controllers/Api/T4/T4Control.tt

@@ -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
 <#}
 	#>
-
  }
 <#+  
  

APT.MicroApi/APT.FM.WebApi/Controllers/Api/T4/T4Control.cs

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

APT.MicroApi/APT.FM.WebApi/Controllers/Api/T4/T4Control.tt

@@ -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

APT.MicroApi/APT.FO.WebApi/Controllers/T4/T4Control.tt

@@ -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
 <#}
 	#>
-
  }
 <#+  
  

APT.MicroApi/APT.HM.WebApi/Controllers/Api/T4/T4Control.cs

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

APT.MicroApi/APT.HM.WebApi/Controllers/Api/T4/T4Control.tt

@@ -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
 <#}
 	#>
-
  }
 <#+  
  

APT.MicroApi/APT.LG.WebApi/Controllers/Api/T4/T4Control.cs

@@ -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
+
  }

APT.MicroApi/APT.LG.WebApi/Controllers/Api/T4/T4Control.tt

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

APT.MicroApi/APT.NW.WebApi/Controllers/Api/T4/T4Control.cs

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

APT.MicroApi/APT.NW.WebApi/Controllers/Api/T4/T4Control.tt

@@ -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
 <#}
 	#>
-
  }
 <#+  
  

APT.MicroApi/APT.OP.WebApi/Controllers/Api/T4/T4Control.cs

@@ -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,6 +1154,7 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
 
+       
               	/// <summary>
 	/// 获得树形实体数据
 	/// </summary>
@@ -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
+
  }

APT.MicroApi/APT.PF.WebApi/APT.PF.WebApi.csproj

@@ -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>
 

APT.MicroApi/APT.PF.WebApi/Controllers/Api/PFBivideoimgController.cs

@@ -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;
-            });
-        }
     }
 }

APT.MicroApi/APT.PF.WebApi/Controllers/Api/T4/T4Control.tt

@@ -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
 <#}
 	#>
-
  }
 <#+  
  

APT.MicroApi/APT.PP.WebApi/Controllers/Api/T4/T4Control.tt

@@ -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
 <#}
 	#>
-
  }
 <#+  
  

APT.MicroApi/APT.SC.WebApi/Controllers/Api/T4/T4Control.cs

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

APT.MicroApi/APT.SC.WebApi/Controllers/Api/T4/T4Control.tt

@@ -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
 		<#}
 	#>
-
  }
  
 <#+  

APT.MicroApi/APT.SK.WebApi/Controllers/Api/T4/T4Control.cs

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

APT.MicroApi/APT.SK.WebApi/Controllers/Api/T4/T4Control.tt

@@ -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
 <#}
 	#>
-
  }
 <#+