haotian/wenlvApp
2
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

我的--修改--我的发布作品添加查看是否点赞过

Browse Source
This commit is contained in:
haotian 2025-01-20 17:55:32 +08:00
parent cc26fecc28
commit fa6c59d83b
13 changed files with 249 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
View File

@ -1292,6 +1292,24 @@ public class AppSystemController extends BaseController {
userWork.setUserId(getUserId());
List<UserWork> userWorkList = userWorkService.selectUserWorkList(userWork);
// 查看自己作品自己是否点赞过
for(UserWork userWork1: userWorkList){
//----------------------------------查看是否点赞该作品--------------------------------------------------
SysUserLike sysUserLike = new SysUserLike();
sysUserLike.setUserId(getUserId());
sysUserLike.setTargetId(userWork1.getWorkId());
sysUserLike.setTargetType("1");
sysUserLike.setStatus("0");
List<SysUserLike> sysUserLikeList = sysUserLikeService.selectSysUserLikeList(sysUserLike);
if(sysUserLikeList.size() > 0){
// 已点赞
userWork1.setIsAddLike("1");
}else{
userWork1.setIsAddLike("0");
}
//----------------------------------查看是否点赞该作品end-----------------------------------------------
}
return AjaxResult.success(userWorkList);
}
@ -1768,6 +1786,41 @@ public class AppSystemController extends BaseController {
}
// 更多--查看他的详情
@GetMapping("/getMoreUserDetail/{userId}")
public AjaxResult getMoreUserDetail(@PathVariable("userId") Long userId)
{
MoreUserDetailDto moreUserDetailDto = sysUserService.getMoreUserDetail(userId);
moreUserDetailDto.setUserId(userId);
//----------------------------------查看是否关注该用户-----------------------------------------------
SysUserFollow userFollow = new SysUserFollow();
userFollow.setUserId(getUserId());
userFollow.setFollowedUserId(userId);
userFollow.setStatus("0");
List<SysUserFollow> userFollowList = userFollowService.selectSysUserFollowList(userFollow);
if(userFollowList.size() > 0){
// 以关注
moreUserDetailDto.setIsFollow("1");
}else{
moreUserDetailDto.setIsFollow("0");
}
//----------------------------------查看是否关注该用户end-----------------------------------------------
// // 查看他人发布作品
// moreUserDetailDto.setUserWorkList(userWorkService.getUserPublishWorkMore(userId));
return success(moreUserDetailDto);
}
// 更多--查看他人发布作品
@GetMapping("/getMoreUserPublishWork/{userId}")
public TableDataInfo getMoreUserPublishWork(@PathVariable("userId") Long userId)
{
startPage();
List<UserPublishWorkMoreDto> userPublishWorkMoreDtoList = userWorkService.getUserPublishWorkMore(userId);
return getDataTable(userPublishWorkMoreDtoList);
}
@GetMapping("/getMessage")
public AjaxResult getMessage()

11
ruoyi-system/src/main/java/com/ruoyi/system/domain/UserWork.java
View File

@ -86,6 +86,9 @@ public class UserWork extends BaseEntity
@Excel(name = "城市")
private String city;
// 是否点赞过
private String isAddLike;
private Date updateTime;
public void setWorkId(Long workId)
@ -244,6 +247,14 @@ public class UserWork extends BaseEntity
this.updateTime = updateTime;
}
public String getIsAddLike() {
return isAddLike;
}
public void setIsAddLike(String isAddLike) {
this.isAddLike = isAddLike;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

63
ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MoreUserDetailDto.java Normal file
View File

@ -0,0 +1,63 @@
package com.ruoyi.system.domain.dto;
import com.ruoyi.system.domain.UserWork;
import java.util.List;
public class MoreUserDetailDto {
private Long userId;
private String nickName;
private String avatar;
private String remark;
private String isFollow;
// private List<UserPublishWorkMoreDto> userWorkList;
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public String getNickName() {
return nickName;
}
public void setNickName(String nickName) {
this.nickName = nickName;
}
public String getAvatar() {
return avatar;
}
public void setAvatar(String avatar) {
this.avatar = avatar;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark){
this.remark = remark;
}
public String getIsFollow() {
return isFollow;
}
public void setIsFollow(String isFollow) {
this.isFollow = isFollow;
}
// public List<UserPublishWorkMoreDto> getUserWorkList() {
// return userWorkList;
// }
// public void setUserWorkList(List<UserPublishWorkMoreDto> userWorkList) {
// this.userWorkList = userWorkList;
// }
}

12
ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserPublishWorkDetailDto.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.system.domain.dto;
import com.ruoyi.system.domain.SysSource;
import com.ruoyi.system.domain.UserWork;
import java.util.Date;
import java.util.List;
@ -28,6 +29,9 @@ public class UserPublishWorkDetailDto {
private List<UserPublishWorkSourceListDto> sourceList;
// private List<UserWork> userWorkList;
@ -136,6 +140,14 @@ public class UserPublishWorkDetailDto {
this.isAddLike = isAddLike;
}
// public List<UserWork> getUserWorkList() {
// return userWorkList;
// }
//
// public void setUserWorkList(List<UserWork> userWorkList) {
// this.userWorkList = userWorkList;
// }

43
ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserPublishWorkMoreDto.java Normal file
View File

@ -0,0 +1,43 @@
package com.ruoyi.system.domain.dto;
// 更多--他的发布
public class UserPublishWorkMoreDto {
private Long workId;
private String workName;
private String workAddress;
// private Long receiveRockets;
public Long getWorkId() {
return workId;
}
public void setWorkId(Long workId) {
this.workId = workId;
}
public String getWorkName(){
return workName;
}
public void setWorkName(String workName){
this.workName = workName;
}
public String getWorkAddress(){
return workAddress;
}
public void setWorkAddress(String workAddress){
this.workAddress = workAddress;
}
// public Long getReceiveRockets(){
// return receiveRockets;
// }
//
// public void setReceiveRockets(Long receiveRockets){
// this.receiveRockets = receiveRockets;
// }
}

6
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
View File

@ -3,6 +3,7 @@ package com.ruoyi.system.mapper;
import java.util.List;
import com.ruoyi.system.domain.dto.BackstageUserDto;
import com.ruoyi.system.domain.dto.MoreUserDetailDto;
import com.ruoyi.system.domain.vo.AppUserSetVo;
import com.ruoyi.system.domain.vo.UserManagerVo;
import org.apache.ibatis.annotations.Param;
@ -148,5 +149,10 @@ public interface SysUserMapper
public AppUserSetVo getUserSetByUserId(@Param("userId")Long userId);
/*
* 更多--查看他人详情
* */
public MoreUserDetailDto getMoreUserDetail(@Param("userId") Long userId);
// int test();
}

6
ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWorkMapper.java
View File

@ -4,6 +4,7 @@ import java.util.Date;
import java.util.List;
import com.ruoyi.system.domain.UserWork;
import com.ruoyi.system.domain.dto.UserPublishWorkDetailDto;
import com.ruoyi.system.domain.dto.UserPublishWorkMoreDto;
import com.ruoyi.system.domain.dto.UserWorkReviewDto;
import org.apache.ibatis.annotations.Param;
@ -85,4 +86,9 @@ public interface UserWorkMapper
* */
public List<UserPublishWorkDetailDto> getUserPublishWorkList();
/*
* 更多--他人主页--他的发布
* */
public List<UserPublishWorkMoreDto> getUserPublishWorkMore(@Param("userId") Long userId);
}

6
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
View File

@ -3,6 +3,7 @@ package com.ruoyi.system.service;
import java.util.List;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.dto.BackstageUserDto;
import com.ruoyi.system.domain.dto.MoreUserDetailDto;
import com.ruoyi.system.domain.vo.AppUserSetVo;
import com.ruoyi.system.domain.vo.UserManagerVo;
@ -249,4 +250,9 @@ public interface ISysUserService
// * */
// public int updateUserState(Long userId, String status);
/*
* 更多--查看他人详情
* */
public MoreUserDetailDto getMoreUserDetail(Long userId);
}

6
ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWorkService.java
View File

@ -4,6 +4,7 @@ import java.util.Date;
import java.util.List;
import com.ruoyi.system.domain.UserWork;
import com.ruoyi.system.domain.dto.UserPublishWorkDetailDto;
import com.ruoyi.system.domain.dto.UserPublishWorkMoreDto;
import com.ruoyi.system.domain.dto.UserWorkReviewDto;
/**
@ -86,4 +87,9 @@ public interface IUserWorkService
* */
public List<UserPublishWorkDetailDto> getUserPublishWorkList();
/*
* 更多--他人主页--他的发布
* */
public List<UserPublishWorkMoreDto> getUserPublishWorkMore(Long userId);
}

9
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View File

@ -6,6 +6,7 @@ import java.util.stream.Collectors;
import javax.validation.Validator;
import com.ruoyi.system.domain.dto.BackstageUserDto;
import com.ruoyi.system.domain.dto.MoreUserDetailDto;
import com.ruoyi.system.domain.vo.AppUserSetVo;
import com.ruoyi.system.domain.vo.UserManagerVo;
import org.slf4j.Logger;
@ -597,4 +598,12 @@ public class SysUserServiceImpl implements ISysUserService
return userMapper.getUserSetByUserId(userId);
}
/*
* 更多--查看他人详情
* */
@Override
public MoreUserDetailDto getMoreUserDetail(Long userId){
return userMapper.getMoreUserDetail(userId);
}
}

9
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWorkServiceImpl.java
View File

@ -4,6 +4,7 @@ import java.util.Date;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.domain.dto.UserPublishWorkDetailDto;
import com.ruoyi.system.domain.dto.UserPublishWorkMoreDto;
import com.ruoyi.system.domain.dto.UserWorkReviewDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -129,4 +130,12 @@ public class UserWorkServiceImpl implements IUserWorkService
public List<UserPublishWorkDetailDto> getUserPublishWorkList(){
return userWorkMapper.getUserPublishWorkList();
}
/*
* 更多--他人主页--他的发布
* */
@Override
public List<UserPublishWorkMoreDto> getUserPublishWorkMore(Long userId){
return userWorkMapper.getUserPublishWorkMore(userId);
}
}

13
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -74,6 +74,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="status" column="status" />
<result property="createTime" column="create_time" />
</resultMap>
<resultMap id="MoreUserDetailDtoResult" type="MoreUserDetailDto">
<result property="nickName" column="nick_name"/>
<result property="avatar" column="avatar"/>
<result property="remark" column="remark"/>
</resultMap>
<sql id="selectUserVo">
select u.user_id, u.dept_id, u.user_name ,u.nick_name,u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
@ -214,8 +220,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where user_id = #{userId}
</select>
<select id="getMoreUserDetail" resultMap="MoreUserDetailDtoResult">
select nick_name, remark, avatar
from sys_user
where user_id = #{userId}
</select>
<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user(
<if test="userId != null and userId != 0">user_id,</if>
<if test="deptId != null and deptId != 0">dept_id,</if>

13
ruoyi-system/src/main/resources/mapper/system/UserWorkMapper.xml
View File

@ -53,6 +53,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<resultMap id="UserPublishWorkMoreDtoResult" type="UserPublishWorkMoreDto">
<result property="workId" column="work_id" />
<result property="workName" column="work_name" />
<result property="workAddress" column="work_address" />
</resultMap>
<sql id="selectUserWorkVo">
select work_id, user_id, work_name, work_address, coordinate, create_time, post_time, work_status, audit_opinion, source_id, price, receive_rockets, detail, delete_flag, scenic, part, city , update_time from user_work
</sql>
@ -219,4 +226,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
on w.user_id = u.user_id
where w.work_status = '3'
</select>
<select id="getUserPublishWorkMore" resultMap="UserPublishWorkMoreDtoResult">
select work_id, work_name, work_address
from user_work
where user_id = #{userId} and work_status = '3'
</select>
</mapper>