diff --git a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/project/controller/ZoneProjectController.java b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/project/controller/ZoneProjectController.java index 30eee393b..f3af0daa7 100644 --- a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/project/controller/ZoneProjectController.java +++ b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/project/controller/ZoneProjectController.java @@ -100,7 +100,7 @@ public class ZoneProjectController extends BaseController { @PostMapping @ApiOperation("批量新增项目聚合") public AjaxResult add(@RequestBody @Validated List zoneProjectInputVoList) { - return toAjax(zoneProjectService.insertBatchZoneProject(zoneProjectInputVoList)); + return success(zoneProjectService.insertBatchZoneProject(zoneProjectInputVoList)); } /** diff --git a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/project/service/impl/ZoneProjectServiceImpl.java b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/project/service/impl/ZoneProjectServiceImpl.java index 986f58b8a..627d8583b 100644 --- a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/project/service/impl/ZoneProjectServiceImpl.java +++ b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/project/service/impl/ZoneProjectServiceImpl.java @@ -569,7 +569,7 @@ public class ZoneProjectServiceImpl implements IZoneProjectService { JSONObject result = gitLinkRequestHelper.doGet( ZoneGitLinkRequestUrl.PROJECTS(gitLinkProjectSearchVo.genQueryString()) ); - return execGitlinkProjectsSearch(zoneId, result,ZoneConstants.GITLINK_RESPONSE_TOTAL_COUNT_KEY); + return execGitlinkProjectsSearch(zoneId, result, ZoneConstants.GITLINK_RESPONSE_TOTAL_COUNT_KEY); } @Override @@ -583,7 +583,9 @@ public class ZoneProjectServiceImpl implements IZoneProjectService { ZoneProject zoneProject = zoneProjectMapper .selectZoneProjectByGitLinkProjectIdAndZoneId(gitlinkProjectId, zoneId); if (zoneProject != null) { - throw new ServiceException("该GitLink项目已存在于专区中,不可重复添加(专区Id[" + zoneId + "],GitLink项目Id[" + gitlinkProjectId + "])"); +// throw new ServiceException("该GitLink项目已存在于专区中,不可重复添加(专区Id[" + zoneId + "],GitLink项目Id[" + gitlinkProjectId + "])"); + logger.warn("该GitLink项目已存在于专区中,不可重复添加(专区Id[{}],GitLink项目Id[{}])", zoneId, gitlinkProjectId); + break; } success += insertZoneProject(zoneProjectInputVo); } @@ -766,10 +768,10 @@ public class ZoneProjectServiceImpl implements IZoneProjectService { JSONObject result = gitLinkRequestHelper.doGet( ZoneGitLinkRequestUrl.MY_OWNER_PROJECTS(SecurityUtils.getUsername(), gitLinkProjectSearchVo.myProjectsQueryString()) ); - return execGitlinkProjectsSearch(zoneId, result,ZoneConstants.GITLINK_RESPONSE_COUNT_KEY); + return execGitlinkProjectsSearch(zoneId, result, ZoneConstants.GITLINK_RESPONSE_COUNT_KEY); } - private GenericsTableDataInfo execGitlinkProjectsSearch(Long zoneId, JSONObject result,String totalKey) { + private GenericsTableDataInfo execGitlinkProjectsSearch(Long zoneId, JSONObject result, String totalKey) { List list = result.getList(ZoneConstants.GITLINK_RESPONSE_PROJECTS_KEY, JSONObject.class); if (list == null) { throw new ServiceException("Gitlink项目列表获取失败");