优化重启服务

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

@@ -152,6 +152,7 @@ public class ServiceServiceImpl implements ServiceService {
         if (!oldServiceVersion.getReplicas().equals(serviceVersionVo.getReplicas()) || !oldServiceVersion.getComputingResourceId().equals(serviceVersionVo.getComputingResourceId())
                 || serviceVersionVo.getRerun()) {
             updateServiceVersion(serviceVersion, serviceVersionVo.getRerun());
+            serviceVersion.setRunState(Constant.Pending);
         }
         LoginUser loginUser = SecurityUtils.getLoginUser();
         serviceVersion.setUpdateBy(loginUser.getUsername());
@@ -322,7 +323,7 @@ public class ServiceServiceImpl implements ServiceService {
                 ServiceVersion serviceVersionById = serviceDao.getServiceVersionById(serviceVersion.getId());
                 // 记录开始扣积分
                 if (reRun) {
-                    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);
                 } else if (Constant.Running.equals(serviceVersionById.getRunState()) || Constant.Pending.equals(serviceVersionById.getRunState())) {
                     resourceOccupyService.update(Constant.TaskType_Service, serviceVersion.getServiceId(), serviceVersion.getId(), serviceVersion.getComputingResourceId(), serviceVersion.getReplicas());
                 }