用户反馈代码优化

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/CommunityFeedbackController.java

@@ -4,22 +4,22 @@ package com.ruoyi.generator.controller;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.exception.user.ProjectException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.generator.domain.Community.CommunityArticleImages;
-import com.ruoyi.generator.domain.Community.CommunityFeedbackImages;
-import com.ruoyi.generator.domain.Community.CommunityFeedbackUser;
-import com.ruoyi.generator.domain.Community.CommunityReportUser;
+import com.ruoyi.generator.domain.Community.*;
 import com.ruoyi.generator.mapper.community.CommunityFeedbackUserMapper;
 import com.ruoyi.generator.mapper.community.CommunityReportUserMapper;
+import com.ruoyi.generator.mapper.community.CommunityUserInfoMapper;
 import com.ruoyi.generator.service.ICommunityFeedbackUserService;
 import com.ruoyi.generator.service.ICommunityReportUserService;
 import com.ruoyi.generator.vo.CommunityArticleVo;
 import com.ruoyi.generator.vo.CommunityFeedbackUserVo;
 import com.ruoyi.generator.vo.CommunityImagesVo;
 import com.ruoyi.generator.vo.CommunityReportUserVo;
+import com.ruoyi.system.mapper.SysUserMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +50,12 @@ public class CommunityFeedbackController {
     @Autowired
     private CommunityFeedbackUserMapper communityFeedbackUserMapper;
 
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
+    @Autowired
+    private CommunityUserInfoMapper communityUserInfoMapper;
+
     /**
      * 用户反馈
      * @param communityFeedbackUser
@@ -121,7 +127,6 @@ public class CommunityFeedbackController {
             List<CommunityFeedbackUserVo> feedbackVos_copy = new ArrayList<>(communityFeedbackUserVos);
 
             for (CommunityFeedbackUserVo feedbackVo : feedbackVos_copy) {
-
                 //获取用户传的图片
                 List<Map<String, Object>> userImageList = feedbackVo.getUserImages();
 
@@ -163,8 +168,24 @@ public class CommunityFeedbackController {
                 }
                 feedbackVo.setPunishVideoList(punishVideoList);
 
+
+                //设置用户头像和名称
+                SysUser sysUser = sysUserMapper.selectUserById(feedbackVo.getUserId());
+                if (sysUser != null) {
+                    feedbackVo.setAvatar(sysUser.getAvatar());
+                    feedbackVo.setUserName(sysUser.getNickName());
+                }
+                CommunityUserInfo communityUserInfo = communityUserInfoMapper.selectOne(new QueryWrapper<CommunityUserInfo>().eq("user_id", feedbackVo.getUserId()));
+
+                if (communityUserInfo != null){
+                    feedbackVo.setCyId(communityUserInfo.getId());
+                }
+
             }
 
+
+
+
 /*
 
             total = communityReportUserMapper.selectList(new QueryWrapper<CommunityReportUser>()

ruoyi-generator/src/main/java/com/ruoyi/generator/vo/CommunityFeedbackUserVo.java

@@ -141,4 +141,23 @@ public class CommunityFeedbackUserVo implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+    /**
+     * 次元ID
+     */
+    @ApiModelProperty("次元ID")
+    private Long cyId;
+
+    /**
+     * 头像地址
+     */
+    @ApiModelProperty("头像地址")
+    private String avatar;
+
+
+    /**
+     * 用户名
+     */
+    @ApiModelProperty("用户名")
+    private String userName;
+
 }