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 new file mode 100644 index 00000000..48e666fd --- /dev/null +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/autoML/AutoMLController.java @@ -0,0 +1,35 @@ +package com.ruoyi.platform.controller.autoML; + +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.GenericsAjaxResult; +import com.ruoyi.platform.domain.AutoMl; +import com.ruoyi.platform.service.AutoMLService; +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 javax.annotation.Resource; + +@RestController +@RequestMapping("autoML") +@Api("自动机器学习") +public class AutoMLController extends BaseController { + + @Resource + private AutoMLService autoMLService; + + @GetMapping + @ApiOperation("分页查询") + public GenericsAjaxResult> queryByPage(@RequestParam("page") int page, + @RequestParam("size") int size, + @RequestParam(value = "mlName", required = false) String mlName) { + PageRequest pageRequest = PageRequest.of(page, size); + return genericsSuccess(this.autoMLService.queryByPage(mlName, pageRequest)); + + } +} diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/codeConfig/CodeConfigController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/codeConfig/CodeConfigController.java index 3aa6c37f..b445a232 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/codeConfig/CodeConfigController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/codeConfig/CodeConfigController.java @@ -7,7 +7,6 @@ import com.ruoyi.platform.service.CodeConfigService; import io.swagger.annotations.Api; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/AutoMl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/AutoMl.java new file mode 100644 index 00000000..409e5726 --- /dev/null +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/AutoMl.java @@ -0,0 +1,31 @@ +package com.ruoyi.platform.domain; + +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.Data; + +import java.util.Date; + +@Data +@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) +public class AutoMl { + private Long id; + + private String mlName; + + private String mlDescription; + + private Integer state; + + private String runState; + + private Double progress; + + private String createBy; + + private Date createTime; + + private String updateBy; + + private Date updateTime; +} 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 new file mode 100644 index 00000000..3334999b --- /dev/null +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/AutoMLDao.java @@ -0,0 +1,13 @@ +package com.ruoyi.platform.mapper; + +import com.ruoyi.platform.domain.AutoMl; +import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; + +import java.util.List; + +public interface AutoMLDao { + long count(@Param("mlName") String mlName); + + List queryByPage(@Param("mlName") String mlName, @Param("pageable") Pageable pageable); +} 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 new file mode 100644 index 00000000..37de7921 --- /dev/null +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AutoMLService.java @@ -0,0 +1,9 @@ +package com.ruoyi.platform.service; + +import com.ruoyi.platform.domain.AutoMl; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; + +public interface AutoMLService { + Page queryByPage(String mlName, PageRequest pageRequest); +} 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 new file mode 100644 index 00000000..4fe834ff --- /dev/null +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AutoMLServiceImpl.java @@ -0,0 +1,25 @@ +package com.ruoyi.platform.service.impl; + +import com.ruoyi.platform.domain.AutoMl; +import com.ruoyi.platform.mapper.AutoMLDao; +import com.ruoyi.platform.service.AutoMLService; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service("autoMLService") +public class AutoMLServiceImpl implements AutoMLService { + @Resource + private AutoMLDao autoMLDao; + + @Override + public Page queryByPage(String mlName, PageRequest pageRequest) { + long total = autoMLDao.count(mlName); + List autoMls = autoMLDao.queryByPage(mlName, pageRequest); + return new PageImpl<>(autoMls, pageRequest, total); + } +} 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 new file mode 100644 index 00000000..9d39b807 --- /dev/null +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/AutoMLDaoMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + state = 1 + + and ml_name like concat('%', #{mlName}, '%') + + + + \ No newline at end of file