11

DW5S.App/CorTools/ResampleForm.cs

@@ -15,11 +15,18 @@ using System.Windows.Forms;
 using DW5S.DTO;
 using DW5S.Entity;
 using DW5S.Repostory;
+using Microsoft.Extensions.Logging;
 
 namespace DW5S.App.CorTools
 {
     public partial class ResampleForm : DevExpress.XtraEditors.XtraForm
     {
+        [Autowired]
+        private readonly ILogger logger;
+
+        [Autowired]
+        private readonly UnitOfWork unitOfWork;
+
         public SatInfo info;
         public ResampleForm()
         {
@@ -74,7 +81,9 @@ namespace DW5S.App.CorTools
             {
 
                 layoutControl1.Enabled = false;
-                if (SysConfig.Config== null)
+                var repsSys = unitOfWork.Of<SysSetings>();
+                var settings = await repsSys.FirstOrDefaultAsync();
+                if (settings == null)
                 {
                     layoutControl1.Enabled = true;
                     DxHelper.MsgBoxHelper.ShowWarning($"请在系统设置中配置基础信息");
@@ -88,7 +97,7 @@ namespace DW5S.App.CorTools
                 catch (Exception ex)
                 {
                     layoutControl1.Enabled = true;
-                    DW5S.Framework.LogHelper.Error(ex.Message, ex);
+                    logger.LogError(ex,ex.Message);
                     DxHelper.MsgBoxHelper.ShowError(ex.Message);
                     return;
                 }
@@ -108,7 +117,7 @@ namespace DW5S.App.CorTools
                         this.txtOutFile.Text = outFile;
                     else
                     {
-                        DW5S.Framework.LogHelper.Error($"下载文件[{response.data.File}]失败");
+                        logger.LogError($"下载文件[{response.data.File}]失败");
                         MsgBoxHelper.ShowError($"下载文件[{response.data.File}]失败");
                     }
                 }
@@ -119,12 +128,12 @@ namespace DW5S.App.CorTools
             }
             catch (TaskCanceledException)
             {
-                DW5S.Framework.LogHelper.Warning("变采样Http接口调用超时");
+                logger.LogInformation("变采样Http接口调用超时");
                 DxHelper.MsgBoxHelper.ShowInfo("变采样Http接口调用超时");
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("变采样出错", ex);
+                logger.LogError(ex,"变采样出错");
                 DxHelper.MsgBoxHelper.ShowError("变采样出错");
             }
             finally

DW5S.App/EditForms/X1D1DTOParamEditor.cs

@@ -15,22 +15,31 @@ using DW5S.KxcApi;
 using DW5S.DTO;
 using DW5S.Entity;
 using DW5S.Repostory;
+using Microsoft.Extensions.Logging;
 
 namespace DW5S.App.EditForms
 {
     public partial class X1D1DTOParamEditor : DevExpress.XtraEditors.XtraUserControl
     {
+        [Autowired]
+        private readonly ILogger logger;
+
+        [Autowired]
+        private readonly UnitOfWork unitOfWork;
+
         private MapControl mapControl1;
         private PosRes info;
         private CgRes cg;
         private List<SatInfo> listSat;
         private CxRes cx;
         private StationRes station;
-        public X1D1DTOParamEditor(PosRes info, MapControl mapControl)
+        public   X1D1DTOParamEditor(PosRes info, MapControl mapControl)
         {
             InitializeComponent();
             this.info = info;
-            itemSigTime.Text = $"{itemSigTime.Text}({SysConfig.Config.TimeZoneUTC})";
+            var repsSys = unitOfWork.Of<SysSetings>();
+            var settings = repsSys.FirstOrDefaultAsync().Result;
+            itemSigTime.Text = $"{itemSigTime.Text}({settings.TimeZoneUTC})";
             sigTime.UseDefault();
             this.layoutControl1.UseDefault();
             this.Text = $"{info.PosResType.GetEnumDisplayName()}时差参数";
@@ -40,10 +49,8 @@ namespace DW5S.App.EditForms
         private async void X1D1DTOParamEditor_Load(object sender, EventArgs e)
         {
             this.layoutControl1.BestFit();
-            using (RHDWContext db = new RHDWContext())
-            {
-                listSat = await db.SatInfos.ToListAsync();
-            }
+            var repsSat = unitOfWork.Of<SatInfo>();
+            listSat = (await repsSat.GetAllAsync()).ToList();
             using (RHDWPartContext db = RHDWPartContext.GetContext(info.SigTime))
             {
                 cg = await db?.CgRes.Where(m => m.ID == info.CgResID).FirstOrDefaultAsync();
@@ -203,7 +210,7 @@ namespace DW5S.App.EditForms
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error($"绘制{info.PosResType.GetEnumDisplayName()}时差线失败.PosID={info.ID},SigTime={info.SigTime}", ex  );
+                logger.LogError(ex,$"绘制{info.PosResType.GetEnumDisplayName()}时差线失败.PosID={info.Id},SigTime={info.SigTime}");
                 DxHelper.MsgBoxHelper.ShowWarning($"绘制{info.PosResType.GetEnumDisplayName()}时差线失败,{ex.Message}");
             }
         }
@@ -232,7 +239,7 @@ namespace DW5S.App.EditForms
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error($"手动推算{info.PosResType.GetEnumDisplayName()}星历失败,SigTime={sigTime}", ex);
+                logger.LogError($"手动推算{info.PosResType.GetEnumDisplayName()}星历失败,SigTime={sigTime}", ex);
                 DxHelper.MsgBoxHelper.ShowError($"手动推算{info.PosResType.GetEnumDisplayName()}星历失败,{ex.Message}");
             }
         }
@@ -286,7 +293,7 @@ namespace DW5S.App.EditForms
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error($"{info.PosResType.GetEnumDisplayName()}手动定位失败.PosID={info.ID},SigTime={info.SigTime}", ex);
+                logger.LogError($"{info.PosResType.GetEnumDisplayName()}手动定位失败.PosID={info.Id},SigTime={info.SigTime}", ex);
                 DxHelper.MsgBoxHelper.ShowWarning($"{info.PosResType.GetEnumDisplayName()}手动定位失败,{ex.Message}");
             }
         }
@@ -312,7 +319,7 @@ namespace DW5S.App.EditForms
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error($"绘制测向线失败.PosID={info.ID},SigTime={info.SigTime}", ex);
+                logger.LogError($"绘制测向线失败.PosID={info.Id},SigTime={info.SigTime}", ex);
                 DxHelper.MsgBoxHelper.ShowWarning($"绘制测向线失败,{ex.Message}");
             }
         }

DW5S.App/MainForm.cs

@@ -83,7 +83,7 @@ namespace DW5S
         {
             this.text = this.Text;
             this.HtmlText = $"<size=12>{this.text}";
-            var repsSys = unitOfWork.Reps<SysSetings>();
+            var repsSys = unitOfWork.Of<SysSetings>();
             var settings = await repsSys.FirstOrDefaultAsync();
             btn_ItemClick(null, null);
             ServerContext.Instance.Init();
@@ -128,7 +128,7 @@ namespace DW5S
             while (true)
             {
                 await Task.Delay(10000);
-                var repsSys = unitOfWork.Reps<SysSetings>();
+                var repsSys = unitOfWork.Of<SysSetings>();
                 var settings = await repsSys.FirstOrDefaultAsync();
                 if (settings == null
                     || string.IsNullOrWhiteSpace(settings.XLDirectory)
@@ -213,7 +213,7 @@ namespace DW5S
             {
                 try
                 {
-                    var repsXl = unitOfWork.Reps<XlInfo>();
+                    var repsXl = unitOfWork.Of<XlInfo>();
                     DateTime dt = DateTime.Now.AddYears(-1);
                     await repsXl.DeleteAsync(p => p.UpdateTime < dt);
                     await unitOfWork.SaveAsync();
@@ -241,8 +241,8 @@ namespace DW5S
                 {
                     List<XlInfo> calcItems = null;
                     List<SatInfo> satInfo = null;
-                    var repsXl = unitOfWork.Reps<XlInfo>();
-                    var repsSat = unitOfWork.Reps<SatInfo>();
+                    var repsXl = unitOfWork.Of<XlInfo>();
+                    var repsSat = unitOfWork.Of<SatInfo>();
 
                     calcItems = (await repsXl.FindAsync(p => p.Lon == null, p => p.SatCode, false)).Take(100).ToList();
                     satInfo = (await repsSat.GetAllAsync()).ToList();
@@ -271,12 +271,7 @@ namespace DW5S
                             }
                             if (Level1.Any())
                             {
-                                var repsXl = unitOfWork.Reps<XlInfo>();
-                                foreach (var item in Level1)
-                                {
-                                    repsXl.Update(item);
-                                }
-                                await unitOfWork.SaveAsync();
+                                await repsXl.AddOrUpdateAsync(Level1);
                             }
                             List<XlInfo> Level2 = new List<XlInfo>();
                             foreach (var item in calcItems)
@@ -295,14 +290,10 @@ namespace DW5S
                             }
                             if (Level2.Any())
                             {
-                                var repsXl = unitOfWork.Reps<XlInfo>();
-                                foreach (var item in Level2)
-                                {
-                                    repsXl.Update(item);
-                                }
-                                await unitOfWork.SaveAsync();
+                                await repsXl.AddOrUpdateAsync(Level2);
                             }
                         });
+                        await unitOfWork.SaveAsync();
                     }
                     else
                     {
@@ -356,7 +347,7 @@ namespace DW5S
         {
             while (true)
             {
-                var repsLogRes = unitOfWork.Reps<LogRes>();
+                var repsLogRes = unitOfWork.Of<LogRes>();
                 try
                 {
                     var time1 = DateTime.Today.AddDays(-7);
@@ -424,7 +415,7 @@ namespace DW5S
         private async void btnOpenApi_ItemClick(object sender, ItemClickEventArgs e)
         {
 
-            var repsSys = unitOfWork.Reps<SysSetings>();
+            var repsSys = unitOfWork.Of<SysSetings>();
             var settings = await repsSys.FirstOrDefaultAsync();
             if (settings == null)
             {
@@ -445,12 +436,12 @@ namespace DW5S
 
         private void StartProcess()
         {
-            Task.Run(async() =>
+            Task.Run(async () =>
             {
                 KillProcess();
                 Process pro = new Process();
                 var servicesDir = Directory.GetDirectories(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Service\\"), "*", SearchOption.TopDirectoryOnly);
-                var repsSys = unitOfWork.Reps<SysSetings>();
+                var repsSys = unitOfWork.Of<SysSetings>();
                 var settings = await repsSys.FirstOrDefaultAsync();
                 foreach (var item in servicesDir)
                 {
@@ -465,7 +456,7 @@ namespace DW5S
                     }
                     catch (Exception ex)
                     {
-                        logger.LogError(ex,$"启动【{item}】中的服务异常");
+                        logger.LogError(ex, $"启动【{item}】中的服务异常");
                         DxHelper.MsgBoxHelper.ShowError($"启动【{item}】中的服务异常");
                     }
                 }

DW5S.App/Model/ModelCg.cs

@@ -9,7 +9,7 @@ using DW5S.Repostory;
 
 namespace DW5S.App.Model
 {
-    public class ModelCg:BaseEntity<long>
+    public class ModelCg:BaseEntityLong
     {
         /// <summary>
         /// 信号时刻

DW5S.App/Model/ModelCgXgf.cs

@@ -9,7 +9,7 @@ using DW5S.Repostory;
 
 namespace DW5S.App.Model
 {
-    public class ModelCgXgf : BaseEntity<long>
+    public class ModelCgXgf : BaseEntityLong
     {
         /// <summary>
         /// 时差(us)

DW5S.App/UserControl/CtrlFixedStation.cs

@@ -5,15 +5,24 @@ using System.Data;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using DevExpress.XtraBars.Customization;
 using DW5S.App.EditForms;
 using DW5S.Entity;
 using DW5S.Repostory;
+using Microsoft.Extensions.Logging;
 
 namespace DW5S.App.UserControl
 {
     public partial class CtrlFixedStation : DevExpress.XtraEditors.XtraUserControl
     {
+        [Autowired]
+        private readonly ILogger logger;
+
+        [Autowired]
+        private readonly UnitOfWork unitOfWork;
+
         readonly List<FixedStation> list = new List<FixedStation>();
+
         public CtrlFixedStation()
         {
             InitializeComponent();
@@ -26,15 +35,13 @@ namespace DW5S.App.UserControl
                     .UseAddAsync(Add)
                     .UseEditAsync<FixedStation>(Edit)
                     .UseDeleteAsync<FixedStation>(Delete).SetDisplayText(nameof(FixedStation.Value), val => $"{val}秒");
-                using (var db = new RHDWContext())
-                {
-                    var items = await db.FixedStation.OrderBy(p => p.StationName).ToListAsync();
-                    list.AddRange(items);
-                }
+                var repsFix = unitOfWork.Of<FixedStation>();
+                var items = await repsFix.GetAllAsync(p => p.StationName);
+                list.AddRange(items);
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("查询固定站信息异常", ex);
+                logger.LogError(ex, "查询固定站信息异常");
                 DxHelper.MsgBoxHelper.ShowError("查询固定站信息异常");
             }
         }
@@ -46,16 +53,14 @@ namespace DW5S.App.UserControl
                 FixedStationEditor frm = new FixedStationEditor();
                 if (frm.ShowDialog() != DialogResult.OK) return null;
                 var addItem = frm.info;
-                using (RHDWContext db = new RHDWContext())
-                {
-                    db.FixedStation.Add(addItem);
-                    await db.SaveChangesAsync();
-                }
+                var repsFix = unitOfWork.Of<FixedStation>();
+                await repsFix.AddOrUpdateAsync(addItem);
+                await unitOfWork.SaveAsync();
                 return addItem;
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("添加卫星信息异常", ex);
+                logger.LogError(ex,"添加卫星信息异常");
                 DxHelper.MsgBoxHelper.ShowError("添加卫星信息异常");
                 return null;
             }
@@ -68,23 +73,23 @@ namespace DW5S.App.UserControl
                 FixedStationEditor frm = new FixedStationEditor(editItem);
                 if (frm.ShowDialog() != DialogResult.OK) return null;
                 editItem = frm.info;
-                using (RHDWContext db = new RHDWContext())
-                {
-                    var find = await db.FixedStation.Where(p => p.ID == editItem.ID).FirstOrDefaultAsync();
-                    find.StationName = editItem.StationName;
-                    find.FreqUpHz = editItem.FreqUpHz;
-                    find.Lon = editItem.Lon;
-                    find.Lat = editItem.Lat;
-                    find.Value = editItem.Value;
-                    find.Enable = editItem.Enable;
-                    find.UpdateTime = DateTime.Now;
-                    await db.SaveChangesAsync();
-                }
+                var repsFix = unitOfWork.Of<FixedStation>();
+
+                var find = (await repsFix.FirstOrDefaultAsync(p => p.Id == editItem.Id));
+                find.StationName = editItem.StationName;
+                find.FreqUpHz = editItem.FreqUpHz;
+                find.Lon = editItem.Lon;
+                find.Lat = editItem.Lat;
+                find.Value = editItem.Value;
+                find.Enable = editItem.Enable;
+                find.UpdateTime = DateTime.Now;
+                await repsFix.AddOrUpdateAsync(find);
+                await unitOfWork.SaveAsync();
                 return editItem;
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("保存固定站信息异常", ex);
+                logger.LogError(ex,"保存固定站信息异常");
                 DxHelper.MsgBoxHelper.ShowError("保存固定站信息异常");
                 return null;
             }
@@ -94,18 +99,15 @@ namespace DW5S.App.UserControl
         {
             try
             {
-                var ids = list.Select(p => p.ID);
-                using (RHDWContext db = new RHDWContext())
-                {
-                    var delItems = await db.SatInfos.Where(p => ids.Contains(p.ID)).ToListAsync();
-                    db.SatInfos.RemoveRange(delItems);
-                    await db.SaveChangesAsync();
-                }
+                var ids = list.Select(p => p.Id);
+                var repsSat = unitOfWork.Of<SatInfo>();
+                await repsSat.DeleteAsync(p => ids.Contains(p.Id));
+                await unitOfWork.SaveAsync();
                 return true;
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("删除卫星信息异常", ex);
+                logger.LogError(ex,"删除卫星信息异常");
                 DxHelper.MsgBoxHelper.ShowError("删除卫星信息异常");
                 return false;
             }

DW5S.App/UserControl/CtrlHome.cs

@@ -152,7 +152,7 @@ namespace DW5S.App.UserControl
                 foreach (var item in runningList)
                 {
                     item.TaskState = EnumTaskState.Stopped;
-                    repsTask.AddOrUpdate(item);
+                    repsTask.AddOrUpdateAsync(item);
                 }
                 var repsSat = unitOfWork.Of<SatInfo>();
                 var satres = await repsSat.GetAllAsync(p => p.SatName);
@@ -551,7 +551,7 @@ namespace DW5S.App.UserControl
                         find.Adja2Sat = editItem.Adja2Sat;
                     }
                     find.UpdateTime = DateTime.Now;
-                    repsTask.AddOrUpdate(find);
+                    await repsTask.AddOrUpdateAsync(find);
 
                     await repsTaskSig.DeleteAsync(p => p.TaskInfoID == editItem.Id);
                     List<TaskSig> sigList = new List<TaskSig>();
@@ -722,7 +722,7 @@ namespace DW5S.App.UserControl
                     }
                     var item = await repsTask.FirstOrDefaultAsync(p => p.Id == tsk.Id);
                     item.TaskState = EnumTaskState.Running;
-                    repsTask.AddOrUpdate(item);
+                    await repsTask.AddOrUpdateAsync(item);
                     tsk.TaskState = EnumTaskState.Running;
                     await unitOfWork.SaveAsync();
                     logger.LogInformation($"用户启动了任务,ID={tsk.Id}");
@@ -741,7 +741,7 @@ namespace DW5S.App.UserControl
                 {
                     var item = await repsTask.FirstOrDefaultAsync(p => p.Id == tsk.Id);
                     item.TaskState = EnumTaskState.Stopped;
-                    repsTask.AddOrUpdate(item);
+                    await repsTask.AddOrUpdateAsync(item);
                     await unitOfWork.SaveAsync();
                     tsk.TaskState = EnumTaskState.Stopped;
                     string url = "";
@@ -1313,7 +1313,7 @@ namespace DW5S.App.UserControl
                     posItem.PosLat = item.PosLat;
                     posItem.MirrLon = item.MirrLon;
                     posItem.MirrLat = item.MirrLat;
-                    repsPos.AddOrUpdate(posItem);
+                    await repsPos.AddOrUpdateAsync(posItem);
                 }
                 await unitOfWork.SaveAsync();
                 string msg = $"重新定位完成,共{items.Count()}条记录";
@@ -1411,7 +1411,7 @@ namespace DW5S.App.UserControl
                     var posItem = await repsPos.FirstOrDefaultAsync(p => p.Id == item.Id);
                     posItem.TargetInfoID = tar.Id;
                     posItem.ColorKey = tar.TargeColor;
-                    repsPos.AddOrUpdate(posItem);
+                    await repsPos.AddOrUpdateAsync(posItem);
                     mapControl1.UpdatePosItem(posItem);
                 }
                 var ds = this.gridHomePosRes.DataSource as List<ModelPosRes>;

DW5S.App/UserControl/CtrlSvrLog.cs

@@ -17,16 +17,19 @@ using System.Threading.Tasks;
 using System.Windows.Controls;
 using System.Windows.Documents;
 using System.Windows.Forms;
-using DW5S.App.Controllers;
 using DW5S.App.EditForms;
 using DW5S.App.Model;
 using DW5S.DTO;
 using DW5S.Repostory;
+using Microsoft.Extensions.Logging;
 
 namespace DW5S.App.UserControl
 {
     public partial class CtrlSvrLog : DevExpress.XtraEditors.XtraUserControl
     {
+        [Autowired]
+        private readonly ILogger logger;
+
         List<LogInfo> list = new List<LogInfo>();
         public CtrlSvrLog()
         {
@@ -101,7 +104,7 @@ namespace DW5S.App.UserControl
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("查询日志出错", ex);
+                logger.LogError(ex,"查询日志出错");
                 MsgBoxHelper.ShowError("查询日志出错");
             }
             btnQuery.Enabled = true;

DW5S.App/UserControl/CtrlSvrs.Designer.cs

@@ -132,7 +132,7 @@
             this.Controls.Add(this.layoutControl1);
             this.Name = "CtrlSvrs";
             this.Size = new System.Drawing.Size(805, 490);
-            this.Load += new System.EventHandler(this.CtrlSvrs_Load);
+            this.Load += new System.EventHandler(this.CtrlSvrs_LoadAsync);
             ((System.ComponentModel.ISupportInitialize)(this.gridSvrs)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();

DW5S.App/UserControl/CtrlSvrs.cs

@@ -14,16 +14,24 @@ using System.Threading.Tasks;
 using System.Windows.Controls;
 using System.Windows.Documents;
 using System.Windows.Forms;
-using DW5S.App.Controllers;
 using DW5S.App.EditForms;
 using DW5S.App.Model;
 using DW5S.DTO;
 using DW5S.Repostory;
+using DW5S.Service;
+using DW5S.Entity;
+using Microsoft.Extensions.Logging;
 
 namespace DW5S.App.UserControl
 {
     public partial class CtrlSvrs : DevExpress.XtraEditors.XtraUserControl
     {
+        [Autowired]
+        private readonly ILogger logger;
+
+        [Autowired]
+        private readonly UnitOfWork unitOfWork;
+
         List<ModelSvr> list = new List<ModelSvr>();
         public CtrlSvrs()
         {
@@ -31,7 +39,7 @@ namespace DW5S.App.UserControl
         }
 
 
-        private void CtrlSvrs_Load(object sender, EventArgs e)
+        private async void CtrlSvrs_Load(object sender, EventArgs e)
         {
             gridSvrs.UseDefault(list).UseGroup().UseRowNumber();
             gridSvrs.UseEdit();
@@ -42,11 +50,13 @@ namespace DW5S.App.UserControl
                 gridView1.Columns[nameof(ModelSvr.SwaggerAddr)].ColumnEdit = linkEdit;
                 gridView1.Columns[nameof(ModelSvr.SwaggerAddr)].OptionsColumn.AllowEdit = true;
             }
-            this.list.AddRange(ServerContext.Instance.GetAll());
+            this.list.AddRange(ServerContext.Instance.GetAll().To<List<ModelSvr>>());
             gridView1.RefreshData();
             Messenger.Defalut.Sub<List<ModelSvr>>("服务集合改变", RefreshSvr);
-            if (SysConfig.Config != null)
-                this.simpleLabelItem2.Text = $"如果服务无法注册到平台需要到平台所在设备允许防火墙通过平台端口{SysConfig.Config.HttpPort}";
+            var repsSys = unitOfWork.Of<SysSetings>();
+            var settings = await repsSys.FirstOrDefaultAsync();
+            if (settings != null)
+                this.simpleLabelItem2.Text = $"如果服务无法注册到平台需要到平台所在设备允许防火墙通过平台端口{settings.HttpPort}";
 
         }
         private void RefreshSvr(List<ModelSvr> items)
@@ -93,7 +103,7 @@ namespace DW5S.App.UserControl
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("处理服务状态上报异常", ex);
+                logger.LogError(ex,"处理服务状态上报异常");
             }
         }
 

DW5S.Entity/FixedStation.cs

@@ -11,7 +11,7 @@ namespace DW5S.Entity
     /// <summary>
     /// 固定站信息表
     /// </summary>
-    public class FixedStation : BaseEntityLong
+    public class FixedStation : BaseEntity
     {
         /// <summary>
         /// 名称