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