| @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.*; | |||||
| import javax.annotation.Resource; | import javax.annotation.Resource; | ||||
| import java.io.IOException; | import java.io.IOException; | ||||
| import java.util.List; | |||||
| import java.util.Map; | import java.util.Map; | ||||
| @RestController | @RestController | ||||
| @@ -60,12 +61,24 @@ public class ServiceController extends BaseController { | |||||
| return genericsSuccess(serviceService.editServiceVersion(serviceVersion)); | return genericsSuccess(serviceService.editServiceVersion(serviceVersion)); | ||||
| } | } | ||||
| @GetMapping("/serviceDetail/{id}") | |||||
| @ApiOperation("查询服务详细信息") | |||||
| public GenericsAjaxResult<Service> getService(@PathVariable("id") Long id){ | |||||
| return genericsSuccess(serviceService.getService(id)); | |||||
| } | |||||
| @GetMapping("/serviceVersionDetail/{id}") | @GetMapping("/serviceVersionDetail/{id}") | ||||
| @ApiOperation("查询服务版本详细信息") | @ApiOperation("查询服务版本详细信息") | ||||
| public GenericsAjaxResult<ServiceVersion> getServiceVersion(@PathVariable("id") Long id) { | public GenericsAjaxResult<ServiceVersion> getServiceVersion(@PathVariable("id") Long id) { | ||||
| return genericsSuccess(serviceService.getServiceVersion(id)); | return genericsSuccess(serviceService.getServiceVersion(id)); | ||||
| } | } | ||||
| @GetMapping("/serviceVersionList/{id}") | |||||
| @ApiOperation("查询服务版本列表") | |||||
| public GenericsAjaxResult<List<ServiceVersion>> serviceVersionList(@PathVariable("id") Long id){ | |||||
| return genericsSuccess(serviceService.serviceVersionList(id)); | |||||
| } | |||||
| @DeleteMapping("{id}") | @DeleteMapping("{id}") | ||||
| @ApiOperation("删除服务") | @ApiOperation("删除服务") | ||||
| public GenericsAjaxResult<String> deleteService(@PathVariable("id") Long id) { | public GenericsAjaxResult<String> deleteService(@PathVariable("id") Long id) { | ||||
| @@ -78,13 +91,13 @@ public class ServiceController extends BaseController { | |||||
| return genericsSuccess(serviceService.deleteServiceVersion(id)); | return genericsSuccess(serviceService.deleteServiceVersion(id)); | ||||
| } | } | ||||
| @GetMapping("/runServiceVersion/{id}") | |||||
| @PostMapping("/runServiceVersion/{id}") | |||||
| @ApiOperation("启动服务版本") | @ApiOperation("启动服务版本") | ||||
| public GenericsAjaxResult<String> runServiceVersion(@PathVariable("id") Long id) { | public GenericsAjaxResult<String> runServiceVersion(@PathVariable("id") Long id) { | ||||
| return genericsSuccess(serviceService.runServiceVersion(id)); | return genericsSuccess(serviceService.runServiceVersion(id)); | ||||
| } | } | ||||
| @GetMapping("/stopServiceVersion/{id}") | |||||
| @DeleteMapping("/stopServiceVersion/{id}") | |||||
| @ApiOperation("停止服务版本") | @ApiOperation("停止服务版本") | ||||
| 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)); | ||||
| @@ -31,4 +31,6 @@ public interface ServiceDao { | |||||
| ServiceVersion getServiceVersionById(@Param("id") Long id); | ServiceVersion getServiceVersionById(@Param("id") Long id); | ||||
| List<ServiceVersion> getServiceVersionList(@Param("serviceId") Long serviceId); | |||||
| } | } | ||||
| @@ -6,6 +6,7 @@ import org.springframework.data.domain.Page; | |||||
| import org.springframework.data.domain.PageRequest; | import org.springframework.data.domain.PageRequest; | ||||
| import java.io.IOException; | import java.io.IOException; | ||||
| import java.util.List; | |||||
| import java.util.Map; | import java.util.Map; | ||||
| public interface ServiceService { | public interface ServiceService { | ||||
| @@ -21,6 +22,8 @@ public interface ServiceService { | |||||
| ServiceVersion editServiceVersion(ServiceVersion serviceVersion); | ServiceVersion editServiceVersion(ServiceVersion serviceVersion); | ||||
| Service getService(Long id); | |||||
| ServiceVersion getServiceVersion(Long id); | ServiceVersion getServiceVersion(Long id); | ||||
| String deleteService(Long id); | String deleteService(Long id); | ||||
| @@ -36,4 +39,6 @@ public interface ServiceService { | |||||
| String getServiceVersionLog(Long id, String startTime, String endTime); | String getServiceVersionLog(Long id, String startTime, String endTime); | ||||
| Map<String, Object> getServiceVersionDocs(Long id); | Map<String, Object> getServiceVersionDocs(Long id); | ||||
| List<ServiceVersion> serviceVersionList(Long id); | |||||
| } | } | ||||
| @@ -126,6 +126,11 @@ public class ServiceServiceImpl implements ServiceService { | |||||
| return serviceDao.getServiceVersionById(serviceVersion.getId()); | return serviceDao.getServiceVersionById(serviceVersion.getId()); | ||||
| } | } | ||||
| @Override | |||||
| public com.ruoyi.platform.domain.Service getService(Long id) { | |||||
| return serviceDao.getServiceById(id); | |||||
| } | |||||
| @Override | @Override | ||||
| public ServiceVersion getServiceVersion(Long id) { | public ServiceVersion getServiceVersion(Long id) { | ||||
| return serviceDao.getServiceVersionById(id); | return serviceDao.getServiceVersionById(id); | ||||
| @@ -260,4 +265,9 @@ public class ServiceServiceImpl implements ServiceService { | |||||
| } | } | ||||
| } | } | ||||
| @Override | |||||
| public List<ServiceVersion> serviceVersionList(Long id) { | |||||
| return serviceDao.getServiceVersionList(id); | |||||
| } | |||||
| } | } | ||||
| @@ -67,6 +67,12 @@ | |||||
| where id = #{id} | where id = #{id} | ||||
| </select> | </select> | ||||
| <select id="getServiceVersionList" resultType="com.ruoyi.platform.domain.ServiceVersion"> | |||||
| select * | |||||
| from service_version | |||||
| where service_id = #{serviceId} | |||||
| </select> | |||||
| <insert id="insertService"> | <insert id="insertService"> | ||||
| insert into service(service_name, service_type, description, create_by, update_by) | insert into service(service_name, service_type, description, create_by, update_by) | ||||
| values (#{service.serviceName}, #{service.serviceType}, #{service.description}, #{service.createBy}, #{service.updateBy}) | values (#{service.serviceName}, #{service.serviceType}, #{service.description}, #{service.createBy}, #{service.updateBy}) | ||||