update entity

DW5S.App/EditForms/RefTaskFreqEditor.cs

@@ -63,8 +63,8 @@ namespace DW5S.App.EditForms
                 this.searchLookSat.EditValue = sats.FirstOrDefault(r => r.Id == info.SatInfoID);
                 this.txtCalccCycle.EditValue = $"{info.CalccCycle}";
                 this.txtSnr.EditValue = info.Snr;
-                this.txtDtoCenter.EditValue = Convert.ToInt64(info.DtoCenter * 1e6);
-                this.txtDtoRange.EditValue = info.DtoRange;
+                this.txtDtoCenter.EditValue = Convert.ToInt64(info.DtoCenterus * 1e6);
+                this.txtDtoRange.EditValue = info.DtoRangeus;
                 this.txtSampleLen.EditValue = info.SampleLen;
                 this.txtEnable.Checked = info.Enable;
             }
@@ -103,7 +103,7 @@ namespace DW5S.App.EditForms
                     dxErrorProvider.SetError(txtSnr, "信噪比格式错误");
                     return;
                 }
-                if (!long.TryParse(txtDtoCenter.Text, out long dtoCenter))
+                if (!int.TryParse(txtDtoCenter.Text, out int dtoCenter))
                 {
                     dxErrorProvider.SetError(txtDtoCenter, "时差中心格式错误");
                     return;
@@ -133,8 +133,8 @@ namespace DW5S.App.EditForms
                 info.SatInfo = satInfo.To<SatInfo>();
                 info.CalccCycle = Convert.ToInt32(txtCalccCycle.EditValue);
                 info.Snr = snr;
-                info.DtoCenter = dtoCenter / 1000000f;
-                info.DtoRange = dtoRange;
+                info.DtoCenterus = dtoCenter;
+                info.DtoRangeus = dtoRange;
                 info.SampleLen = sampleLen;
                 info.Enable = txtEnable.Checked;
 

DW5S.App/UserControl/CtrlRefCgRes.cs

@@ -132,7 +132,7 @@ namespace DW5S.App.UserControl
                 DateTime end = DateTime.MinValue;
                 if (satId!=null)
                 {
-                    queryable = queryable.Where(p => p.SatInfoId == satId);
+                    queryable = queryable.Where(p => p.SatInfoID == satId);
                 }
                 if (txtTimeCho.Text == "自定义")
                 {
@@ -142,26 +142,26 @@ namespace DW5S.App.UserControl
                 else
                 {
                     
-                    var max = queryable.OrderByDescending(p => p.SigTime).FirstOrDefault();
+                    var max = queryable.OrderByDescending(p => p.FileTime).FirstOrDefault();
                     if (max != null)
                     {
-                        end = max.SigTime;
+                        end = max.FileTime;
                         start = end.AddHours(-(int)txtTimeCho.EditValue);
                     }
                 }
                
                 if (start != DateTime.MinValue)
                 {
-                    queryable = queryable.Where(w => w.SigTime >= start);
+                    queryable = queryable.Where(w => w.FileTime >= start);
                 }
                 if (end != DateTime.MinValue)
                 {
-                    queryable = queryable.Where(w => w.SigTime <= end);
+                    queryable = queryable.Where(w => w.FileTime <= end);
                 }
                 queryable = queryable
                       .Include(w => w.SatInfo)
                       .Include(w => w.RefTxInfo)
-                      .OrderByDescending(o => o.SigTime)
+                      .OrderByDescending(o => o.FileTime)
                       .ThenBy(p => p.SatInfo.SatCode);
             }
             catch (Exception ex)

DW5S.App/UserControl/CtrlRefTask.cs

@@ -115,10 +115,10 @@ namespace DW5S.App.UserControl
                 {
                     SampleInfoID = addItem.SampleInfoID,
                     SatInfoID = addItem.SatInfoID,
-                    CalccCycle = addItem.CalccCycle,
-                    Snr = addItem.Snr,
-                    DtoCenter = addItem.DtoCenter,
-                    DtoRange = addItem.DtoRange,
+                    CalcCycle = addItem.CalccCycle,
+                    Snr0 = addItem.Snr,
+                    DtoCenterus = addItem.DtoCenterus,
+                    DtoRangeus = addItem.DtoRangeus,
                     SampleLen = addItem.SampleLen,
                     Enable = addItem.Enable,
                     UpdateTime = DateTime.Now,

DW5S.Controller/PosController.cs

@@ -107,7 +107,7 @@ namespace DW5S.Controllers
             var repsCheckRes = unitOfWork.OfLong<CheckRes>();
             var ckRes = await repsCheckRes.AddOrUpdateAsync(new CheckRes
             {
-                FileName = dto.CheckRes.FileName,
+                HttpFile = dto.CheckRes.FileName,
                 SmpStart = dto.CheckRes.SmpStart,
                 SmpCount = dto.CheckRes.SmpCount,
                 PosCheckType = (EnumPosCheckType?)dto.CheckRes?.PosCheckType,
@@ -297,7 +297,7 @@ namespace DW5S.Controllers
             var repsCheckRes = unitOfWork.OfLong<CheckRes>();
             var ckRes = await repsCheckRes.AddOrUpdateAsync(new CheckRes
             {
-                FileName = dto.CheckRes.FileName,
+                HttpFile = dto.CheckRes.FileName,
                 SmpStart = dto.CheckRes.SmpStart,
                 SmpCount = dto.CheckRes.SmpCount,
                 PosCheckType = (EnumPosCheckType?)dto.CheckRes?.PosCheckType,
@@ -468,7 +468,7 @@ namespace DW5S.Controllers
             var repsCheckRes = unitOfWork.OfLong<CheckRes>();
             var ckRes = await repsCheckRes.AddOrUpdateAsync(new CheckRes
             {
-                FileName = dto.CheckRes.FileName,
+                HttpFile = dto.CheckRes.FileName,
                 SmpStart = dto.CheckRes.SmpStart,
                 SmpCount = dto.CheckRes.SmpCount,
                 PosCheckType = (EnumPosCheckType?)dto.CheckRes?.PosCheckType,

DW5S.Entity/ADRes.cs

@@ -12,7 +12,6 @@ namespace DW5S.Entity
     /// <summary>
     /// 采集结果表
     /// </summary>
-    [Table("AdRes")]
     public class AdRes : BaseEntity<long>
     {
         /// <summary>

DW5S.Entity/CgRes.cs

@@ -1,4 +1,5 @@
-using System;
+using Microsoft.EntityFrameworkCore;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
@@ -11,7 +12,7 @@ namespace DW5S.Entity
     /// <summary>
     /// 参数估计结果表
     /// </summary>
-    [Table("CgRes")]
+    [Index(nameof(TaskID), nameof(SigTime), nameof(FrequpHz), IsDescending = new[] { true, true, false })]
     public class CgRes : BaseEntity<long>
     {
         /// <summary>

DW5S.Entity/CgXgfRes.cs

@@ -11,7 +11,6 @@ namespace DW5S.Entity
     /// <summary>
     /// 参数估计相关峰结果表
     /// </summary>
-    [Table("CgXgfRes")]
     public class CgXgfRes : BaseEntity<long>
     {
         [Display(AutoGenerateField = false)]
@@ -49,7 +48,5 @@ namespace DW5S.Entity
         [Display(Name = "信噪比(dB)")]
         public double? Snr { get; set; }
 
-
-       
     }
 }

DW5S.Entity/CheckRes.cs

@@ -1,4 +1,5 @@
-using System;
+using Microsoft.EntityFrameworkCore;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
@@ -8,13 +9,23 @@ using System.Threading.Tasks;
 
 namespace DW5S.Entity
 {
-    [Table("CheckRes")]
+    [Index(nameof(TaskID), nameof(SigTime), IsDescending = new[] { true, true })]
     public class CheckRes : BaseEntity<long>
     {
+        /// <summary>
+        /// 任务编号
+        /// </summary>
+        public int TaskID { get; set; }
+
+        /// <summary>
+        /// 采集文件时刻
+        /// </summary>
+        public int SigTime { get; set; }
+
         /// <summary>
         /// 检测文件名称
         /// </summary>
-        public string FileName { get; set; }
+        public string HttpFile { get; set; }
 
         /// <summary>
         /// 检测类型

DW5S.Entity/CxRes.cs

@@ -1,4 +1,5 @@
-using System;
+using Microsoft.EntityFrameworkCore;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
@@ -8,7 +9,7 @@ using System.Threading.Tasks;
 
 namespace DW5S.Entity
 {
-    [Table("CxRes")]
+    [Index(nameof(SigTime), IsDescending = new[] { true })]
     public class CxRes: BaseEntity<long>
     {
         [Display(Name = "信号时刻")]

DW5S.Entity/PosRes.cs

@@ -1,10 +1,13 @@
-using Newtonsoft.Json;
+using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
+using Serilog;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace DW5S.Entity
@@ -12,7 +15,7 @@ namespace DW5S.Entity
     /// <summary>
     /// 定位结果表
     /// </summary>
-    [Table("PosRes")]
+    [Index(nameof(TaskID), nameof(SigTime), nameof(FrequpHz), IsDescending = new[] { true, true, false })]
     public class PosRes : BaseEntity<long>
     {
         /// <summary>

DW5S.Entity/RefCgRes.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -12,45 +13,44 @@ namespace DW5S.Entity
     /// <summary>
     /// 参考参数估计结果表
     /// </summary>
-    [Table("RefCgRes")]
+    [Index(nameof(FileTime), nameof(FrequpHz), nameof(YbSnr), IsDescending = new[] { true, false, true })]
     public class RefCgRes : BaseEntity<long>
     {
         /// <summary>
-        /// 信号时刻
+        /// 文件时刻
         /// </summary>
-        public DateTime SigTime { get; set; }
+        public DateTime FileTime { get; set; }
 
         /// <summary>
         /// 参考上行频点(Hz)
         /// </summary>
-        public double RefFreqUp { get; set; }
+        public double FrequpHz { get; set; }
 
         /// <summary>
         /// 参考下行频点(Hz)
         /// </summary>
-        public double RefFreqDown { get; set; }
-
+        public double FreqdownHz { get; set; }
 
         /// <summary>
-        /// 卫星
+        /// 卫星编号
         /// </summary>
-        public int SatInfoId { get; set; }
+        public int SatInfoID { get; set; }
 
-        [Display(AutoGenerateField = false)]
+        /// <summary>
+        /// 卫星信息
+        /// </summary>
         public virtual SatInfo SatInfo { get; set; }
 
-
         /// <summary>
         /// 参考站ID
         /// </summary>
         public long RefTxInfoID { get; set; }
 
-
-        [Display(AutoGenerateField = false)]
-        public virtual TxInfo RefTxInfo { get; set; }
         /// <summary>
-        /// 参考站名称
+        /// 参考站信息
         /// </summary>
+        public virtual TxInfo RefTxInfo { get; set; }
+
 
         /// <summary>
         /// 样本时差(us)
@@ -66,39 +66,5 @@ namespace DW5S.Entity
         /// 样本信噪比(dB)
         /// </summary>
         public double YbSnr { get; set; }
-       
-        /// <summary>
-        /// 卫星星历发布时刻
-        /// </summary>
-        public DateTime SatXlTime { get; set; }
-        /// <summary>
-        /// 卫星坐标X
-        /// </summary>
-        public double SatX { get; set; }
-
-        /// <summary>
-        /// 卫星坐标Y
-        /// </summary>
-        public double SatY { get; set; }
-
-        /// <summary>
-        /// 卫星坐标Z
-        /// </summary>
-        public double SatZ { get; set; }
-
-        /// <summary>
-        /// 卫星速度Vx(m/s)
-        /// </summary>
-        public double SatVx { get; set; }
-
-        /// <summary>
-        /// 卫星速度Vy(m/s)
-        /// </summary>
-        public double SatVy { get; set; }
-
-        /// <summary>
-        /// 卫星速度Vz(m/s)
-        /// </summary>
-        public double SatVz { get; set; }
     }
 }

DW5S.Entity/RefTaskFreq.cs

@@ -13,7 +13,6 @@ namespace DW5S.Entity
     /// <summary>
     /// 参考任务频点表  卫星 频点 参考站  计算周期 信噪比 时差中心 时差范围  样本长度 状态 
     /// </summary>
-    [Table("RefTaskFreq")]
     public class RefTaskFreq : BaseEntity<long>
     {
         /// <summary>
@@ -21,39 +20,52 @@ namespace DW5S.Entity
         /// </summary>
         public int SampleInfoID { get; set; }
 
-        [Display(AutoGenerateField = false)]
+        /// <summary>
+        /// 样本信息
+        /// </summary>
         public virtual SampleInfo SampleInfo { get; set; }
+
         /// <summary>
         /// 卫星编号
         /// </summary>
         public int SatInfoID { get; set; }
 
-        [Display(AutoGenerateField = false)]
+        /// <summary>
+        /// 卫星信息
+        /// </summary>
         public virtual SatInfo SatInfo { get; set; }
     
         /// <summary>
         /// 计算周期(s)
         /// </summary>
-        public int CalccCycle { get; set; }
+        public int CalcCycle { get; set; }
 
         /// <summary>
-        /// 信噪比
+        /// 信噪比门限
         /// </summary>
-        public int Snr { get; set; }
+        public int Snr0 { get; set; }
 
         /// <summary>
-        /// 时差中心(s)
+        /// 时差中心us
         /// </summary>
-        public float DtoCenter { get; set; }
+        public int DtoCenterus { get; set; }
+
+
         /// <summary>
-        /// 时差范围 Hz
+        /// 时差范围us
         /// </summary>
-        public int DtoRange { get; set; }
+        public int DtoRangeus { get; set; }
+
+        /// <summary>
+        /// 频差范围Hz
+        /// </summary>
+        public int DfoRange { get; set; }
 
         /// <summary>
         /// 样本长度(s)
         /// </summary>
         public int SampleLen { get; set; }
+
         /// <summary>
         /// 是否启用
         /// </summary>

DW5S.Entity/SampleInfo.cs

@@ -12,7 +12,6 @@ using System.Threading.Tasks;
 
 namespace DW5S.Entity
 {
-    [Table("SampleInfo")]
     public class SampleInfo : BaseEntity<int>
     {
         /// <summary>

DW5S.Entity/SigInfo.cs

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DW5S.Entity
 {
-    [Table("SigInfo")]
     public class SigInfo : BaseEntity<int>
     {
         /// <summary>

DW5S.Entity/StationRes.cs

@@ -10,7 +10,6 @@ namespace DW5S.Entity
     /// <summary>
     /// 站点信息结果表
     /// </summary>
-    [Table("StationRes")]
     public class StationRes: BaseEntity<long>
     {
         /// <summary>

DW5S.Entity/SysSetings.cs

@@ -8,7 +8,6 @@ using System.Threading.Tasks;
 
 namespace DW5S.Entity
 {
-    [Table("SysSetings")]
     public class SysSetings : BaseEntity<int>
     {
         /// <summary>

DW5S.Entity/TaskTemplate.cs

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DW5S.Entity
 {
-    [Table("TaskTemplate")]   // 标识数据库创建的表名
     public class TaskTemplate : BaseEntity<int>
     {
         [Required]

DW5S.Entity/XlInfo.cs

@@ -12,7 +12,7 @@ namespace DW5S.Entity
     /// <summary>
     /// 星历信息表
     /// </summary>
-    [Index(nameof(SatName), nameof(TimeUTC), nameof(Lon))]
+    [Index(nameof(SatName), nameof(TimeUTC), nameof(Lon), IsDescending = new[] { false, true, false })]
     public class XlInfo : BaseEntity<int>
     {
         /// <summary>

DW5S.Repostory/04.DW5S.Repostory.csproj

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

DW5S.Repostory/EFContext/OracleContext.cs

@@ -95,6 +95,32 @@ namespace DW5S.Repostory
         }
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
+            //在Oracle11g中列名、索引、字段、表名、序列、触发器等名称长度均不能超过30个字符
+            //自动生成的超出30个字符的需要在下面自定义
+            modelBuilder.Entity<CgRes>().HasOne(p => p.StationRes).WithMany()
+                .HasConstraintName("FK_CGRES_STATIONRESID");
+            modelBuilder.Entity<SampleInfo>().HasOne(p => p.SigInfo).WithOne()
+                .HasConstraintName("FK_SAMPLEINFO_SIGINFOID");
+            modelBuilder.Entity<PosRes>().HasOne(p => p.StationRes).WithOne()
+                .HasConstraintName("FK_POSRES_STATIONRESID");
+            modelBuilder.Entity<PosRes>().HasOne(p => p.TargetInfo).WithOne()
+                .HasConstraintName("FK_POSRES_TARGETINFOID");
+            modelBuilder.Entity<RefTaskFreq>().HasOne(p => p.SampleInfo).WithOne()
+                .HasConstraintName("FK_REFTASKFREQ_SAMPLEINFOID");
+            modelBuilder.Entity<RefTaskFreq>().HasOne(p => p.SatInfo).WithOne()
+                .HasConstraintName("FK_REFTASKFREQ_SATINFOID");
+
+            modelBuilder.Entity<LogRes>().HasIndex(p => new { p.Module, p.LogTime, p.LogType })
+                .HasDatabaseName("IX_LOGRES_MODULE_TIME_TYPE");
+            modelBuilder.Entity<RefCgRes>().HasIndex(p => new { p.FileTime, p.FrequpHz, p.YbSnr })
+                .HasDatabaseName("IX_REFCGRES_TIME_FREQ_SNR");
+            modelBuilder.Entity<CgRes>().HasIndex(p => new { p.TaskID, p.SigTime, p.FrequpHz })
+                .HasDatabaseName("IX_CGRES_TASKID_TIME_FREQ");
+            modelBuilder.Entity<PosRes>().HasIndex(p => new { p.TaskID, p.SigTime, p.FrequpHz })
+                .HasDatabaseName("IX_POSRES_TASKID_TIME_FREQ");
+            
+
+
         }
         public DbSet<XlInfo> XlInfos { set; get; }
 
@@ -123,6 +149,9 @@ namespace DW5S.Repostory
         public DbSet<RefTaskFreq> RefTaskFreqs { get; set; }
 
         /*以下是Range分区表的DbSet*/
+
+        public DbSet<AdRes> AdRes { get; set; }
+
         public DbSet<LogRes> LogRes { set; get; }
         public DbSet<StationRes> StationRes { get; set; }
         public DbSet<CxRes> CxRes { get; set; }

DW5S.Repostory/Migrations/20250212085549_Init.cs → DW5S.Repostory/Migrations/20250217111330_Init.cs

@@ -12,15 +12,17 @@ namespace DW5S.Repostory.Migrations
         protected override void Up(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.CreateTable(
-                name: "CheckRes",
+                name: "CHECKRES",
                 columns: table => new
                 {
                     ID = table.Column<long>(type: "NUMBER(19)", nullable: false)
                         .Annotation("Oracle:Identity", "START WITH 1 INCREMENT BY 1"),
-                    FILENAME = table.Column<string>(type: "NVARCHAR2(2000)", nullable: true),
+                    TASKID = table.Column<int>(type: "NUMBER(10)", nullable: false),
+                    SIGTIME = table.Column<int>(type: "NUMBER(10)", nullable: false),
+                    HTTPFILE = table.Column<string>(type: "NVARCHAR2(2000)", nullable: true),
                     POSCHECKTYPE = table.Column<int>(type: "NUMBER(10)", nullable: true),
-                    SMPSTART = table.Column<long>(type: "NUMBER(19)", nullable: true),
-                    SMPCOUNT = table.Column<long>(type: "NUMBER(19)", nullable: true),
+                    SMPSTART = table.Column<long>(type: "NUMBER(19)", nullable: false),
+                    SMPCOUNT = table.Column<long>(type: "NUMBER(19)", nullable: false),
                     USERNAME = table.Column<string>(type: "NVARCHAR2(2000)", nullable: true),
                     MODTYPE = table.Column<string>(type: "NVARCHAR2(2000)", nullable: true),
                     MODRATE = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
@@ -35,7 +37,7 @@ namespace DW5S.Repostory.Migrations
                 });
 
             migrationBuilder.CreateTable(
-                name: "CxRes",
+                name: "CXRES",
                 columns: table => new
                 {
                     ID = table.Column<long>(type: "NUMBER(19)", nullable: false)
@@ -108,17 +110,35 @@ namespace DW5S.Repostory.Migrations
                 });
 
             migrationBuilder.CreateTable(
-                name: "SigInfo",
+                name: "SIGDELAY",
                 columns: table => new
                 {
                     ID = table.Column<int>(type: "NUMBER(10)", nullable: false)
                         .Annotation("Oracle:Identity", "START WITH 1 INCREMENT BY 1"),
-                    FREQUP = table.Column<long>(type: "NUMBER(19)", nullable: false),
-                    FREQDOWN = table.Column<long>(type: "NUMBER(19)", nullable: false),
+                    SIGINFOID = table.Column<int>(type: "NUMBER(10)", nullable: false),
+                    SATINFOSATCODE = table.Column<int>(type: "NUMBER(10)", nullable: false),
+                    SAT = table.Column<string>(type: "NVARCHAR2(2000)", nullable: true),
+                    DELAY = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
+                    CREATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
+                    UPDATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_SIGDELAY", x => x.ID);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "SIGINFO",
+                columns: table => new
+                {
+                    ID = table.Column<int>(type: "NUMBER(10)", nullable: false)
+                        .Annotation("Oracle:Identity", "START WITH 1 INCREMENT BY 1"),
+                    FREQUPHZ = table.Column<long>(type: "NUMBER(19)", nullable: false),
+                    FREQDOWNHZ = table.Column<long>(type: "NUMBER(19)", nullable: false),
                     SIGTYPE = table.Column<int>(type: "NUMBER(10)", nullable: false),
                     SIGCHECKTYPE = table.Column<int>(type: "NUMBER(10)", nullable: false),
-                    SNR = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
-                    BAND = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
+                    BAND = table.Column<int>(type: "NUMBER(10)", nullable: false),
+                    FSHZ = table.Column<int>(type: "NUMBER(10)", nullable: false),
                     CREATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
                     UPDATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false)
                 },
@@ -128,7 +148,7 @@ namespace DW5S.Repostory.Migrations
                 });
 
             migrationBuilder.CreateTable(
-                name: "StationRes",
+                name: "STATIONRES",
                 columns: table => new
                 {
                     ID = table.Column<long>(type: "NUMBER(19)", nullable: false)
@@ -140,8 +160,12 @@ namespace DW5S.Repostory.Migrations
                     CDBTXLAT = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
                     CXLON = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
                     CXLAT = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
+                    REFNAME = table.Column<string>(type: "NVARCHAR2(2000)", nullable: true),
                     REFLON = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
                     REFLAT = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
+                    FIXEDNAME = table.Column<string>(type: "NVARCHAR2(2000)", nullable: true),
+                    FIXEDLON = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
+                    FIXEDLAT = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
                     CREATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
                     UPDATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false)
                 },
@@ -151,7 +175,7 @@ namespace DW5S.Repostory.Migrations
                 });
 
             migrationBuilder.CreateTable(
-                name: "SysSetings",
+                name: "SYSSETINGS",
                 columns: table => new
                 {
                     ID = table.Column<int>(type: "NUMBER(10)", nullable: false)
@@ -198,13 +222,12 @@ namespace DW5S.Repostory.Migrations
                         .Annotation("Oracle:Identity", "START WITH 1 INCREMENT BY 1"),
                     TASKSTATE = table.Column<int>(type: "NUMBER(10)", nullable: false),
                     TASKNAME = table.Column<string>(type: "NVARCHAR2(2000)", nullable: true),
+                    TASKSOURCETYPE = table.Column<int>(type: "NUMBER(10)", nullable: false),
                     TASKTYPE = table.Column<int>(type: "NUMBER(10)", nullable: false),
                     POSTYPE = table.Column<int>(type: "NUMBER(10)", nullable: false),
                     MAINSAT = table.Column<int>(type: "NUMBER(10)", nullable: false),
-                    ADJA1SAT = table.Column<int>(type: "NUMBER(10)", nullable: true),
+                    ADJA1SAT = table.Column<int>(type: "NUMBER(10)", nullable: false),
                     ADJA2SAT = table.Column<int>(type: "NUMBER(10)", nullable: true),
-                    CAPDIR = table.Column<string>(type: "NVARCHAR2(2000)", nullable: true),
-                    CAPDIRFORMAT = table.Column<string>(type: "NVARCHAR2(2000)", nullable: true),
                     CREATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
                     UPDATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false)
                 },
@@ -271,91 +294,40 @@ namespace DW5S.Repostory.Migrations
                 });
 
             migrationBuilder.CreateTable(
-                name: "SIGDELAY",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "NUMBER(10)", nullable: false)
-                        .Annotation("Oracle:Identity", "START WITH 1 INCREMENT BY 1"),
-                    SIGINFOID = table.Column<int>(type: "NUMBER(10)", nullable: false),
-                    SATINFOSATCODE = table.Column<int>(type: "NUMBER(10)", nullable: false),
-                    SAT = table.Column<string>(type: "NVARCHAR2(2000)", nullable: true),
-                    SATINFOID = table.Column<int>(type: "NUMBER(10)", nullable: true),
-                    DELAY = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
-                    CREATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
-                    UPDATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_SIGDELAY", x => x.ID);
-                    table.ForeignKey(
-                        name: "FK_SIGDELAY_SATINFOID",
-                        column: x => x.SATINFOID,
-                        principalTable: "SATINFO",
-                        principalColumn: "ID");
-                    table.ForeignKey(
-                        name: "FK_SIGDELAY_SIGINFOID",
-                        column: x => x.SIGINFOID,
-                        principalTable: "SigInfo",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "CgRes",
+                name: "CGRES",
                 columns: table => new
                 {
                     ID = table.Column<long>(type: "NUMBER(19)", nullable: false)
                         .Annotation("Oracle:Identity", "START WITH 1 INCREMENT BY 1"),
+                    TASKID = table.Column<int>(type: "NUMBER(10)", nullable: false),
                     SIGTIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
+                    SIGINFOID = table.Column<int>(type: "NUMBER(10)", nullable: false),
+                    FREQUPHZ = table.Column<long>(type: "NUMBER(19)", nullable: false),
+                    FREQDOWNHZ = table.Column<long>(type: "NUMBER(19)", nullable: false),
                     STATIONRESID = table.Column<long>(type: "NUMBER(19)", nullable: false),
-                    TASKID = table.Column<int>(type: "NUMBER(10)", nullable: false),
-                    FIXEDSTATIONID = table.Column<int>(type: "NUMBER(10)", nullable: true),
-                    DTO1 = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    DFO1 = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    SNR1 = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
+                    CHECKRESID = table.Column<long>(type: "NUMBER(19)", nullable: false),
+                    ADRESID1 = table.Column<long>(type: "NUMBER(19)", nullable: false),
+                    ADRESID2 = table.Column<long>(type: "NUMBER(19)", nullable: false),
+                    ADRESID3 = table.Column<long>(type: "NUMBER(19)", nullable: true),
+                    MAINCODE = table.Column<int>(type: "NUMBER(10)", nullable: false),
+                    ADJA1CODE = table.Column<int>(type: "NUMBER(10)", nullable: false),
+                    ADJA2CODE = table.Column<int>(type: "NUMBER(10)", nullable: true),
+                    DTO1 = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
+                    DFO1 = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
+                    SNR1 = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
                     DTO2 = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
                     DFO2 = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
                     SNR2 = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    DTOCDB = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    DFOCDB = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    SNRCDB = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    YBMAINDTO = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    YBMAINDFO = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    YBMAINSNR = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    YBADJA1DTO = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    YBADJA1DFO = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    YBADJA1SNR = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    YBADJA2DTO = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    YBADJA2DFO = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    YBADJA2SNR = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    TARFREQUP = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    TARFREQDOWN = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    REFFREQUP = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    REFFREQDOWN = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    MAINCODE = table.Column<int>(type: "NUMBER(10)", nullable: true),
-                    ADJA1CODE = table.Column<int>(type: "NUMBER(10)", nullable: true),
-                    ADJA2CODE = table.Column<int>(type: "NUMBER(10)", nullable: true),
-                    MAINXLTIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: true),
+                    REFYBDTO1 = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
+                    REFYBDTO2 = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
+                    MAINXLTIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
                     ADJA1XLTIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: true),
-                    ADJA2XLTIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: true),
-                    MAINX = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    MAINY = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    MAINZ = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    MAINVX = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    MAINVY = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    MAINVZ = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
+                    MAINX = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
+                    MAINY = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
+                    MAINZ = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
                     ADJA1X = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
                     ADJA1Y = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
                     ADJA1Z = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    ADJA1VX = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    ADJA1VY = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    ADJA1VZ = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    ADJA2X = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    ADJA2Y = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    ADJA2Z = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    ADJA2VX = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    ADJA2VY = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
-                    ADJA2VZ = table.Column<double>(type: "BINARY_DOUBLE", nullable: true),
                     CREATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
                     UPDATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false)
                 },
@@ -363,14 +335,21 @@ namespace DW5S.Repostory.Migrations
                 {
                     table.PrimaryKey("PK_CGRES", x => x.ID);
                     table.ForeignKey(
-                        name: "FK_CGRES_FIXEDSTATIONID",
-                        column: x => x.FIXEDSTATIONID,
-                        principalTable: "FIXEDSTATION",
-                        principalColumn: "ID");
+                        name: "FK_CGRES_CHECKRES_CHECKRESID",
+                        column: x => x.CHECKRESID,
+                        principalTable: "CHECKRES",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_CGRES_SIGINFO_SIGINFOID",
+                        column: x => x.SIGINFOID,
+                        principalTable: "SIGINFO",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Cascade);
                     table.ForeignKey(
                         name: "FK_CGRES_STATIONRESID",
                         column: x => x.STATIONRESID,
-                        principalTable: "StationRes",
+                        principalTable: "STATIONRES",
                         principalColumn: "ID",
                         onDelete: ReferentialAction.Cascade);
                 });
@@ -383,8 +362,12 @@ namespace DW5S.Repostory.Migrations
                         .Annotation("Oracle:Identity", "START WITH 1 INCREMENT BY 1"),
                     TASKINFOID = table.Column<int>(type: "NUMBER(10)", nullable: false),
                     SIGINFOID = table.Column<int>(type: "NUMBER(10)", nullable: false),
-                    FREQUP = table.Column<long>(type: "NUMBER(19)", nullable: false),
-                    FREQDOWN = table.Column<long>(type: "NUMBER(19)", nullable: false),
+                    FSHZ = table.Column<long>(type: "NUMBER(19)", nullable: false),
+                    FREQUPHZ = table.Column<long>(type: "NUMBER(19)", nullable: false),
+                    FREQDOWNHZ = table.Column<long>(type: "NUMBER(19)", nullable: false),
+                    DTOCENTERUS = table.Column<float>(type: "BINARY_FLOAT", nullable: false),
+                    DTORANGEUS = table.Column<int>(type: "NUMBER(10)", nullable: false),
+                    SNR = table.Column<int>(type: "NUMBER(10)", nullable: false),
                     CREATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
                     UPDATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false)
                 },
@@ -392,13 +375,13 @@ namespace DW5S.Repostory.Migrations
                 {
                     table.PrimaryKey("PK_TASKSIG", x => x.ID);
                     table.ForeignKey(
-                        name: "FK_TASKSIG_SIGINFOID",
+                        name: "FK_TASKSIG_SIGINFO_SIGINFOID",
                         column: x => x.SIGINFOID,
-                        principalTable: "SigInfo",
+                        principalTable: "SIGINFO",
                         principalColumn: "ID",
                         onDelete: ReferentialAction.Cascade);
                     table.ForeignKey(
-                        name: "FK_TASKSIG_TASKINFOID",
+                        name: "FK_TASKSIG_TASKINFO_TASKINFOID",
                         column: x => x.TASKINFOID,
                         principalTable: "TASKINFO",
                         principalColumn: "ID",
@@ -406,27 +389,57 @@ namespace DW5S.Repostory.Migrations
                 });
 
             migrationBuilder.CreateTable(
-                name: "RefCgRes",
+                name: "ADRES",
                 columns: table => new
                 {
                     ID = table.Column<long>(type: "NUMBER(19)", nullable: false)
                         .Annotation("Oracle:Identity", "START WITH 1 INCREMENT BY 1"),
+                    HTTPFILE = table.Column<string>(type: "NVARCHAR2(2000)", nullable: true),
                     SIGTIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
-                    REFFREQUP = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
-                    REFFREQDOWN = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
+                    FSHZ = table.Column<int>(type: "NUMBER(10)", nullable: false),
+                    SATCODE = table.Column<int>(type: "NUMBER(10)", nullable: false),
+                    FREQUPHZ = table.Column<long>(type: "NUMBER(19)", nullable: false),
+                    FREQDOWNHZ = table.Column<long>(type: "NUMBER(19)", nullable: false),
+                    CH = table.Column<int>(type: "NUMBER(10)", nullable: false),
+                    FREQCENTER = table.Column<long>(type: "NUMBER(19)", nullable: false),
+                    FILETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
+                    FILESECONDS = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
+                    FILESIZE = table.Column<long>(type: "NUMBER(19)", nullable: false),
+                    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),
+                    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),
+                    UPDATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ADRES", x => x.ID);
+                    table.ForeignKey(
+                        name: "FK_ADRES_TXINFO_RECTXINFOID",
+                        column: x => x.RECTXINFOID1,
+                        principalTable: "TXINFO",
+                        principalColumn: "ID");
+                });
+
+            migrationBuilder.CreateTable(
+                name: "REFCGRES",
+                columns: table => new
+                {
+                    ID = table.Column<long>(type: "NUMBER(19)", nullable: false)
+                        .Annotation("Oracle:Identity", "START WITH 1 INCREMENT BY 1"),
+                    FILETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
+                    FREQUPHZ = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
+                    FREQDOWNHZ = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
                     SATINFOID = table.Column<int>(type: "NUMBER(10)", nullable: false),
                     REFTXINFOID = table.Column<long>(type: "NUMBER(19)", nullable: false),
                     REFTXINFOID1 = table.Column<int>(type: "NUMBER(10)", nullable: true),
                     YBDTO = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
                     YBDFO = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
                     YBSNR = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
-                    SATXLTIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
-                    SATX = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
-                    SATY = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
-                    SATZ = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
-                    SATVX = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
-                    SATVY = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
-                    SATVZ = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
                     CREATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
                     UPDATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false)
                 },
@@ -434,33 +447,33 @@ namespace DW5S.Repostory.Migrations
                 {
                     table.PrimaryKey("PK_REFCGRES", x => x.ID);
                     table.ForeignKey(
-                        name: "FK_REFCGRES_SATINFOID",
+                        name: "FK_REFCGRES_SATINFO_SATINFOID",
                         column: x => x.SATINFOID,
                         principalTable: "SATINFO",
                         principalColumn: "ID",
                         onDelete: ReferentialAction.Cascade);
                     table.ForeignKey(
-                        name: "FK_REFCGRES_REFTXINFOID",
+                        name: "FK_REFCGRES_TXINFO_REFTXINFOID",
                         column: x => x.REFTXINFOID1,
                         principalTable: "TXINFO",
                         principalColumn: "ID");
                 });
 
             migrationBuilder.CreateTable(
-                name: "SampleInfo",
+                name: "SAMPLEINFO",
                 columns: table => new
                 {
                     ID = table.Column<int>(type: "NUMBER(10)", nullable: false)
                         .Annotation("Oracle:Identity", "START WITH 1 INCREMENT BY 1"),
                     SAMPLENAME = table.Column<string>(type: "NVARCHAR2(2000)", nullable: true),
-                    REFTXINFOID = table.Column<int>(type: "NUMBER(10)", nullable: false),
+                    TXINFOID = table.Column<int>(type: "NUMBER(10)", nullable: false),
                     SIGINFOID = table.Column<int>(type: "NUMBER(10)", nullable: false),
                     FS = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
                     STARTSEC = table.Column<int>(type: "NUMBER(10)", nullable: false),
                     ENDSEC = table.Column<int>(type: "NUMBER(10)", nullable: false),
-                    SAMPLEFILENAME = table.Column<string>(type: "NVARCHAR2(200)", maxLength: 200, nullable: true),
+                    SAMPLEFILENAME = table.Column<string>(type: "NVARCHAR2(2000)", nullable: true),
                     SAMPLEPATH = table.Column<string>(type: "NVARCHAR2(2000)", nullable: true),
-                    REMARK = table.Column<string>(type: "NVARCHAR2(200)", maxLength: 200, nullable: true),
+                    REMARK = table.Column<string>(type: "NVARCHAR2(2000)", nullable: true),
                     CREATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
                     UPDATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false)
                 },
@@ -470,19 +483,19 @@ namespace DW5S.Repostory.Migrations
                     table.ForeignKey(
                         name: "FK_SAMPLEINFO_SIGINFOID",
                         column: x => x.SIGINFOID,
-                        principalTable: "SigInfo",
+                        principalTable: "SIGINFO",
                         principalColumn: "ID",
                         onDelete: ReferentialAction.Cascade);
                     table.ForeignKey(
-                        name: "FK_SAMPLEINFO_REFTXINFOID",
-                        column: x => x.REFTXINFOID,
+                        name: "FK_SAMPLEINFO_TXINFO_TXINFOID",
+                        column: x => x.TXINFOID,
                         principalTable: "TXINFO",
                         principalColumn: "ID",
                         onDelete: ReferentialAction.Cascade);
                 });
 
             migrationBuilder.CreateTable(
-                name: "CgXgfRes",
+                name: "CGXGFRES",
                 columns: table => new
                 {
                     ID = table.Column<long>(type: "NUMBER(19)", nullable: false)
@@ -500,36 +513,37 @@ namespace DW5S.Repostory.Migrations
                 {
                     table.PrimaryKey("PK_CGXGFRES", x => x.ID);
                     table.ForeignKey(
-                        name: "FK_CGXGFRES_CGRESID",
+                        name: "FK_CGXGFRES_CGRES_CGRESID",
                         column: x => x.CGRESID,
-                        principalTable: "CgRes",
+                        principalTable: "CGRES",
                         principalColumn: "ID",
                         onDelete: ReferentialAction.Cascade);
                 });
 
             migrationBuilder.CreateTable(
-                name: "PosRes",
+                name: "POSRES",
                 columns: table => new
                 {
                     ID = table.Column<long>(type: "NUMBER(19)", nullable: false)
                         .Annotation("Oracle:Identity", "START WITH 1 INCREMENT BY 1"),
-                    TASKINFOID = table.Column<int>(type: "NUMBER(10)", nullable: false),
+                    TASKID = table.Column<int>(type: "NUMBER(10)", nullable: false),
+                    SIGINFOID = table.Column<int>(type: "NUMBER(10)", nullable: false),
                     FREQUPHZ = table.Column<long>(type: "NUMBER(19)", nullable: false),
+                    FREQDOWNHZ = table.Column<long>(type: "NUMBER(19)", nullable: false),
+                    SIGTIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
                     STATIONRESID = table.Column<long>(type: "NUMBER(19)", nullable: false),
                     CXRESID = table.Column<long>(type: "NUMBER(19)", nullable: true),
                     CGRESID = table.Column<long>(type: "NUMBER(19)", nullable: false),
                     TARGETINFOID = table.Column<int>(type: "NUMBER(10)", nullable: true),
-                    CHECKRESID = table.Column<long>(type: "NUMBER(19)", nullable: true),
+                    CHECKRESID = table.Column<long>(type: "NUMBER(19)", nullable: false),
                     POSRESTYPE = table.Column<int>(type: "NUMBER(10)", nullable: false),
-                    TARGETSTATE = table.Column<int>(type: "NUMBER(10)", nullable: false),
-                    CREATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
-                    UPDATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
-                    SIGTIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
                     POSLON = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
                     POSLAT = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
                     MIRRLON = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
                     MIRRLAT = table.Column<double>(type: "BINARY_DOUBLE", nullable: false),
-                    CONFIDENCE = table.Column<int>(type: "NUMBER(10)", nullable: false)
+                    CONFIDENCE = table.Column<int>(type: "NUMBER(10)", nullable: false),
+                    CREATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
+                    UPDATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false)
                 },
                 constraints: table =>
                 {
@@ -537,39 +551,52 @@ namespace DW5S.Repostory.Migrations
                     table.ForeignKey(
                         name: "FK_POSRES_CGRES_CGRESID",
                         column: x => x.CGRESID,
-                        principalTable: "CgRes",
+                        principalTable: "CGRES",
                         principalColumn: "ID",
                         onDelete: ReferentialAction.Cascade);
                     table.ForeignKey(
-                        name: "FK_POSRES_CHECKRESID",
+                        name: "FK_POSRES_CHECKRES_CHECKRESID",
                         column: x => x.CHECKRESID,
-                        principalTable: "CheckRes",
-                        principalColumn: "ID");
+                        principalTable: "CHECKRES",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Cascade);
                     table.ForeignKey(
                         name: "FK_POSRES_CXRES_CXRESID",
                         column: x => x.CXRESID,
-                        principalTable: "CxRes",
+                        principalTable: "CXRES",
                         principalColumn: "ID");
+                    table.ForeignKey(
+                        name: "FK_POSRES_SIGINFO_SIGINFOID",
+                        column: x => x.SIGINFOID,
+                        principalTable: "SIGINFO",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Cascade);
                     table.ForeignKey(
                         name: "FK_POSRES_STATIONRESID",
                         column: x => x.STATIONRESID,
-                        principalTable: "StationRes",
+                        principalTable: "STATIONRES",
                         principalColumn: "ID",
                         onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_POSRES_TARGETINFOID",
+                        column: x => x.TARGETINFOID,
+                        principalTable: "TARGETINFO",
+                        principalColumn: "ID");
                 });
 
             migrationBuilder.CreateTable(
-                name: "RefTaskFreq",
+                name: "REFTASKFREQ",
                 columns: table => new
                 {
                     ID = table.Column<long>(type: "NUMBER(19)", nullable: false)
                         .Annotation("Oracle:Identity", "START WITH 1 INCREMENT BY 1"),
                     SAMPLEINFOID = table.Column<int>(type: "NUMBER(10)", nullable: false),
                     SATINFOID = table.Column<int>(type: "NUMBER(10)", nullable: false),
-                    CALCCCYCLE = table.Column<int>(type: "NUMBER(10)", nullable: false),
-                    SNR = table.Column<int>(type: "NUMBER(10)", nullable: false),
-                    DTOCENTER = table.Column<float>(type: "BINARY_FLOAT", nullable: false),
-                    DTORANGE = table.Column<int>(type: "NUMBER(10)", nullable: false),
+                    CALCCYCLE = table.Column<int>(type: "NUMBER(10)", nullable: false),
+                    SNR0 = table.Column<int>(type: "NUMBER(10)", nullable: false),
+                    DTOCENTERUS = table.Column<int>(type: "NUMBER(10)", nullable: false),
+                    DTORANGEUS = table.Column<int>(type: "NUMBER(10)", nullable: false),
+                    DFORANGE = table.Column<int>(type: "NUMBER(10)", nullable: false),
                     SAMPLELEN = table.Column<int>(type: "NUMBER(10)", nullable: false),
                     ENABLE = table.Column<bool>(type: "NUMBER(1)", nullable: false),
                     CREATETIME = table.Column<DateTime>(type: "TIMESTAMP(7)", nullable: false),
@@ -581,7 +608,7 @@ namespace DW5S.Repostory.Migrations
                     table.ForeignKey(
                         name: "FK_REFTASKFREQ_SAMPLEINFOID",
                         column: x => x.SAMPLEINFOID,
-                        principalTable: "SampleInfo",
+                        principalTable: "SAMPLEINFO",
                         principalColumn: "ID",
                         onDelete: ReferentialAction.Cascade);
                     table.ForeignKey(
@@ -593,38 +620,71 @@ namespace DW5S.Repostory.Migrations
                 });
 
             migrationBuilder.CreateIndex(
-                name: "IX_CGRES_FIXEDSTATIONID",
-                table: "CgRes",
-                column: "FIXEDSTATIONID");
+                name: "IX_ADRES_RECTXINFOID",
+                table: "ADRES",
+                column: "RECTXINFOID1");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ADRES_UPDATETIME",
+                table: "ADRES",
+                column: "UPDATETIME");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CGRES_CHECKRESID",
+                table: "CGRES",
+                column: "CHECKRESID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CGRES_SIGINFOID",
+                table: "CGRES",
+                column: "SIGINFOID");
 
             migrationBuilder.CreateIndex(
                 name: "IX_CGRES_STATIONRESID",
-                table: "CgRes",
+                table: "CGRES",
                 column: "STATIONRESID");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_CGRES_TASKID_TIME_FREQ",
+                table: "CGRES",
+                columns: new[] { "TASKID", "SIGTIME", "FREQUPHZ" },
+                descending: new[] { true, true, false });
+
             migrationBuilder.CreateIndex(
                 name: "IX_CGRES_UPDATETIME",
-                table: "CgRes",
+                table: "CGRES",
                 column: "UPDATETIME");
 
             migrationBuilder.CreateIndex(
                 name: "IX_CGXGFRES_CGRESID",
-                table: "CgXgfRes",
+                table: "CGXGFRES",
                 column: "CGRESID");
 
             migrationBuilder.CreateIndex(
                 name: "IX_CGXGFRES_UPDATETIME",
-                table: "CgXgfRes",
+                table: "CGXGFRES",
                 column: "UPDATETIME");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_CHECKRES_TASKID_SIGTIME",
+                table: "CHECKRES",
+                columns: new[] { "TASKID", "SIGTIME" },
+                descending: new bool[0]);
+
             migrationBuilder.CreateIndex(
                 name: "IX_CHECKRES_UPDATETIME",
-                table: "CheckRes",
+                table: "CHECKRES",
                 column: "UPDATETIME");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_CXRES_SIGTIME",
+                table: "CXRES",
+                column: "SIGTIME",
+                descending: new bool[0]);
+
             migrationBuilder.CreateIndex(
                 name: "IX_CXRES_UPDATETIME",
-                table: "CxRes",
+                table: "CXRES",
                 column: "UPDATETIME");
 
             migrationBuilder.CreateIndex(
@@ -644,72 +704,100 @@ namespace DW5S.Repostory.Migrations
 
             migrationBuilder.CreateIndex(
                 name: "IX_POSRES_CGRESID",
-                table: "PosRes",
+                table: "POSRES",
                 column: "CGRESID");
 
             migrationBuilder.CreateIndex(
                 name: "IX_POSRES_CHECKRESID",
-                table: "PosRes",
+                table: "POSRES",
                 column: "CHECKRESID");
 
             migrationBuilder.CreateIndex(
                 name: "IX_POSRES_CXRESID",
-                table: "PosRes",
+                table: "POSRES",
                 column: "CXRESID");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_POSRES_SIGINFOID",
+                table: "POSRES",
+                column: "SIGINFOID");
+
             migrationBuilder.CreateIndex(
                 name: "IX_POSRES_STATIONRESID",
-                table: "PosRes",
-                column: "STATIONRESID");
+                table: "POSRES",
+                column: "STATIONRESID",
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_POSRES_TARGETINFOID",
+                table: "POSRES",
+                column: "TARGETINFOID",
+                unique: true,
+                filter: "\"TARGETINFOID\" IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_POSRES_TASKID_TIME_FREQ",
+                table: "POSRES",
+                columns: new[] { "TASKID", "SIGTIME", "FREQUPHZ" },
+                descending: new[] { true, true, false });
 
             migrationBuilder.CreateIndex(
                 name: "IX_POSRES_UPDATETIME",
-                table: "PosRes",
+                table: "POSRES",
                 column: "UPDATETIME");
 
             migrationBuilder.CreateIndex(
                 name: "IX_REFCGRES_REFTXINFOID",
-                table: "RefCgRes",
+                table: "REFCGRES",
                 column: "REFTXINFOID1");
 
             migrationBuilder.CreateIndex(
                 name: "IX_REFCGRES_SATINFOID",
-                table: "RefCgRes",
+                table: "REFCGRES",
                 column: "SATINFOID");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_REFCGRES_TIME_FREQ_SNR",
+                table: "REFCGRES",
+                columns: new[] { "FILETIME", "FREQUPHZ", "YBSNR" },
+                descending: new[] { true, false, true });
+
             migrationBuilder.CreateIndex(
                 name: "IX_REFCGRES_UPDATETIME",
-                table: "RefCgRes",
+                table: "REFCGRES",
                 column: "UPDATETIME");
 
             migrationBuilder.CreateIndex(
                 name: "IX_REFTASKFREQ_SAMPLEINFOID",
-                table: "RefTaskFreq",
-                column: "SAMPLEINFOID");
+                table: "REFTASKFREQ",
+                column: "SAMPLEINFOID",
+                unique: true);
 
             migrationBuilder.CreateIndex(
                 name: "IX_REFTASKFREQ_SATINFOID",
-                table: "RefTaskFreq",
-                column: "SATINFOID");
+                table: "REFTASKFREQ",
+                column: "SATINFOID",
+                unique: true);
 
             migrationBuilder.CreateIndex(
                 name: "IX_REFTASKFREQ_UPDATETIME",
-                table: "RefTaskFreq",
+                table: "REFTASKFREQ",
                 column: "UPDATETIME");
 
             migrationBuilder.CreateIndex(
-                name: "IX_SAMPLEINFO_REFTXINFOID",
-                table: "SampleInfo",
-                column: "REFTXINFOID");
+                name: "IX_SAMPLEINFO_SIGINFOID",
+                table: "SAMPLEINFO",
+                column: "SIGINFOID",
+                unique: true);
 
             migrationBuilder.CreateIndex(
-                name: "IX_SAMPLEINFO_SIGINFOID",
-                table: "SampleInfo",
-                column: "SIGINFOID");
+                name: "IX_SAMPLEINFO_TXINFOID",
+                table: "SAMPLEINFO",
+                column: "TXINFOID");
 
             migrationBuilder.CreateIndex(
                 name: "IX_SAMPLEINFO_UPDATETIME",
-                table: "SampleInfo",
+                table: "SAMPLEINFO",
                 column: "UPDATETIME");
 
             migrationBuilder.CreateIndex(
@@ -717,16 +805,6 @@ namespace DW5S.Repostory.Migrations
                 table: "SATINFO",
                 column: "UPDATETIME");
 
-            migrationBuilder.CreateIndex(
-                name: "IX_SIGDELAY_SATINFOID",
-                table: "SIGDELAY",
-                column: "SATINFOID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_SIGDELAY_SIGINFOID",
-                table: "SIGDELAY",
-                column: "SIGINFOID");
-
             migrationBuilder.CreateIndex(
                 name: "IX_SIGDELAY_UPDATETIME",
                 table: "SIGDELAY",
@@ -734,17 +812,17 @@ namespace DW5S.Repostory.Migrations
 
             migrationBuilder.CreateIndex(
                 name: "IX_SIGINFO_UPDATETIME",
-                table: "SigInfo",
+                table: "SIGINFO",
                 column: "UPDATETIME");
 
             migrationBuilder.CreateIndex(
                 name: "IX_STATIONRES_UPDATETIME",
-                table: "StationRes",
+                table: "STATIONRES",
                 column: "UPDATETIME");
 
             migrationBuilder.CreateIndex(
                 name: "IX_SYSSETINGS_UPDATETIME",
-                table: "SysSetings",
+                table: "SYSSETINGS",
                 column: "UPDATETIME");
 
             migrationBuilder.CreateIndex(
@@ -785,7 +863,8 @@ namespace DW5S.Repostory.Migrations
             migrationBuilder.CreateIndex(
                 name: "IX_XLINFO_SATNAME_TIMEUTC_LON",
                 table: "XLINFO",
-                columns: new[] { "SATNAME", "TIMEUTC", "LON" });
+                columns: new[] { "SATNAME", "TIMEUTC", "LON" },
+                descending: new[] { false, true, false });
 
             migrationBuilder.CreateIndex(
                 name: "IX_XLINFO_UPDATETIME",
@@ -797,28 +876,31 @@ namespace DW5S.Repostory.Migrations
         protected override void Down(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.DropTable(
-                name: "CgXgfRes");
+                name: "ADRES");
 
             migrationBuilder.DropTable(
-                name: "LOGRES");
+                name: "CGXGFRES");
 
             migrationBuilder.DropTable(
-                name: "PosRes");
+                name: "FIXEDSTATION");
 
             migrationBuilder.DropTable(
-                name: "RefCgRes");
+                name: "LOGRES");
 
             migrationBuilder.DropTable(
-                name: "RefTaskFreq");
+                name: "POSRES");
 
             migrationBuilder.DropTable(
-                name: "SIGDELAY");
+                name: "REFCGRES");
 
             migrationBuilder.DropTable(
-                name: "SysSetings");
+                name: "REFTASKFREQ");
 
             migrationBuilder.DropTable(
-                name: "TARGETINFO");
+                name: "SIGDELAY");
+
+            migrationBuilder.DropTable(
+                name: "SYSSETINGS");
 
             migrationBuilder.DropTable(
                 name: "TASKRUNNNINGINFO");
@@ -830,16 +912,16 @@ namespace DW5S.Repostory.Migrations
                 name: "XLINFO");
 
             migrationBuilder.DropTable(
-                name: "CgRes");
+                name: "CGRES");
 
             migrationBuilder.DropTable(
-                name: "CheckRes");
+                name: "CXRES");
 
             migrationBuilder.DropTable(
-                name: "CxRes");
+                name: "TARGETINFO");
 
             migrationBuilder.DropTable(
-                name: "SampleInfo");
+                name: "SAMPLEINFO");
 
             migrationBuilder.DropTable(
                 name: "SATINFO");
@@ -848,13 +930,13 @@ namespace DW5S.Repostory.Migrations
                 name: "TASKINFO");
 
             migrationBuilder.DropTable(
-                name: "FIXEDSTATION");
+                name: "CHECKRES");
 
             migrationBuilder.DropTable(
-                name: "StationRes");
+                name: "STATIONRES");
 
             migrationBuilder.DropTable(
-                name: "SigInfo");
+                name: "SIGINFO");
 
             migrationBuilder.DropTable(
                 name: "TXINFO");

DW5S.ViewModel/RefTaskViewModel.cs

@@ -68,29 +68,34 @@ namespace DW5S.ViewModel
         public int Snr { get; set; }
 
         /// <summary>
-        /// 时差中心(s)
+        /// 时差中心us
         /// </summary>
-        [Display(Name = "时差中心(s)")]
-        public float DtoCenter { get; set; }
+        [Display(Name = "时差中心(us)")]
+        public int DtoCenterus { get; set; }
+
+        /// <summary>
+        /// 时差范围us
+        /// </summary>
+        [Display(Name = "时差范围(us)")]
+        public int DtoRangeus { get; set; }
+
         /// <summary>
-        /// 时差范围 Hz
+        /// 频差范围Hz
         /// </summary>
-        [Display(Name = "时差范围(Hz)")]
-        public int DtoRange { get; set; }
+        [Display(Name = "频差范围(Hz)")]
+        public int DfoRange { get; set; }
 
         /// <summary>
         /// 样本长度(s)
         /// </summary>
         [Display(Name = "样本长度(s)")]
         public int SampleLen { get; set; }
+        
         /// <summary>
         /// 是否启用
         /// </summary>
         [Display(Name = "是否启用", AutoGenerateField = false)]
         public bool Enable { get; set; }
 
-        [NotMapped]
-        [Display(Name = "是否启用")]
-        public string IsEnable => Enable ? "启用" : "禁用";
     }
 }