Merge branch 'master' of http://test.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

Server/Apis/Siger.ApiACC/Controllers/FixtureToolsController.cs

@@ -22,13 +22,15 @@ namespace Siger.ApiACC.Controllers
         private readonly IUnitOfWork _unitOfWork;
         private readonly IAutomationFixtureToolsCategoryRepository _toolsCategoryRepository;
         private readonly IAutomationFixtureToolsAssemblyRepository _toolsAssemblyRepository;
+        private readonly IAutomationFixtureToolsRepository _toolsRepository;
 
         public FixtureToolsController(IUnitOfWork unitOfWork, IAutomationFixtureToolsCategoryRepository toolsCategoryRepository,
-            IAutomationFixtureToolsAssemblyRepository toolsAssemblyRepository)
+            IAutomationFixtureToolsAssemblyRepository toolsAssemblyRepository, IAutomationFixtureToolsRepository toolsRepository)
         {
             _unitOfWork = unitOfWork;
             _toolsCategoryRepository = toolsCategoryRepository;
             _toolsAssemblyRepository = toolsAssemblyRepository;
+            _toolsRepository = toolsRepository;
         }
 
         [HttpGet]
@@ -163,5 +165,34 @@ namespace Siger.ApiACC.Controllers
                 return new ObjectResult(CommonEnum.Succefull);
             throw new BadRequestException(CommonEnum.Fail);
         }
+
+        [HttpGet]
+        public IActionResult GetCategoryList()
+        {
+            var list = _toolsCategoryRepository.GetList(q => q.projectId == ProjectId && q.status == (int)RowState.Valid).ToList();
+            var res = GetChildren("", list);
+            return new ObjectResult(res);
+        }
+
+        private List<FixtureToolsCategoryTree> GetChildren(string parentid, List<siger_automation_fixture_tools_category> sectionDatas)
+        {
+            var resp = new List<FixtureToolsCategoryTree>();
+            var query = sectionDatas.Where(f => f.parent == parentid);
+            if (!query.Any())
+            {
+                return null;
+            }
+            foreach (var section in query)
+            {
+                var data = new FixtureToolsCategoryTree
+                {
+                    value = section.id,
+                    label = section.name
+                };
+                data.children = GetChildren(section.guid, sectionDatas);
+                resp.Add(data);
+            }
+            return resp;
+        }
     }
 }

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationFixtureToolsCategoryRepository.cs

 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore;

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Response/ResponseFixtureTools.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Siger.Middlelayer.AccRepository.Response
+{
+    public class FixtureToolsCategoryTree
+    {
+        public int value { get; set; }
+
+        public string label { get; set; }
+
+        public List<FixtureToolsCategoryTree> children = new List<FixtureToolsCategoryTree>();
+    }
+}