From c5c0afed3fe7e1eb06c8a42328b50937d28c1e73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Mon, 15 Jan 2024 14:50:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=E5=AD=98=E5=82=A8=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/platform/mapper/ComponentDao.java | 2 ++ .../platform/service/impl/ComponentServiceImpl.java | 11 ++++++++--- .../mapper/managementPlatform/ExperimentDaoMapper.xml | 1 + .../managementPlatform/ExperimentInsDaoMapper.xml | 1 + .../mapper/managementPlatform/WorkflowDaoMapper.xml | 1 + 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ComponentDao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ComponentDao.java index 14c85f20..2f6bdb20 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ComponentDao.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ComponentDao.java @@ -74,6 +74,8 @@ public interface ComponentDao { */ int insertOrUpdateBatch(@Param("entities") List entities); + + /** * 修改数据 * 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 764f9061..f5da44cc 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 @@ -145,15 +145,20 @@ public class ComponentServiceImpl implements ComponentService { //将object转成string类型 component = ConvertUtil.entityToVo(componentVo,Component.class); + Gson gson = new Gson(); - component.setEnvVirables(componentVo.getEnvVirables().toString()); - component.setInParameters(componentVo.getInParameters().toString()); - component.setOutParameters(componentVo.getOutParameters().toString()); + 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.setUpdateBy(loginUser.getUsername()); component.setUpdateTime(new Date()); this.componentDao.update(component); return this.queryById(component.getId()); + } /** diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentDaoMapper.xml index c22a1274..01d611c0 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentDaoMapper.xml @@ -94,6 +94,7 @@ and update_time = #{experiment.updateTime} + order by update_time DESC limit #{pageable.offset}, #{pageable.pageSize} diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml index 49c787a5..8b522836 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml @@ -118,6 +118,7 @@ and update_time = #{experimentIns.updateTime} + order by update_time DESC limit #{pageable.offset}, #{pageable.pageSize} diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/WorkflowDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/WorkflowDaoMapper.xml index ba2e313c..755a11da 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/WorkflowDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/WorkflowDaoMapper.xml @@ -54,6 +54,7 @@ and update_time = #{workflow.updateTime} + order by update_time DESC limit #{pageable.offset}, #{pageable.pageSize} From 0446f75c10874eddf861f44c360e1302e946aa4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Mon, 15 Jan 2024 14:58:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=A9=BC=E5=B3=B0=E8=BD=AC=E4=B8=8B=E5=88=92=E7=BA=BF?= =?UTF-8?q?=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/platform/domain/DatasetVersion.java | 4 ++++ .../src/main/java/com/ruoyi/platform/domain/Experiment.java | 3 +++ .../main/java/com/ruoyi/platform/domain/ExperimentIns.java | 4 ++++ .../src/main/java/com/ruoyi/platform/domain/Models.java | 4 ++++ .../main/java/com/ruoyi/platform/domain/ModelsVersion.java | 4 ++++ .../src/main/java/com/ruoyi/platform/domain/Workflow.java | 3 +++ 6 files changed, 22 insertions(+) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java index 7649dc82..4a70baeb 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java @@ -1,5 +1,8 @@ package com.ruoyi.platform.domain; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; + import java.util.Date; import java.io.Serializable; @@ -9,6 +12,7 @@ import java.io.Serializable; * @author Xidaray * @since 2024-01-03 16:57:12 */ +@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) public class DatasetVersion implements Serializable { private static final long serialVersionUID = -96998451993465838L; /** diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java index d7ee965c..154d85fc 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; import com.ruoyi.common.core.web.domain.BaseEntity; import java.io.Serializable; @@ -16,6 +18,7 @@ import java.util.List; * @author makejava * @since 2023-11-07 15:08:22 */ +@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) public class Experiment extends BaseEntity implements Serializable { private static final long serialVersionUID = 409135817108439880L; @TableId diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java index ea6552b1..df586a76 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java @@ -1,5 +1,8 @@ package com.ruoyi.platform.domain; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; + import java.io.Serializable; import java.util.Date; @@ -9,6 +12,7 @@ import java.util.Date; * @author makejava * @since 2023-11-09 09:48:36 */ +@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) public class ExperimentIns implements Serializable { private static final long serialVersionUID = 623464560240790680L; 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 185476c5..480a998f 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 @@ -1,5 +1,8 @@ package com.ruoyi.platform.domain; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; + import java.util.Date; import java.io.Serializable; @@ -9,6 +12,7 @@ import java.io.Serializable; * @author Xidaray * @since 2023-11-28 16:24:19 */ +@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) public class Models implements Serializable { private static final long serialVersionUID = -59896385986032571L; 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 8dd03f39..376bd529 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 @@ -1,5 +1,8 @@ package com.ruoyi.platform.domain; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; + import java.util.Date; import java.io.Serializable; @@ -9,6 +12,7 @@ import java.io.Serializable; * @author Xidaray * @since 2024-01-05 09:02:42 */ +@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) 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 0edc4077..40098889 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 @@ -2,6 +2,8 @@ package com.ruoyi.platform.domain; import com.baomidou.mybatisplus.annotation.TableId; 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 org.springframework.stereotype.Component; @@ -17,6 +19,7 @@ import java.util.Date; */ @Component @Table(name = "workflow") +@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) public class Workflow extends BaseMetaObjectHandler implements Serializable { private static final long serialVersionUID = -28387946419827568L; /**