备注和动态记录增加用户信息

win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/package-info.java

@@ -1,5 +0,0 @@
-/**
- * 数据库连接池，采用 Druid
- * 多数据源，采用爆米花
- */
-package com.win.framework.datasource;

win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/package-info.java

@@ -1 +0,0 @@
-package com.win.framework;

win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/package-info.java

@@ -1,4 +0,0 @@
-/**
- * Web 框架，全局异常、API 日志等
- */
-package com.win.framework;

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<List<RemarkRespVO>> getRemarkList(@Valid RemarkListReqVO listVO) {
         List<RemarkDO> list = remarkService.getRemarkList(listVO);
-        return success(RemarkConvert.INSTANCE.convertList(list));
+        List<RemarkRespVO> 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);
     }
 
 }

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;
+
 }

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<List<TrendsRespVO>> getTrendsList(@Valid TrendsExportReqVO exportReqVO) {
         List<TrendsDO> list = trendsService.getTrendsList(exportReqVO);
-        return success(TrendsConvert.INSTANCE.convertList(list));
+        List<TrendsRespVO> 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")

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;
+
 }

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;
 }