添加好友列表，修改个人发表

pom.xml

@@ -84,6 +84,7 @@
             <dependency>
                 <groupId>net.java.dev.jna</groupId>
                 <artifactId>jna</artifactId>
+                <version>${jna.version}</version>
             </dependency>
 
             <dependency>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbMyFriendsController.java

@@ -0,0 +1,113 @@
+package com.ruoyi.web.controller.api;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
+import java.util.List;
+import java.util.Arrays;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.ruoyi.common.utils.StringUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+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.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.app.domain.TbMyFriends;
+import com.ruoyi.app.service.ITbMyFriendsService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 我的好友
+ * 
+ * @author Alex
+ * @date 2020-10-05
+ */
+@Api(value = "我的好友", tags = "我的好友")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/friends" )
+public class TbMyFriendsController extends BaseController {
+
+    private final ITbMyFriendsService iTbMyFriendsService;
+
+    /**
+     * 查询我的好友列表
+     */
+    @ApiOperation("查询我的好友列表")
+    @PreAuthorize("@ss.hasPermi('system:friends:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TbMyFriends tbMyFriends)
+    {
+        List<TbMyFriends> list = iTbMyFriendsService.pageList(tbMyFriends);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出我的好友列表
+     */
+    @ApiOperation("导出我的好友列表")
+    @PreAuthorize("@ss.hasPermi('system:friends:export')" )
+    @Log(title = "我的好友" , businessType = BusinessType.EXPORT)
+    @GetMapping("/export" )
+    public AjaxResult export(TbMyFriends tbMyFriends) {
+        LambdaQueryWrapper<TbMyFriends> lqw = new LambdaQueryWrapper<TbMyFriends>(tbMyFriends);
+        List<TbMyFriends> list = iTbMyFriendsService.list(lqw);
+        ExcelUtil<TbMyFriends> util = new ExcelUtil<TbMyFriends>(TbMyFriends. class);
+        return util.exportExcel(list, "friends" );
+    }
+
+    /**
+     * 获取我的好友详细信息
+     */
+    @ApiOperation("获取我的好友详细信息")
+    @PreAuthorize("@ss.hasPermi('system:friends:query')" )
+    @GetMapping(value = "/{id}" )
+    public AjaxResult getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iTbMyFriendsService.getById(id));
+    }
+
+    /**
+     * 新增我的好友
+     */
+    @ApiOperation("新增我的好友")
+    @PreAuthorize("@ss.hasPermi('system:friends:add')" )
+    @Log(title = "我的好友" , businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TbMyFriends tbMyFriends) {
+        return toAjax(iTbMyFriendsService.save(tbMyFriends) ? 1 : 0);
+    }
+
+    /**
+     * 修改我的好友
+     */
+    @ApiOperation("修改我的好友")
+    @PreAuthorize("@ss.hasPermi('system:friends:edit')" )
+    @Log(title = "我的好友" , businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TbMyFriends tbMyFriends) {
+        return toAjax(iTbMyFriendsService.updateById(tbMyFriends) ? 1 : 0);
+    }
+
+    /**
+     * 删除我的好友
+     */
+    @ApiOperation("删除我的好友")
+    @PreAuthorize("@ss.hasPermi('system:friends:remove')" )
+    @Log(title = "我的好友" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}" )
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(iTbMyFriendsService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbMyPublishController.java

@@ -49,32 +49,14 @@ public class TbMyPublishController extends BaseController {
 
     private final ITbMyPublishService iTbMyPublishService;
 
-    @Autowired
-    private ITbPublishImgService publishImgService;
-    @Autowired
-    private ITbAppUserService appUserService;
-
     /**
      * 查询我的近况 列表
      */
     @ApiOperation("查询我的发表列表")
     @PreAuthorize("@ss.hasPermi('app:publish:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TbMyPublish tbMyPublish)
-    {
-        startPage();
-        LambdaQueryWrapper<TbMyPublish> lqw = new LambdaQueryWrapper<TbMyPublish>();
-        if (tbMyPublish.getAppUserId() != null){
-            lqw.eq(TbMyPublish::getAppUserId ,tbMyPublish.getAppUserId());
-        }
-        if (StringUtils.isNotBlank(tbMyPublish.getContents())){
-            lqw.like(TbMyPublish::getContents ,tbMyPublish.getContents());
-        }
-        if (StringUtils.isNotBlank(tbMyPublish.getMessage())){
-            lqw.eq(TbMyPublish::getMessage ,tbMyPublish.getMessage());
-        }
-        List<TbMyPublish> list = iTbMyPublishService.list(lqw);
-        return getDataTable(list);
+    public TableDataInfo list(TbMyPublish tbMyPublish) {
+        return iTbMyPublishService.pageList(tbMyPublish);
     }
 
     /**
@@ -98,22 +80,7 @@ public class TbMyPublishController extends BaseController {
     @PreAuthorize("@ss.hasPermi('app:publish:query')" )
     @GetMapping(value = "/{id}" )
     public AjaxResult getInfo(@PathVariable("id" ) Long id) {
-        TbMyPublish publish = iTbMyPublishService.getById(id);
-        if (publish != null) {
-            List<TbPublishImg> publishImgs = publishImgService.list(new LambdaQueryWrapper<TbPublishImg>()
-                .in(TbPublishImg::getPublishId, id)
-            );
-            int thumbs = iTbMyPublishService.getThumbs(id);
-            int comments = iTbMyPublishService.getComments(id);
-            if (publish.getMessageUserId() != null) {
-                TbAppUser user = appUserService.getById(publish.getMessageUserId());
-                publish.setMessageUser(user.getNickName());
-            }
-            publish.setImgList(publishImgs);
-            publish.setThumbs(thumbs);
-            publish.setComments(comments);
-        }
-        return AjaxResult.success(publish);
+        return AjaxResult.success(iTbMyPublishService.getPublish(id));
     }
 
     /**
@@ -139,14 +106,14 @@ public class TbMyPublishController extends BaseController {
     }
 
     /**
-     * 删除我的近况（我的发）
+     * 逻辑删除我的近况
      */
-    @ApiOperation("删除我的近况 ")
+    @ApiOperation("逻辑删除我的近况 ")
     @PreAuthorize("@ss.hasPermi('app:publish:remove')" )
-    @Log(title = "我的近况（我的发）" , businessType = BusinessType.DELETE)
+    @Log(title = "我的近况" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}" )
     public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(iTbMyPublishService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+        return toAjax(iTbMyPublishService.delPublish(Arrays.asList(ids)) ? 1 : 0);
     }
 
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -126,11 +126,11 @@ public class SysMenuController extends BaseController
         else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
                 && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
         {
-            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
         }
         else if (menu.getMenuId().equals(menu.getParentId()))
         {
-            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
         }
         menu.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(menuService.updateMenu(menu));

ruoyi-generator/src/main/resources/vm/java/controller.java.vm

@@ -40,7 +40,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @Api(value = "${functionName}", tags = "${functionName}")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/${moduleName}/${businessName}" )
+@RequestMapping("/system/${businessName}" )
 public class ${ClassName}Controller extends BaseController {
 
     private final I${ClassName}Service i${ClassName}Service;

ruoyi-system/src/main/java/com/ruoyi/app/domain/TbMyFriends.java

@@ -0,0 +1,61 @@
+package com.ruoyi.app.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import com.ruoyi.common.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 我的好友
+ * 
+ * @author Alex
+ * @date 2020-10-05
+ */
+@Data
+@ApiModel(value = "我的好友")
+@ToString
+@EqualsAndHashCode
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("tb_my_friends")
+public class TbMyFriends extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /** 主键ID */
+    @ApiModelProperty(value="主键ID")
+    @TableId(value = "id")
+    private Long id;
+
+    /** 个人id */
+    @ApiModelProperty(value="个人id")
+    @Excel(name = "个人id")
+    private Long appUserId;
+
+    /** 好友id */
+    @ApiModelProperty(value="好友id")
+    @Excel(name = "好友id")
+    private Long friendsUserId;
+
+    /** 状态： 1申请 2已通过 3未通过 */
+    @ApiModelProperty(value="状态： 1申请 2已通过 3未通过")
+    @Excel(name = "状态： 1申请 2已通过 3未通过")
+    private String status;
+
+    @TableField(exist = false)
+    private String nickName;
+
+}

ruoyi-system/src/main/java/com/ruoyi/app/domain/TbMyPublish.java

@@ -33,7 +33,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 @NoArgsConstructor
 @Accessors(chain = true)
 @TableName("tb_my_publish")
-public class TbMyPublish implements Serializable {
+public class TbMyPublish extends BaseEntity {
 
     private static final long serialVersionUID=1L;
 
@@ -62,28 +62,9 @@ public class TbMyPublish implements Serializable {
     @Excel(name = "留念人")
     private Long messageUserId;
 
-    /** 创建者 */
-    @ApiModelProperty(value="创建者")
-    private Long createBy;
-
-    /** 创建时间 */
-    @ApiModelProperty(value="创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /** 更新者 */
-    @ApiModelProperty(value="更新者")
-    private Long updateBy;
-
-    /** 更新时间 */
-    @ApiModelProperty(value="更新时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    /** 备注 */
-    @ApiModelProperty(value="备注")
-    @Excel(name = "备注")
-    private String remark;
+    /** 是否删除 */
+    @ApiModelProperty(value="是否删除 Y是 N否")
+    private String deleted;
 
     /**
      * 图片列表

ruoyi-system/src/main/java/com/ruoyi/app/mapper/TbMyFriendsMapper.java

@@ -0,0 +1,26 @@
+package com.ruoyi.app.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.ruoyi.app.domain.TbMyFriends;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * 我的好友
+ *
+ * @author Alex
+ * @date 2020-10-05
+ */
+public interface TbMyFriendsMapper extends BaseMapper<TbMyFriends> {
+
+//    @Select("select f.*,(select u.nick_name from tb_app_user u where f.friends_user_id = u.id) nick_name from tb_my_friends f ${ew.customSqlSegment}")
+//    List<TbMyFriends> listFriends(@Param(Constants.WRAPPER) LambdaQueryWrapper<TbMyFriends> friendsLambdaQueryWrapper);
+
+
+    List<TbMyFriends> listFriends(@Param("id") Long uid, @Param("status") String status, @Param("nickName") String nickName);
+
+}

ruoyi-system/src/main/java/com/ruoyi/app/mapper/TbMyPublishMapper.java

@@ -1,7 +1,12 @@
 package com.ruoyi.app.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.ruoyi.app.domain.TbMyPublish;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 我的近况（我的发）Mapper接口
@@ -11,4 +16,5 @@ import com.ruoyi.app.domain.TbMyPublish;
  */
 public interface TbMyPublishMapper extends BaseMapper<TbMyPublish> {
 
+    List<TbMyPublish> pageList(@Param(Constants.WRAPPER) LambdaQueryWrapper<TbMyPublish> friendsLambdaQueryWrapper);
 }

ruoyi-system/src/main/java/com/ruoyi/app/service/ITbMyFriendsService.java

@@ -0,0 +1,19 @@
+package com.ruoyi.app.service;
+
+import com.ruoyi.app.domain.TbMyFriends;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * 我的好友
+ *
+ * @author Alex
+ * @date 2020-10-05
+ */
+public interface ITbMyFriendsService extends IService<TbMyFriends> {
+
+    List<TbMyFriends> pageList(TbMyFriends friends);
+    TbMyFriends getByUid(Long userId);
+
+}

ruoyi-system/src/main/java/com/ruoyi/app/service/ITbMyPublishService.java

@@ -3,6 +3,7 @@ package com.ruoyi.app.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.app.domain.TbMyPublish;
 import com.ruoyi.app.domain.TbPublishComment;
+import com.ruoyi.common.core.page.TableDataInfo;
 
 import java.util.List;
 
@@ -14,6 +15,9 @@ import java.util.List;
  */
 public interface ITbMyPublishService extends IService<TbMyPublish> {
 
+    TableDataInfo pageList(TbMyPublish tbMyPublish);
+    TbMyPublish getPublish(Long id);
+    boolean delPublish(List<Long> ids);
     int getThumbs(Long publishId);
     int getComments(Long publishId);
     List<TbPublishComment> listComment(Long publishId);

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

@@ -0,0 +1,61 @@
+package com.ruoyi.app.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.ruoyi.common.core.page.PageDomain;
+import com.ruoyi.common.core.page.TableSupport;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.sql.SqlUtil;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.app.mapper.TbMyFriendsMapper;
+import com.ruoyi.app.domain.TbMyFriends;
+import com.ruoyi.app.service.ITbMyFriendsService;
+
+import java.util.List;
+
+/**
+ * 我的好友
+ *
+ * @author Alex
+ * @date 2020-10-05
+ */
+@Service
+public class TbMyFriendsServiceImpl extends ServiceImpl<TbMyFriendsMapper, TbMyFriends> implements ITbMyFriendsService {
+
+    protected void startPage() {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum() == null ? 1 : pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize() == null ? 10 : pageDomain.getPageSize();
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
+            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+            PageHelper.startPage(pageNum, pageSize, orderBy);
+        }
+    }
+
+    @Override
+    public List<TbMyFriends> pageList(TbMyFriends tbMyFriends) {
+        startPage();
+        Long uid = null;
+        String nickName = null;
+        String status = null;
+        if (tbMyFriends.getAppUserId() != null){
+            uid = tbMyFriends.getAppUserId();
+        }
+        if (StringUtils.isNotBlank(tbMyFriends.getNickName())){
+            nickName = tbMyFriends.getNickName();
+        }
+        if (StringUtils.isNotBlank(tbMyFriends.getStatus())){
+            status = tbMyFriends.getStatus();
+        }
+        List<TbMyFriends> list = baseMapper.listFriends(uid,status,nickName);
+        return list;
+    }
+
+    @Override
+    public TbMyFriends getByUid(Long userId) {
+        return baseMapper.selectOne(new LambdaQueryWrapper<TbMyFriends>()
+            .eq(TbMyFriends::getAppUserId, userId)
+        );
+    }
+}

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

@@ -1,21 +1,24 @@
 package com.ruoyi.app.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ruoyi.app.domain.TbAppUser;
-import com.ruoyi.app.domain.TbMyPublish;
-import com.ruoyi.app.domain.TbPublishComment;
-import com.ruoyi.app.domain.TbPublishThumbs;
-import com.ruoyi.app.service.ITbAppUserService;
-import com.ruoyi.app.service.ITbPublishCommentService;
-import com.ruoyi.app.service.ITbPublishThumbsService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.ruoyi.app.domain.*;
+import com.ruoyi.app.service.*;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.core.page.PageDomain;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.page.TableSupport;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.sql.SqlUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.app.mapper.TbMyPublishMapper;
-import com.ruoyi.app.service.ITbMyPublishService;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -28,12 +31,89 @@ import java.util.List;
 public class TbMyPublishServiceImpl extends ServiceImpl<TbMyPublishMapper, TbMyPublish> implements ITbMyPublishService {
 
     @Autowired
+    private ITbPublishImgService imgService;
+    @Autowired
     private ITbPublishThumbsService thumbsService;
     @Autowired
     private ITbPublishCommentService commentService;
     @Autowired
     private ITbAppUserService userService;
 
+    protected void startPage() {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum() == null ? 1 : pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize() == null ? 10 : pageDomain.getPageSize();
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))
+        {
+            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+            PageHelper.startPage(pageNum, pageSize, orderBy);
+        }
+    }
+    /**
+     * 响应请求分页数据
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    protected TableDataInfo getDataTable(List<?> list) {
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setMsg("查询成功");
+        rspData.setRows(list);
+        rspData.setTotal(new PageInfo(list).getTotal());
+        return rspData;
+    }
+
+    @Override
+    public TableDataInfo pageList(TbMyPublish tbMyPublish) {
+        startPage();
+        LambdaQueryWrapper<TbMyPublish> lqw = new LambdaQueryWrapper<TbMyPublish>();
+        if (tbMyPublish.getAppUserId() != null){
+            lqw.eq(TbMyPublish::getAppUserId ,tbMyPublish.getAppUserId());
+        }
+        if (StringUtils.isNotBlank(tbMyPublish.getContents())){
+            lqw.like(TbMyPublish::getContents ,tbMyPublish.getContents());
+        }
+        if (StringUtils.isNotBlank(tbMyPublish.getMessage())){
+            lqw.eq(TbMyPublish::getMessage ,tbMyPublish.getMessage());
+        }
+        if (StringUtils.isNotBlank(tbMyPublish.getDeleted())){
+            lqw.eq(TbMyPublish::getDeleted ,tbMyPublish.getDeleted());
+        }
+        List<TbMyPublish> list = baseMapper.pageList(lqw);
+        return getDataTable(list);
+    }
+
+    @Override
+    public TbMyPublish getPublish(Long id) {
+        TbMyPublish publish = this.getById(id);
+        if (publish != null) {
+            List<TbPublishImg> publishImgs = imgService.list(new LambdaQueryWrapper<TbPublishImg>()
+                    .in(TbPublishImg::getPublishId, id)
+            );
+            int thumbs = this.getThumbs(id);
+            int comments = this.getComments(id);
+            if (publish.getMessageUserId() != null) {
+                TbAppUser user = userService.getById(publish.getMessageUserId());
+                publish.setMessageUser(user.getNickName());
+            }
+            publish.setImgList(publishImgs);
+            publish.setThumbs(thumbs);
+            publish.setComments(comments);
+        }
+        return publish;
+    }
+
+    @Override
+    public boolean delPublish(List<Long> ids){
+        List<TbMyPublish> publishList = this.list(new LambdaQueryWrapper<TbMyPublish>()
+                .in(TbMyPublish::getId, Arrays.asList(ids))
+        );
+        if (publishList.size() > 0) {
+            publishList.forEach(item -> {
+                item.setDeleted("Y");
+            });
+        }
+        return this.updateBatchById(publishList);
+    }
     /**
      * 获取点赞数
      * @param publishId 近况id
@@ -82,7 +162,7 @@ public class TbMyPublishServiceImpl extends ServiceImpl<TbMyPublishMapper, TbMyP
             if (userList.size() > 0) {
                 comments.forEach(item -> {
                     userList.forEach(user -> {
-                        if (item.getAppUserId() == user.getId()) {
+                        if (item.getAppUserId().equals(user.getId())) {
                             item.setAppUserUrl(user.getAvatar());
                             item.setAppUser(user.getNickName());
                         }

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

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.app.mapper.TbMyFriendsMapper">
+    
+    <resultMap type="TbMyFriends" id="TbMyFriendsResult">
+        <result property="id"    column="id"    />
+        <result property="appUserId"    column="app_user_id"    />
+        <result property="friendsUserId"    column="friends_user_id"    />
+        <result property="status"    column="status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="friendsSql">
+
+    </sql>
+
+    <select id="listFriends" resultType="com.ruoyi.app.domain.TbMyFriends" parameterType="String">
+        select * from (
+        select f.*,(select u.nick_name from tb_app_user u where f.app_user_id = u.id) nick_name
+        from tb_my_friends f where friends_user_id = #{id}
+        union all
+        select g.*,(select u.nick_name from tb_app_user u where g.friends_user_id = u.id) nick_name
+        from tb_my_friends g  where app_user_id = #{id}
+        ) a where 1=1
+        <if test="status != null and status != '' ">
+           and a.status = #{status}
+        </if>
+        <if test="nickName != null and nickName != '' ">
+            and a.nick_name like concat('%',#{nickName},'%')
+        </if>
+    </select>
+
+</mapper>

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

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="contents"    column="contents"    />
         <result property="message"    column="message"    />
         <result property="messageUserId"    column="message_user_id"    />
+        <result property="deleted"    column="deleted"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -17,5 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
     </resultMap>
 
+    <select id="pageList" resultType="com.ruoyi.app.domain.TbMyPublish">
+        select p.*,
+        (select count(1) from tb_publish_comment c where c.publish_id = p.id) comments ,
+        (select count(1) from tb_publish_thumbs t where t.publish_id = p.id) thumbs
+        from tb_my_publish p ${ew.customSqlSegment}
+    </select>
 
 </mapper>