mianbin/ops-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://1.14.125.6:3000/mianbin/ops-pro

Browse Source 
# Conflicts:
#	modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/resource/impl/ResourceManagerServiceImpl.java
This commit is contained in:
even 2025-06-02 19:47:30 +08:00
commit 4a535b48ad
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/resource/ResourceReq.java
View File

@ -3,7 +3,7 @@ package cd.casic.ci.process.dal.req.resource;
import cd.casic.ci.process.process.dataObject.resource.PipResourceCloud;
import cd.casic.ci.process.process.dataObject.resource.PipResourceK8S;
import cd.casic.ci.process.process.dataObject.resource.PipResourceMachine;
import cd.casic.ci.process.process.dataObject.resource.PipelineDockerEndpoint;
import cd.casic.module.execute.docker.dataobject.dto.DockerEndpointDo;
import lombok.Data;
@Data
@ -36,7 +36,7 @@ public class ResourceReq {
private PipResourceMachine resourceMachine;
private PipelineDockerEndpoint dockerEndpoint;
private DockerEndpointDo dockerEndpoint;
private PipResourceK8S pipResourceK8S;

4
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/resource/ResourceFindResp.java
View File

@ -3,7 +3,7 @@ package cd.casic.ci.process.dal.resp.resource;
import cd.casic.ci.process.process.dataObject.resource.PipResourceCloud;
import cd.casic.ci.process.process.dataObject.resource.PipResourceK8S;
import cd.casic.ci.process.process.dataObject.resource.PipResourceMachine;
import cd.casic.ci.process.process.dataObject.resource.PipelineDockerEndpoint;
import cd.casic.module.execute.docker.dataobject.dto.DockerEndpointDo;
import lombok.Data;
@Data
@ -54,7 +54,7 @@ public class ResourceFindResp {
private PipResourceMachine resourceMachine;
private PipelineDockerEndpoint dockerEndpoint;
private DockerEndpointDo dockerEndpoint;
private PipResourceK8S pipResourceK8S;

17
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/resource/impl/ResourceManagerServiceImpl.java
View File

@ -5,7 +5,6 @@ import cd.casic.ci.process.dal.req.resource.ResourceReq;
import cd.casic.ci.process.dal.resp.resource.ResourceFindResp;
import cd.casic.ci.process.process.converter.ResourceConverter;
import cd.casic.ci.process.process.dal.pipeline.PipResourceCloudDao;
import cd.casic.ci.process.process.dal.pipeline.PipResourceDockerEndpointDao;
import cd.casic.ci.process.process.dal.pipeline.PipResourceK8SDao;
import cd.casic.ci.process.process.dal.pipeline.PipResourceMachineDao;
import cd.casic.ci.process.process.dal.pipeline.PipResourceManagerDao;
@ -13,20 +12,20 @@ import cd.casic.ci.process.process.dataObject.resource.PipResourceCloud;
import cd.casic.ci.process.process.dataObject.resource.PipResourceK8S;
import cd.casic.ci.process.process.dataObject.resource.PipResourceMachine;
import cd.casic.ci.process.process.dataObject.resource.PipResourceManager;
import cd.casic.ci.process.process.dataObject.resource.PipelineDockerEndpoint;
import cd.casic.ci.process.process.service.resource.ResourceManagerService;
import cd.casic.framework.commons.exception.ServiceException;
import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants;
import cd.casic.framework.commons.pojo.PageResult;
import cd.casic.framework.security.dal.user.AdminUserDO;
import cd.casic.framework.tenant.core.service.AdminUserServiceImpl;
import cd.casic.module.execute.docker.dao.DockerEndpointDao;
import cd.casic.module.execute.docker.dataobject.dto.DockerEndpointDo;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
@ -50,8 +49,8 @@ public class ResourceManagerServiceImpl extends ServiceImpl<PipResourceManagerDa
@Resource
private PipResourceMachineDao machineDao;
@Autowired
private PipResourceDockerEndpointDao dockerEndpointDao;
@Resource
private DockerEndpointDao dockerEndpointDao;
@Resource
private PipResourceK8SDao k8SDao;
@ -61,8 +60,6 @@ public class ResourceManagerServiceImpl extends ServiceImpl<PipResourceManagerDa
@Resource
private AdminUserServiceImpl adminUserService;
@Autowired
private PipResourceDockerEndpointDao pipResourceDockerEndpointDao;
@Override
@ -85,7 +82,7 @@ public class ResourceManagerServiceImpl extends ServiceImpl<PipResourceManagerDa
pipResourceManager.setK8sId(pipResourceK8S.getId());
}
if (!ObjectUtils.isEmpty(resourceReq.getDockerEndpoint())) {
PipelineDockerEndpoint dockerEndpoint = resourceReq.getDockerEndpoint();
DockerEndpointDo dockerEndpoint = resourceReq.getDockerEndpoint();
dockerEndpointDao.insert(dockerEndpoint);
pipResourceManager.setDockerId(dockerEndpoint.getId());
@ -161,7 +158,7 @@ public class ResourceManagerServiceImpl extends ServiceImpl<PipResourceManagerDa
temp.setK8sId(pipResourceK8S.getId());
}
if (!ObjectUtils.isEmpty(resourceReq.getDockerEndpoint())) {
PipelineDockerEndpoint dockerEndpoint = resourceReq.getDockerEndpoint();
DockerEndpointDo dockerEndpoint = resourceReq.getDockerEndpoint();
dockerEndpointDao.insert(dockerEndpoint);
temp.setDockerId(dockerEndpoint.getId());
@ -292,7 +289,7 @@ public class ResourceManagerServiceImpl extends ServiceImpl<PipResourceManagerDa
resourceFindResp.setPipResourceK8S(pipResourceK8S);
}
if (!StringUtils.isEmpty(resourceFindResp.getDockerId())) {
PipelineDockerEndpoint dockerEndpoint = dockerEndpointDao.selectById(resourceFindResp.getDockerId());
DockerEndpointDo dockerEndpoint = dockerEndpointDao.selectById(resourceFindResp.getDockerId());
resourceFindResp.setDockerEndpoint(dockerEndpoint);
}
if (!StringUtils.isEmpty(resourceFindResp.getCloudId())) {