开发服务功能

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/service/ServiceController.java

@@ -106,11 +106,11 @@ public class ServiceController extends BaseController {
         return genericsSuccess(serviceService.deleteServiceVersion(id));
     }
 
-    @PostMapping("/runServiceVersion/{id}")
-    @ApiOperation("启动服务版本")
-    public GenericsAjaxResult<String> runServiceVersion(@PathVariable("id") Long id) {
-        return genericsSuccess(serviceService.runServiceVersion(id));
-    }
+//    @PostMapping("/runServiceVersion/{id}")
+//    @ApiOperation("启动服务版本")
+//    public GenericsAjaxResult<String> runServiceVersion(@PathVariable("id") Long id) {
+//        return genericsSuccess(serviceService.runServiceVersion(id));
+//    }
 
     @DeleteMapping("/stopServiceVersion/{id}")
     @ApiOperation("停止服务版本")
@@ -118,11 +118,11 @@ public class ServiceController extends BaseController {
         return genericsSuccess(serviceService.stopServiceVersion(id));
     }
 
-    @PutMapping("/updateServiceVersion")
-    @ApiOperation("更新服务版本")
-    public GenericsAjaxResult<String> updateServiceVersion(@RequestBody ServiceVersion serviceVersion) {
-        return genericsSuccess(serviceService.updateServiceVersion(serviceVersion));
-    }
+//    @PutMapping("/updateServiceVersion")
+//    @ApiOperation("更新服务版本")
+//    public GenericsAjaxResult<String> updateServiceVersion(@RequestBody ServiceVersion serviceVersion) {
+//        return genericsSuccess(serviceService.updateServiceVersion(serviceVersion));
+//    }
 
     @GetMapping("/getServiceVersionLog/{id}")
     @ApiOperation("获取服务版本日志")

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java

@@ -132,6 +132,11 @@ public class ServiceServiceImpl implements ServiceService {
     public String editServiceVersion(ServiceVersionVo serviceVersionVo) {
         ServiceVersion serviceVersion = getServiceVersion(serviceVersionVo);
 
+        ServiceVersion oldServiceVersion = serviceDao.getServiceVersionById(serviceVersionVo.getId());
+        if (!oldServiceVersion.getReplicas().equals(serviceVersionVo.getReplicas()) || !oldServiceVersion.getResource().equals(serviceVersionVo.getResource())
+                || serviceVersionVo.getRerun()) {
+            updateServiceVersion(serviceVersion);
+        }
         LoginUser loginUser = SecurityUtils.getLoginUser();
         serviceVersion.setUpdateBy(loginUser.getUsername());
         serviceDao.updateServiceVersion(serviceVersion);
@@ -242,8 +247,7 @@ public class ServiceServiceImpl implements ServiceService {
         paramMap.put("update_model", JSON.toJSONString(updateMap));
         String req = HttpUtils.sendPost(argoUrl + modelService + "/update", JSON.toJSONString(paramMap));
         if (StringUtils.isNotEmpty(req)) {
-            ServiceVersionVo serviceVersionVo = getServiceVersionVo(serviceVersion);
-            return editServiceVersion(serviceVersionVo);
+            return "修改成功";
         } else {
             throw new RuntimeException("更新失败");
         }

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/serviceVos/ServiceVersionVo.java

@@ -53,4 +53,6 @@ public class ServiceVersionVo {
     private String deploymentName;
 
     private String svcName;
+
+    private Boolean rerun;
 }