diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/jupyter/JupyterController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/jupyter/JupyterController.java index 2d568ff0..a533193d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/jupyter/JupyterController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/jupyter/JupyterController.java @@ -2,6 +2,7 @@ package com.ruoyi.platform.controller.jupyter; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.domain.GenericsAjaxResult; import com.ruoyi.platform.service.JupyterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -23,8 +24,8 @@ public class JupyterController extends BaseController { private JupyterService jupyterService; @GetMapping(value = "/getURL") @ApiOperation("得到访问地址") - public AjaxResult getURL() throws IOException { - return AjaxResult.success(jupyterService.getJupyterServiceUrl()); + public GenericsAjaxResult getURL() throws IOException { + return genericsSuccess(jupyterService.getJupyterServiceUrl()); } @GetMapping(value = "/upload") diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java index dea9e44c..c14aad6d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java @@ -1,26 +1,26 @@ package com.ruoyi.platform.controller.model; -import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.GenericsAjaxResult; import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.platform.domain.Dataset; import com.ruoyi.platform.domain.Models; import com.ruoyi.platform.domain.ModelsVersion; import com.ruoyi.platform.service.ModelsService; -import com.ruoyi.platform.vo.DatasetVo; import com.ruoyi.platform.vo.ModelsVo; import com.ruoyi.system.api.model.LoginUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.core.io.InputStreamResource; +import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * (Models)表控制层 @@ -31,7 +31,7 @@ import java.util.List; @RestController @RequestMapping("models") @Api("模型管理") -public class ModelsController { +public class ModelsController extends BaseController { /** * 服务对象 */ @@ -48,11 +48,11 @@ public class ModelsController { */ @GetMapping @ApiOperation("模型广场分页查询，可传model_type进行筛选") - public AjaxResult queryByPage(Models models, @RequestParam("page") int page, - @RequestParam("size") int size, - //@RequestParam("available_range") int availableRange, - @RequestParam(value = "model_type", required = false) String modelType, - @RequestParam(value = "model_tag", required = false) String modelTag) { + public GenericsAjaxResult> queryByPage(Models models, @RequestParam("page") int page, + @RequestParam("size") int size, + //@RequestParam("available_range") int availableRange, + @RequestParam(value = "model_type", required = false) String modelType, + @RequestParam(value = "model_tag", required = false) String modelTag) { if (modelType != null){ models.setModelType(modelType); // 设置筛选条件 } @@ -61,7 +61,7 @@ public class ModelsController { } models.setAvailableRange(1); // 设置筛选条件 PageRequest pageRequest = PageRequest.of(page, size); - return AjaxResult.success(this.modelsService.queryByPage(models, pageRequest)); + return genericsSuccess(this.modelsService.queryByPage(models, pageRequest)); } @@ -75,10 +75,10 @@ public class ModelsController { */ @GetMapping("/personalModels") @ApiOperation("分页查询当前用户的个人模型 ，根据model_type筛选") - public AjaxResult queryByPagePersonal(Models models, @RequestParam("page") int page, - @RequestParam("size") int size, - @RequestParam(value = "model_type", required = false) String modelType, - @RequestParam(value = "model_tag", required = false) String modelTag) { + public GenericsAjaxResult> queryByPagePersonal(Models models, @RequestParam("page") int page, + @RequestParam("size") int size, + @RequestParam(value = "model_type", required = false) String modelType, + @RequestParam(value = "model_tag", required = false) String modelTag) { // 获取当前用户的认证信息 LoginUser loginUser = SecurityUtils.getLoginUser(); // 设置筛选条件 @@ -90,7 +90,7 @@ public class ModelsController { models.setModelTag(modelTag); // 设置筛选条件 } PageRequest pageRequest = PageRequest.of(page, size); - return AjaxResult.success(this.modelsService.queryByPage(models, pageRequest)); + return genericsSuccess(this.modelsService.queryByPage(models, pageRequest)); } @@ -102,14 +102,14 @@ public class ModelsController { */ @GetMapping("{id}") @ApiOperation("根据id查询") - public AjaxResult queryById(@PathVariable("id") Integer id) { - return AjaxResult.success(this.modelsService.queryById(id)); + public GenericsAjaxResult queryById(@PathVariable("id") Integer id) { + return genericsSuccess(this.modelsService.queryById(id)); } @GetMapping("/versions/{modelId}") @ApiOperation(value = "获取模型的所有版本", notes = "根据模型ID获取该模型的所有版本信息。") - public AjaxResult getModelVersions(@PathVariable("modelId") Integer modelId) throws Exception { - return AjaxResult.success(this.modelsService.getModelVersions(modelId)); + public GenericsAjaxResult> getModelVersions(@PathVariable("modelId") Integer modelId) throws Exception { + return genericsSuccess(this.modelsService.getModelVersions(modelId)); } @@ -121,8 +121,8 @@ public class ModelsController { */ @PostMapping @ApiOperation("添加模型") - public AjaxResult add(@RequestBody Models models) { - return AjaxResult.success(this.modelsService.insert(models)); + public GenericsAjaxResult add(@RequestBody Models models) { + return genericsSuccess(this.modelsService.insert(models)); } @@ -134,8 +134,8 @@ public class ModelsController { */ @PostMapping("/addModelAndVersion") @ApiOperation("添加模型和版本") - public AjaxResult addModelAndVersion(@RequestBody ModelsVo modelsVo) throws Exception { - return AjaxResult.success(this.modelsService.insertModelAndVersion(modelsVo)); + public GenericsAjaxResult addModelAndVersion(@RequestBody ModelsVo modelsVo) throws Exception { + return genericsSuccess(this.modelsService.insertModelAndVersion(modelsVo)); } @@ -147,8 +147,8 @@ public class ModelsController { */ @PutMapping @ApiOperation("编辑模型") - public AjaxResult edit(@RequestBody Models models) { - return AjaxResult.success(this.modelsService.update(models)); + public GenericsAjaxResult edit(@RequestBody Models models) { + return genericsSuccess(this.modelsService.update(models)); } /** @@ -159,8 +159,8 @@ public class ModelsController { */ @DeleteMapping("{id}") @ApiOperation("删除模型") - public AjaxResult deleteById(@PathVariable("id") Integer id) { - return AjaxResult.success(this.modelsService.removeById(id)); + public GenericsAjaxResult deleteById(@PathVariable("id") Integer id) { + return genericsSuccess(this.modelsService.removeById(id)); } /** @@ -176,8 +176,8 @@ public class ModelsController { @CrossOrigin(origins = "*", allowedHeaders = "*") @PostMapping("/upload") @ApiOperation(value = "上传模型", notes = "根据模型id上传模型文件，并将信息存入数据库。") - public AjaxResult uploadModels(@RequestParam("file") MultipartFile[] files) throws Exception { - return AjaxResult.success(this.modelsService.uploadModels(files)); + public GenericsAjaxResult>> uploadModels(@RequestParam("file") MultipartFile[] files) throws Exception { + return genericsSuccess(this.modelsService.uploadModels(files)); } @@ -187,8 +187,8 @@ public class ModelsController { */ @PostMapping("/upload_pipeline") @ApiOperation("从流水线上传模型,并将信息存入数据库") - public AjaxResult uploadModelsPipeline(@RequestBody(required =false) ModelsVersion modelsVersion) throws Exception { - return AjaxResult.success(this.modelsService.uploadModelsPipeline(modelsVersion)); + public GenericsAjaxResult uploadModelsPipeline(@RequestBody(required =false) ModelsVersion modelsVersion) throws Exception { + return genericsSuccess(this.modelsService.uploadModelsPipeline(modelsVersion)); } /** @@ -220,8 +220,8 @@ public class ModelsController { @GetMapping("/readme") @ApiOperation(value = "读取README文件", notes = "读取README文件并返回String类型。") - public AjaxResult readFileContent(@RequestParam("models_id") Integer modelsId, @RequestParam("version") String version) throws Exception { - return AjaxResult.success(this.modelsService.readFileContent(modelsId,version)); + public GenericsAjaxResult readFileContent(@RequestParam("models_id") Integer modelsId, @RequestParam("version") String version) throws Exception { + return genericsSuccess(this.modelsService.readFileContent(modelsId,version)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java index 48cc698c..ba1b9077 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java @@ -1,16 +1,18 @@ package com.ruoyi.platform.controller.model; -import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.GenericsAjaxResult; import com.ruoyi.platform.domain.*; import com.ruoyi.platform.service.*; +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.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; +import java.util.Map; /** * (ModelsVersion)表控制层 @@ -20,7 +22,8 @@ import java.util.List; */ @RestController @RequestMapping("modelsVersion") -public class ModelsVersionController { +@Api("模型版本管理") +public class ModelsVersionController extends BaseController { /** * 服务对象 */ @@ -37,9 +40,9 @@ public class ModelsVersionController { */ @GetMapping @ApiOperation("分页查询") - public AjaxResult queryByPage(ModelsVersion modelsVersion, int page, int size) { + public GenericsAjaxResult> queryByPage(ModelsVersion modelsVersion, int page, int size) { PageRequest pageRequest = PageRequest.of(page,size); - return AjaxResult.success(this.modelsVersionService.queryByPage(modelsVersion, pageRequest)); + return genericsSuccess(this.modelsVersionService.queryByPage(modelsVersion, pageRequest)); } /** @@ -49,8 +52,8 @@ public class ModelsVersionController { * @return 单条数据 */ @GetMapping("{id}") - public AjaxResult queryById(@PathVariable("id") Integer id) { - return AjaxResult.success(this.modelsVersionService.queryById(id)); + public GenericsAjaxResult queryById(@PathVariable("id") Integer id) { + return genericsSuccess(this.modelsVersionService.queryById(id)); } /** @@ -61,9 +64,9 @@ public class ModelsVersionController { * @return 匹配的模型版本记录列表 */ @GetMapping("/versions") - public AjaxResult queryByModelsIdAndVersion(@RequestParam("models_id") Integer modelsId, - @RequestParam("version") String version) { - return AjaxResult.success(this.modelsVersionService.queryByModelsIdAndVersion(modelsId, version)); + public GenericsAjaxResult> queryByModelsIdAndVersion(@RequestParam("models_id") Integer modelsId, + @RequestParam("version") String version) { + return genericsSuccess(this.modelsVersionService.queryByModelsIdAndVersion(modelsId, version)); } @@ -74,8 +77,8 @@ public class ModelsVersionController { * @return 新增结果 */ @PostMapping - public AjaxResult add(@RequestBody ModelsVersion modelsVersion) { - return AjaxResult.success(this.modelsVersionService.insert(modelsVersion)); + public GenericsAjaxResult add(@RequestBody ModelsVersion modelsVersion) { + return genericsSuccess(this.modelsVersionService.insert(modelsVersion)); } /** @@ -86,8 +89,8 @@ public class ModelsVersionController { */ @PostMapping("/addModelVersions") @ApiOperation("批量添加模型版本，传数组") - public AjaxResult addModelVersions(@RequestBody List modelsVersions) throws Exception { - return AjaxResult.success(this.modelsVersionService.addModelVersions(modelsVersions)); + public GenericsAjaxResult addModelVersions(@RequestBody List modelsVersions) throws Exception { + return genericsSuccess(this.modelsVersionService.addModelVersions(modelsVersions)); } /** @@ -97,8 +100,8 @@ public class ModelsVersionController { * @return 编辑结果 */ @PutMapping - public AjaxResult edit(@RequestBody ModelsVersion modelsVersion) { - return AjaxResult.success(this.modelsVersionService.update(modelsVersion)); + public GenericsAjaxResult edit(@RequestBody ModelsVersion modelsVersion) { + return genericsSuccess(this.modelsVersionService.update(modelsVersion)); } /** @@ -108,8 +111,8 @@ public class ModelsVersionController { * @return 删除是否成功 */ @DeleteMapping("{id}") - public AjaxResult deleteById(@PathVariable("id") Integer id) { - return AjaxResult.success(this.modelsVersionService.removeById(id)); + public GenericsAjaxResult deleteById(@PathVariable("id") Integer id) { + return genericsSuccess(this.modelsVersionService.removeById(id)); } @@ -123,9 +126,9 @@ public class ModelsVersionController { */ @DeleteMapping("/deleteVersion") @ApiOperation(value = "逻辑删除模型版本", notes = "根据模型ID和版本逻辑删除模型版本记录。") - public AjaxResult deleteModelsVersion(@RequestParam("models_id") Integer modelsId, - @RequestParam("version") String version) { - return AjaxResult.success(this.modelsVersionService.deleteModelsVersion(modelsId, version)); + public GenericsAjaxResult> deleteModelsVersion(@RequestParam("models_id") Integer modelsId, + @RequestParam("version") String version) { + return genericsSuccess(this.modelsVersionService.deleteModelsVersion(modelsId, version)); } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/resources/ComputingResourceController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/resources/ComputingResourceController.java index f2a178fc..0e869970 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/resources/ComputingResourceController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/resources/ComputingResourceController.java @@ -1,10 +1,12 @@ package com.ruoyi.platform.controller.resources; -import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.GenericsAjaxResult; import com.ruoyi.platform.domain.ComputingResource; import com.ruoyi.platform.service.ComputingResourceService; 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.*; @@ -19,7 +21,7 @@ import javax.annotation.Resource; @RestController @RequestMapping("computingResource") @Api("计算资源管理") -public class ComputingResourceController { +public class ComputingResourceController extends BaseController { /** * 服务对象 */ @@ -34,9 +36,9 @@ public class ComputingResourceController { */ @GetMapping @ApiOperation("分页查询") - public AjaxResult queryByPage(ComputingResource computingResource, int page, int size) { + public GenericsAjaxResult> queryByPage(ComputingResource computingResource, int page, int size) { PageRequest pageRequest = PageRequest.of(page,size); - return AjaxResult.success(this.computingResourceService.queryByPage(computingResource, pageRequest)); + return genericsSuccess(this.computingResourceService.queryByPage(computingResource, pageRequest)); } /** @@ -47,8 +49,8 @@ public class ComputingResourceController { */ @GetMapping("{id}") @ApiOperation("根据id查询") - public AjaxResult queryById(@PathVariable("id") Integer id) { - return AjaxResult.success(this.computingResourceService.queryById(id)); + public GenericsAjaxResult queryById(@PathVariable("id") Integer id) { + return genericsSuccess(this.computingResourceService.queryById(id)); } /** @@ -59,8 +61,8 @@ public class ComputingResourceController { */ @PostMapping @ApiOperation("新增计算资源") - public AjaxResult add(@RequestBody ComputingResource computingResource) { - return AjaxResult.success(this.computingResourceService.insert(computingResource)); + public GenericsAjaxResult add(@RequestBody ComputingResource computingResource) { + return genericsSuccess(this.computingResourceService.insert(computingResource)); } /** @@ -71,8 +73,8 @@ public class ComputingResourceController { */ @PutMapping @ApiOperation("编辑计算资源") - public AjaxResult edit(@RequestBody ComputingResource computingResource) { - return AjaxResult.success(this.computingResourceService.update(computingResource)); + public GenericsAjaxResult edit(@RequestBody ComputingResource computingResource) { + return genericsSuccess(this.computingResourceService.update(computingResource)); } /** @@ -83,8 +85,8 @@ public class ComputingResourceController { */ @DeleteMapping("{id}") @ApiOperation("删除计算资源") - public AjaxResult deleteById(@PathVariable("id") Integer id) { - return AjaxResult.success(this.computingResourceService.removeById(id)); + public GenericsAjaxResult deleteById(@PathVariable("id") Integer id) { + return genericsSuccess(this.computingResourceService.removeById(id)); } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/tensorBoard/TensorBoardController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/tensorBoard/TensorBoardController.java index 23b99a45..bc5bdfb5 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/tensorBoard/TensorBoardController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/tensorBoard/TensorBoardController.java @@ -1,6 +1,7 @@ package com.ruoyi.platform.controller.tensorBoard; -import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.GenericsAjaxResult; import com.ruoyi.platform.service.TensorBoardService; import com.ruoyi.platform.vo.FrameLogPathVo; import io.swagger.annotations.Api; @@ -16,7 +17,7 @@ import javax.annotation.Resource; @RestController @RequestMapping("tensorBoard") @Api("TensorBoard管理") -public class TensorBoardController { +public class TensorBoardController extends BaseController { //状态查询接口 @@ -32,8 +33,8 @@ public class TensorBoardController { @PostMapping("/run") @ApiOperation("启动tensorBoard") @ApiResponse - public AjaxResult runTensorBoard(@RequestBody FrameLogPathVo frameLogPathVo) throws Exception { - return AjaxResult.success(tensorBoardService.runTensorBoard(frameLogPathVo)); + public GenericsAjaxResult runTensorBoard(@RequestBody FrameLogPathVo frameLogPathVo) throws Exception { + return genericsSuccess(tensorBoardService.runTensorBoard(frameLogPathVo)); } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workflow/WorkflowController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workflow/WorkflowController.java index 4d40f6cd..359b3dfc 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workflow/WorkflowController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workflow/WorkflowController.java @@ -1,10 +1,12 @@ package com.ruoyi.platform.controller.workflow; -import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.GenericsAjaxResult; import com.ruoyi.platform.domain.Workflow; import com.ruoyi.platform.service.WorkflowService; 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.*; @@ -19,7 +21,7 @@ import javax.annotation.Resource; @RestController @RequestMapping("workflow") @Api("流水线管理") -public class WorkflowController { +public class WorkflowController extends BaseController { @@ -39,9 +41,9 @@ public class WorkflowController { */ @GetMapping @ApiOperation("分页查询") - public AjaxResult queryByPage(Workflow workflow, int page,int size) { + public GenericsAjaxResult> queryByPage(Workflow workflow, int page, int size) { PageRequest pageRequest = PageRequest.of(page,size); - return AjaxResult.success(this.workflowService.queryByPage(workflow, pageRequest)); + return genericsSuccess(this.workflowService.queryByPage(workflow, pageRequest)); } @@ -53,8 +55,8 @@ public class WorkflowController { */ @GetMapping("name/{name}") @ApiOperation("按流水线名字模糊查询流水线") - public AjaxResult queryByName(@PathVariable("name") String name) { - return AjaxResult.success(this.workflowService.queryByName(name)); + public GenericsAjaxResult> queryByName(@PathVariable("name") String name) { + return genericsSuccess(this.workflowService.queryByName(name)); } /** @@ -65,8 +67,8 @@ public class WorkflowController { */ @GetMapping("{id}") @ApiOperation("根据id查询单条数据") - public AjaxResult queryById(@PathVariable("id") Long id) { - return AjaxResult.success(this.workflowService.queryById(id)); + public GenericsAjaxResult queryById(@PathVariable("id") Long id) { + return genericsSuccess(this.workflowService.queryById(id)); } /** @@ -77,8 +79,8 @@ public class WorkflowController { */ @PostMapping @ApiOperation("新增流水线") - public AjaxResult add(@RequestBody Workflow workflow) { - return AjaxResult.success(this.workflowService.insert(workflow)); + public GenericsAjaxResult add(@RequestBody Workflow workflow) { + return genericsSuccess(this.workflowService.insert(workflow)); } @@ -90,8 +92,8 @@ public class WorkflowController { */ @ApiOperation("复制流水线记录") @PostMapping("duplicate/{id}") - public AjaxResult duplicateWorkflow(@PathVariable("id") Long id) { - return AjaxResult.success(this.workflowService.duplicateWorkflow(id)); + public GenericsAjaxResult duplicateWorkflow(@PathVariable("id") Long id) { + return genericsSuccess(this.workflowService.duplicateWorkflow(id)); } /** @@ -102,7 +104,7 @@ public class WorkflowController { // @ApiOperation("流水线保存") // @PutMapping("/saveWorkflow/{id}") // public ResponseEntity saveWorkflow(@PathVariable("id") Long id) { -// return AjaxResult.success(this.workflowService.saveWorkflow(id)); +// return genericsSuccess(this.workflowService.saveWorkflow(id)); // } @@ -114,8 +116,8 @@ public class WorkflowController { */ @PutMapping @ApiOperation("编辑流水线") - public AjaxResult edit(@RequestBody Workflow workflow) { - return AjaxResult.success(this.workflowService.update(workflow)); + public GenericsAjaxResult edit(@RequestBody Workflow workflow) { + return genericsSuccess(this.workflowService.update(workflow)); } /** @@ -129,8 +131,8 @@ public class WorkflowController { */ @DeleteMapping("{id}") @ApiOperation("删除流水线") - public AjaxResult deleteById(@PathVariable("id") Long id) throws Exception { - return AjaxResult.success(this.workflowService.removeById(id)); + public GenericsAjaxResult deleteById(@PathVariable("id") Long id) throws Exception { + return genericsSuccess(this.workflowService.removeById(id)); } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workflow/WorkflowParamController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workflow/WorkflowParamController.java index 5634fa8b..8725334c 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workflow/WorkflowParamController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workflow/WorkflowParamController.java @@ -1,12 +1,13 @@ package com.ruoyi.platform.controller.workflow; -import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.GenericsAjaxResult; import com.ruoyi.platform.domain.WorkflowParam; import com.ruoyi.platform.service.WorkflowParamService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.checkerframework.checker.units.qual.A; +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; @@ -19,7 +20,8 @@ import javax.annotation.Resource; */ @RestController @RequestMapping("workflowParam") -public class WorkflowParamController { +@Api("流水线参数管理") +public class WorkflowParamController extends BaseController { /** * 服务对象 */ @@ -34,9 +36,9 @@ public class WorkflowParamController { */ @GetMapping @ApiOperation("分页查询") - public AjaxResult queryByPage(WorkflowParam workflowParam, int page, int size) { + public GenericsAjaxResult> queryByPage(WorkflowParam workflowParam, int page, int size) { PageRequest pageRequest = PageRequest.of(page,size); - return AjaxResult.success(this.workflowParamService.queryByPage(workflowParam, pageRequest)); + return genericsSuccess(this.workflowParamService.queryByPage(workflowParam, pageRequest)); } /** @@ -47,8 +49,8 @@ public class WorkflowParamController { */ @GetMapping("{id}") @ApiOperation("根据id查询单条数据") - public AjaxResult queryById(@PathVariable("id") Integer id) { - return AjaxResult.success(this.workflowParamService.queryById(id)); + public GenericsAjaxResult queryById(@PathVariable("id") Integer id) { + return genericsSuccess(this.workflowParamService.queryById(id)); } /** * 新增数据 @@ -58,8 +60,8 @@ public class WorkflowParamController { */ @PostMapping @ApiOperation("新增流水线参数") - public AjaxResult add(WorkflowParam workflowParam) throws Exception { - return AjaxResult.success(this.workflowParamService.insert(workflowParam)); + public GenericsAjaxResult add(WorkflowParam workflowParam) throws Exception { + return genericsSuccess(this.workflowParamService.insert(workflowParam)); } /** @@ -70,8 +72,8 @@ public class WorkflowParamController { */ @PutMapping @ApiOperation("编辑流水线参数") - public AjaxResult edit(WorkflowParam workflowParam) { - return AjaxResult.success(this.workflowParamService.update(workflowParam)); + public GenericsAjaxResult edit(WorkflowParam workflowParam) { + return genericsSuccess(this.workflowParamService.update(workflowParam)); } /** @@ -82,8 +84,8 @@ public class WorkflowParamController { */ @DeleteMapping @ApiOperation("删除流水线参数") - public AjaxResult deleteById(Integer id) { - return AjaxResult.success(this.workflowParamService.removeById(id)); + public GenericsAjaxResult deleteById(Integer id) { + return genericsSuccess(this.workflowParamService.removeById(id)); } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java index 98d42b2e..26a4fd66 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java @@ -2,6 +2,7 @@ package com.ruoyi.platform.domain; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Date; @@ -14,6 +15,7 @@ import java.io.Serializable; * @since 2023-11-28 16:24:19 */ @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) +@ApiModel("模型对象") public class Models implements Serializable { private static final long serialVersionUID = -59896385986032571L; @ApiModelProperty(name = "id") diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java index 24f58500..c02eb970 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java @@ -2,6 +2,7 @@ package com.ruoyi.platform.domain; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Date; @@ -14,6 +15,7 @@ import java.io.Serializable; * @since 2024-01-05 09:02:42 */ @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) +@ApiModel("模型版本对象") public class ModelsVersion implements Serializable { private static final long serialVersionUID = -20181111893295288L; /** diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java index 1bbd543a..70eb8f76 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; import com.ruoyi.platform.handler.BaseMetaObjectHandler; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.springframework.stereotype.Component; @@ -21,6 +22,7 @@ import java.util.Date; @Component @Table(name = "workflow") @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) +@ApiModel("流水线对象") public class Workflow extends BaseMetaObjectHandler implements Serializable { private static final long serialVersionUID = -28387946419827568L; /** diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/WorkflowParam.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/WorkflowParam.java index ef19b6c1..262b2741 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/WorkflowParam.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/WorkflowParam.java @@ -2,6 +2,7 @@ package com.ruoyi.platform.domain; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModel; import java.util.Date; import java.io.Serializable; @@ -13,6 +14,7 @@ import java.io.Serializable; * @since 2024-03-18 15:48:42 */ @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) +@ApiModel("流水线参数对象") public class WorkflowParam implements Serializable { private static final long serialVersionUID = -96152285866099549L; /**