修改个人发表管理

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

@@ -6,6 +6,8 @@ import java.util.List;
 import java.util.Arrays;
 
 import com.ruoyi.common.utils.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +34,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author Alex
  * @date 2020-09-28
  */
+@Api(tags = "家族管理", value = "家族管理")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/family" )
@@ -42,6 +45,7 @@ public class TbFamilyController extends BaseController {
     /**
      * 查询家族列表
      */
+    @ApiOperation("查询家族列表")
     @PreAuthorize("@ss.hasPermi('system:family:list')")
     @GetMapping("/list")
     public TableDataInfo list(TbFamily tbFamily)
@@ -70,6 +74,7 @@ public class TbFamilyController extends BaseController {
     /**
      * 导出家族列表
      */
+    @ApiOperation("导出家族列表")
     @PreAuthorize("@ss.hasPermi('system:family:export')" )
     @Log(title = "家族" , businessType = BusinessType.EXPORT)
     @GetMapping("/export" )
@@ -83,6 +88,7 @@ public class TbFamilyController extends BaseController {
     /**
      * 获取家族详细信息
      */
+    @ApiOperation("获取家族详细信息")
     @PreAuthorize("@ss.hasPermi('system:family:query')" )
     @GetMapping(value = "/{id}" )
     public AjaxResult getInfo(@PathVariable("id" ) Long id) {
@@ -92,6 +98,7 @@ public class TbFamilyController extends BaseController {
     /**
      * 新增家族
      */
+    @ApiOperation("新增家族")
     @PreAuthorize("@ss.hasPermi('system:family:add')" )
     @Log(title = "家族" , businessType = BusinessType.INSERT)
     @PostMapping
@@ -102,6 +109,7 @@ public class TbFamilyController extends BaseController {
     /**
      * 修改家族
      */
+    @ApiOperation("修改家族")
     @PreAuthorize("@ss.hasPermi('system:family:edit')" )
     @Log(title = "家族" , businessType = BusinessType.UPDATE)
     @PutMapping
@@ -112,6 +120,7 @@ public class TbFamilyController extends BaseController {
     /**
      * 删除家族
      */
+    @ApiOperation("删除家族")
     @PreAuthorize("@ss.hasPermi('system:family:remove')" )
     @Log(title = "家族" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}" )

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

@@ -2,14 +2,21 @@ package com.ruoyi.web.controller.api;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Arrays;
 
+import com.ruoyi.app.domain.TbAppUser;
 import com.ruoyi.app.domain.TbMyPublish;
+import com.ruoyi.app.domain.TbPublishComment;
+import com.ruoyi.app.domain.TbPublishImg;
+import com.ruoyi.app.service.ITbAppUserService;
+import com.ruoyi.app.service.ITbPublishImgService;
 import com.ruoyi.common.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -42,10 +49,15 @@ public class TbMyPublishController extends BaseController {
 
     private final ITbMyPublishService iTbMyPublishService;
 
+    @Autowired
+    private ITbPublishImgService publishImgService;
+    @Autowired
+    private ITbAppUserService appUserService;
+
     /**
-     * 查询我的近况（我的发）列表
+     * 查询我的近况 列表
      */
-    @ApiOperation("查询我的近况（我的发）列表")
+    @ApiOperation("查询我的发表列表")
     @PreAuthorize("@ss.hasPermi('app:publish:list')")
     @GetMapping("/list")
     public TableDataInfo list(TbMyPublish tbMyPublish)
@@ -56,52 +68,19 @@ public class TbMyPublishController extends BaseController {
             lqw.eq(TbMyPublish::getAppUserId ,tbMyPublish.getAppUserId());
         }
         if (StringUtils.isNotBlank(tbMyPublish.getContents())){
-            lqw.eq(TbMyPublish::getContents ,tbMyPublish.getContents());
-        }
-        if (StringUtils.isNotBlank(tbMyPublish.getPicurl1())){
-            lqw.eq(TbMyPublish::getPicurl1 ,tbMyPublish.getPicurl1());
-        }
-        if (StringUtils.isNotBlank(tbMyPublish.getPicurl2())){
-            lqw.eq(TbMyPublish::getPicurl2 ,tbMyPublish.getPicurl2());
-        }
-        if (StringUtils.isNotBlank(tbMyPublish.getPicurl3())){
-            lqw.eq(TbMyPublish::getPicurl3 ,tbMyPublish.getPicurl3());
-        }
-        if (StringUtils.isNotBlank(tbMyPublish.getPicurl4())){
-            lqw.eq(TbMyPublish::getPicurl4 ,tbMyPublish.getPicurl4());
-        }
-        if (StringUtils.isNotBlank(tbMyPublish.getPicurl5())){
-            lqw.eq(TbMyPublish::getPicurl5 ,tbMyPublish.getPicurl5());
-        }
-        if (StringUtils.isNotBlank(tbMyPublish.getPicurl6())){
-            lqw.eq(TbMyPublish::getPicurl6 ,tbMyPublish.getPicurl6());
-        }
-        if (StringUtils.isNotBlank(tbMyPublish.getPicurl7())){
-            lqw.eq(TbMyPublish::getPicurl7 ,tbMyPublish.getPicurl7());
-        }
-        if (StringUtils.isNotBlank(tbMyPublish.getPicurl8())){
-            lqw.eq(TbMyPublish::getPicurl8 ,tbMyPublish.getPicurl8());
-        }
-        if (StringUtils.isNotBlank(tbMyPublish.getPicurl9())){
-            lqw.eq(TbMyPublish::getPicurl9 ,tbMyPublish.getPicurl9());
+            lqw.like(TbMyPublish::getContents ,tbMyPublish.getContents());
         }
         if (StringUtils.isNotBlank(tbMyPublish.getMessage())){
             lqw.eq(TbMyPublish::getMessage ,tbMyPublish.getMessage());
         }
-        if (tbMyPublish.getMessageUserId() != null){
-            lqw.eq(TbMyPublish::getMessageUserId ,tbMyPublish.getMessageUserId());
-        }
-        if (tbMyPublish.getThumbs() != null){
-            lqw.eq(TbMyPublish::getThumbs ,tbMyPublish.getThumbs());
-        }
         List<TbMyPublish> list = iTbMyPublishService.list(lqw);
         return getDataTable(list);
     }
 
     /**
-     * 导出我的近况（我的发）列表
+     * 导出我的近况 列表
      */
-    @ApiOperation("导出我的近况（我的发）列表")
+    @ApiOperation("导出我的近况 列表")
     @PreAuthorize("@ss.hasPermi('app:publish:export')" )
     @Log(title = "我的近况（我的发）" , businessType = BusinessType.EXPORT)
     @GetMapping("/export" )
@@ -113,19 +92,34 @@ public class TbMyPublishController extends BaseController {
     }
 
     /**
-     * 获取我的近况（我的发）详细信息
+     * 获取我的近况详细信息
      */
-    @ApiOperation("获取我的近况（我的发）详细信息")
+    @ApiOperation("获取我的近况 详细信息")
     @PreAuthorize("@ss.hasPermi('app:publish:query')" )
     @GetMapping(value = "/{id}" )
     public AjaxResult getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iTbMyPublishService.getById(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);
     }
 
     /**
-     * 新增我的近况（我的发）
+     * 新增我的近况
      */
-    @ApiOperation("新增我的近况（我的发）")
+    @ApiOperation("新增我的近况 ")
     @PreAuthorize("@ss.hasPermi('app:publish:add')" )
     @Log(title = "我的近况（我的发）" , businessType = BusinessType.INSERT)
     @PostMapping
@@ -134,9 +128,9 @@ public class TbMyPublishController extends BaseController {
     }
 
     /**
-     * 修改我的近况（我的发）
+     * 修改我的近况
      */
-    @ApiOperation("修改我的近况（我的发）")
+    @ApiOperation("修改我的近况 ")
     @PreAuthorize("@ss.hasPermi('app:publish:edit')" )
     @Log(title = "我的近况（我的发）" , businessType = BusinessType.UPDATE)
     @PutMapping
@@ -147,11 +141,35 @@ public class TbMyPublishController extends BaseController {
     /**
      * 删除我的近况（我的发）
      */
-    @ApiOperation("删除我的近况（我的发）")
+    @ApiOperation("删除我的近况 ")
     @PreAuthorize("@ss.hasPermi('app:publish:remove')" )
     @Log(title = "我的近况（我的发）" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}" )
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(iTbMyPublishService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
     }
+
+
+
+    /**
+     * 获取我的近况 评论列表
+     * @param id
+     * @return
+     */
+    @ApiOperation("获取我的近况 评论列表")
+    @GetMapping(value = "/listComment/{id}" )
+    public TableDataInfo listComment(@PathVariable("id" ) Long id) {
+        startPage();
+        List<TbPublishComment> list = iTbMyPublishService.listComment(id);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("删除一条评论")
+    @GetMapping(value = "/delComment/{id}" )
+    public AjaxResult delComment(@PathVariable("id" ) Long id) {
+        if (iTbMyPublishService.delComment(id)) {
+            return AjaxResult.success("删除成功");
+        }
+        return AjaxResult.error("删除失败");
+    }
 }

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

@@ -0,0 +1,121 @@
+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.TbPublishImg;
+import com.ruoyi.app.service.ITbPublishImgService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 我的状况图片
+ * 
+ * @author Administrator
+ * @date 2020-10-02
+ */
+@Api(value = "我的状况图片", tags = "我的状况图片")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/publishImg" )
+public class TbPublishImgController extends BaseController {
+
+    private final ITbPublishImgService iTbPublishImgService;
+
+    /**
+     * 查询我的状况图片列表
+     */
+    @ApiOperation("查询我的状况图片列表")
+    @PreAuthorize("@ss.hasPermi('system:publish:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TbPublishImg tbPublishImg)
+    {
+        startPage();
+        LambdaQueryWrapper<TbPublishImg> lqw = new LambdaQueryWrapper<TbPublishImg>();
+        if (tbPublishImg.getPublishId() != null){
+            lqw.eq(TbPublishImg::getPublishId ,tbPublishImg.getPublishId());
+        }
+        if (StringUtils.isNotBlank(tbPublishImg.getUrl())){
+            lqw.eq(TbPublishImg::getUrl ,tbPublishImg.getUrl());
+        }
+        List<TbPublishImg> list = iTbPublishImgService.list(lqw);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出我的状况图片列表
+     */
+    @ApiOperation("导出我的状况图片列表")
+    @PreAuthorize("@ss.hasPermi('system:publish:export')" )
+    @Log(title = "我的状况图片" , businessType = BusinessType.EXPORT)
+    @GetMapping("/export" )
+    public AjaxResult export(TbPublishImg tbPublishImg) {
+        LambdaQueryWrapper<TbPublishImg> lqw = new LambdaQueryWrapper<TbPublishImg>(tbPublishImg);
+        List<TbPublishImg> list = iTbPublishImgService.list(lqw);
+        ExcelUtil<TbPublishImg> util = new ExcelUtil<TbPublishImg>(TbPublishImg. class);
+        return util.exportExcel(list, "img" );
+    }
+
+    /**
+     * 获取我的状况图片详细信息
+     */
+    @ApiOperation("获取我的状况图片详细信息")
+    @PreAuthorize("@ss.hasPermi('system:publish:query')" )
+    @GetMapping(value = "/{id}" )
+    public AjaxResult getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iTbPublishImgService.getById(id));
+    }
+
+    /**
+     * 新增我的状况图片
+     */
+    @ApiOperation("新增我的状况图片")
+    @PreAuthorize("@ss.hasPermi('system:publish:add')" )
+    @Log(title = "我的状况图片" , businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TbPublishImg tbPublishImg) {
+        return toAjax(iTbPublishImgService.save(tbPublishImg) ? 1 : 0);
+    }
+
+    /**
+     * 修改我的状况图片
+     */
+    @ApiOperation("修改我的状况图片")
+    @PreAuthorize("@ss.hasPermi('system:publish:edit')" )
+    @Log(title = "我的状况图片" , businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TbPublishImg tbPublishImg) {
+        return toAjax(iTbPublishImgService.updateById(tbPublishImg) ? 1 : 0);
+    }
+
+    /**
+     * 删除我的状况图片
+     */
+    @ApiOperation("删除我的状况图片")
+    @PreAuthorize("@ss.hasPermi('system:publish:remove')" )
+    @Log(title = "我的状况图片" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}" )
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(iTbPublishImgService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -50,8 +50,8 @@ public class BaseController
     protected void startPage()
     {
         PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
+        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());

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

@@ -27,7 +27,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 @NoArgsConstructor
 @Accessors(chain = true)
 @TableName("tb_family")
-public class TbFamily implements Serializable {
+public class TbFamily extends BaseEntity {
 
     private static final long serialVersionUID=1L;
 
@@ -55,22 +55,22 @@ public class TbFamily implements Serializable {
     /** $column.columnComment */
     @Excel(name = "家族头像url")
     private String city;
-
-    /** 创建者 */
-    private Long createBy;
-
-    /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /** 更新者 */
-    private Long updateBy;
-
-    /** 更新时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    /** 备注 */
-    @Excel(name = "备注")
-    private String remark;
+//
+//    /** 创建者 */
+//    private Long createBy;
+//
+//    /** 创建时间 */
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    private Date createTime;
+//
+//    /** 更新者 */
+//    private Long updateBy;
+//
+//    /** 更新时间 */
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    private Date updateTime;
+//
+//    /** 备注 */
+//    @Excel(name = "备注")
+//    private String remark;
 }

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

@@ -40,18 +40,6 @@ public class TbFamilyMember implements Serializable {
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long appUserId;
 
-    /** 家族id */
-    @Excel(name = "家族id")
-    private Long familyId;
-
-    /** 是否家族管理员 1是 0否 */
-    @Excel(name = "是否家族管理员 1是 0否")
-    private String admin;
-
-    /** 父成员id */
-    @Excel(name = "父成员id")
-    private Long parentId;
-
     /** 配偶id */
     @Excel(name = "配偶id")
     private Long spouseId;

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

@@ -1,5 +1,6 @@
 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;
@@ -15,6 +16,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
+
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
@@ -34,7 +37,6 @@ public class TbMyPublish implements Serializable {
 
     private static final long serialVersionUID=1L;
 
-
     /** 主键id */
     @ApiModelProperty(value="主键id")
     @TableId(value = "id")
@@ -50,51 +52,6 @@ public class TbMyPublish implements Serializable {
     @Excel(name = "发表内容")
     private String contents;
 
-    /** 图片1 */
-    @ApiModelProperty(value="图片1")
-    @Excel(name = "图片1")
-    private String picurl1;
-
-    /** 图片2 */
-    @ApiModelProperty(value="图片2")
-    @Excel(name = "图片2")
-    private String picurl2;
-
-    /** 图片3 */
-    @ApiModelProperty(value="图片3")
-    @Excel(name = "图片3")
-    private String picurl3;
-
-    /** 图片4 */
-    @ApiModelProperty(value="图片4")
-    @Excel(name = "图片4")
-    private String picurl4;
-
-    /** 图片5 */
-    @ApiModelProperty(value="图片5")
-    @Excel(name = "图片5")
-    private String picurl5;
-
-    /** 图片6 */
-    @ApiModelProperty(value="图片6")
-    @Excel(name = "图片6")
-    private String picurl6;
-
-    /** 图片7 */
-    @ApiModelProperty(value="图片7")
-    @Excel(name = "图片7")
-    private String picurl7;
-
-    /** 图片8 */
-    @ApiModelProperty(value="图片8")
-    @Excel(name = "图片8")
-    private String picurl8;
-
-    /** 图片9 */
-    @ApiModelProperty(value="图片9")
-    @Excel(name = "图片9")
-    private String picurl9;
-
     /** 纪念留言 */
     @ApiModelProperty(value="纪念留言")
     @Excel(name = "纪念留言")
@@ -105,11 +62,6 @@ public class TbMyPublish implements Serializable {
     @Excel(name = "留念人")
     private Long messageUserId;
 
-    /** 点赞数 */
-    @ApiModelProperty(value="点赞数")
-    @Excel(name = "点赞数")
-    private Long thumbs;
-
     /** 创建者 */
     @ApiModelProperty(value="创建者")
     private Long createBy;
@@ -132,4 +84,29 @@ public class TbMyPublish implements Serializable {
     @ApiModelProperty(value="备注")
     @Excel(name = "备注")
     private String remark;
+
+    /**
+     * 图片列表
+     */
+    @ApiModelProperty(value="图片列表")
+    @TableField(exist = false)
+    private List<TbPublishImg> imgList;
+    /**
+     * 评论数
+     */
+    @ApiModelProperty(value="评论数")
+    @TableField(exist = false)
+    private int comments;
+    /**
+     * 点赞数
+     */
+    @ApiModelProperty(value="点赞数")
+    @TableField(exist = false)
+    private int thumbs;
+    /**
+     * 纪念留言人
+     */
+    @ApiModelProperty(value="纪念留言人")
+    @TableField(exist = false)
+    private String messageUser;
 }

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

@@ -0,0 +1,87 @@
+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 Administrator
+ * @date 2020-10-03
+ */
+@Data
+@ApiModel(value = "我的近况评论")
+@ToString
+@EqualsAndHashCode
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("tb_publish_comment")
+public class TbPublishComment implements Serializable {
+
+    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 publishId;
+
+    /** 评论人id */
+    @ApiModelProperty(value="评论人id")
+    @Excel(name = "评论人id")
+    private Long appUserId;
+
+    @ApiModelProperty(value="评论人")
+    @TableField(exist = false)
+    private String appUser;
+    @ApiModelProperty(value="评论人头像")
+    @TableField(exist = false)
+    private String appUserUrl;
+
+    /** 内容 */
+    @ApiModelProperty(value="内容")
+    @Excel(name = "内容")
+    private String contents;
+
+    /** 创建者 */
+    @ApiModelProperty(value="创建者")
+    private String createBy;
+
+    /** 创建时间 */
+    @ApiModelProperty(value="创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    @ApiModelProperty(value="更新者")
+    private String updateBy;
+
+    /** 更新时间 */
+    @ApiModelProperty(value="更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 备注 */
+    @ApiModelProperty(value="备注")
+    @Excel(name = "备注")
+    private String remark;
+}

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

@@ -0,0 +1,52 @@
+package com.ruoyi.app.domain;
+
+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 Administrator
+ * @date 2020-10-02
+ */
+@Data
+@ApiModel(value = "我的状况图片")
+@ToString
+@EqualsAndHashCode
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("tb_publish_img")
+public class TbPublishImg implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+
+    /** 主键地 */
+    @ApiModelProperty(value="主键地")
+    @TableId(value = "id")
+    private Long id;
+
+    /** 我的状况id */
+    @ApiModelProperty(value="我的状况id")
+    @Excel(name = "我的状况id")
+    private Long publishId;
+
+    /** 图片url */
+    @ApiModelProperty(value="图片url")
+    @Excel(name = "图片url")
+    private String url;
+}

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

@@ -0,0 +1,75 @@
+package com.ruoyi.app.domain;
+
+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 Administrator
+ * @date 2020-10-03
+ */
+@Data
+@ApiModel(value = "我的近况点赞记录")
+@ToString
+@EqualsAndHashCode
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("tb_publish_thumbs")
+public class TbPublishThumbs implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+
+    /** $column.columnComment */
+    @ApiModelProperty(value="$column.columnComment")
+    @TableId(value = "id")
+    private Long id;
+
+    /** 近况id */
+    @ApiModelProperty(value="近况id")
+    @Excel(name = "近况id")
+    private Long publishId;
+
+    /** 点赞人id */
+    @ApiModelProperty(value="点赞人id")
+    @Excel(name = "点赞人id")
+    private Long appUserId;
+
+    /** 创建者 */
+    @ApiModelProperty(value="创建者")
+    private String createBy;
+
+    /** 创建时间 */
+    @ApiModelProperty(value="创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    @ApiModelProperty(value="更新者")
+    private String updateBy;
+
+    /** 更新时间 */
+    @ApiModelProperty(value="更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 备注 */
+    @ApiModelProperty(value="备注")
+    @Excel(name = "备注")
+    private String remark;
+}

ruoyi-system/src/main/java/com/ruoyi/app/domain/vo/AppMemberVo.java

@@ -82,21 +82,6 @@ public class AppMemberVo extends BaseEntity implements Serializable {
 
 
 
-    /** 家族id */
-    @ApiModelProperty(value="家族id")
-    @Excel(name = "家族id")
-    private Long familyId;
-
-    /** 是否家族管理员 1是 0否 */
-    @ApiModelProperty(value="家族id")
-    @Excel(name = "家族id")
-    private String admin;
-
-    /** 父成员id */
-    @ApiModelProperty(value="父成员id")
-    @Excel(name = "父成员id")
-    private Long parentId;
-
     /** 配偶id */
     @ApiModelProperty(value="配偶id")
     @Excel(name = "配偶id")

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

@@ -0,0 +1,14 @@
+package com.ruoyi.app.mapper;
+
+import com.ruoyi.app.domain.TbPublishComment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 我的近况评论
+ *
+ * @author Administrator
+ * @date 2020-10-03
+ */
+public interface TbPublishCommentMapper extends BaseMapper<TbPublishComment> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.ruoyi.app.mapper;
+
+import com.ruoyi.app.domain.TbPublishImg;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 我的状况图片
+ *
+ * @author Administrator
+ * @date 2020-10-02
+ */
+public interface TbPublishImgMapper extends BaseMapper<TbPublishImg> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.ruoyi.app.mapper;
+
+import com.ruoyi.app.domain.TbPublishThumbs;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 我的近况点赞记录
+ *
+ * @author Administrator
+ * @date 2020-10-03
+ */
+public interface TbPublishThumbsMapper extends BaseMapper<TbPublishThumbs> {
+
+}

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

@@ -2,6 +2,9 @@ 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 java.util.List;
 
 /**
  * 我的近况（我的发）Service接口
@@ -11,4 +14,8 @@ import com.ruoyi.app.domain.TbMyPublish;
  */
 public interface ITbMyPublishService extends IService<TbMyPublish> {
 
+    int getThumbs(Long publishId);
+    int getComments(Long publishId);
+    List<TbPublishComment> listComment(Long publishId);
+    boolean delComment(Long id);
 }

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

@@ -0,0 +1,14 @@
+package com.ruoyi.app.service;
+
+import com.ruoyi.app.domain.TbPublishComment;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 我的近况评论
+ *
+ * @author Administrator
+ * @date 2020-10-03
+ */
+public interface ITbPublishCommentService extends IService<TbPublishComment> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.ruoyi.app.service;
+
+import com.ruoyi.app.domain.TbPublishImg;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 我的状况图片
+ *
+ * @author Administrator
+ * @date 2020-10-02
+ */
+public interface ITbPublishImgService extends IService<TbPublishImg> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.ruoyi.app.service;
+
+import com.ruoyi.app.domain.TbPublishThumbs;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 我的近况点赞记录
+ *
+ * @author Administrator
+ * @date 2020-10-03
+ */
+public interface ITbPublishThumbsService extends IService<TbPublishThumbs> {
+
+}

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

@@ -1,13 +1,25 @@
 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 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.List;
+
 /**
- * 我的近况（我的发）Service业务层处理
+ * 我的近况（发表）
  *
  * @author Administrator
  * @date 2020-10-02
@@ -15,4 +27,79 @@ import com.ruoyi.app.service.ITbMyPublishService;
 @Service
 public class TbMyPublishServiceImpl extends ServiceImpl<TbMyPublishMapper, TbMyPublish> implements ITbMyPublishService {
 
+    @Autowired
+    private ITbPublishThumbsService thumbsService;
+    @Autowired
+    private ITbPublishCommentService commentService;
+    @Autowired
+    private ITbAppUserService userService;
+
+    /**
+     * 获取点赞数
+     * @param publishId 近况id
+     * @return
+     */
+    @Async
+    @Override
+    public int getThumbs(Long publishId) {
+        int count = thumbsService.count(new LambdaQueryWrapper<TbPublishThumbs>()
+            .eq(TbPublishThumbs::getPublishId, publishId)
+        );
+        return count;
+    }
+    /**
+     * 获取评论数
+     * @param publishId 近况id
+     * @return
+     */
+    @Async
+    @Override
+    public int getComments(Long publishId) {
+        int count = commentService.count(new LambdaQueryWrapper<TbPublishComment>()
+            .eq(TbPublishComment::getPublishId, publishId)
+        );
+        return count;
+    }
+
+    /**
+     * 获取评论
+     * @param publishId
+     * @return
+     */
+    @Override
+    public List<TbPublishComment> listComment(Long publishId){
+        List<TbPublishComment> comments = commentService.list(new LambdaQueryWrapper<TbPublishComment>()
+            .eq(TbPublishComment::getPublishId, publishId)
+        );
+        if (comments.size() > 0) {
+            List<Long> ids = new ArrayList<>();
+            comments.forEach(item -> {
+                ids.add(item.getAppUserId());
+            });
+            List<TbAppUser> userList = userService.list(new LambdaQueryWrapper<TbAppUser>()
+                .in(TbAppUser::getId,ids)
+            );
+            if (userList.size() > 0) {
+                comments.forEach(item -> {
+                    userList.forEach(user -> {
+                        if (item.getAppUserId() == user.getId()) {
+                            item.setAppUserUrl(user.getAvatar());
+                            item.setAppUser(user.getNickName());
+                        }
+                    });
+                });
+            }
+        }
+        return comments;
+    }
+
+    /**
+     * 删除一条评论
+     * @param id
+     * @return
+     */
+    @Override
+    public boolean delComment(Long id) {
+        return commentService.removeById(id);
+    }
 }

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

@@ -0,0 +1,18 @@
+package com.ruoyi.app.service.impl;
+
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.app.mapper.TbPublishCommentMapper;
+import com.ruoyi.app.domain.TbPublishComment;
+import com.ruoyi.app.service.ITbPublishCommentService;
+
+/**
+ * 我的近况评论
+ *
+ * @author Administrator
+ * @date 2020-10-03
+ */
+@Service
+public class TbPublishCommentServiceImpl extends ServiceImpl<TbPublishCommentMapper, TbPublishComment> implements ITbPublishCommentService {
+
+}

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

@@ -0,0 +1,18 @@
+package com.ruoyi.app.service.impl;
+
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.app.mapper.TbPublishImgMapper;
+import com.ruoyi.app.domain.TbPublishImg;
+import com.ruoyi.app.service.ITbPublishImgService;
+
+/**
+ * 我的状况图片
+ *
+ * @author Administrator
+ * @date 2020-10-02
+ */
+@Service
+public class TbPublishImgServiceImpl extends ServiceImpl<TbPublishImgMapper, TbPublishImg> implements ITbPublishImgService {
+
+}

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

@@ -0,0 +1,18 @@
+package com.ruoyi.app.service.impl;
+
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.app.mapper.TbPublishThumbsMapper;
+import com.ruoyi.app.domain.TbPublishThumbs;
+import com.ruoyi.app.service.ITbPublishThumbsService;
+
+/**
+ * 我的近况点赞记录
+ *
+ * @author Administrator
+ * @date 2020-10-03
+ */
+@Service
+public class TbPublishThumbsServiceImpl extends ServiceImpl<TbPublishThumbsMapper, TbPublishThumbs> implements ITbPublishThumbsService {
+
+}

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

@@ -27,9 +27,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <sql id="sqlAppMember">
         select a.id user_id,a.joins,a.template_id,a.nick_name,a.avatar,a.qrcode,a.mobile,a.openid,a.ver_code,a.deleted,a.enable,a.login_time,a.login_ip,
-        a.create_by user_create_by,a.create_time user_create_time, a.update_by user_update_by, a.update_time user_update_time, a.remark user_remark,
-
-        b.id member_id,b.family_id,b.admin,b.parent_id,b.spouse_id,b.name,b.birthday,b.gender,b.education,b.state,
+        a.create_by user_create_by,a.create_time user_create_time, a.update_by user_update_by, a.update_time user_update_time, a.remark user_remark
+        ,
+        b.id member_id,b.spouse_id,b.name,b.birthday,b.gender,b.education,b.state,
         b.create_by member_create_by,b.create_time member_create_time,b.update_by member_update_by,b.update_time member_update_time,b.remark member_remark
         from tb_app_user a
         <if test="type == 'user' ">

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

@@ -7,9 +7,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="TbFamilyMember" id="TbFamilyMemberResult">
         <result property="id"    column="id"    />
         <result property="appUserId"    column="app_user_id"    />
-        <result property="familyId"    column="family_id"    />
-        <result property="admin"    column="admin"    />
-        <result property="parentId"    column="parent_id"    />
         <result property="spouseId"    column="spouse_id"    />
         <result property="name"    column="name"    />
         <result property="birthday"    column="birthday"    />

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

@@ -8,18 +8,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="appUserId"    column="app_user_id"    />
         <result property="contents"    column="contents"    />
-        <result property="picurl1"    column="picurl1"    />
-        <result property="picurl2"    column="picurl2"    />
-        <result property="picurl3"    column="picurl3"    />
-        <result property="picurl4"    column="picurl4"    />
-        <result property="picurl5"    column="picurl5"    />
-        <result property="picurl6"    column="picurl6"    />
-        <result property="picurl7"    column="picurl7"    />
-        <result property="picurl8"    column="picurl8"    />
-        <result property="picurl9"    column="picurl9"    />
         <result property="message"    column="message"    />
         <result property="messageUserId"    column="message_user_id"    />
-        <result property="thumbs"    column="thumbs"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />

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

@@ -0,0 +1,20 @@
+<?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.TbPublishCommentMapper">
+    
+    <resultMap type="TbPublishComment" id="TbPublishCommentResult">
+        <result property="id"    column="id"    />
+        <result property="publishId"    column="publish_id"    />
+        <result property="appUserId"    column="app_user_id"    />
+        <result property="contents"    column="contents"    />
+        <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>
+
+
+</mapper>

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

@@ -0,0 +1,14 @@
+<?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.TbPublishImgMapper">
+    
+    <resultMap type="TbPublishImg" id="TbPublishImgResult">
+        <result property="id"    column="id"    />
+        <result property="publishId"    column="publish_id"    />
+        <result property="url"    column="url"    />
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,19 @@
+<?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.TbPublishThumbsMapper">
+    
+    <resultMap type="TbPublishThumbs" id="TbPublishThumbsResult">
+        <result property="id"    column="id"    />
+        <result property="publishId"    column="publish_id"    />
+        <result property="appUserId"    column="app_user_id"    />
+        <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>
+
+
+</mapper>