添加APP端族友圈列表

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

@@ -39,10 +39,8 @@ import java.util.Map;
 @RequestMapping("/app" )
 public class AppLoginController {
 
-    @Autowired
-    AppTokenService appTokenService;
-    @Autowired
-    private ITbAppUserService userService;
+    private final AppTokenService appTokenService;
+    private final ITbAppUserService userService;
 
     /**
      * 登录

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

@@ -0,0 +1,55 @@
+package com.ruoyi.app.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.app.controller.base.AppBaseController;
+import com.ruoyi.app.domain.TbMyPublish;
+import com.ruoyi.app.service.ITbAppUserService;
+import com.ruoyi.app.service.ITbMyPublishService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+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.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 会员管理
+ *
+ * @author Alex
+ * @date 2020-10-09
+ */
+@Api(value = "会员管理",tags = "会员管理")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/app/user" )
+public class AppUserController extends AppBaseController {
+
+    private final ITbMyPublishService publishService;
+
+    private final ITbAppUserService userService;
+
+    /**
+     * 查询家族朋友圈
+     * @return
+     */
+    @ApiOperation(value = "查询家族朋友圈", notes = "查询家族朋友圈")
+    @ApiImplicitParam(name = "userId", value = "会员ID",paramType="Long")
+    @GetMapping("/selectCircle")
+    public TableDataInfo selectCircle(Long userId){
+        LambdaQueryWrapper<TbMyPublish> lqw = new LambdaQueryWrapper();
+        if (userId == null) {
+            return new TableDataInfo();
+        }
+        lqw.eq(TbMyPublish::getAppUserId,userId);
+        List<TbMyPublish> list = publishService.selectPublish(lqw);
+        return getDataTable(list);
+    }
+
+}

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

@@ -27,7 +27,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @date 2020-10-02
  */
 @Data
-@ApiModel(value = "我的近况（我的发）")
+@ApiModel(value = "我的近况（发表）")
 @ToString
 @EqualsAndHashCode
 @NoArgsConstructor
@@ -35,8 +35,6 @@ import com.ruoyi.common.core.domain.BaseEntity;
 @TableName("tb_my_publish")
 public class TbMyPublish extends BaseEntity {
 
-    private static final long serialVersionUID=1L;
-
     /** 主键id */
     @ApiModelProperty(value="主键id")
     @TableId(value = "id")

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

@@ -9,12 +9,24 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
- * 我的近况（我的发）Mapper接口
+ * 我的近况（发表）Mapper接口
  *
  * @author Administrator
  * @date 2020-10-02
  */
 public interface TbMyPublishMapper extends BaseMapper<TbMyPublish> {
 
-    List<TbMyPublish> pageList(@Param(Constants.WRAPPER) LambdaQueryWrapper<TbMyPublish> friendsLambdaQueryWrapper);
+    /**
+     * 我的近况列表
+     * @param wrapper
+     * @return
+     */
+    List<TbMyPublish> pageList(@Param(Constants.WRAPPER) LambdaQueryWrapper<TbMyPublish> wrapper);
+
+    /**
+     * 族友圈列表
+     * @param wrapper
+     * @return
+     */
+    List<TbMyPublish> selectPublish(@Param(Constants.WRAPPER) LambdaQueryWrapper<TbMyPublish> wrapper);
 }

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

@@ -1,9 +1,12 @@
 package com.ruoyi.app.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 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 org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -22,4 +25,10 @@ public interface ITbMyPublishService extends IService<TbMyPublish> {
     int getComments(Long publishId);
     List<TbPublishComment> listComment(Long publishId);
     boolean delComment(Long id);
+    /**
+     * 族友圈列表
+     * @param wrapper
+     * @return
+     */
+    List<TbMyPublish> selectPublish(LambdaQueryWrapper<TbMyPublish> wrapper);
 }

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

@@ -182,4 +182,15 @@ public class TbMyPublishServiceImpl extends ServiceImpl<TbMyPublishMapper, TbMyP
     public boolean delComment(Long id) {
         return commentService.removeById(id);
     }
+
+
+    /**
+     * 族友圈列表
+     * @param wrapper
+     * @return
+     */
+    @Override
+    public List<TbMyPublish> selectPublish(LambdaQueryWrapper<TbMyPublish> wrapper) {
+        return baseMapper.selectPublish(wrapper);
+    }
 }

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

@@ -24,5 +24,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (select count(1) from tb_publish_thumbs t where t.publish_id = p.id) thumbs
         from tb_my_publish p ${ew.customSqlSegment}
     </select>
+<!--    族友圈列表-->
+    <select id="selectPublish" resultType="com.ruoyi.app.domain.TbMyPublish">
+        select * from (
+        select a.*,
+        (select nick_name from tb_app_user us where us.id = a.app_user_id)nick_name,
+        (select nick_name from tb_app_user us where us.id = a.message_user_id)message_user,
+        (select count(1)  from tb_publish_thumbs where publish_id = 1)thumbs
+        from (
+            select * from tb_my_publish p
+            where deleted = 'N' and app_user_id in (
+                select f.app_user_id uid from tb_my_friends f where friends_user_id = 2 and status = 2
+                union all
+                select g.friends_user_id uid from tb_my_friends g  where app_user_id = 2 and status = 2
+            )
+            union
+            select * from tb_my_publish p
+            where deleted = 'N' and app_user_id in (
+                select u.id from tb_app_user u
+                left join tb_family_member m on u.id = m.app_user_id
+                left join tb_member_middle mi on m.id = mi.member_id
+                where family_id = 1 and deleted = 'N'
+            )
+        ) a
+        ) b
+        ${ew.customSqlSegment}
+    </select>
 
 </mapper>