11

gx_api/GxPress/Model/GxPress.Entity/tede2/Attach/Attach.cs

@@ -41,7 +41,7 @@ namespace GxPress.Entity.tede2.Attach
         /// </summary>
         /// <value></value>
         [DataColumn]
-        public int CategoryId { get; set; }
+        public string CategoryId { get; set; }
 
         /// <summary>
         /// 分类名称
@@ -121,11 +121,17 @@ namespace GxPress.Entity.tede2.Attach
         /// <value></value>
         [DataColumn]
         public int LabelId { get; set; }
-         /// <summary>
+        /// <summary>
         /// 栏目名称
         /// </summary>
         /// <value></value>
         [DataColumn]
         public int LabelName { get; set; }
+        /// <summary>
+        /// 完整类别
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public string FullCategoryId { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.Entity/tede2/Media/Media.cs

@@ -102,8 +102,12 @@ namespace GxPress.Entity.tede2.Media
         /// 分类ID
         /// </summary>
         [DataColumn]
-        public int CategoryId { get; set; }
-
+        public string CategoryId { get; set; }
+        /// <summary>
+        /// 完整分类ID
+        /// </summary>
+        [DataColumn]
+        public string FullCategoryId { get; set; }
         /// <summary>
         /// 分类名称
         /// </summary>

gx_api/GxPress/Model/GxPress.Result/Media/MediaResult.cs

@@ -93,13 +93,18 @@ namespace GxPress.Result.Media
         /// <summary>
         /// 分类ID
         /// </summary>
+        public List<string> CategoryId { get; set; }
 
-        public int CategoryId { get; set; }
+        /// <summary>
+        /// 完整分类ID
+        /// </summary>
+
+        public List<string> FullCategoryId { get; set; }
         /// <summary>
         /// 分类名称
         /// </summary>
         /// <value></value>
-        public string CategoryName { get; set; }
+        public List<string> CategoryName { get; set; }
         /// <summary>
         /// 标签ID
         /// </summary>

gx_api/GxPress/Repository/GxPress.Repository.Implement/Attach/AttachRepository.cs

@@ -62,12 +62,29 @@ namespace GxPress.Repository.Implement.Attach
 
         public async Task<int> InsertAsync(Entity.tede2.Attach.Attach note)
         {
-
+            var categoryId = "";
+            var categoryIds = StringUtils.StringCollectionToStringList(note.CategoryId);
+            foreach (var item in categoryIds)
+            {
+                categoryId += item.Split(",")[item.Split(",").Length - 1] + ",";
+            }
+            categoryId = categoryId.Remove(categoryId.Length - 1, 1);
+            note.FullCategoryId = note.CategoryId;
+            note.CategoryId = categoryId;
             return await _repository.InsertAsync(note);
         }
 
         public async Task<bool> UpdateAsync(Entity.tede2.Attach.Attach note)
         {
+            var categoryId = "";
+            var categoryIds = StringUtils.StringCollectionToStringList(note.CategoryId);
+            foreach (var item in categoryIds)
+            {
+                categoryId += item.Split(",")[item.Split(",").Length - 1] + ",";
+            }
+            categoryId = categoryId.Remove(categoryId.Length - 1, 1);
+            note.FullCategoryId = note.CategoryId;
+            note.CategoryId = categoryId;
             return await _repository.UpdateAsync(note);
         }
 

gx_api/GxPress/Repository/GxPress.Repository.Implement/Media/MediaRepository.cs

@@ -93,6 +93,14 @@ namespace GxPress.Repository.Implement.Media
                 using (var transactionScope = new TransactionScope())
                 {
                     model.AutoNumber = DateTime.Now.Ticks.ToString();
+                    var categoryId = "";
+                    foreach (var item in result.CategoryId)
+                    {
+                        categoryId += item.Split(",")[item.Split(",").Length - 1] + ",";
+                    }
+                    categoryId = categoryId.Remove(categoryId.Length - 1, 1);
+                    model.CategoryId = categoryId;
+                    model.FullCategoryId = StringUtils.ObjectCollectionToString(result.CategoryId);
                     var id = await _repository.InsertAsync(model);
                     if (id > 0)
                     {

gx_api/GxPress/Service/GxPress.Service.Implement/Attach/AttachService.cs

@@ -18,13 +18,13 @@ namespace GxPress.Service.Implement.Attach
 
         public async Task<int> InsertAsync(Entity.tede2.Attach.Attach note)
         {
-            note.CategoryName = await categoryRepository.GetCategoryParentAsync(note.CategoryId, note.CategoryName);
+            //note.CategoryName = await categoryRepository.GetCategoryParentAsync(note.CategoryId, note.CategoryName);
             return await attachRepository.InsertAsync(note);
         }
 
         public async Task<bool> UpdateAsync(Entity.tede2.Attach.Attach note)
         {
-            note.CategoryName = await categoryRepository.GetCategoryParentAsync(note.CategoryId, note.CategoryName);
+            //note.CategoryName = await categoryRepository.GetCategoryParentAsync(note.CategoryId, note.CategoryName);
             return await attachRepository.UpdateAsync(note);
         }
     }

gx_api/GxPress/Service/GxPress.Service.Implement/Media/MediaService.cs

@@ -18,10 +18,10 @@ namespace GxPress.Service.Implement.Media
         public async Task<bool> InsertAsync(MediaResult result)
         {
 
-            if (result.CategoryId > 0)
-            {
-                result.CategoryName = await categoryRepository.GetCategoryParentAsync(result.CategoryId, result.CategoryName);
-            }
+            // if (result.CategoryId > 0)
+            // {
+            //     result.CategoryName = await categoryRepository.GetCategoryParentAsync(result.CategoryId, result.CategoryName);
+            // }
             return await mediaRepository.InsertAsync(result);
         }
     }