From f9fe8f9ecd2b36bc8526f47656d8d26de4a85e23 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Fri, 20 Oct 2023 14:22:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=B3=A8=E5=92=8C=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../win/framework/datasource/package-info.java | 5 ----- .../main/java/com/win/framework/package-info.java | 1 - .../main/java/com/win/framework/package-info.java | 4 ---- .../infra/controller/remark/RemarkController.java | 15 ++++++++++++++- .../infra/controller/remark/vo/RemarkRespVO.java | 9 +++++++++ .../infra/controller/trends/TrendsController.java | 15 ++++++++++++++- .../infra/controller/trends/vo/TrendsRespVO.java | 9 +++++++++ .../system/api/user/dto/AdminUserRespDTO.java | 5 ++++- 8 files changed, 50 insertions(+), 13 deletions(-) delete mode 100644 win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/package-info.java delete mode 100644 win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/package-info.java delete mode 100644 win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/package-info.java diff --git a/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/package-info.java b/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/package-info.java deleted file mode 100644 index 400098e7..00000000 --- a/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * 数据库连接池，采用 Druid - * 多数据源，采用爆米花 - */ -package com.win.framework.datasource; diff --git a/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/package-info.java b/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/package-info.java deleted file mode 100644 index b858371b..00000000 --- a/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.win.framework; diff --git a/win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/package-info.java b/win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/package-info.java deleted file mode 100644 index e00af685..00000000 --- a/win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Web 框架，全局异常、API 日志等 - */ -package com.win.framework; diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/remark/RemarkController.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/remark/RemarkController.java index 423b5d2c..bfd706d4 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/remark/RemarkController.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/remark/RemarkController.java @@ -7,6 +7,8 @@ import com.win.module.infra.controller.remark.vo.RemarkRespVO; import com.win.module.infra.convert.remark.RemarkConvert; import com.win.module.infra.dal.dataobject.remark.RemarkDO; import com.win.module.infra.service.remark.RemarkService; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -29,6 +31,9 @@ public class RemarkController { @Resource private RemarkService remarkService; + @Resource + private AdminUserApi adminUserApi; + @PostMapping("/create") @Operation(summary = "创建备注") @PreAuthorize("@ss.hasPermission('infra:remark:create')") @@ -50,7 +55,15 @@ public class RemarkController { @PreAuthorize("@ss.hasPermission('infra:remark:query')") public CommonResult> getRemarkList(@Valid RemarkListReqVO listVO) { List list = remarkService.getRemarkList(listVO); - return success(RemarkConvert.INSTANCE.convertList(list)); + List remarkRespVOList = RemarkConvert.INSTANCE.convertList(list); + for(RemarkRespVO remarkRespVO : remarkRespVOList) { + AdminUserRespDTO user = adminUserApi.getUser(Long.parseLong(remarkRespVO.getCreator())); + if(user != null) { + remarkRespVO.setNickname(user.getNickname()); + remarkRespVO.setAvatar(user.getAvatar()); + } + } + return success(remarkRespVOList); } } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/remark/vo/RemarkRespVO.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/remark/vo/RemarkRespVO.java index 9a3d0a5a..e47274ab 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/remark/vo/RemarkRespVO.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/remark/vo/RemarkRespVO.java @@ -13,4 +13,13 @@ public class RemarkRespVO extends RemarkBaseVO { @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) private LocalDateTime createTime; + @Schema(description = "用户id") + private String creator; + + @Schema(description = "用户昵称") + private String nickname; + + @Schema(description = "用户头像") + private String avatar; + } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/TrendsController.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/TrendsController.java index 8785fe38..8a17b43a 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/TrendsController.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/TrendsController.java @@ -11,6 +11,8 @@ import com.win.module.infra.controller.trends.vo.TrendsRespVO; import com.win.module.infra.convert.trends.TrendsConvert; import com.win.module.infra.dal.dataobject.trends.TrendsDO; import com.win.module.infra.service.trends.TrendsService; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -39,6 +41,9 @@ public class TrendsController { @Resource private TrendsService trendsService; + @Resource + private AdminUserApi adminUserApi; + @GetMapping("/get") @Operation(summary = "获得动态记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") @@ -53,7 +58,15 @@ public class TrendsController { @PreAuthorize("@ss.hasPermission('infra:trends:query')") public CommonResult> getTrendsList(@Valid TrendsExportReqVO exportReqVO) { List list = trendsService.getTrendsList(exportReqVO); - return success(TrendsConvert.INSTANCE.convertList(list)); + List trendsRespVOList = TrendsConvert.INSTANCE.convertList(list); + for(TrendsRespVO trendsRespVO : trendsRespVOList) { + AdminUserRespDTO user = adminUserApi.getUser(Long.parseLong(trendsRespVO.getCreator())); + if(user != null) { + trendsRespVO.setNickname(user.getNickname()); + trendsRespVO.setAvatar(user.getAvatar()); + } + } + return success(trendsRespVOList); } @GetMapping("/page") diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsRespVO.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsRespVO.java index 171b313a..62b419b9 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsRespVO.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsRespVO.java @@ -13,4 +13,13 @@ public class TrendsRespVO extends TrendsBaseVO { @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) private LocalDateTime createTime; + @Schema(description = "用户id") + private String creator; + + @Schema(description = "用户昵称") + private String nickname; + + @Schema(description = "用户头像") + private String avatar; + } diff --git a/win-module-system/win-module-system-api/src/main/java/com/win/module/system/api/user/dto/AdminUserRespDTO.java b/win-module-system/win-module-system-api/src/main/java/com/win/module/system/api/user/dto/AdminUserRespDTO.java index b359e4b2..d0378f69 100644 --- a/win-module-system/win-module-system-api/src/main/java/com/win/module/system/api/user/dto/AdminUserRespDTO.java +++ b/win-module-system/win-module-system-api/src/main/java/com/win/module/system/api/user/dto/AdminUserRespDTO.java @@ -40,5 +40,8 @@ public class AdminUserRespDTO { * 手机号码 */ private String mobile; - + /** + * 用户头像 + */ + private String avatar; }