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 a77ad8f1..e74de944 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 @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.io.IOException; +import java.util.List; import java.util.Map; @RestController @@ -60,12 +61,24 @@ public class ServiceController extends BaseController { return genericsSuccess(serviceService.editServiceVersion(serviceVersion)); } + @GetMapping("/serviceDetail/{id}") + @ApiOperation("查询服务详细信息") + public GenericsAjaxResult getService(@PathVariable("id") Long id){ + return genericsSuccess(serviceService.getService(id)); + } + @GetMapping("/serviceVersionDetail/{id}") @ApiOperation("查询服务版本详细信息") public GenericsAjaxResult getServiceVersion(@PathVariable("id") Long id) { return genericsSuccess(serviceService.getServiceVersion(id)); } + @GetMapping("/serviceVersionList/{id}") + @ApiOperation("查询服务版本列表") + public GenericsAjaxResult> serviceVersionList(@PathVariable("id") Long id){ + return genericsSuccess(serviceService.serviceVersionList(id)); + } + @DeleteMapping("{id}") @ApiOperation("删除服务") public GenericsAjaxResult deleteService(@PathVariable("id") Long id) { @@ -78,13 +91,13 @@ public class ServiceController extends BaseController { return genericsSuccess(serviceService.deleteServiceVersion(id)); } - @GetMapping("/runServiceVersion/{id}") + @PostMapping("/runServiceVersion/{id}") @ApiOperation("启动服务版本") public GenericsAjaxResult runServiceVersion(@PathVariable("id") Long id) { return genericsSuccess(serviceService.runServiceVersion(id)); } - @GetMapping("/stopServiceVersion/{id}") + @DeleteMapping("/stopServiceVersion/{id}") @ApiOperation("停止服务版本") public GenericsAjaxResult stopServiceVersion(@PathVariable("id") Long id) { return genericsSuccess(serviceService.stopServiceVersion(id)); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ServiceDao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ServiceDao.java index d114e0cd..55549a2f 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ServiceDao.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ServiceDao.java @@ -31,4 +31,6 @@ public interface ServiceDao { ServiceVersion getServiceVersionById(@Param("id") Long id); + List getServiceVersionList(@Param("serviceId") Long serviceId); + } 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 1f98ce1e..0fa439a6 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 @@ -6,6 +6,7 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import java.io.IOException; +import java.util.List; import java.util.Map; public interface ServiceService { @@ -21,6 +22,8 @@ public interface ServiceService { ServiceVersion editServiceVersion(ServiceVersion serviceVersion); + Service getService(Long id); + ServiceVersion getServiceVersion(Long id); String deleteService(Long id); @@ -36,4 +39,6 @@ public interface ServiceService { String getServiceVersionLog(Long id, String startTime, String endTime); Map getServiceVersionDocs(Long id); + + List serviceVersionList(Long id); } 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 7075c051..2440179d 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 @@ -126,6 +126,11 @@ public class ServiceServiceImpl implements ServiceService { return serviceDao.getServiceVersionById(serviceVersion.getId()); } + @Override + public com.ruoyi.platform.domain.Service getService(Long id) { + return serviceDao.getServiceById(id); + } + @Override public ServiceVersion getServiceVersion(Long id) { return serviceDao.getServiceVersionById(id); @@ -260,4 +265,9 @@ public class ServiceServiceImpl implements ServiceService { } } + @Override + public List serviceVersionList(Long id) { + return serviceDao.getServiceVersionList(id); + } + } diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ServiceDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ServiceDaoMapper.xml index c7427eb4..8e4e3259 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ServiceDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ServiceDaoMapper.xml @@ -67,6 +67,12 @@ where id = #{id} + + insert into service(service_name, service_type, description, create_by, update_by) values (#{service.serviceName}, #{service.serviceType}, #{service.description}, #{service.createBy}, #{service.updateBy})