| @@ -5,8 +5,10 @@ import com.alibaba.fastjson2.JSONObject; | |||||
| import com.ruoyi.common.security.utils.SecurityUtils; | import com.ruoyi.common.security.utils.SecurityUtils; | ||||
| import com.ruoyi.platform.constant.Constant; | import com.ruoyi.platform.constant.Constant; | ||||
| import com.ruoyi.platform.domain.AssetWorkflow; | import com.ruoyi.platform.domain.AssetWorkflow; | ||||
| import com.ruoyi.platform.domain.ComputingResource; | |||||
| import com.ruoyi.platform.domain.ServiceVersion; | import com.ruoyi.platform.domain.ServiceVersion; | ||||
| import com.ruoyi.platform.mapper.AssetWorkflowDao; | import com.ruoyi.platform.mapper.AssetWorkflowDao; | ||||
| import com.ruoyi.platform.mapper.ComputingResourceDao; | |||||
| import com.ruoyi.platform.mapper.ServiceDao; | import com.ruoyi.platform.mapper.ServiceDao; | ||||
| import com.ruoyi.platform.service.ResourceOccupyService; | import com.ruoyi.platform.service.ResourceOccupyService; | ||||
| import com.ruoyi.platform.service.ServiceService; | import com.ruoyi.platform.service.ServiceService; | ||||
| @@ -49,6 +51,9 @@ public class ServiceServiceImpl implements ServiceService { | |||||
| @Resource | @Resource | ||||
| private ResourceOccupyService resourceOccupyService; | private ResourceOccupyService resourceOccupyService; | ||||
| @Resource | |||||
| private ComputingResourceDao computingResourceDao; | |||||
| @Override | @Override | ||||
| public Page<com.ruoyi.platform.domain.Service> queryByPageService(com.ruoyi.platform.domain.Service service, PageRequest pageRequest) { | public Page<com.ruoyi.platform.domain.Service> queryByPageService(com.ruoyi.platform.domain.Service service, PageRequest pageRequest) { | ||||
| long total = serviceDao.countService(service); | long total = serviceDao.countService(service); | ||||
| @@ -124,6 +129,8 @@ public class ServiceServiceImpl implements ServiceService { | |||||
| serviceVersion.setCreateBy(loginUser.getUsername()); | serviceVersion.setCreateBy(loginUser.getUsername()); | ||||
| serviceVersion.setUpdateBy(loginUser.getUsername()); | serviceVersion.setUpdateBy(loginUser.getUsername()); | ||||
| serviceVersion.setRunState(Constant.Pending); | serviceVersion.setRunState(Constant.Pending); | ||||
| ComputingResource computingResource = computingResourceDao.queryById(serviceVersionVo.getComputingResourceId()); | |||||
| serviceVersion.setResource(computingResource.getDescription()); | |||||
| serviceDao.insertServiceVersion(serviceVersion); | serviceDao.insertServiceVersion(serviceVersion); | ||||
| runServiceVersion(serviceVersion.getId()); | runServiceVersion(serviceVersion.getId()); | ||||
| return serviceVersion; | return serviceVersion; | ||||