From b28c43f6dab6efd9207cc05872f29f39c0014e60 Mon Sep 17 00:00:00 2001 From: WangXianfeng Date: Sat, 29 Jul 2023 11:53:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=AA=E4=BA=BA=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E7=AC=AC=E4=B8=89=E6=96=B9=E5=BA=94=E7=94=A8=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E4=B8=AD=E7=9A=84=E4=B8=80=E4=BA=9B=E5=B0=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9A=201.=20system=E6=A8=A1=E5=9D=97URL=E9=94=99?= =?UTF-8?q?=E8=AF=AF=202.=20RemoteSocialBo=E6=9C=AA=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8F=B7=E6=8E=A5=E5=8F=A3=203.=20SysSocialV?= =?UTF-8?q?o=E7=BC=BA=E5=B0=91AutoMapper=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/api/domain/bo/RemoteSocialBo.java | 10 ++++++++-- .../controller/system/SysClientController.java | 2 +- .../controller/system/SysSocialController.java | 2 +- .../dromara/system/domain/vo/SysSocialVo.java | 16 ++++++++++++++-- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteSocialBo.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteSocialBo.java index f2b6549d..78daf2f5 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteSocialBo.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteSocialBo.java @@ -1,6 +1,10 @@ package org.dromara.system.api.domain.bo; import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serial; +import java.io.Serializable; /** * 社会化关系业务对象 sys_social @@ -8,8 +12,10 @@ import lombok.Data; * @author Michelle.Chung */ @Data -public class RemoteSocialBo { - +@NoArgsConstructor +public class RemoteSocialBo implements Serializable { + @Serial + private static final long serialVersionUID = 1L; /** * 主键 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java index b7a9d524..c8938e50 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java @@ -31,7 +31,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/client") +@RequestMapping("/client") public class SysClientController extends BaseController { private final ISysClientService sysClientService; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java index 8d0d12fb..4b977e21 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java @@ -24,7 +24,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/social") +@RequestMapping("/social") public class SysSocialController extends BaseController { private final ISysSocialService socialUserService; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java index 8a00cc38..9f7cd04b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java @@ -3,11 +3,16 @@ package org.dromara.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; +import io.github.linpeilie.annotations.AutoMappers; import lombok.Data; +import org.dromara.system.api.domain.bo.RemoteSocialBo; +import org.dromara.system.api.domain.vo.RemoteSocialVo; import org.dromara.system.domain.SysSocial; +import org.dromara.system.domain.bo.SysSocialBo; import java.io.Serial; import java.io.Serializable; +import java.util.Date; /** @@ -17,7 +22,10 @@ import java.io.Serializable; */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = SysSocial.class) +@AutoMappers({ + @AutoMapper(target = SysSocial.class, reverseConvertGenerate = false), + @AutoMapper(target = RemoteSocialVo.class) +}) public class SysSocialVo implements Serializable { @Serial @@ -161,5 +169,9 @@ public class SysSocialVo implements Serializable { @ExcelProperty(value = "Twitter平台用户的附带属性，部分平台可能没有") private String oauthTokenSecret; - + /** + * 显示绑定时间 + */ + @ExcelProperty(value = "绑定时间") + private Date createTime; }