diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java index 67457175..4d960370 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java @@ -349,6 +349,7 @@ public class SysUser extends BaseEntity { .append("dept", getDept()) .append("gitLinkUsername", getGitLinkUsername()) .append("gitLinkPassword", getGitLinkPassword()) + .append("credit", getCredit()) .toString(); } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ComputingResource.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ComputingResource.java index 5e7b83b1..b5a13d7e 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ComputingResource.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ComputingResource.java @@ -49,7 +49,7 @@ public class ComputingResource implements Serializable { private Integer gpuNums; @ApiModelProperty("积分/小时") - private Float creditPerHour; + private Double creditPerHour; @ApiModelProperty("标签") private String labels; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ResourceOccupy.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ResourceOccupy.java index 4a030c5c..53eaba3b 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ResourceOccupy.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ResourceOccupy.java @@ -19,8 +19,14 @@ public class ResourceOccupy { @ApiModelProperty("计算资源") private Integer computingResourceId; + @ApiModelProperty("描述") + private String description; + @ApiModelProperty("积分/小时") - private Float creditPerHour; + private Double creditPerHour; + + @ApiModelProperty("扣除的积分") + private Double deduceCredit; @ApiModelProperty("上一次扣分时间") private Date deduceLastTime; @@ -36,4 +42,7 @@ public class ResourceOccupy { @ApiModelProperty("类型id") private Long taskId; + + @ApiModelProperty("流水线节点id") + private String nodeId; } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ResourceOccupyDao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ResourceOccupyDao.java index cb03d638..ca3b98d2 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ResourceOccupyDao.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ResourceOccupyDao.java @@ -14,9 +14,9 @@ public interface ResourceOccupyDao { int edit(@Param("resourceOccupy") ResourceOccupy resourceOccupy); - ResourceOccupy getResourceOccupyByTask(@Param("taskType") String taskType, @Param("taskId") Long taskId); + List getResourceOccupyByTask(@Param("taskType") String taskType, @Param("taskId") Long taskId, @Param("nodeId") String nodeId); - int deduceCredit(@Param("credit") Float credit, @Param("userId") Long userId); + int deduceCredit(@Param("credit") Double credit, @Param("userId") Long userId); int updateUsed(@Param("id") Integer id, @Param("used") Integer used); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java index 55ed5a45..1c32edff 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java @@ -1,11 +1,13 @@ package com.ruoyi.platform.scheduling; +import com.ruoyi.platform.constant.Constant; import com.ruoyi.platform.domain.Experiment; import com.ruoyi.platform.domain.ExperimentIns; import com.ruoyi.platform.mapper.ExperimentDao; import com.ruoyi.platform.mapper.ExperimentInsDao; import com.ruoyi.platform.service.AimService; import com.ruoyi.platform.service.ExperimentInsService; +import com.ruoyi.platform.service.ResourceOccupyService; import com.ruoyi.platform.utils.JacksonUtil; import com.ruoyi.platform.utils.JsonUtils; import com.ruoyi.platform.vo.InsMetricInfoVo; @@ -16,6 +18,8 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.io.IOException; +import java.text.SimpleDateFormat; +import java.time.Instant; import java.util.*; @Component() @@ -28,6 +32,8 @@ public class ExperimentInstanceStatusTask { private ExperimentInsDao experimentInsDao; @Resource private AimService aimService; + @Resource + private ResourceOccupyService resourceOccupyService; private List experimentIds = new ArrayList<>(); @@ -43,7 +49,27 @@ public class ExperimentInstanceStatusTask { try { experimentIns = experimentInsService.queryStatusFromArgo(experimentIns); } catch (Exception e) { - experimentIns.setStatus("Failed"); + experimentIns.setStatus(Constant.Failed); + // 结束扣除积分 + resourceOccupyService.endDeduce(Constant.TaskType_Workflow, Long.valueOf(experimentIns.getId()), null, null); + } + + // 扣除积分 + if (StringUtils.isNotEmpty(experimentIns.getNodesStatus())) { + Map nodesStatusMap = JsonUtils.jsonToMap(experimentIns.getNodesStatus()); + for (String key : nodesStatusMap.keySet()) { + Map value = (Map) nodesStatusMap.get(key); + String startedAt = (String) value.get("startedAt"); + Instant instant = Instant.parse(startedAt); + Date startTime = Date.from(instant); + + String finishedAt = (String) value.get("finishedAt"); + if (StringUtils.isEmpty(finishedAt)) { + resourceOccupyService.deducing(Constant.TaskType_Workflow, Long.valueOf(experimentIns.getId()), key, startTime); + } else { + resourceOccupyService.endDeduce(Constant.TaskType_Workflow, Long.valueOf(experimentIns.getId()), key, startTime); + } + } } //运行成功的实验实例记录指标数值 Map metricRecord = JacksonUtil.parseJSONStr2Map(experimentIns.getMetricRecord()); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/RayInsStatusTask.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/RayInsStatusTask.java index 86f21d65..083559ca 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/RayInsStatusTask.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/RayInsStatusTask.java @@ -42,13 +42,18 @@ public class RayInsStatusTask { //当原本状态为null或非终止态时才调用argo接口 try { rayIns = rayInsService.queryStatusFromArgo(rayIns); + + // 扣除积分 if (Constant.Running.equals(rayIns.getStatus())) { - resourceOccupyService.deducing(Constant.TaskType_Ray, rayIns.getId()); - } else { - resourceOccupyService.endDeduce(Constant.TaskType_Ray, rayIns.getId()); + resourceOccupyService.deducing(Constant.TaskType_Ray, rayIns.getId(), null,null); + } else if (Constant.Failed.equals(rayIns.getStatus()) || Constant.Terminated.equals(rayIns.getStatus()) + || Constant.Succeeded.equals(rayIns.getStatus())) { + resourceOccupyService.endDeduce(Constant.TaskType_Ray, rayIns.getId(), null,null); } } catch (Exception e) { rayIns.setStatus(Constant.Failed); + // 结束扣除积分 + resourceOccupyService.endDeduce(Constant.TaskType_Ray, rayIns.getId(), null, null); } // 线程安全的添加操作 synchronized (rayIds) { diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ResourceOccupyTask.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ResourceOccupyTask.java index 1ae0d2f1..d3e0b0dd 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ResourceOccupyTask.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ResourceOccupyTask.java @@ -25,11 +25,11 @@ public class ResourceOccupyTask { private ServiceDao serviceDao; // 开发环境功能扣除积分 - @Scheduled(cron = "0 0/10 * * * ?") // 每10分钟执行一次 + @Scheduled(cron = "0 0/1 * * * ?") // 每10分钟执行一次 public void devDeduceCredit() { List devEnvironments = devEnvironmentDao.getRunning(); for (DevEnvironment devEnvironment : devEnvironments) { - resourceOccupyService.deducing(Constant.TaskType_Dev, Long.valueOf(devEnvironment.getId())); + resourceOccupyService.deducing(Constant.TaskType_Dev, Long.valueOf(devEnvironment.getId()), null, null); } } @@ -38,7 +38,7 @@ public class ResourceOccupyTask { public void serviceDeduceCredit() { List serviceVersions = serviceDao.getRunning(); for (ServiceVersion serviceVersion : serviceVersions) { - resourceOccupyService.deducing(Constant.TaskType_Service, serviceVersion.getId()); + resourceOccupyService.deducing(Constant.TaskType_Service, serviceVersion.getId(), null, null); } } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ResourceOccupyService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ResourceOccupyService.java index 8395bc75..1c57ba1b 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ResourceOccupyService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ResourceOccupyService.java @@ -4,15 +4,17 @@ import com.ruoyi.platform.domain.ResourceOccupy; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import java.util.Date; + public interface ResourceOccupyService { Boolean haveResource(Integer computingResourceId) throws Exception; - void startDeduce(Integer computingResourceId, String taskType, Long taskId); + void startDeduce(Integer computingResourceId, String taskType, Long taskId, String nodeId); - void endDeduce(String taskType, Long taskId); + void endDeduce(String taskType, Long taskId, String nodeId, Date nodeStartTime); - void deducing(String taskType, Long taskId); + void deducing(String taskType, Long taskId, String nodeId, Date nodeStartTime); Page queryByPage(PageRequest pageRequest); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java index 03599dd1..995a2191 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java @@ -3,6 +3,7 @@ package com.ruoyi.platform.service.impl; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSON; import com.ruoyi.common.security.utils.SecurityUtils; +import com.ruoyi.platform.constant.Constant; import com.ruoyi.platform.domain.DatasetTempStorage; import com.ruoyi.platform.domain.Experiment; import com.ruoyi.platform.domain.ExperimentIns; @@ -12,6 +13,7 @@ import com.ruoyi.platform.mapper.ExperimentDao; import com.ruoyi.platform.mapper.ExperimentInsDao; import com.ruoyi.platform.mapper.ModelDependency1Dao; import com.ruoyi.platform.service.ExperimentInsService; +import com.ruoyi.platform.service.ResourceOccupyService; import com.ruoyi.platform.utils.*; import com.ruoyi.platform.vo.LogRequestVo; import com.ruoyi.platform.vo.PodLogVo; @@ -66,6 +68,9 @@ public class ExperimentInsServiceImpl implements ExperimentInsService { @Resource private DatasetTempStorageDao datasetTempStorageDao; + @Resource + private ResourceOccupyService resourceOccupyService; + private final MinioUtil minioUtil; public ExperimentInsServiceImpl(MinioUtil minioUtil) { @@ -410,6 +415,8 @@ public class ExperimentInsServiceImpl implements ExperimentInsService { //修改实验状态 updateExperimentStatus(experimentIns.getExperimentId()); + // 结束扣除积分 + resourceOccupyService.endDeduce(Constant.TaskType_Workflow, Long.valueOf(experimentIns.getId()), null, null); return true; } else { throw new Exception("终止错误"); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java index dcdb3b7c..0fc2785a 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java @@ -10,7 +10,6 @@ import com.ruoyi.platform.domain.*; import com.ruoyi.platform.domain.dependencydomain.ProjectDepency; import com.ruoyi.platform.domain.dependencydomain.TrainTaskDepency; import com.ruoyi.platform.mapper.ExperimentDao; -import com.ruoyi.platform.mapper.ExperimentInsDao; import com.ruoyi.platform.mapper.ModelDependency1Dao; import com.ruoyi.platform.service.*; import com.ruoyi.platform.utils.HttpUtils; @@ -62,6 +61,9 @@ public class ExperimentServiceImpl implements ExperimentService { @Lazy private ExperimentInsService experimentInsService; + @Resource + private ResourceOccupyService resourceOccupyService; + @Resource private ModelDependency1Dao modelDependency1Dao; @@ -233,6 +235,14 @@ public class ExperimentServiceImpl implements ExperimentService { } Map converMap = JsonUtils.jsonToMap(convertRes); + // 判断积分和资源是否足够 + Map> resourceInfo = (Map>) converMap.get("resource_info"); + for (Map.Entry> entry : resourceInfo.entrySet()) { + Map node = entry.getValue(); + resourceOccupyService.haveResource((Integer) node.get("computing_resource_id")); + } + + // 组装运行接口json Map runReqMap = new HashMap<>(); runReqMap.put("data", converMap.get("data")); @@ -300,6 +310,11 @@ public class ExperimentServiceImpl implements ExperimentService { insertDatasetTempStorage(datasetDependendcy, trainInfo, experiment.getId(), insert.getId(), experiment.getName(), experiment.getWorkflowId()); } + // 记录开始扣积分 + for (Map.Entry> entry : resourceInfo.entrySet()) { + Map node = entry.getValue(); + resourceOccupyService.startDeduce((Integer) node.get("computing_resource_id"), Constant.TaskType_Workflow, Long.valueOf(insert.getId()), entry.getKey()); + } } catch (Exception e) { throw new RuntimeException(e); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/JupyterServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/JupyterServiceImpl.java index 3a6048eb..76fe1d02 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/JupyterServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/JupyterServiceImpl.java @@ -133,9 +133,6 @@ public class JupyterServiceImpl implements JupyterService { return "pod不存在！"; } - // 结束扣积分 - resourceOccupyService.endDeduce(Constant.TaskType_Dev, Long.valueOf(id)); - // 使用 Kubernetes API 删除 Pod String deleteResult = k8sClientUtil.deletePod(podName, namespace); // 删除service @@ -143,6 +140,9 @@ public class JupyterServiceImpl implements JupyterService { devEnvironment.setStatus(Constant.Terminated); this.devEnvironmentService.update(devEnvironment); + + // 结束扣积分 + resourceOccupyService.endDeduce(Constant.TaskType_Dev, Long.valueOf(id), null, null); return deleteResult + "，编辑器已停止"; } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayInsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayInsServiceImpl.java index 2ae6a5de..31c4ab91 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayInsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayInsServiceImpl.java @@ -168,7 +168,7 @@ public class RayInsServiceImpl implements RayInsService { rayInsDao.update(ins); updateRayStatus(rayIns.getRayId()); // 结束扣积分 - resourceOccupyService.endDeduce(Constant.TaskType_Ray, id); + resourceOccupyService.endDeduce(Constant.TaskType_Ray, id, null, null); return true; } else { return false; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayServiceImpl.java index 105025a6..f758a58d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayServiceImpl.java @@ -205,7 +205,8 @@ public class RayServiceImpl implements RayService { rayIns.setResultPath(outputPath); rayInsDao.insert(rayIns); rayInsService.updateRayStatus(id); - resourceOccupyService.startDeduce(ray.getComputingResourceId(), Constant.TaskType_Ray, rayIns.getId()); + // 记录开始扣除积分 + resourceOccupyService.startDeduce(ray.getComputingResourceId(), Constant.TaskType_Ray, rayIns.getId(), null); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java index 12f79edf..19283e6f 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java @@ -12,9 +12,11 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Date; +import java.util.List; @Service("resourceOccupyService") public class ResourceOccupyServiceImpl implements ResourceOccupyService { @@ -48,15 +50,18 @@ public class ResourceOccupyServiceImpl implements ResourceOccupyService { } @Override - public void startDeduce(Integer computingResourceId, String taskType, Long taskId) { + @Transactional + public void startDeduce(Integer computingResourceId, String taskType, Long taskId, String nodeId) { ResourceOccupy resourceOccupy = new ResourceOccupy(); ComputingResource computingResource = computingResourceDao.queryById(computingResourceId); resourceOccupy.setComputingResourceId(computingResourceId); LoginUser loginUser = SecurityUtils.getLoginUser(); resourceOccupy.setUserId(loginUser.getUserid()); resourceOccupy.setCreditPerHour(computingResource.getCreditPerHour()); + resourceOccupy.setDescription(computingResource.getDescription()); resourceOccupy.setTaskType(taskType); resourceOccupy.setTaskId(taskId); + resourceOccupy.setNodeId(nodeId); resourceOccupyDao.save(resourceOccupy); if (Constant.Computing_Resource_GPU.equals(computingResource.getComputingResource())) { @@ -67,31 +72,43 @@ public class ResourceOccupyServiceImpl implements ResourceOccupyService { } @Override - public void endDeduce(String taskType, Long taskId) { - ResourceOccupy resourceOccupy = resourceOccupyDao.getResourceOccupyByTask(taskType, taskId); - deducing(taskType, taskId); - resourceOccupy.setState(Constant.State_invalid); - resourceOccupyDao.edit(resourceOccupy); + @Transactional + public void endDeduce(String taskType, Long taskId, String nodeId, Date nodeStartTime) { + List resourceOccupys = resourceOccupyDao.getResourceOccupyByTask(taskType, taskId, nodeId); + for (ResourceOccupy resourceOccupy : resourceOccupys) { + deducing(taskType, taskId, nodeId, nodeStartTime); + resourceOccupy.setState(Constant.State_invalid); + resourceOccupyDao.edit(resourceOccupy); - ComputingResource computingResource = computingResourceDao.queryById(resourceOccupy.getComputingResourceId()); - if (Constant.Computing_Resource_GPU.equals(computingResource.getComputingResource())) { - resourceOccupyDao.updateUnUsed(computingResource.getResourceId(), computingResource.getGpuNums()); - } else { - resourceOccupyDao.updateUnUsed(computingResource.getResourceId(), computingResource.getCpuCores()); + ComputingResource computingResource = computingResourceDao.queryById(resourceOccupy.getComputingResourceId()); + if (Constant.Computing_Resource_GPU.equals(computingResource.getComputingResource())) { + resourceOccupyDao.updateUnUsed(computingResource.getResourceId(), computingResource.getGpuNums()); + } else { + resourceOccupyDao.updateUnUsed(computingResource.getResourceId(), computingResource.getCpuCores()); + } } } @Override - public void deducing(String taskType, Long taskId) { - ResourceOccupy resourceOccupy = resourceOccupyDao.getResourceOccupyByTask(taskType, taskId); - long timeDifferenceMillis = new Date().getTime() - resourceOccupy.getDeduceLastTime().getTime(); - Float hours = (float) (timeDifferenceMillis / (1000 * 60 * 60)); - - float deduceCredit = resourceOccupy.getCreditPerHour() * hours; - resourceOccupyDao.deduceCredit(deduceCredit, resourceOccupy.getUserId()); + @Transactional + public void deducing(String taskType, Long taskId, String nodeId, Date nodeStartTime) { + List resourceOccupys = resourceOccupyDao.getResourceOccupyByTask(taskType, taskId, nodeId); + for (ResourceOccupy resourceOccupy : resourceOccupys) { + Date now = new Date(); + long timeDifferenceMillis; + if (nodeStartTime != null && resourceOccupy.getDeduceLastTime().before(nodeStartTime)) { + timeDifferenceMillis = now.getTime() - nodeStartTime.getTime(); + } else { + timeDifferenceMillis = now.getTime() - resourceOccupy.getDeduceLastTime().getTime(); + } + Double hours = (double) timeDifferenceMillis / (1000 * 60 * 60); + Double deduceCredit = resourceOccupy.getCreditPerHour() * hours; + resourceOccupyDao.deduceCredit(deduceCredit, resourceOccupy.getUserId()); - resourceOccupy.setDeduceLastTime(new Date()); - resourceOccupyDao.edit(resourceOccupy); + resourceOccupy.setDeduceCredit(resourceOccupy.getDeduceCredit() + deduceCredit); + resourceOccupy.setDeduceLastTime(now); + resourceOccupyDao.edit(resourceOccupy); + } } @Override diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java index 8160c457..75cbe10a 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java @@ -252,19 +252,21 @@ public class ServiceServiceImpl implements ServiceService { paramMap.put("service_type", service.getServiceType()); paramMap.put("deploy_type", serviceVersion.getDeployType()); - // 记录开始扣积分 + // 判断是否有资源 if (resourceOccupyService.haveResource(serviceVersion.getComputingResourceId())) { String req = HttpUtils.sendPost(argoUrl + modelService + "/create", JSON.toJSONString(paramMap)); if (StringUtils.isNotEmpty(req)) { Map reqMap = JacksonUtil.parseJSONStr2Map(req); if ((Integer) reqMap.get("code") == 200) { - resourceOccupyService.startDeduce(serviceVersion.getComputingResourceId(), Constant.TaskType_Service, serviceVersion.getId()); Map data = (Map) reqMap.get("data"); serviceVersion.setUrl(data.get("url")); serviceVersion.setDeploymentName(data.get("deployment_name")); serviceVersion.setSvcName(data.get("svc_name")); serviceVersion.setRunState(Constant.Pending); serviceDao.updateServiceVersion(serviceVersion); + + // 记录开始扣积分 + resourceOccupyService.startDeduce(serviceVersion.getComputingResourceId(), Constant.TaskType_Service, serviceVersion.getId(), null); return "启动成功"; } else { throw new RuntimeException("启动失败"); @@ -286,7 +288,7 @@ public class ServiceServiceImpl implements ServiceService { serviceVersion.setRunState(Constant.Stopped); serviceDao.updateServiceVersion(serviceVersion); // 结束扣积分 - resourceOccupyService.endDeduce(Constant.TaskType_Service, id); + resourceOccupyService.endDeduce(Constant.TaskType_Service, id, null, null); return "停止成功"; } else { throw new RuntimeException("停止失败"); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java index 31ea6338..a55ad632 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java @@ -1,6 +1,5 @@ package com.ruoyi.platform.utils; -import com.alibaba.fastjson2.JSON; import com.ruoyi.platform.constant.Constant; import com.ruoyi.platform.domain.ComputingResource; import com.ruoyi.platform.domain.DevEnvironment; @@ -11,7 +10,6 @@ import io.kubernetes.client.custom.IntOrString; import io.kubernetes.client.custom.Quantity; import io.kubernetes.client.openapi.ApiClient; import io.kubernetes.client.openapi.ApiException; -import io.kubernetes.client.openapi.apis.AppsV1Api; import io.kubernetes.client.openapi.apis.CoreV1Api; import io.kubernetes.client.openapi.models.*; import io.kubernetes.client.util.ClientBuilder; @@ -19,7 +17,6 @@ import io.kubernetes.client.util.Config; import io.kubernetes.client.util.credentials.AccessTokenAuthentication; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @@ -519,7 +516,8 @@ public class K8sClientUtil { pod = api.createNamespacedPod(namespace, pod, null, null, null); String nodeName = getNodeName(podName, namespace); - resourceOccupyService.startDeduce(devEnvironment.getComputingResourceId(), Constant.TaskType_Dev, Long.valueOf(devEnvironment.getId())); + // 记录开始扣除积分 + resourceOccupyService.startDeduce(devEnvironment.getComputingResourceId(), Constant.TaskType_Dev, Long.valueOf(devEnvironment.getId()), null); } } catch (ApiException e) { throw new RuntimeException("创建pod异常:" + e.getResponseBody()); @@ -699,8 +697,7 @@ public class K8sClientUtil { ComputingResource computingResource = computingResourceDao.queryById(computingResourceId); //配置pod资源 - String memory = computingResource.getMemoryGb().toString(); - memory = memory.substring(0, memory.length() - 1).concat("i"); + String memory = computingResource.getMemoryGb().toString().concat("Gi"); HashMap limitMap = new HashMap<>(); if (computingResource.getGpuNums() != null && computingResource.getGpuNums() != 0) { limitMap.put("nvidia.com/gpu", new Quantity(String.valueOf(computingResource.getGpuNums()))); diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ResourceOccupy.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ResourceOccupy.xml index ad8a782c..10407dc2 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ResourceOccupy.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ResourceOccupy.xml @@ -2,8 +2,11 @@ - insert into resource_occupy (user_id, computing_resource_id, credit_per_hour) - values (#{resourceOccupy.userId}, #{resourceOccupy.computingResourceId}, #{resourceOccupy.creditPerHour}) + insert into resource_occupy (user_id, computing_resource_id, credit_per_hour, description, task_type, task_id, + node_id) + values (#{resourceOccupy.userId}, #{resourceOccupy.computingResourceId}, #{resourceOccupy.creditPerHour}, + #{resourceOccupy.description}, #{resourceOccupy.taskType}, #{resourceOccupy.taskId}, + #{resourceOccupy.nodeId}) @@ -15,6 +18,9 @@ deduce_last_time = #{resourceOccupy.deduceLastTime}, + + deduce_credit = #{resourceOccupy.deduceCredit}, + where id = #{resourceOccupy.id} @@ -46,12 +52,16 @@