Merge branch 'dev' of https://gitlink.org.cn/ci4s/ci4sManagement-cloud into dev

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/RayInsStatusTask.java

@@ -42,9 +42,9 @@ public class RayInsStatusTask {
                 //当原本状态为null或非终止态时才调用argo接口
                 try {
                     rayIns = rayInsService.queryStatusFromArgo(rayIns);
-
+                    Ray ray = rayDao.getRayById(rayIns.getRayId());
                     // 扣除积分
-                    if (Constant.Running.equals(rayIns.getStatus())) {
+                    if (Constant.Running.equals(rayIns.getStatus()) && resourceOccupyService.haveResource(ray.getComputingResourceId(), 1)) {
                         resourceOccupyService.deducing(Constant.TaskType_Ray, null, rayIns.getId(), null, null);
                     } else if (Constant.Failed.equals(rayIns.getStatus()) || Constant.Terminated.equals(rayIns.getStatus())
                             || Constant.Succeeded.equals(rayIns.getStatus())) {

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java

@@ -3,7 +3,6 @@ package com.ruoyi.platform.service.impl;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.constant.Constant;
 import com.ruoyi.platform.domain.AssetWorkflow;
 import com.ruoyi.platform.domain.ComputingResource;
 import com.ruoyi.platform.domain.ServiceVersion;
@@ -18,6 +17,7 @@ import com.ruoyi.platform.utils.JacksonUtil;
 import com.ruoyi.platform.vo.serviceVos.ServiceCodeConfigVo;
 import com.ruoyi.platform.vo.serviceVos.ServiceModelVo;
 import com.ruoyi.platform.vo.serviceVos.ServiceVersionVo;
+import com.ruoyi.system.api.constant.Constant;
 import com.ruoyi.system.api.model.LoginUser;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -277,7 +277,7 @@ public class ServiceServiceImpl implements ServiceService {
                     serviceDao.updateServiceVersion(serviceVersion);
 
                     // 记录开始扣积分
-                    resourceOccupyService.startDeduce(serviceVersion.getComputingResourceId(), serviceVersion.getReplicas(), Constant.TaskType_Service, serviceVersion.getServiceId(), serviceVersion.getId(), null, service.getServiceName(), null, null);
+                    resourceOccupyService.startDeduce(serviceVersion.getComputingResourceId(), serviceVersion.getReplicas(), Constant.TaskType_Service, serviceVersion.getServiceId(), serviceVersion.getId(), null, service.getServiceName(), null, Constant.State_building);
                     return "启动成功";
                 } else {
                     throw new RuntimeException("启动失败");