shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123

Browse Source
This commit is contained in:
张良(004796)
2024-01-02 17:09:58 +08:00
parent 2c68510a02
commit c3b9c761af
5 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Dynamic.java
View File

@@ -36,6 +36,7 @@ public class Dynamic implements Serializable {
* 城市ID
*/
private Integer cityId;
private String city;
/**
* 是否有附件 0 没有 1 有
*/

7
ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/DynamicListVo.java
View File

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

1
ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/DynamicVo.java
View File

@@ -7,6 +7,7 @@ import java.time.LocalDateTime;
import java.util.List;
@Data
@Schema(description = "动态模型")
public class DynamicVo {
/**
*

12
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DynamicServiceImpl.java
View File

@@ -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{

2
ruoyi-cai/src/main/resources/mapper/cai/DynamicMapper.xml
View File

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