diff --git a/manager/src/main/java/com/usthe/manager/pojo/entity/JsonMapAttributeConverter.java b/manager/src/main/java/com/usthe/manager/pojo/entity/JsonMapAttributeConverter.java deleted file mode 100644 index b90fa3d..0000000 --- a/manager/src/main/java/com/usthe/manager/pojo/entity/JsonMapAttributeConverter.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.usthe.manager.pojo.entity; - -import com.usthe.common.util.GsonUtil; - -import javax.persistence.AttributeConverter; -import java.util.Map; - -/** - * json 互转map对象字段为数据String字段 - * @author tom - * @date 2021/12/4 07:54 - */ -public class JsonMapAttributeConverter implements AttributeConverter, String> { - - @Override - public String convertToDatabaseColumn(Map attribute) { - return GsonUtil.toJson(attribute); - - } - - @Override - public Map convertToEntityAttribute(String dbData) { - return GsonUtil.fromJson(dbData, Map.class); - } -} diff --git a/manager/src/main/java/com/usthe/manager/pojo/entity/JsonOptionListAttributeConverter.java b/manager/src/main/java/com/usthe/manager/pojo/entity/JsonOptionListAttributeConverter.java new file mode 100644 index 0000000..2142fd6 --- /dev/null +++ b/manager/src/main/java/com/usthe/manager/pojo/entity/JsonOptionListAttributeConverter.java @@ -0,0 +1,25 @@ +package com.usthe.manager.pojo.entity; + +import com.usthe.common.util.GsonUtil; + +import javax.persistence.AttributeConverter; +import java.util.List; + +/** + * json 互转map对象字段为数据String字段 + * @author tom + * @date 2021/12/4 07:54 + */ +public class JsonOptionListAttributeConverter implements AttributeConverter, String> { + + @Override + public String convertToDatabaseColumn(List attribute) { + return GsonUtil.toJson(attribute); + + } + + @Override + public List convertToEntityAttribute(String dbData) { + return GsonUtil.fromJson(dbData, List.class); + } +} diff --git a/manager/src/main/java/com/usthe/manager/pojo/entity/ParamDefine.java b/manager/src/main/java/com/usthe/manager/pojo/entity/ParamDefine.java index b98bd1c..5ec4368 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/entity/ParamDefine.java +++ b/manager/src/main/java/com/usthe/manager/pojo/entity/ParamDefine.java @@ -15,7 +15,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; import java.time.LocalDateTime; -import java.util.Map; +import java.util.List; import static io.swagger.annotations.ApiModelProperty.AccessMode.READ_ONLY; import static io.swagger.annotations.ApiModelProperty.AccessMode.READ_WRITE; @@ -107,8 +107,8 @@ public class ParamDefine { */ @ApiModelProperty(value = "当type为radio单选框,checkbox复选框时,option表示可选项值列表", example = "{key1,value1}", accessMode = READ_WRITE, position = 8) @Column(name = "param_options") - @Convert(converter = JsonMapAttributeConverter.class) - private Map options; + @Convert(converter = JsonOptionListAttributeConverter.class) + private List