From 88243286cb32db87bcadaaac92916bc33c056d91 Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Wed, 31 Jul 2024 16:16:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3autoMapping=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/scale/domain/SysScale.java   |  4 +++-
 .../org/dromara/scale/domain/vo/SysScaleVo.java   | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java
index 9d40f40..2174998 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java
@@ -21,7 +21,7 @@ import java.math.BigDecimal;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("sys_scale")
-@AutoMapper(target = SysScaleVo.class, reverseConvertGenerate = false)
+@AutoMapper(target = SysScaleVo.class)
 public class SysScale extends TenantEntity {
 
     @Serial
@@ -78,8 +78,10 @@ public class SysScale extends TenantEntity {
     /**
      * 封面
      */
+    @AutoMapping(target = "coverUrl")
     private Long cover;
 
+    @AutoMapping(target = "appCoverUrl")
     private Long appCover;
 
     /**
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java
index ad103c2..528cd65 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java
@@ -1,9 +1,11 @@
 package org.dromara.scale.domain.vo;
 
+import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMapping;
 import lombok.Data;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.scale.domain.SysScale;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -18,7 +20,7 @@ import java.util.List;
  * @date 2024-03-29
  */
 @Data
-//@AutoMapper(target = SysScale.class)
+@AutoMapper(target = SysScale.class)
 public class SysScaleVo implements Serializable {
 
     @Serial
@@ -63,6 +65,7 @@ public class SysScaleVo implements Serializable {
      * 适应人群：对应字典项people_type
      */
     //@AutoMapping(target = "peopleType", expression = "java(cn.hutool.core.util.StrUtil.split(source.getPeopleType(), \",\"))")
+    @AutoMapping(ignore = true)
     private List<String> peopleType;
 
     /**
@@ -75,6 +78,7 @@ public class SysScaleVo implements Serializable {
      * 适用年龄段：对应字典项age_range
      */
     //@AutoMapping(target = "ageRange", expression = "java(cn.hutool.core.util.StrUtil.split(source.getAgeRange(), \",\"))")
+    @AutoMapping(ignore = true)
     private List<String> ageRange;
 
     /**
@@ -88,12 +92,12 @@ public class SysScaleVo implements Serializable {
      * 封面地址
      */
     @Translation(type = TransConstant.OSS_ID_TO_URL)
-    @AutoMapping(target = "cover")
-    private String coverUrl;
+    //@AutoMapping(target = "cover")
+    private Long coverUrl;
 
     @Translation(type = TransConstant.OSS_ID_TO_URL)
-    @AutoMapping(target = "appCover")
-    private String appCoverUrl;
+    //@AutoMapping(target = "appCover")
+    private Long appCoverUrl;
 
     /**
      * 发布次数
@@ -104,6 +108,7 @@ public class SysScaleVo implements Serializable {
      * 量表类型：对应字典项scale_type
      */
     //@AutoMapping(target = "scaleType", expression = "java(cn.hutool.core.util.StrUtil.split(source.getScaleType(), \",\"))")
+    @AutoMapping(ignore = true)
     private List<String> scaleType;
 
     /**