11

DW5S.DTO/PosDto/AdResDto.cs

@@ -86,7 +86,7 @@ namespace DW5S.DTO
         /// <summary>
         /// 接收站编号
         /// </summary>
-        public long RecTxInfoID { get; set; }
+        public int RecTxInfoID { get; set; }
 
         /// <summary>
         /// 接收站名称

DW5S.Entity/ADRes.cs

@@ -88,8 +88,7 @@ namespace DW5S.Entity
         /// <summary>
         /// 接收站编号
         /// </summary>
-        public long RecTxInfoID { get; set; }
-
+        public int RecTxInfoID { get; set; }
 
         /// <summary>
         /// 接收站信息

DW5S.Repostory/04.DW5S.Repostory.csproj

@@ -23,7 +23,4 @@
 	<ItemGroup>
 	  <ProjectReference Include="..\DW5S.Entity\03.DW5S.Entity.csproj" />
 	</ItemGroup>
-	<ItemGroup>
-	  <Folder Include="Migrations\" />
-	</ItemGroup>
 </Project>

DW5S.Repostory/Migrations/20250217111330_Init.Designer.cs → DW5S.Repostory/Migrations/20250218024518_init.Designer.cs

@@ -12,8 +12,8 @@ using Oracle.EntityFrameworkCore.Metadata;
 namespace DW5S.Repostory.Migrations
 {
     [DbContext(typeof(OracleContext))]
-    [Migration("20250217111330_Init")]
-    partial class Init
+    [Migration("20250218024518_init")]
+    partial class init
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -94,11 +94,7 @@ namespace DW5S.Repostory.Migrations
                         .HasColumnType("NVARCHAR2(2000)")
                         .HasColumnName("RECSTATIONNAME");
 
-                    b.Property<long>("RecTxInfoID")
-                        .HasColumnType("NUMBER(19)")
-                        .HasColumnName("RECTXINFOID");
-
-                    b.Property<int?>("RecTxInfoId")
+                    b.Property<int>("RecTxInfoID")
                         .HasColumnType("NUMBER(10)")
                         .HasColumnName("RECTXINFOID");
 
@@ -117,17 +113,13 @@ namespace DW5S.Repostory.Migrations
                     b.HasKey("Id")
                         .HasName("PK_ADRES");
 
-                    b.HasIndex("RecTxInfoId")
+                    b.HasIndex("RecTxInfoID")
                         .HasDatabaseName("IX_ADRES_RECTXINFOID");
 
                     b.HasIndex("UpdateTime")
                         .HasDatabaseName("IX_ADRES_UPDATETIME");
 
-                    b.ToTable("ADRES", null, t =>
-                        {
-                            t.Property("RecTxInfoId")
-                                .HasColumnName("RECTXINFOID1");
-                        });
+                    b.ToTable("ADRES", (string)null);
                 });
 
             modelBuilder.Entity("DW5S.Entity.CgRes", b =>
@@ -1464,7 +1456,9 @@ namespace DW5S.Repostory.Migrations
                 {
                     b.HasOne("DW5S.Entity.TxInfo", "RecTxInfo")
                         .WithMany()
-                        .HasForeignKey("RecTxInfoId")
+                        .HasForeignKey("RecTxInfoID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
                         .HasConstraintName("FK_ADRES_TXINFO_RECTXINFOID");
 
                     b.Navigation("RecTxInfo");

DW5S.Repostory/Migrations/20250217111330_Init.cs → DW5S.Repostory/Migrations/20250218024518_init.cs

@@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 namespace DW5S.Repostory.Migrations
 {
     /// <inheritdoc />
-    public partial class Init : Migration
+    public partial class init : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
@@ -408,8 +408,7 @@ namespace DW5S.Repostory.Migrations
                     REALFILECREATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
                     REALFILEUPDATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
                     REALFILESIZE = table.Column<long>(type: "NUMBER(19)", nullable: false),
-                    RECTXINFOID = table.Column<long>(type: "NUMBER(19)", nullable: false),
-                    RECTXINFOID1 = table.Column<int>(type: "NUMBER(10)", nullable: true),
+                    RECTXINFOID = table.Column<int>(type: "NUMBER(10)", nullable: false),
                     RECSTATIONNAME = table.Column<string>(type: "NVARCHAR2(2000)", nullable: true),
                     FILEERRORMSG = table.Column<string>(type: "NVARCHAR2(2000)", nullable: true),
                     CREATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
@@ -420,9 +419,10 @@ namespace DW5S.Repostory.Migrations
                     table.PrimaryKey("PK_ADRES", x => x.ID);
                     table.ForeignKey(
                         name: "FK_ADRES_TXINFO_RECTXINFOID",
-                        column: x => x.RECTXINFOID1,
+                        column: x => x.RECTXINFOID,
                         principalTable: "TXINFO",
-                        principalColumn: "ID");
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Cascade);
                 });
 
             migrationBuilder.CreateTable(
@@ -622,7 +622,7 @@ namespace DW5S.Repostory.Migrations
             migrationBuilder.CreateIndex(
                 name: "IX_ADRES_RECTXINFOID",
                 table: "ADRES",
-                column: "RECTXINFOID1");
+                column: "RECTXINFOID");
 
             migrationBuilder.CreateIndex(
                 name: "IX_ADRES_UPDATETIME",

DW5S.Repostory/Migrations/OracleContextModelSnapshot.cs

@@ -91,11 +91,7 @@ namespace DW5S.Repostory.Migrations
                         .HasColumnType("NVARCHAR2(2000)")
                         .HasColumnName("RECSTATIONNAME");
 
-                    b.Property<long>("RecTxInfoID")
-                        .HasColumnType("NUMBER(19)")
-                        .HasColumnName("RECTXINFOID");
-
-                    b.Property<int?>("RecTxInfoId")
+                    b.Property<int>("RecTxInfoID")
                         .HasColumnType("NUMBER(10)")
                         .HasColumnName("RECTXINFOID");
 
@@ -114,17 +110,13 @@ namespace DW5S.Repostory.Migrations
                     b.HasKey("Id")
                         .HasName("PK_ADRES");
 
-                    b.HasIndex("RecTxInfoId")
+                    b.HasIndex("RecTxInfoID")
                         .HasDatabaseName("IX_ADRES_RECTXINFOID");
 
                     b.HasIndex("UpdateTime")
                         .HasDatabaseName("IX_ADRES_UPDATETIME");
 
-                    b.ToTable("ADRES", null, t =>
-                        {
-                            t.Property("RecTxInfoId")
-                                .HasColumnName("RECTXINFOID1");
-                        });
+                    b.ToTable("ADRES", (string)null);
                 });
 
             modelBuilder.Entity("DW5S.Entity.CgRes", b =>
@@ -1461,7 +1453,9 @@ namespace DW5S.Repostory.Migrations
                 {
                     b.HasOne("DW5S.Entity.TxInfo", "RecTxInfo")
                         .WithMany()
-                        .HasForeignKey("RecTxInfoId")
+                        .HasForeignKey("RecTxInfoID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
                         .HasConstraintName("FK_ADRES_TXINFO_RECTXINFOID");
 
                     b.Navigation("RecTxInfo");

DW5S.ViewModel/ADResViewModel.cs

@@ -16,56 +16,74 @@ namespace DW5S.ViewModel
     /// </summary>
     public class ADResViewModel : BaseViewModel<long>
     {
-        /// <summary>
-        /// 信号时刻
-        /// </summary>
+
         [Display(Name = "信号时刻")]
         public DateTime SigTime { get; set; }
 
-        /// <summary>
-        /// 采集上行频点(Hz)
-        /// </summary>
-        [Display(Name = "采集上行频点(Hz)", AutoGenerateField = false)]
-        public double ADFreqUp { get; set; }
-
-        [Display(Name = "采集上行频点(MHz)")]
-        public double ADFreqUpDis => ADFreqUp / 1e6;
+        [Display(Name = "采样率")]
+        public int FsHz { get; set; }
 
         /// <summary>
-        /// 采集下行频点(Hz)
-        /// </summary>
-        [Display(Name = "采集下行频点(Hz)", AutoGenerateField = false)]
-        public double ADFreqDown { get; set; }
-
-
-        [Display(Name = "采集下行频点(MHz)")]
-        public double ADFreqDownDis => ADFreqDown / 1e6;
-
-
-        /// <summary>
-        /// 卫星
+        /// 卫星(4位数表示超短站方向编号)
         /// </summary>
         [Display(Name = "卫星编号", AutoGenerateField = false)]
-        public int SatInfoId { get; set; }
+        public int SatCode { get; set; }
 
         [Display(AutoGenerateField = false)]
-        [JsonIgnore]
         public virtual SatViewModel SatInfo { get; set; }
 
         [Display(Name = "卫星")]
         public string Sat => SatInfo.Sat;
 
-        /// <summary>
-        /// 接收站ID
-        /// </summary>
-        [Display(Name = "接收站ID", AutoGenerateField = false)]
-        public long RecTxInfoID { get; set; }
+        [Display(Name = "上行频点(Hz)", AutoGenerateField = false)]
+        public double FrequpHz { get; set; }
 
-        [Display(AutoGenerateField = false)]
-        [JsonIgnore]
-        public virtual RecTxViewModel RecTxInfo { get; set; }
+        [Display(Name = "上行频点(MHz)")]
+        public double FrequpMHz => FrequpHz / 1e6;
+
+        [Display(Name = "主星下行频点(Hz)", AutoGenerateField = false)]
+        public double FreqdownHz { get; set; }
+
+        [Display(Name = "主星下行频点(MHz)")]
+        public double FreqdownMHz => FreqdownHz / 1e6;
+
+        [Display(Name = "通道号")]
+        public int Ch { get; set; }
+
+        [Display(Name = "变频器中心频点")]
+        public long FreqCenter { get; set; }
+
+        [Display(Name = "文件理论开始时刻")]
+        public DateTime FileTime { get; set; }
+
+        [Display(Name = "文件理论采集时长")]
+        public double FileSeconds { get; set; }
+
+        [Display(Name = "文件理论字节大小(B)")]
+        public long FileSize { get; set; }
+
+        [Display(Name = "实际文件创建时刻")]
+        public DateTime RealFileCreateTime { get; set; }
+
+        [Display(Name = "实际文件修改时刻")]
+        public DateTime RealFileUpdateTime { get; set; }
+
+        [Display(Name = "实际文件字节大小(B)")]
+        public long RealFileSize { get; set; }
+
+        [Display(Name = "接收站编号")]
+        public int RecTxInfoID { get; set; }
+
+        [Display(Name = "通道号")]
+        public virtual TxInfo RecTxInfo { get; set; }
 
         [Display(Name = "接收站名称")]
-        public string RecName => RecTxInfo.Name;
+        public string RecStationName => RecTxInfo.Name;
+
+        /// <summary>
+        /// 文件错误信息(文件大小、落盘时间等)
+        /// </summary>
+        [Display(Name = "文件错误信息")]
+        public string FileErrorMsg { get; set; }
     }
 }