代码优化

yangzhiqin · yangzhiqin · commit 3b80faf29a0d · 2023-07-17T10:03:16.000+08:00
diff --git a/OMDb.Core/Services/DataCenterDbService/EntryLabelClassService.cs b/OMDb.Core/Services/DataCenterDbService/EntryLabelClassService.cs
@@ -18,7 +18,7 @@ public static class EntryLabelClassService
         public static List<EntryLabelClassLinkDb> SelectAllEntryLabel()
         {
             StringBuilder sb = new StringBuilder();
-            sb.AppendFormat(@"select * from EntryLabel ");
+            sb.AppendFormat(@"select * from EntryLabelClassLink ");
             return DbService.DCDb.Ado.SqlQuery<EntryLabelClassLinkDb>(sb.ToString());
         }
 
@@ -31,7 +31,7 @@ public static List<EntryLabelClassLinkDb> SelectAllEntryLabel()
         public static List<EntryLabelClassLinkDb> SelectAllEntryLabel(string dbId)
         {
             StringBuilder sb = new StringBuilder();
-            sb.AppendFormat($@"select * from EntryLabel where DbId='{dbId}'");
+            sb.AppendFormat($@"select * from EntryLabelClassLink where DbId='{dbId}'");
             return DbService.DCDb.Ado.SqlQuery<EntryLabelClassLinkDb>(sb.ToString());
         }
 
diff --git a/OMDb.Core/Services/DataCenterDbService/EntryLabelPropertyService.cs b/OMDb.Core/Services/DataCenterDbService/EntryLabelPropertyService.cs
@@ -18,7 +18,7 @@ public static class EntryLabelPropertyService
         public static List<EntryLabelPropertyLinkDb> SelectAllEntryLabel()
         {
             StringBuilder sb = new StringBuilder();
-            sb.AppendFormat(@"select * from EntryLabel ");
+            sb.AppendFormat(@"select * from EntryLabelPropertyLink");
             return DbService.DCDb.Ado.SqlQuery<EntryLabelPropertyLinkDb>(sb.ToString());
         }
 
@@ -31,7 +31,7 @@ public static List<EntryLabelPropertyLinkDb> SelectAllEntryLabel()
         public static List<EntryLabelPropertyLinkDb> SelectAllEntryLabel(string dbId)
         {
             StringBuilder sb = new StringBuilder();
-            sb.AppendFormat($@"select * from EntryLabel where DbId='{dbId}'");
+            sb.AppendFormat($@"select * from EntryLabelPropertyLink where DbId='{dbId}'");
             return DbService.DCDb.Ado.SqlQuery<EntryLabelPropertyLinkDb>(sb.ToString());
         }
 
diff --git a/OMDb.Core/Services/DataCenterDbService/LabelPropertyService.cs b/OMDb.Core/Services/DataCenterDbService/LabelPropertyService.cs
@@ -47,7 +47,12 @@ public static async Task<List<LabelPropertyDb>> GetAllLabelAsync(string currentD
             else return null;
         }
 
-
+        public static List<LabelPropertyDb> Get1stLabel()
+        {
+            if (IsLocalDbValid())
+                return DbService.DCDb.Queryable<LabelPropertyDb>().Where(a=>a.Level==1).ToList();
+            else return null;
+        }
 
         /// <summary>
         /// 获取属性标签数量
@@ -279,7 +284,7 @@ public static List<string> GetLKId(string DbCenterId, string lpid)
             var lst1 = DbService.DCDb.Ado.SqlQuery<string>(sb1.ToString());
             var lst2 = DbService.DCDb.Ado.SqlQuery<string>(sb2.ToString());
             lst1.AddRange(lst2);
-            var lst=lst1.Distinct();
+            var lst = lst1.Distinct();
             return lst.ToList();
         }
 
@@ -291,7 +296,10 @@ public static List<string> GetLKId(string DbCenterId, string lpid)
         /// <returns></returns>
         public static void ClearLabelPropertyLK(string DbCenterId, string lpid)
         {
-            DbService.DCDb.Deleteable<LabelPropertyLinkDb>(p => p.LPIdA == lpid||p.LPIdB==lpid).ExecuteCommand();
+            DbService.DCDb.Deleteable<LabelPropertyLinkDb>(p => p.LPIdA == lpid || p.LPIdB == lpid).ExecuteCommand();
         }
+
+
+
     }
 }
diff --git a/OMDb.Core/Services/StorageDbService/EntryCommonService.cs b/OMDb.Core/Services/StorageDbService/EntryCommonService.cs
@@ -21,7 +21,7 @@ public static List<dynamic> SelectEntry(string dbId)
                 sb.AppendFormat(@"select 
 t13.Eid,NameStr,ReleaseDate,MyRating,SaveType,path_entry,path_cover,path_source from 
 (select distinct t1.EntryId as Eid,t1.Path as path_entry,t1.SaveType,t1.CoverImg as path_cover,t1.ReleaseDate,t1.MyRating,group_concat(t3.path,'>,<') as path_source from Entry t1 
-    left join EntrySource t3 on t1.EntryId=t3.EntryId and ((t1.SaveType=t3.FileType) or (t1.SaveType=2 and t3.FileType!=1) or (t1.SaveType=3))
+    left join EntrySource t3 on t1.EntryId=t3.EntryId and ((t1.SaveType=t3.PathType) or (t1.SaveType=2 and t3.PathType<>1) or (t1.SaveType=3))
     group by t1.EntryId) t13 
 inner join 
 (select distinct t1.EntryId as Eid,group_concat(t2.Name,'/') as NameStr from Entry t1 
diff --git a/OMDb.Core/Services/StorageDbService/EntryService.cs b/OMDb.Core/Services/StorageDbService/EntryService.cs
@@ -378,7 +378,7 @@ public static void UpdateOrAddEntry(Entry entry)
                 entry.EntryId = Guid.NewGuid().ToString();
             entry.CoverImg = entry.CoverImg.GetDefaultCoverName();
             var existingEntry = DbService.GetConnection(entry.DbId).Queryable<EntryDb>().Where(s => s.EntryId == entry.EntryId).First();
-            if (existingEntry != null)
+            if (existingEntry == null)
                 DbService.GetConnection(entry.DbId).Insertable(entry as EntryDb).ExecuteCommand();
             else
                 DbService.GetConnection(entry.DbId).Updateable<EntryDb>(entry as EntryDb).RemoveDataCache().ExecuteCommand();
diff --git a/OMDb.WinUI3/OMDb.WinUI3/Models/EntrySortInfoResult.cs b/OMDb.WinUI3/OMDb.WinUI3/Models/EntrySortInfoResult.cs
@@ -0,0 +1,35 @@
+﻿using CommunityToolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OMDb.WinUI3.Models
+{
+    public class EntrySortInfoResult : ObservableObject
+    {
+        private string _title;
+        public string Title
+        {
+            get => _title;
+            set => SetProperty(ref _title, value);
+        }
+
+        private string _sortType;
+        public string SortType
+        {
+            get => _sortType;
+            set => SetProperty(ref _sortType, value);
+        }
+
+        public List<string> SortTypes= new List<string>() { "升序","降序"};
+
+        public EntrySortInfoResult(string title) 
+        {
+            _title = title;
+            _sortType = "升序";
+        }
+    }
+}
diff --git a/OMDb.WinUI3/OMDb.WinUI3/Models/EntrySortInfoTree.cs b/OMDb.WinUI3/OMDb.WinUI3/Models/EntrySortInfoTree.cs
@@ -0,0 +1,36 @@
+﻿using CommunityToolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OMDb.WinUI3.Models
+{
+    public class EntrySortInfoTree : ObservableObject
+    {
+        private string _title;
+        public string Title
+        {
+            get => _title;
+            set => SetProperty(ref _title, value);
+        }
+
+        private ObservableCollection<EntrySortInfoTree> _children;
+        public ObservableCollection<EntrySortInfoTree> Children
+        {
+            get => _children;
+            set => SetProperty(ref _children, value);
+        }
+
+        public EntrySortInfoTree(string title) 
+        {
+            _title = title;
+        }
+        public EntrySortInfoTree()
+        {
+
+        }
+    }
+}
diff --git a/OMDb.WinUI3/OMDb.WinUI3/MyControls/StorageCard.xaml.cs b/OMDb.WinUI3/OMDb.WinUI3/MyControls/StorageCard.xaml.cs
@@ -102,7 +102,7 @@ private async void Export_Click(object sender, RoutedEventArgs e)
             //var outputPath = System.IO.Path.Combine(((OMDb.WinUI3.Models.EnrtyStorage)((Microsoft.UI.Xaml.FrameworkElement)e.OriginalSource).DataContext).StoragePath, name);
             var dbId = ((OMDb.WinUI3.Models.EnrtyStorage)((Microsoft.UI.Xaml.FrameworkElement)e.OriginalSource).DataContext).StorageName;
             var enrtyStorage = ((OMDb.WinUI3.Models.EnrtyStorage)((Microsoft.UI.Xaml.FrameworkElement)e.OriginalSource).DataContext);
-            var outputPath = await Helpers.PickHelper.PickSaveFileAsync(".xlsx");
+            var outputPath = await Helpers.PickHelper.PickSaveFileAsync(".xls");
             if (outputPath== null )
             {
                 InfoHelper.ShowError("導出路徑有誤！");
diff --git a/OMDb.WinUI3/OMDb.WinUI3/Services/EntryService.cs b/OMDb.WinUI3/OMDb.WinUI3/Services/EntryService.cs
@@ -112,10 +112,10 @@ private static async Task SaveToDbAsync(Models.EntryDetail ed)
         {
             await Task.Run(() =>
             {
+                TreatEntry(ed);//处理词条主表Entry
                 Core.Services.EntryService.UpdateOrAddEntry(ed.Entry);//词条
                 Core.Services.EntryNameSerivce.UpdateOrAddDefaultNames(ed.Entry.EntryId, ed.Entry.DbId, ed.Entry.Name);//更新或插入词条默认名称
 
-                TreatEntry(ed);//处理词条主表Entry
                 TreatEntrySource(ed);//资源路径表EntrySource更新
                 TreatLabelLink(ed);//词条标签关联表
 
diff --git a/OMDb.WinUI3/OMDb.WinUI3/Services/ExcelService.cs b/OMDb.WinUI3/OMDb.WinUI3/Services/ExcelService.cs
@@ -152,6 +152,7 @@ public static void ExportExcel(string filePath, EnrtyStorage enrtyStorage)
             //DataTable的列名和excel的列名对应字典，因为excel的列名一般是中文的，DataTable的列名是英文的，字典主要是存储excel和DataTable列明的对应关系，当然我们也可以把这个对应关系存在配置文件或者其他地方
             Dictionary<string, string> dir = new Dictionary<string, string>();
             dir.Add("Name", "詞條名稱");
+            dir.Add("Alias", "别稱");
             dir.Add("ReleaseDate", "發行日期");
             dir.Add("MyRating", "評分");
 
diff --git a/OMDb.WinUI3/OMDb.WinUI3/ViewModels/EntryViewModel.cs b/OMDb.WinUI3/OMDb.WinUI3/ViewModels/EntryViewModel.cs
diff --git a/OMDb.WinUI3/OMDb.WinUI3/Views/EntryPage.xaml b/OMDb.WinUI3/OMDb.WinUI3/Views/EntryPage.xaml

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public static class EntryLabelClassService`
`18`	`18`	`public static List<EntryLabelClassLinkDb> SelectAllEntryLabel()`
`19`	`19`	`{`
`20`	`20`	`StringBuilder sb = new StringBuilder();`
`21`		`- sb.AppendFormat(@"select * from EntryLabel ");`
	`21`	`+ sb.AppendFormat(@"select * from EntryLabelClassLink ");`
`22`	`22`	`return DbService.DCDb.Ado.SqlQuery<EntryLabelClassLinkDb>(sb.ToString());`
`23`	`23`	`}`
`24`	`24`
`@@ -31,7 +31,7 @@ public static List<EntryLabelClassLinkDb> SelectAllEntryLabel()`
`31`	`31`	`public static List<EntryLabelClassLinkDb> SelectAllEntryLabel(string dbId)`
`32`	`32`	`{`
`33`	`33`	`StringBuilder sb = new StringBuilder();`
`34`		`- sb.AppendFormat($@"select * from EntryLabel where DbId='{dbId}'");`
	`34`	`+ sb.AppendFormat($@"select * from EntryLabelClassLink where DbId='{dbId}'");`
`35`	`35`	`return DbService.DCDb.Ado.SqlQuery<EntryLabelClassLinkDb>(sb.ToString());`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,12 @@ public static async Task<List<LabelPropertyDb>> GetAllLabelAsync(string currentD`
`47`	`47`	`else return null;`
`48`	`48`	`}`
`49`	`49`
`50`		`-`
	`50`	`+ public static List<LabelPropertyDb> Get1stLabel()`
	`51`	`+ {`
	`52`	`+ if (IsLocalDbValid())`
	`53`	`+ return DbService.DCDb.Queryable<LabelPropertyDb>().Where(a=>a.Level==1).ToList();`
	`54`	`+ else return null;`
	`55`	`+ }`
`51`	`56`
`52`	`57`	`/// <summary>`
`53`	`58`	`/// 获取属性标签数量`
`@@ -279,7 +284,7 @@ public static List<string> GetLKId(string DbCenterId, string lpid)`
`279`	`284`	`var lst1 = DbService.DCDb.Ado.SqlQuery<string>(sb1.ToString());`
`280`	`285`	`var lst2 = DbService.DCDb.Ado.SqlQuery<string>(sb2.ToString());`
`281`	`286`	`lst1.AddRange(lst2);`
`282`		`- var lst=lst1.Distinct();`
	`287`	`+ var lst = lst1.Distinct();`
`283`	`288`	`return lst.ToList();`
`284`	`289`	`}`
`285`	`290`
`@@ -291,7 +296,10 @@ public static List<string> GetLKId(string DbCenterId, string lpid)`
`291`	`296`	`/// <returns></returns>`
`292`	`297`	`public static void ClearLabelPropertyLK(string DbCenterId, string lpid)`
`293`	`298`	`{`
`294`		`- DbService.DCDb.Deleteable<LabelPropertyLinkDb>(p => p.LPIdA == lpid\|\|p.LPIdB==lpid).ExecuteCommand();`
	`299`	`+ DbService.DCDb.Deleteable<LabelPropertyLinkDb>(p => p.LPIdA == lpid \|\| p.LPIdB == lpid).ExecuteCommand();`
`295`	`300`	`}`
	`301`	`+`
	`302`	`+`
	`303`	`+`
`296`	`304`	`}`
`297`	`305`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ private async void Export_Click(object sender, RoutedEventArgs e)`
`102`	`102`	`//var outputPath = System.IO.Path.Combine(((OMDb.WinUI3.Models.EnrtyStorage)((Microsoft.UI.Xaml.FrameworkElement)e.OriginalSource).DataContext).StoragePath, name);`
`103`	`103`	`var dbId = ((OMDb.WinUI3.Models.EnrtyStorage)((Microsoft.UI.Xaml.FrameworkElement)e.OriginalSource).DataContext).StorageName;`
`104`	`104`	`var enrtyStorage = ((OMDb.WinUI3.Models.EnrtyStorage)((Microsoft.UI.Xaml.FrameworkElement)e.OriginalSource).DataContext);`
`105`		`- var outputPath = await Helpers.PickHelper.PickSaveFileAsync(".xlsx");`
	`105`	`+ var outputPath = await Helpers.PickHelper.PickSaveFileAsync(".xls");`
`106`	`106`	`if (outputPath== null )`
`107`	`107`	`{`
`108`	`108`	`InfoHelper.ShowError("導出路徑有誤！");`
Original file line number	Diff line number	Diff line change
`@@ -112,10 +112,10 @@ private static async Task SaveToDbAsync(Models.EntryDetail ed)`
`112`	`112`	`{`
`113`	`113`	`await Task.Run(() =>`
`114`	`114`	`{`
	`115`	`+ TreatEntry(ed);//处理词条主表Entry`
`115`	`116`	`Core.Services.EntryService.UpdateOrAddEntry(ed.Entry);//词条`
`116`	`117`	`Core.Services.EntryNameSerivce.UpdateOrAddDefaultNames(ed.Entry.EntryId, ed.Entry.DbId, ed.Entry.Name);//更新或插入词条默认名称`
`117`	`118`
`118`		`- TreatEntry(ed);//处理词条主表Entry`
`119`	`119`	`TreatEntrySource(ed);//资源路径表EntrySource更新`
`120`	`120`	`TreatLabelLink(ed);//词条标签关联表`
`121`	`121`