From c3b9c761afda35b15fb5c9297e796237b1efa37b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= <zhanglian.zl@fcbox.com>
Date: Tue, 2 Jan 2024 17:09:58 +0800
Subject: [PATCH] 123

---
 .../src/main/java/com/ruoyi/cai/domain/Dynamic.java  |  1 +
 .../java/com/ruoyi/cai/dto/app/vo/DynamicListVo.java |  7 +++++++
 .../java/com/ruoyi/cai/dto/app/vo/DynamicVo.java     |  1 +
 .../ruoyi/cai/service/impl/DynamicServiceImpl.java   | 12 ++++++++++--
 .../src/main/resources/mapper/cai/DynamicMapper.xml  |  2 +-
 5 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Dynamic.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Dynamic.java
index 0f968506..1b08077e 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Dynamic.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Dynamic.java
@@ -36,6 +36,7 @@ public class Dynamic implements Serializable {
      * 城市ID
      */
     private Integer cityId;
+    private String city;
     /**
      * 是否有附件  0 没有  1  有
      */
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/DynamicListVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/DynamicListVo.java
index 20522f9c..878be57f 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/DynamicListVo.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/DynamicListVo.java
@@ -1,19 +1,26 @@
 package com.ruoyi.cai.dto.app.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
+@Schema(description = "动态扩展用户信息模型")
 public class DynamicListVo extends DynamicVo{
 
+    @Schema(description = "年龄")
     private Integer age;
     /**
      * 性别   0 未知  1  女  2 男
      */
+    @Schema(description = "性别")
     private Integer gender;
+    @Schema(description = "头像")
     private String avatar;
+    @Schema(description = "昵称")
     private String nickname;
+    @Schema(description = "是否点赞")
     private boolean star;
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/DynamicVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/DynamicVo.java
index 12692c7a..273159d4 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/DynamicVo.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/DynamicVo.java
@@ -7,6 +7,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
+@Schema(description = "动态模型")
 public class DynamicVo {
     /**
      *
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DynamicServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DynamicServiceImpl.java
index e2a006d0..c0acfd6d 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DynamicServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DynamicServiceImpl.java
@@ -17,6 +17,7 @@ import com.ruoyi.cai.dto.app.vo.DynamicVo;
 import com.ruoyi.cai.enums.SystemConfigEnum;
 import com.ruoyi.cai.manager.SystemConfigManager;
 import com.ruoyi.cai.mapper.DynamicMapper;
+import com.ruoyi.cai.service.CitysService;
 import com.ruoyi.cai.service.DynamicImagesService;
 import com.ruoyi.cai.service.DynamicService;
 import com.ruoyi.cai.service.UserService;
@@ -49,11 +50,12 @@ public class DynamicServiceImpl extends ServiceImpl<DynamicMapper, Dynamic> impl
     private UserService userService;
     @Autowired
     private SystemConfigManager systemConfigManager;
+    @Autowired
+    private CitysService citysService;
 
     @Override
     public List<String> selectDynamicImageList(Long userId, Integer limit) {
-        List<String> res = baseMapper.selectDynamicImageList(userId,limit);
-        return res;
+        return baseMapper.selectDynamicImageList(userId,limit);
     }
 
     @Override
@@ -91,6 +93,12 @@ public class DynamicServiceImpl extends ServiceImpl<DynamicMapper, Dynamic> impl
             }
         }
         Dynamic dynamic = BeanConvertUtil.convertTo(res, Dynamic::new);
+        if(dynamic.getCityId() == null || dynamic.getCityId() == 0){
+            dynamic.setCityId(user.getCityId());
+            dynamic.setCity(user.getCity());
+        } else {
+            dynamic.setCity(citysService.getByCityId(dynamic.getCityId()));
+        }
         if(CollectionUtil.isNotEmpty(res.getImageList())){
             dynamic.setIsAttach(1);
         }else{
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/DynamicMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/DynamicMapper.xml
index fad66edb..36fb2d4d 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/DynamicMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/DynamicMapper.xml
@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="pageApp" resultType="com.ruoyi.cai.dto.app.vo.DynamicListVo">
         select
             t2.age,t2.gender,t2.avatar,t2.nickname,if(t3.id is null,0,1) as star,
-            t1.id,t1.user_id,t1.city_id,t1.is_attach,t1.audit_status,t1.create_time,t1.content
+            t1.id,t1.user_id,t1.city_id,t1.city,t1.is_attach,t1.audit_status,t1.create_time,t1.content
         from cai_dynamic t1
         left join cai_user t2 on t1.user_id = t2.id
         left join cai_user_follow_dynamic t3 on t1.id = t3.dynamic_id and t3.user_id = #{query.currentUserId}