mozhe
/
mental-tenant-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AutoMapper问题还原，暂未能解决

This commit is contained in:
cjw 2024-07-31 15:47:53 +08:00
parent 701a67e094
commit 0ab4f618b9
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java
View File

@ -2,9 +2,12 @@ package org.dromara.scale.domain;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMapping;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.tenant.core.TenantEntity; import org.dromara.common.tenant.core.TenantEntity;
import org.dromara.scale.domain.vo.SysScaleVo;
import java.io.Serial; import java.io.Serial;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -18,7 +21,7 @@ import java.math.BigDecimal;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@TableName("sys_scale") @TableName("sys_scale")
//@AutoMapper(target = SysScaleVo.class, reverseConvertGenerate = false) @AutoMapper(target = SysScaleVo.class, reverseConvertGenerate = false)
public class SysScale extends TenantEntity { public class SysScale extends TenantEntity {
@Serial @Serial
@ -63,12 +66,13 @@ public class SysScale extends TenantEntity {
/** /**
* 适应人群：对应字典项people_type * 适应人群：对应字典项people_type
*/ */
@AutoMapping(target = "peopleType", expression = "java(cn.hutool.core.util.StrUtil.split(source.getPeopleType(), \",\"))")
private String peopleType; private String peopleType;
/** /**
* 适用年龄段：对应字典项age_range * 适用年龄段：对应字典项age_range
*/ */
@AutoMapping(target = "ageRange", expression = "java(cn.hutool.core.util.StrUtil.split(source.getAgeRange(), \",\"))")
private String ageRange; private String ageRange;
/** /**
@ -86,7 +90,7 @@ public class SysScale extends TenantEntity {
/** /**
* 量表类型：对应字典项scale_type * 量表类型：对应字典项scale_type
*/ */
@AutoMapping(target = "scaleType", expression = "java(cn.hutool.core.util.StrUtil.split(source.getScaleType(), \",\"))")
private String scaleType; private String scaleType;
/** /**

10
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java
View File

@ -1,11 +1,9 @@
package org.dromara.scale.domain.vo; package org.dromara.scale.domain.vo;
import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMapping; import io.github.linpeilie.annotations.AutoMapping;
import lombok.Data; import lombok.Data;
import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant; import org.dromara.common.translation.constant.TransConstant;
import org.dromara.scale.domain.SysScale;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
@ -20,7 +18,7 @@ import java.util.List;
* @date 2024-03-29 * @date 2024-03-29
*/ */
@Data @Data
@AutoMapper(target = SysScale.class) //@AutoMapper(target = SysScale.class)
public class SysScaleVo implements Serializable { public class SysScaleVo implements Serializable {
@Serial @Serial
@ -64,7 +62,7 @@ public class SysScaleVo implements Serializable {
/** /**
* 适应人群：对应字典项people_type * 适应人群：对应字典项people_type
*/ */
@AutoMapping(target = "peopleType", expression = "java(cn.hutool.core.util.StrUtil.split(source.getPeopleType(), \",\"))") //@AutoMapping(target = "peopleType", expression = "java(cn.hutool.core.util.StrUtil.split(source.getPeopleType(), \",\"))")
private List<String> peopleType; private List<String> peopleType;
/** /**
@ -76,7 +74,7 @@ public class SysScaleVo implements Serializable {
/** /**
* 适用年龄段：对应字典项age_range * 适用年龄段：对应字典项age_range
*/ */
@AutoMapping(target = "ageRange", expression = "java(cn.hutool.core.util.StrUtil.split(source.getAgeRange(), \",\"))") //@AutoMapping(target = "ageRange", expression = "java(cn.hutool.core.util.StrUtil.split(source.getAgeRange(), \",\"))")
private List<String> ageRange; private List<String> ageRange;
/** /**
@ -105,7 +103,7 @@ public class SysScaleVo implements Serializable {
/** /**
* 量表类型：对应字典项scale_type * 量表类型：对应字典项scale_type
*/ */
@AutoMapping(target = "scaleType", expression = "java(cn.hutool.core.util.StrUtil.split(source.getScaleType(), \",\"))") //@AutoMapping(target = "scaleType", expression = "java(cn.hutool.core.util.StrUtil.split(source.getScaleType(), \",\"))")
private List<String> scaleType; private List<String> scaleType;
/** /**