APP：修改我的近况

ruoyi-app/src/main/java/com/ruoyi/app/controller/MyPublishController.java

@@ -7,19 +7,23 @@ import com.ruoyi.app.domain.TbAppUser;
 import com.ruoyi.app.domain.TbMyPublish;
 import com.ruoyi.app.service.ITbAppUserService;
 import com.ruoyi.app.service.ITbMyPublishService;
+import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.framework.config.ServerConfig;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 我的近况
@@ -34,7 +38,7 @@ import java.util.List;
 public class MyPublishController extends AppBaseController {
 
     private final ITbMyPublishService publishService;
-    private final ITbAppUserService userService;
+    private final ServerConfig serverConfig;
 
     /**
      * 查询家族朋友圈
@@ -58,7 +62,7 @@ public class MyPublishController extends AppBaseController {
      */
     @ApiOperation("我的近况 分页列表")
     @ApiImplicitParam(name = "userId", value = "会员ID",paramType="Long")
-    @GetMapping("/myList")
+    @GetMapping("/list")
     public TableDataInfo pageList(Long userId) {
         if (userId == null) {
             return new TableDataInfo();
@@ -69,14 +73,30 @@ public class MyPublishController extends AppBaseController {
         return publishService.pageList(tbMyPublish);
     }
 
+    @ApiOperation("我的近况 上传图片")
+    @ResponseBody
+    @PostMapping("/upload")
+    public AjaxResult add(@RequestParam(value = "file") MultipartFile files[]) throws Exception {
 
-    @ApiOperation("登录信息")
-    @GetMapping("/loginUser")
-    public AjaxResult loginUser(){
-
-        TbAppUser user = getLoginUser().getUser();
-        return AjaxResult.success(user);
+        // 上传文件路径
+        String filePath = RuoYiConfig.getUploadPath()+"/publish";
+        if (files != null && files.length >= 1) {
+            try {
+                AjaxResult ajax = AjaxResult.success();
+                for (MultipartFile file : files) {
+                    Map<String, Object> map = new HashMap<>(2);
+                    // 上传并返回新文件名称
+                    String fileName = FileUploadUtils.upload(filePath, file);
+                    String url = serverConfig.getUrl() + fileName;
+                    map.put("fileName", fileName);
+                    map.put("url", url);
+                    ajax.put("files", map);
+                }
+                return ajax;
+            } catch (Exception e) {
+                return AjaxResult.error(e.getMessage());
+            }
+        }
+        return AjaxResult.success("上传成功");
     }
-
-
 }

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbMyPublishServiceImpl.java

@@ -84,6 +84,24 @@ public class TbMyPublishServiceImpl extends ServiceImpl<TbMyPublishMapper, TbMyP
         }
         startPage();
         List<TbMyPublish> list = baseMapper.pageList(lqw);
+        List<Long> ids = new ArrayList<>();
+        list.forEach(item -> {
+            ids.add(item.getId());
+        });
+        // 族友圈中放入图片列表 点赞列表 评论列表
+        List<TbPublishImg> imgList = imgService.list(new LambdaQueryWrapper<TbPublishImg>()
+                .in(TbPublishImg::getPublishId, ids)
+        );
+        list.forEach(item -> {
+            // 加入图片列表
+            List<TbPublishImg> imgs = new ArrayList<>();
+            imgList.forEach(img -> {
+                if (img.getPublishId().equals(item.getId())) {
+                    imgs.add(img);
+                }
+            });
+            item.setImgList(imgs);
+        });
         return getDataTable(list);
     }
 
@@ -199,6 +217,7 @@ public class TbMyPublishServiceImpl extends ServiceImpl<TbMyPublishMapper, TbMyP
      */
     @Override
     public List<TbMyPublish> selectPublish(LambdaQueryWrapper<TbMyPublish> wrapper) {
+        startPage();
         List<TbMyPublish> list = baseMapper.selectPublish(wrapper);
         if (list.size() <= 0) {
             return new ArrayList<>();

ruoyi-system/src/main/resources/mapper/app/TbPublishCommentMapper.xml

@@ -17,9 +17,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="selectList" resultType="com.ruoyi.app.domain.TbPublishComment">
-        select c.*,(select nick_name from tb_app_user u where u.id = c.appUserId) appUser,
-        (select avatar from tb_app_user u where u.id = c.appUserId) appUserUrl
-        from tb_publish_comment ${ew.customSqlSegment}
+        select c.*,(select nick_name from tb_app_user u where u.id = c.app_user_id) appUser,
+        (select avatar from tb_app_user u where u.id = c.app_user_id) appUserUrl
+        from tb_publish_comment c ${ew.customSqlSegment}
     </select>
 
 </mapper>

ruoyi-system/src/main/resources/mapper/app/TbPublishThumbsMapper.xml

@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="selectList" resultType="com.ruoyi.app.domain.TbPublishThumbs">
-        select t.*,(select nick_name from tb_app_user u where u.id = t.create_by)
-        from tb_publisg_thumbs ${ew.customSqlSegment}
+        select t.*,(select nick_name from tb_app_user u where u.id = t.create_by) appUserName
+        from tb_publish_thumbs t ${ew.customSqlSegment}
     </select>
 </mapper>