Browse Source

开发服务功能

dev-lhz
chenzhihang 1 year ago
parent
commit
41633ece46
3 changed files with 38 additions and 9 deletions
  1. +7
    -2
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/service/ServiceController.java
  2. +4
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ServiceService.java
  3. +27
    -6
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java

+ 7
- 2
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/service/ServiceController.java View File

@@ -32,8 +32,7 @@ public class ServiceController extends BaseController {
@GetMapping("/serviceVersion") @GetMapping("/serviceVersion")
@ApiOperation("分页查询服务版本列表") @ApiOperation("分页查询服务版本列表")
public GenericsAjaxResult<Page<ServiceVersion>> queryByPageServiceVersion(ServiceVersion serviceVersion, int page, int size) throws IOException { public GenericsAjaxResult<Page<ServiceVersion>> 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 @PostMapping
@@ -89,4 +88,10 @@ public class ServiceController extends BaseController {
public GenericsAjaxResult<String> stopServiceVersion(@PathVariable("id") Long id) { public GenericsAjaxResult<String> stopServiceVersion(@PathVariable("id") Long id) {
return genericsSuccess(serviceService.stopServiceVersion(id)); return genericsSuccess(serviceService.stopServiceVersion(id));
} }

@PutMapping("/updateServiceVersion")
@ApiOperation("更新服务版本")
public GenericsAjaxResult<ServiceVersion> updateServiceVersion(@RequestBody ServiceVersion serviceVersion) {
return genericsSuccess(serviceService.updateServiceVersion(serviceVersion));
}
} }

+ 4
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ServiceService.java View File

@@ -1,5 +1,6 @@
package com.ruoyi.platform.service; package com.ruoyi.platform.service;


import com.fasterxml.jackson.core.JsonProcessingException;
import com.ruoyi.platform.domain.Service; import com.ruoyi.platform.domain.Service;
import com.ruoyi.platform.domain.ServiceVersion; import com.ruoyi.platform.domain.ServiceVersion;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
@@ -10,7 +11,7 @@ import java.io.IOException;
public interface ServiceService { public interface ServiceService {
Page<Service> queryByPageService(Service service, PageRequest pageRequest) throws IOException; Page<Service> queryByPageService(Service service, PageRequest pageRequest) throws IOException;


Page<ServiceVersion> queryByPageServiceVersion(ServiceVersion serviceVersion, PageRequest pageRequest) throws IOException;
Page<ServiceVersion> queryByPageServiceVersion(ServiceVersion serviceVersion, int page, int size) throws IOException;


Service addService(Service service); Service addService(Service service);


@@ -29,4 +30,6 @@ public interface ServiceService {
String runServiceVersion(Long id); String runServiceVersion(Long id);


String stopServiceVersion(Long id); String stopServiceVersion(Long id);

ServiceVersion updateServiceVersion(ServiceVersion serviceVersion);
} }

+ 27
- 6
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java View File

@@ -18,7 +18,6 @@ import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -33,14 +32,19 @@ public class ServiceServiceImpl implements ServiceService {
private ServiceDao serviceDao; private ServiceDao serviceDao;


@Override @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); long total = serviceDao.countService(service);
List<com.ruoyi.platform.domain.Service> services = serviceDao.queryByPageService(service, pageRequest); List<com.ruoyi.platform.domain.Service> services = serviceDao.queryByPageService(service, pageRequest);
return new PageImpl<>(services, pageRequest, total); return new PageImpl<>(services, pageRequest, total);
} }


@Override @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); long total = serviceDao.countServiceVersion(serviceVersion);
List<ServiceVersion> serviceVersions = serviceDao.queryByPageServiceVersion(serviceVersion, pageRequest); List<ServiceVersion> serviceVersions = serviceDao.queryByPageServiceVersion(serviceVersion, pageRequest);
return new PageImpl<>(serviceVersions, pageRequest, total); return new PageImpl<>(serviceVersions, pageRequest, total);
@@ -139,7 +143,7 @@ public class ServiceServiceImpl implements ServiceService {
serviceVersion.setDeploymentName((String) reqMap.get("deployment_name")); serviceVersion.setDeploymentName((String) reqMap.get("deployment_name"));
serviceVersion.setSvcName((String) reqMap.get("svc_name")); serviceVersion.setSvcName((String) reqMap.get("svc_name"));
serviceVersion.setRunState(Constant.State_building); serviceVersion.setRunState(Constant.State_building);
serviceDao.updateServiceVersion(serviceVersion);
editServiceVersion(serviceVersion);
return "启动成功"; return "启动成功";
} else { } else {
throw new RuntimeException("创建失败"); throw new RuntimeException("创建失败");
@@ -154,10 +158,27 @@ public class ServiceServiceImpl implements ServiceService {
String req = HttpUtils.sendPost(argoUrl + "/model/service/create", JSON.toJSONString(paramMap)); String req = HttpUtils.sendPost(argoUrl + "/model/service/create", JSON.toJSONString(paramMap));
if (StringUtils.isNotEmpty(req)) { if (StringUtils.isNotEmpty(req)) {
serviceVersion.setRunState(Constant.State_invalid); serviceVersion.setRunState(Constant.State_invalid);
serviceDao.updateServiceVersion(serviceVersion);
editServiceVersion(serviceVersion);
return "停止成功"; return "停止成功";
}else {
} else {
throw new RuntimeException("停止失败"); 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("更新失败");
}
}

} }

Loading…
Cancel
Save