|
|
|
@@ -18,7 +18,6 @@ import org.springframework.data.domain.PageRequest; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import javax.annotation.Resource; |
|
|
|
import java.io.IOException; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
@@ -33,14 +32,19 @@ public class ServiceServiceImpl implements ServiceService { |
|
|
|
private ServiceDao serviceDao; |
|
|
|
|
|
|
|
@Override |
|
|
|
public Page<com.ruoyi.platform.domain.Service> queryByPageService(com.ruoyi.platform.domain.Service service, PageRequest pageRequest) throws IOException { |
|
|
|
public Page<com.ruoyi.platform.domain.Service> queryByPageService(com.ruoyi.platform.domain.Service service, PageRequest pageRequest) { |
|
|
|
long total = serviceDao.countService(service); |
|
|
|
List<com.ruoyi.platform.domain.Service> services = serviceDao.queryByPageService(service, pageRequest); |
|
|
|
return new PageImpl<>(services, pageRequest, total); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Page<ServiceVersion> queryByPageServiceVersion(ServiceVersion serviceVersion, PageRequest pageRequest) throws IOException { |
|
|
|
public Page<ServiceVersion> queryByPageServiceVersion(ServiceVersion serviceVersion, int page, int size) { |
|
|
|
if (serviceVersion.getRunState() != null) { |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
PageRequest pageRequest = PageRequest.of(page, size); |
|
|
|
long total = serviceDao.countServiceVersion(serviceVersion); |
|
|
|
List<ServiceVersion> serviceVersions = serviceDao.queryByPageServiceVersion(serviceVersion, pageRequest); |
|
|
|
return new PageImpl<>(serviceVersions, pageRequest, total); |
|
|
|
@@ -139,7 +143,7 @@ public class ServiceServiceImpl implements ServiceService { |
|
|
|
serviceVersion.setDeploymentName((String) reqMap.get("deployment_name")); |
|
|
|
serviceVersion.setSvcName((String) reqMap.get("svc_name")); |
|
|
|
serviceVersion.setRunState(Constant.State_building); |
|
|
|
serviceDao.updateServiceVersion(serviceVersion); |
|
|
|
editServiceVersion(serviceVersion); |
|
|
|
return "启动成功"; |
|
|
|
} else { |
|
|
|
throw new RuntimeException("创建失败"); |
|
|
|
@@ -154,10 +158,27 @@ public class ServiceServiceImpl implements ServiceService { |
|
|
|
String req = HttpUtils.sendPost(argoUrl + "/model/service/create", JSON.toJSONString(paramMap)); |
|
|
|
if (StringUtils.isNotEmpty(req)) { |
|
|
|
serviceVersion.setRunState(Constant.State_invalid); |
|
|
|
serviceDao.updateServiceVersion(serviceVersion); |
|
|
|
editServiceVersion(serviceVersion); |
|
|
|
return "停止成功"; |
|
|
|
}else { |
|
|
|
} else { |
|
|
|
throw new RuntimeException("停止失败"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ServiceVersion updateServiceVersion(ServiceVersion serviceVersion) { |
|
|
|
HashMap<String, Object> paramMap = new HashMap<>(); |
|
|
|
paramMap.put("deployment_name", serviceVersion.getDeploymentName()); |
|
|
|
HashMap<String, Object> updateMap = new HashMap<>(); |
|
|
|
updateMap.put("replicas", serviceVersion.getReplicas()); |
|
|
|
updateMap.put("resource", serviceVersion.getResource()); |
|
|
|
paramMap.put("update_model", JSON.toJSONString(updateMap)); |
|
|
|
String req = HttpUtils.sendPost(argoUrl + "/model/service/update", JSON.toJSONString(paramMap)); |
|
|
|
if (StringUtils.isNotEmpty(req)) { |
|
|
|
return editServiceVersion(serviceVersion); |
|
|
|
} else { |
|
|
|
throw new RuntimeException("更新失败"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |