diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/autoML/AutoMLController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/autoML/AutoMLController.java index 48e666fd..8b0c9a74 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/autoML/AutoMLController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/autoML/AutoMLController.java @@ -8,10 +8,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -30,6 +27,24 @@ public class AutoMLController extends BaseController { @RequestParam(value = "mlName", required = false) String mlName) { PageRequest pageRequest = PageRequest.of(page, size); return genericsSuccess(this.autoMLService.queryByPage(mlName, pageRequest)); + } + + @PostMapping + @ApiOperation("新增自动机器学习") + public GenericsAjaxResult addAutoMl(@RequestBody AutoMl autoMl) { + return genericsSuccess(this.autoMLService.save(autoMl)); + } + @PutMapping + @ApiOperation("编辑自动机器学习") + public GenericsAjaxResult editAutoMl(@RequestBody AutoMl autoMl){ + return genericsSuccess(this.autoMLService.edit(autoMl)); } + + @DeleteMapping("{id}") + @ApiOperation("删除自动机器学习") + public GenericsAjaxResult deleteAutoMl(@PathVariable("id") Long id){ + return genericsSuccess(this.autoMLService.delete(id)); + } + } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/AutoMLDao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/AutoMLDao.java index 3334999b..ed68d8a9 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/AutoMLDao.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/AutoMLDao.java @@ -10,4 +10,10 @@ public interface AutoMLDao { long count(@Param("mlName") String mlName); List queryByPage(@Param("mlName") String mlName, @Param("pageable") Pageable pageable); + + AutoMl getAutoById(@Param("id") Long id); + + int save(@Param("autoMl") AutoMl autoMl); + + int edit(@Param("autoMl") AutoMl autoMl); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AutoMLService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AutoMLService.java index 37de7921..ce06b9c4 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AutoMLService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AutoMLService.java @@ -6,4 +6,10 @@ import org.springframework.data.domain.PageRequest; public interface AutoMLService { Page queryByPage(String mlName, PageRequest pageRequest); + + AutoMl save(AutoMl autoMl); + + String edit(AutoMl autoMl); + + String delete(Long id); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AutoMLServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AutoMLServiceImpl.java index 4fe834ff..4504c4f7 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AutoMLServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AutoMLServiceImpl.java @@ -1,8 +1,12 @@ package com.ruoyi.platform.service.impl; +import com.ruoyi.common.security.utils.SecurityUtils; +import com.ruoyi.platform.constant.Constant; import com.ruoyi.platform.domain.AutoMl; import com.ruoyi.platform.mapper.AutoMLDao; import com.ruoyi.platform.service.AutoMLService; +import com.ruoyi.system.api.model.LoginUser; +import org.apache.commons.lang3.StringUtils; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; @@ -22,4 +26,34 @@ public class AutoMLServiceImpl implements AutoMLService { List autoMls = autoMLDao.queryByPage(mlName, pageRequest); return new PageImpl<>(autoMls, pageRequest, total); } + + @Override + public AutoMl save(AutoMl autoMl) { + autoMLDao.save(autoMl); + return autoMl; + } + + @Override + public String edit(AutoMl autoMl) { + autoMLDao.edit(autoMl); + return "修改成功"; + } + + @Override + public String delete(Long id) { + AutoMl autoMl = autoMLDao.getAutoById(id); + if (autoMl == null) { + throw new RuntimeException("服务不存在"); + } + + LoginUser loginUser = SecurityUtils.getLoginUser(); + String username = loginUser.getUsername(); + String createBy = autoMl.getCreateBy(); + if (!(StringUtils.equals(username, "admin") || StringUtils.equals(username, createBy))) { + throw new RuntimeException("无权限删除该服务"); + } + + autoMl.setState(Constant.State_invalid); + return autoMLDao.edit(autoMl) > 0 ? "删除成功" : "删除失败"; + } } diff --git a/ruoyi-modules/management-platform/src/main/resources/bootstrap.yml b/ruoyi-modules/management-platform/src/main/resources/bootstrap.yml index 22eaf828..29dd7cd4 100644 --- a/ruoyi-modules/management-platform/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/management-platform/src/main/resources/bootstrap.yml @@ -14,16 +14,16 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: nacos-ci4s.argo.svc:8848 + server-addr: 172.20.32.181:18848 username: nacos - password: h1n2x3j4y5@ + password: nacos retry: enabled: true +# namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01 config: - username: nacos - password: h1n2x3j4y5@ +# namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01 # 配置中心地址 - server-addr: nacos-ci4s.argo.svc:8848 + server-addr: 172.20.32.181:18848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/AutoMLDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/AutoMLDaoMapper.xml index 9d39b807..788c2dec 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/AutoMLDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/AutoMLDaoMapper.xml @@ -1,6 +1,32 @@ + + insert into auto_ml(ml_name, ml_description) + values (#{autoMl.mlName}, #{autoMl.mlDescription}) + + + + update auto_ml + + + ml_name = #{autoMl.mlName}, + + + ml_description = #{autoMl.mlDescription}, + + + run_state = #{autoMl.runState}, + + + progress = #{autoMl.progress}, + + + state = #{autoMl.state}, + + + where id = #{autoMl.id} + + + state = 1