Gitlink
/
microservices
43
0
Fork 9
Code Issues Pull Requests Packages Projects Releases 7 Wiki Activity

Merge pull request 'fixed 工作项增加企业标识' (#872) from xxq250/microservices:master into master

This commit is contained in:
xxq250 2025-05-20 09:51:39 +08:00
parent 8f3331c079 a78c9c2b5d
commit b2d3d413be
5 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/controller/PmsEnterpriseController.java
View File

@ -160,4 +160,15 @@ public class PmsEnterpriseController extends BaseController
@ApiParam(name = "gitlinkOrgId", value = "gitlink组织Id") @PathVariable Long gitlinkOrgId) {
return genericsSuccess(pmsEnterpriseService.getWorkbenchUrl(gitlinkOrgId));
}
/**
* 通过组织标识获取工作台访问地址（未开通返回null）
*/
@GetMapping("/getEnterpriseIdentifierByProjectId")
@ApiOperation(value = "通过组织标识获取工作台访问地址（未开通返回null）")
public GenericsAjaxResult<String> getEnterpriseIdentifierByProjectId(
@ApiParam(name = "projectId", value = "项目Id") @PathVariable Long projectId) {
return genericsSuccess(pmsEnterpriseService.getEnterpriseByProjectId(projectId).getEnterpriseIdentifier());
}
}

3
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/IPmsEnterpriseService.java
View File

@ -149,4 +149,7 @@ public interface IPmsEnterpriseService {
void increaseOpenEnterpriseProcessCount(Long gitlinkOrgId);
void decreaseOpenEnterpriseProcessCount(Long gitlinkOrgId);
PmsEnterprise getEnterpriseByProjectId(Long projectId);
}

6
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java
View File

@ -617,4 +617,10 @@ public class PmsEnterpriseServiceImpl implements IPmsEnterpriseService {
private Boolean checkEnterpriseInitComplete(Long gitlinkOrgId) {
return !redisService.hasKey(CacheConstants.getGitlinkOrgIdOpenEnterpriseKey(gitlinkOrgId));
}
@Override
public PmsEnterprise getEnterpriseByProjectId(Long projectId) {
PmsProject pmsProject = pmsProjectService.selectAndCheckPmsProjectById(projectId);
return pmsEnterpriseMapper.selectPmsEnterpriseByDeptId(pmsProject.getPmsEnterpriseId());
}
}

6
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/controller/PmsProjectIssuesController.java
View File

@ -55,7 +55,8 @@ public class PmsProjectIssuesController extends BaseController {
@RequiresPermissions("pms:pmsProjectIssues:add")
@PostMapping("/add")
@ApiOperation(value = "新增项目工作项")
public AjaxResult add(@RequestBody PmsProjectIssuesInputVo pmsProjectIssuesInputVo) {
public AjaxResult add(@PathVariable String enterpriseIdentifier, @RequestBody PmsProjectIssuesInputVo pmsProjectIssuesInputVo) {
pmsProjectIssuesInputVo.setEnterpriseIdentifier(enterpriseIdentifier);
JSONObject result = pmsProjectIssuesService.insertPmsProjectIssuesRestricted(pmsProjectIssuesInputVo);
return success(result);
}
@ -66,7 +67,8 @@ public class PmsProjectIssuesController extends BaseController {
@RequiresPermissions("pms:pmsProjectIssues:edit")
@PostMapping("/edit/{id}")
@ApiOperation(value = "编辑项目工作项")
public AjaxResult edit(@PathVariable("id") Long id, @RequestBody PmsProjectIssuesInputVo pmsProjectIssuesInputVo) {
public AjaxResult edit(@PathVariable("id") Long id, @PathVariable String enterpriseIdentifier, @RequestBody PmsProjectIssuesInputVo pmsProjectIssuesInputVo) {
pmsProjectIssuesInputVo.setEnterpriseIdentifier(enterpriseIdentifier);
JSONObject result = pmsProjectIssuesService.updatePmsProjectIssues(id, pmsProjectIssuesInputVo);
return success(result);
}

3
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectIssuesInputVo.java
View File

@ -15,6 +15,9 @@ import java.util.List;
@ApiModel("项目工作项输入对象")
public class PmsProjectIssuesInputVo {
@ApiModelProperty(value = "组织标识")
private String enterpriseIdentifier;
@ApiModelProperty(value = "工作项父id")
private Long rootId;