center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

feat: 增加系统变量功能

Browse Source
This commit is contained in:
taojinlong 2024-05-16 18:54:36 +08:00
parent 25d138f359
commit 98cbba3e68
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java
View File

@ -220,13 +220,15 @@ public class PermissionManage {
private String handleSysVariable(UserFormVO userEntity, String sysVariable) { private String handleSysVariable(UserFormVO userEntity, String sysVariable) {
String value = null; String value = null;
System.out.println(sysVariable);
System.out.println(JsonUtil.toJSONString(userEntity));
if (StringUtils.isNotBlank(sysVariable) && sysVariable.startsWith("${") && sysVariable.endsWith("}")) { if (StringUtils.isNotBlank(sysVariable) && sysVariable.startsWith("${") && sysVariable.endsWith("}")) {
String variableId = sysVariable.substring(2, sysVariable.length() - 1); String variableId = sysVariable.substring(2, sysVariable.length() - 1);
for (SysVariableValueItem variable : userEntity.getVariables()) { for (SysVariableValueItem variable : userEntity.getVariables()) {
if (variableId.equalsIgnoreCase(variable.getVariableId())) { if (variableId.equalsIgnoreCase(variable.getVariableId().toString())) {
if (variable.getSysVariableDto().getType().equalsIgnoreCase("text")) { if (variable.getSysVariableDto().getType().equalsIgnoreCase("text")) {
for (SysVariableValueDto sysVariableValueDto : variable.getValueList()) { for (SysVariableValueDto sysVariableValueDto : variable.getValueList()) {
if (sysVariableValueDto.getId().toString().equals(variable.getVariableValueId())) { if (sysVariableValueDto.getId().equals(variable.getVariableValueId())) {
value = sysVariableValueDto.getValue(); value = sysVariableValueDto.getValue();
} }
} }

3
sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserFormVO.java
View File

@ -44,9 +44,6 @@ public class UserFormVO implements Serializable {
@Schema(description = "模式") @Schema(description = "模式")
private String model; private String model;
@Schema(description = "系统变量")
private String sysVariable;
@Schema(description = "系统变量") @Schema(description = "系统变量")
private List<SysVariableValueItem> variables; private List<SysVariableValueItem> variables;
} }

3
sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserGridVO.java
View File

@ -2,7 +2,6 @@ package io.dataease.api.permissions.user.vo;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.dataease.api.permissions.variable.dto.SysVariableValueItem;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@ -28,5 +27,5 @@ public class UserGridVO {
@Schema(description = "创建时间") @Schema(description = "创建时间")
private Long createTime; private Long createTime;
@Schema(description = "系统变量") @Schema(description = "系统变量")
private List<SysVariableValueItem> variables; private String sysVariable;
} }

4
sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/api/SysVariablesApi.java
View File

@ -36,7 +36,7 @@ public interface SysVariablesApi {
@Operation(summary = "详细信息") @Operation(summary = "详细信息")
@GetMapping("/detail/{id}") @GetMapping("/detail/{id}")
SysVariableDto detail(@PathVariable String id); SysVariableDto detail(@PathVariable Long id);
@Operation(summary = "查询") @Operation(summary = "查询")
@PostMapping("/query") @PostMapping("/query")
@ -55,7 +55,7 @@ public interface SysVariablesApi {
void deleteValue(@PathVariable String id); void deleteValue(@PathVariable String id);
@GetMapping("/value/selected/{id}") @GetMapping("/value/selected/{id}")
List<SysVariableValueDto> selectVariableValue(@PathVariable("id") String id); List<SysVariableValueDto> selectVariableValue(@PathVariable("id") Long id);
@PostMapping("/value/selected/{goPage}/{pageSize}") @PostMapping("/value/selected/{goPage}/{pageSize}")
IPage<SysVariableValueDto> selectPage(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody SysVariableValueDto sysVariableValueDto); IPage<SysVariableValueDto> selectPage(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody SysVariableValueDto sysVariableValueDto);

15
sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableValueItem.java
View File

@ -8,12 +8,17 @@ import java.util.List;
@Data @Data
public class SysVariableValueItem { public class SysVariableValueItem {
private SysVariableDto sysVariableDto;
@JsonSerialize(using = ToStringSerializer.class)
private String variableId;
@JsonSerialize(using = ToStringSerializer.class)
private String variableValueId;
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private String variableValue; private String variableValue;
@JsonSerialize(using = ToStringSerializer.class)
private String variableValue2;
private String variableType;
@JsonSerialize(using = ToStringSerializer.class)
private Long variableId;
@JsonSerialize(using = ToStringSerializer.class)
private Long variableValueId;
private String variableName;
private List<SysVariableValueDto> valueList; private List<SysVariableValueDto> valueList;
private SysVariableDto sysVariableDto;
} }