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