ci4s
/
ci4sManagement-cloud
41
0
Fork 1
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
fans 2024-01-15 15:19:28 +08:00
parent b97e939fbb 0446f75c10
commit f00ce3208c
9 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java
View File

@ -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

4
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java
View File

@ -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;

4
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java
View File

@ -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;

3
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java
View File

@ -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;
/**

2
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ComponentDao.java
View File

@ -74,6 +74,8 @@ public interface ComponentDao {
*/
int insertOrUpdateBatch(@Param("entities") List<Component> entities);
/**
* 修改数据
*

11
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComponentServiceImpl.java
View File

@ -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());
}
/**

1
ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentDaoMapper.xml
View File

@ -94,6 +94,7 @@
and update_time = #{experiment.updateTime}
</if>
</where>
order by update_time DESC
limit #{pageable.offset}, #{pageable.pageSize}
</select>

1
ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml
View File

@ -118,6 +118,7 @@
and update_time = #{experimentIns.updateTime}
</if>
</where>
order by update_time DESC
limit #{pageable.offset}, #{pageable.pageSize}
</select>

1
ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/WorkflowDaoMapper.xml
View File

@ -54,6 +54,7 @@
and update_time = #{workflow.updateTime}
</if>
</where>
order by update_time DESC
limit #{pageable.offset}, #{pageable.pageSize}
</select>