diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppFeedbackController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppFeedbackController.java new file mode 100644 index 0000000..17bd83f --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppFeedbackController.java @@ -0,0 +1,114 @@ +package com.ruoyi.app.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.core.domain.R; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.app.domain.AppFeedback; +import com.ruoyi.app.service.IAppFeedbackService; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.page.TableDataInfo; + +/** + * 意见反馈Controller + * + * @author wyh + * @date 2024-05-29 + */ +@RestController +@RequestMapping("/feedback") +@Api(tags = "意见反馈" , description = "意见反馈") +public class AppFeedbackController extends BaseController +{ + @Autowired + private IAppFeedbackService appFeedbackService; + + /** + * 查询意见反馈列表 + */ + @RequiresPermissions("app:feedback:list") + @GetMapping("/list") + @ApiOperation(value = "查询意见反馈", notes = "查询意见反馈", httpMethod = "GET") + public TableDataInfo list(AppFeedback appFeedback) + { + startPage(); + List list = appFeedbackService.selectAppFeedbackList(appFeedback); + return getDataTable(list); + } + + /** + * 导出意见反馈列表 + */ + @RequiresPermissions("app:feedback:export") + @Log(title = "意见反馈", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, AppFeedback appFeedback) + { + List list = appFeedbackService.selectAppFeedbackList(appFeedback); + ExcelUtil util = new ExcelUtil(AppFeedback.class); + util.exportExcel(response, list, "意见反馈数据"); + } + + /** + * 获取意见反馈详细信息 + */ + @RequiresPermissions("app:feedback:query") + @GetMapping(value = "/{id}") + @ApiOperation(value = "获取意见反馈详细信息", notes = "获取意见反馈详细信息", httpMethod = "GET") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(appFeedbackService.selectAppFeedbackById(id)); + } + + /** + * 新增意见反馈 + */ + @RequiresPermissions("app:feedback:add") + @ApiOperation(value = "新增意见反馈", notes = "新增意见反馈", httpMethod = "POST") + @Log(title = "意见反馈", businessType = BusinessType.INSERT) + @PostMapping("/add") + public AjaxResult add(@RequestBody AppFeedback appFeedback) + { + return toAjax(appFeedbackService.insertAppFeedback(appFeedback)); + } + + /** + * 修改意见反馈 + */ + @RequiresPermissions("app:feedback:edit") + @ApiOperation(value = "修改意见反馈", notes = "修改意见反馈", httpMethod = "PUT") + @Log(title = "意见反馈", businessType = BusinessType.UPDATE) + @PutMapping("/edit") + public AjaxResult edit(@RequestBody AppFeedback appFeedback) + { + return toAjax(appFeedbackService.updateAppFeedback(appFeedback)); + } + + /** + * 删除意见反馈 + */ + @RequiresPermissions("app:feedback:remove") + @Log(title = "意见反馈", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(appFeedbackService.deleteAppFeedbackByIds(ids)); + } +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppFeedback.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppFeedback.java new file mode 100644 index 0000000..e15dfb3 --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppFeedback.java @@ -0,0 +1,88 @@ +package com.ruoyi.app.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 意见反馈对象 app_feedback + * + * @author wyh + * @date 2024-05-29 + */ +public class AppFeedback extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Long id; + + /** 反馈人 */ + @Excel(name = "反馈人") + private Long userId; + + /** 反馈内容 */ + @Excel(name = "反馈内容") + private String content; + + /** 反馈图片 */ + @Excel(name = "反馈图片") + private String imgUrl; + + @Excel(name = "用户名") + private String username; + + @Excel(name = "头像") + private String avatarUrl; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setUserId(Long userId) + { + this.userId = userId; + } + + public Long getUserId() + { + return userId; + } + public void setContent(String content) + { + this.content = content; + } + + public String getContent() + { + return content; + } + public void setImgUrl(String imgUrl) + { + this.imgUrl = imgUrl; + } + + public String getImgUrl() + { + return imgUrl; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("userId", getUserId()) + .append("content", getContent()) + .append("imgUrl", getImgUrl()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppInform.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppInform.java index 9e40a9b..e349104 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppInform.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppInform.java @@ -44,6 +44,10 @@ public class AppInform extends BaseEntity @Excel(name = "用户名") private String byUsername; + /** 图片 */ + @Excel(name = "图片") + private String imgUrl; + public void setId(Long id) { this.id = id; diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppFeedbackMapper.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppFeedbackMapper.java new file mode 100644 index 0000000..b119e12 --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppFeedbackMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.app.mapper; + +import java.util.List; +import com.ruoyi.app.domain.AppFeedback; + +/** + * 意见反馈Mapper接口 + * + * @author wyh + * @date 2024-05-29 + */ +public interface AppFeedbackMapper +{ + /** + * 查询意见反馈 + * + * @param id 意见反馈主键 + * @return 意见反馈 + */ + public AppFeedback selectAppFeedbackById(Long id); + + /** + * 查询意见反馈列表 + * + * @param appFeedback 意见反馈 + * @return 意见反馈集合 + */ + public List selectAppFeedbackList(AppFeedback appFeedback); + public List selectList(AppFeedback appFeedback); + + /** + * 新增意见反馈 + * + * @param appFeedback 意见反馈 + * @return 结果 + */ + public int insertAppFeedback(AppFeedback appFeedback); + + /** + * 修改意见反馈 + * + * @param appFeedback 意见反馈 + * @return 结果 + */ + public int updateAppFeedback(AppFeedback appFeedback); + + /** + * 删除意见反馈 + * + * @param id 意见反馈主键 + * @return 结果 + */ + public int deleteAppFeedbackById(Long id); + + /** + * 批量删除意见反馈 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteAppFeedbackByIds(Long[] ids); +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppFeedbackService.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppFeedbackService.java new file mode 100644 index 0000000..a104ca7 --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppFeedbackService.java @@ -0,0 +1,61 @@ +package com.ruoyi.app.service; + +import java.util.List; +import com.ruoyi.app.domain.AppFeedback; + +/** + * 意见反馈Service接口 + * + * @author wyh + * @date 2024-05-29 + */ +public interface IAppFeedbackService +{ + /** + * 查询意见反馈 + * + * @param id 意见反馈主键 + * @return 意见反馈 + */ + public AppFeedback selectAppFeedbackById(Long id); + + /** + * 查询意见反馈列表 + * + * @param appFeedback 意见反馈 + * @return 意见反馈集合 + */ + public List selectAppFeedbackList(AppFeedback appFeedback); + + /** + * 新增意见反馈 + * + * @param appFeedback 意见反馈 + * @return 结果 + */ + public int insertAppFeedback(AppFeedback appFeedback); + + /** + * 修改意见反馈 + * + * @param appFeedback 意见反馈 + * @return 结果 + */ + public int updateAppFeedback(AppFeedback appFeedback); + + /** + * 批量删除意见反馈 + * + * @param ids 需要删除的意见反馈主键集合 + * @return 结果 + */ + public int deleteAppFeedbackByIds(Long[] ids); + + /** + * 删除意见反馈信息 + * + * @param id 意见反馈主键 + * @return 结果 + */ + public int deleteAppFeedbackById(Long id); +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppFeedbackServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppFeedbackServiceImpl.java new file mode 100644 index 0000000..1f9e3f1 --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppFeedbackServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.app.service.impl; + +import java.util.List; +import com.ruoyi.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.app.mapper.AppFeedbackMapper; +import com.ruoyi.app.domain.AppFeedback; +import com.ruoyi.app.service.IAppFeedbackService; + +/** + * 意见反馈Service业务层处理 + * + * @author wyh + * @date 2024-05-29 + */ +@Service +public class AppFeedbackServiceImpl implements IAppFeedbackService +{ + @Autowired + private AppFeedbackMapper appFeedbackMapper; + + /** + * 查询意见反馈 + * + * @param id 意见反馈主键 + * @return 意见反馈 + */ + @Override + public AppFeedback selectAppFeedbackById(Long id) + { + return appFeedbackMapper.selectAppFeedbackById(id); + } + + /** + * 查询意见反馈列表 + * + * @param appFeedback 意见反馈 + * @return 意见反馈 + */ + @Override + public List selectAppFeedbackList(AppFeedback appFeedback) + { + return appFeedbackMapper.selectList(appFeedback); + } + + /** + * 新增意见反馈 + * + * @param appFeedback 意见反馈 + * @return 结果 + */ + @Override + public int insertAppFeedback(AppFeedback appFeedback) + { + appFeedback.setCreateTime(DateUtils.getNowDate()); + return appFeedbackMapper.insertAppFeedback(appFeedback); + } + + /** + * 修改意见反馈 + * + * @param appFeedback 意见反馈 + * @return 结果 + */ + @Override + public int updateAppFeedback(AppFeedback appFeedback) + { + appFeedback.setUpdateTime(DateUtils.getNowDate()); + return appFeedbackMapper.updateAppFeedback(appFeedback); + } + + /** + * 批量删除意见反馈 + * + * @param ids 需要删除的意见反馈主键 + * @return 结果 + */ + @Override + public int deleteAppFeedbackByIds(Long[] ids) + { + return appFeedbackMapper.deleteAppFeedbackByIds(ids); + } + + /** + * 删除意见反馈信息 + * + * @param id 意见反馈主键 + * @return 结果 + */ + @Override + public int deleteAppFeedbackById(Long id) + { + return appFeedbackMapper.deleteAppFeedbackById(id); + } +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java index 0d58388..bbe7158 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java @@ -170,6 +170,7 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService appUserDynamic.setPrivacyStatus(0l); AppUserFriend appUserFriend = new AppUserFriend(); appUserFriend.setUserId(appUserDynamic.getUserId()); + appUserFriend.setStatus(0l); List friends = appUserFriendMapper.selectAppUserFriendList(appUserFriend); if (friends != null && friends.size() > 0) { // 好友的动态 @@ -221,6 +222,7 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService AppUserFriend appUserFriend = new AppUserFriend(); appUserFriend.setUserId(appUserDynamic.getUserId()); + appUserFriend.setStatus(0l); List friends = appUserFriendMapper.selectAppUserFriendList(appUserFriend); if (friends.stream().map(AppUserFriend::getFriendId).collect(Collectors.toList()).contains(appUserDynamicVo.getUserId())) { appUserDynamicVo.setIsFans(0); diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java index 154e5b3..7bf12e4 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java @@ -205,6 +205,7 @@ public class AppUserServiceImpl implements IAppUserService { // 查询我的用户列表 AppUserFriend appUserFriend = new AppUserFriend(); appUserFriend.setUserId(appUser.getAppId()); + appUserFriend.setStatus(0l); List appUserFriends = appUserFriendMapper.selectAppUserFriendList(appUserFriend); List ids = appUserFriends.stream().map(x -> x.getFriendId()).collect(Collectors.toList()); @@ -260,6 +261,7 @@ public class AppUserServiceImpl implements IAppUserService { case 1://好友 AppUserFriend appUserFriend = new AppUserFriend(); appUserFriend.setUserId(appUser.getAppId()); + appUserFriend.setStatus(0l); List list = appUserFriendMapper.selectAppUserFriendList(appUserFriend); ids = list.stream().map(x -> x.getFriendId()).collect(Collectors.toList()); break; diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/AppFeedbackMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/AppFeedbackMapper.xml new file mode 100644 index 0000000..098aa5a --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/AppFeedbackMapper.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + select id, user_id, content, img_url, create_time, update_time, remark from app_feedback + + + + + + + + + + insert into app_feedback + + user_id, + content, + img_url, + create_time, + update_time, + remark, + + + #{userId}, + #{content}, + #{imgUrl}, + #{createTime}, + #{updateTime}, + #{remark}, + + + + + update app_feedback + + user_id = #{userId}, + content = #{content}, + img_url = #{imgUrl}, + create_time = #{createTime}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from app_feedback where id = #{id} + + + + delete from app_feedback where id in + + #{id} + + + \ No newline at end of file diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppInformMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppInformMapper.xml index 9f62aad..04b3d8f 100644 --- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppInformMapper.xml +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppInformMapper.xml @@ -9,13 +9,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, content, user_id, by_user_id, create_time, update_time, remark from app_inform + select id, content, user_id, by_user_id,img_url, create_time, update_time, remark from app_inform