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

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

@@ -66,8 +66,6 @@ public class ExperimentInstanceStatusTask {
                         String finishedAt = (String) value.get("finishedAt");
 
                         if (StringUtils.isEmpty(finishedAt) && Constant.Running.equals(phase)) {
-                            ResourceOccupy resourceOccupy = new ResourceOccupy();
-                            resourceOccupy.setState(Constant.State_valid);
                             resourceOccupyService.deducing(Constant.TaskType_Workflow, null, Long.valueOf(experimentIns.getId()), key, startTime);
                         } else if (StringUtils.isNotEmpty(finishedAt)) {
                             resourceOccupyService.endDeduce(Constant.TaskType_Workflow, null, Long.valueOf(experimentIns.getId()), key, startTime);

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

@@ -21,5 +21,5 @@ public interface ResourceOccupyService {
 
     Map<String, Double> queryCredit();
 
-    void update(Integer computingResourceId, Integer replicas);
+    void update(String taskType, Long taskId, Long taskInsId, Integer computingResourceId, Integer replicas);
 }

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

@@ -141,8 +141,8 @@ public class ResourceOccupyServiceImpl implements ResourceOccupyService {
 
     @Override
     @Transactional
-    public void update(Integer computingResourceId, Integer replicas) {
-        ResourceOccupy resourceOccupy = new ResourceOccupy();
+    public void update(String taskType, Long taskId, Long taskInsId, Integer computingResourceId, Integer replicas) {
+        ResourceOccupy resourceOccupy = resourceOccupyDao.getResourceOccupyByTask(taskType, taskId, taskInsId, null).get(0);
         ComputingResource oldComputingResource = computingResourceDao.queryById(resourceOccupy.getComputingResourceId());
         ComputingResource computingResource = computingResourceDao.queryById(computingResourceId);
 

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

@@ -321,7 +321,7 @@ public class ServiceServiceImpl implements ServiceService {
                 if (reRun) {
                     resourceOccupyService.startDeduce(serviceVersion.getComputingResourceId(), serviceVersion.getReplicas(), Constant.TaskType_Service, serviceVersion.getServiceId(), serviceVersion.getId(), null, service.getServiceName(), null, null);
                 } else {
-                    resourceOccupyService.update(serviceVersion.getComputingResourceId(), serviceVersion.getReplicas());
+                    resourceOccupyService.update(Constant.TaskType_Service, serviceVersion.getServiceId(), serviceVersion.getId(), serviceVersion.getComputingResourceId(), serviceVersion.getReplicas());
                 }
                 return "修改成功";
             } else {

ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ResourceOccupy.xml

@@ -73,7 +73,7 @@
         <if test="nodeId != null and nodeId !=''">
             and node_id = #{nodeId}
         </if>
-        and state = 1
+        and state in (1, 2)
     </select>
 
     <select id="count" resultType="java.lang.Long">