diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/service/ServiceController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/service/ServiceController.java index f5499bcc..133301fc 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/service/ServiceController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/service/ServiceController.java @@ -32,8 +32,7 @@ public class ServiceController extends BaseController { @GetMapping("/serviceVersion") @ApiOperation("分页查询服务版本列表") public GenericsAjaxResult> queryByPageServiceVersion(ServiceVersion serviceVersion, int page, int size) throws IOException { - PageRequest pageRequest = PageRequest.of(page, size); - return genericsSuccess(serviceService.queryByPageServiceVersion(serviceVersion, pageRequest)); + return genericsSuccess(serviceService.queryByPageServiceVersion(serviceVersion, page, size)); } @PostMapping @@ -89,4 +88,10 @@ public class ServiceController extends BaseController { public GenericsAjaxResult stopServiceVersion(@PathVariable("id") Long id) { return genericsSuccess(serviceService.stopServiceVersion(id)); } + + @PutMapping("/updateServiceVersion") + @ApiOperation("更新服务版本") + public GenericsAjaxResult updateServiceVersion(@RequestBody ServiceVersion serviceVersion) { + return genericsSuccess(serviceService.updateServiceVersion(serviceVersion)); + } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ServiceService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ServiceService.java index e7f9df29..f3350409 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ServiceService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ServiceService.java @@ -1,5 +1,6 @@ package com.ruoyi.platform.service; +import com.fasterxml.jackson.core.JsonProcessingException; import com.ruoyi.platform.domain.Service; import com.ruoyi.platform.domain.ServiceVersion; import org.springframework.data.domain.Page; @@ -10,7 +11,7 @@ import java.io.IOException; public interface ServiceService { Page queryByPageService(Service service, PageRequest pageRequest) throws IOException; - Page queryByPageServiceVersion(ServiceVersion serviceVersion, PageRequest pageRequest) throws IOException; + Page queryByPageServiceVersion(ServiceVersion serviceVersion, int page, int size) throws IOException; Service addService(Service service); @@ -29,4 +30,6 @@ public interface ServiceService { String runServiceVersion(Long id); String stopServiceVersion(Long id); + + ServiceVersion updateServiceVersion(ServiceVersion serviceVersion); } 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 5c6bedf7..f19ccef9 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 @@ -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 queryByPageService(com.ruoyi.platform.domain.Service service, PageRequest pageRequest) throws IOException { + public Page queryByPageService(com.ruoyi.platform.domain.Service service, PageRequest pageRequest) { long total = serviceDao.countService(service); List services = serviceDao.queryByPageService(service, pageRequest); return new PageImpl<>(services, pageRequest, total); } @Override - public Page queryByPageServiceVersion(ServiceVersion serviceVersion, PageRequest pageRequest) throws IOException { + public Page queryByPageServiceVersion(ServiceVersion serviceVersion, int page, int size) { + if (serviceVersion.getRunState() != null) { + + } + + PageRequest pageRequest = PageRequest.of(page, size); long total = serviceDao.countServiceVersion(serviceVersion); List 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 paramMap = new HashMap<>(); + paramMap.put("deployment_name", serviceVersion.getDeploymentName()); + HashMap 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("更新失败"); + } + } + }