diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java index b15d73d8..7b2cfa1e 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java @@ -38,7 +38,7 @@ public class ComponentController { */ @GetMapping @ApiOperation("分页查询") - public ResponseEntity> queryByPage(@RequestBody Component component, int page, int size) { + public ResponseEntity> queryByPage( Component component, int page, int size) { PageRequest pageRequest = PageRequest.of(page,size); return ResponseEntity.ok(this.componentService.queryByPage(component, pageRequest)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java index 6ebee1ba..c1c76f16 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java @@ -44,7 +44,7 @@ public class DatasetController { */ @GetMapping @ApiOperation("分页查询") - public ResponseEntity> queryByPage(@RequestBody Dataset dataset, int page,int size) { + public ResponseEntity> queryByPage(Dataset dataset, int page,int size) { PageRequest pageRequest = PageRequest.of(page,size); return ResponseEntity.ok(this.datasetService.queryByPage(dataset, pageRequest)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java index 53437906..82f9a492 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java @@ -36,7 +36,7 @@ public class DatasetVersionController { */ @GetMapping @ApiOperation("分页查询") - public ResponseEntity> queryByPage(@RequestBody DatasetVersion datasetVersion, int page,int size) { + public ResponseEntity> queryByPage(DatasetVersion datasetVersion, int page,int size) { PageRequest pageRequest = PageRequest.of(page,size); return ResponseEntity.ok(this.datasetVersionService.queryByPage(datasetVersion, pageRequest)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentController.java index aa203f80..c5d097a6 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentController.java @@ -37,7 +37,7 @@ public class ExperimentController { */ @GetMapping @ApiOperation("分页查询") - public ResponseEntity> queryByPage(@RequestBody Experiment experiment, int page,int size) { + public ResponseEntity> queryByPage(Experiment experiment, int page,int size) { PageRequest pageRequest = PageRequest.of(page,size); return ResponseEntity.ok(this.experimentService.queryByPage(experiment, pageRequest)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java index 6903ffe5..609e7685 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java @@ -35,7 +35,7 @@ public class ExperimentInsController { */ @GetMapping @ApiOperation("分页查询") - public ResponseEntity> queryByPage(@RequestBody ExperimentIns experimentIns, int page, int size) { + public ResponseEntity> queryByPage(ExperimentIns experimentIns, int page, int size) { PageRequest pageRequest = PageRequest.of(page,size); return ResponseEntity.ok(this.experimentInsService.queryByPage(experimentIns, pageRequest)); } 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 15e9f4d2..3e031c6b 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 @@ -41,7 +41,7 @@ public class ModelsController { */ @GetMapping @ApiOperation("分页查询") - public ResponseEntity> queryByPage(@RequestBody Models models, int page, int size) { + public ResponseEntity> queryByPage(Models models, int page, int size) { PageRequest pageRequest = PageRequest.of(page,size); return ResponseEntity.ok(this.modelsService.queryByPage(models, pageRequest)); } 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 a01c27ce..801146f3 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 @@ -35,7 +35,7 @@ public class ModelsVersionController { */ @GetMapping @ApiOperation("分页查询") - public ResponseEntity> queryByPage(@RequestBody ModelsVersion modelsVersion, int page, int size) { + public ResponseEntity> queryByPage(ModelsVersion modelsVersion, int page, int size) { PageRequest pageRequest = PageRequest.of(page,size); return ResponseEntity.ok(this.modelsVersionService.queryByPage(modelsVersion, pageRequest)); } 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 4ab12948..53289a1b 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 @@ -35,7 +35,7 @@ public class ComputingResourceController { */ @GetMapping @ApiOperation("分页查询") - public ResponseEntity> queryByPage(@RequestBody ComputingResource computingResource, int page, int size) { + public ResponseEntity> queryByPage(ComputingResource computingResource, int page, int size) { PageRequest pageRequest = PageRequest.of(page,size); return ResponseEntity.ok(this.computingResourceService.queryByPage(computingResource, pageRequest)); } 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 864f15bf..0d731153 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 @@ -40,7 +40,7 @@ public class WorkflowController { */ @GetMapping @ApiOperation("分页查询") - public ResponseEntity> queryByPage(@RequestBody Workflow workflow, int page,int size) { + public ResponseEntity> queryByPage(Workflow workflow, int page,int size) { PageRequest pageRequest = PageRequest.of(page,size); return ResponseEntity.ok(this.workflowService.queryByPage(workflow, pageRequest)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComponentServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComponentServiceImpl.java index ef3fc4ed..764f9061 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComponentServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComponentServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.platform.service.impl; +import com.google.gson.Gson; import com.ruoyi.common.security.utils.DictUtils; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.platform.domain.Component; @@ -20,6 +21,8 @@ import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; +import static com.ruoyi.platform.utils.GsonUtil.gson; + /** * (Component)表服务实现类 * @@ -96,11 +99,17 @@ public class ComponentServiceImpl implements ComponentService { @Override public Component insert(ComponentVo componentVo) { //把那几个Object转成String类型 + Gson gson = new Gson(); Component component = ConvertUtil.entityToVo(componentVo, Component.class); - component.setControlStrategy(controlStrategy.toString()); - component.setEnvVirables(componentVo.getEnvVirables().toString()); - component.setInParameters(componentVo.getInParameters().toString()); - component.setOutParameters(componentVo.getOutParameters().toString()); + component.setControlStrategy(controlStrategy); + + //json转换,存数据库 + String inParameters= gson.toJson(componentVo.getInParameters(), LinkedHashMap.class); + String outParameters = gson.toJson(componentVo.getOutParameters(), LinkedHashMap.class); + String envVariable = gson.toJson(componentVo.getEnvVirables(), LinkedHashMap.class); + component.setEnvVirables(envVariable); + component.setInParameters(inParameters); + component.setOutParameters(outParameters); LoginUser loginUser = SecurityUtils.getLoginUser(); component.setCreateBy(loginUser.getUsername()); component.setUpdateBy(loginUser.getUsername()); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/GsonUtil.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/GsonUtil.java index 416f0d0a..6ffa5d44 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/GsonUtil.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/GsonUtil.java @@ -19,7 +19,7 @@ public class GsonUtil { /** * 是线程安全的,详细参考文档 */ - private static Gson gson = new Gson(); + public static Gson gson = new Gson(); /**