调整controller文件生成

Controllers/Client/MakeCodeController.cs

@@ -73,7 +73,11 @@ namespace Controllers.Client
                         _DatabaseTableService.makeJavaDto(baseInfo, apiInfo, loginUser);
                         _DatabaseTableService.makeJavaVo(baseInfo, apiInfo, loginUser);
                     }
-                    _DatabaseTableService.makeJavaController(baseInfo, apiGroup, loginUser);
+                    List<string> controllerFilePathList = _ApiInfoService.GetList(m => m.serviceId == baseInfo.id).Select(m => m.controllerFilePath).Distinct().ToList();
+                    foreach(var controllerFilePath in controllerFilePathList)
+                    {
+                        _DatabaseTableService.makeJavaController(baseInfo, controllerFilePath, loginUser);
+                    }
                 }
                 Function.WriteLog("end\n\n\n", "测试生成代码");
             }

Services/DatabaseTableService.cs

@@ -348,9 +348,9 @@ namespace Services
         /// 生成java代码-controller
         /// </summary>
         /// <returns>生成java代码-controller</returns>
-        public void makeJavaController(ProjectService baseInfo, ApiGroup group, TokenModel loginUser)
+        public void makeJavaController(ProjectService baseInfo, string controllerFilePath, TokenModel loginUser)
         {
-            var apiInfos = _ApiInfoService.GetList(m => m.serviceId == baseInfo.id && m.controllerFilePath == group.groupNameUpper);
+            var apiInfos = _ApiInfoService.GetList(m => m.serviceId == baseInfo.id && m.controllerFilePath == controllerFilePath);
 
             var tableIds = apiInfos.Where(m => m.linkTableId > 0).Select(m => m.linkTableId).Distinct().ToList();
             var tables = GetList(m => tableIds.Contains(m.id));
@@ -366,8 +366,8 @@ namespace Services
             pushData.Add("author", loginUser.username);
             pushData.Add("projectService", baseInfo);
             pushData.Add("databaseTables", tables);
-            pushData.Add("apiGroup", group);
             pushData.Add("apiInfos", apiInfos);
+            pushData.Add("controllerName", controllerFilePath);
             MakeHelper.Push(pushData, "controller", "javaController", loginUser.username);
         }
     

Services/IService/IDatabaseTableService.cs

@@ -90,7 +90,7 @@ namespace Services
         /// 生成java代码-controller
         /// </summary>
         /// <returns>生成java代码-controller</returns>
-        void makeJavaController(ProjectService baseInfo, ApiGroup group, TokenModel loginUser);
+        void makeJavaController(ProjectService baseInfo, string controllerFilePath, TokenModel loginUser);
 
 
     }