refactor(communityCenter): 重构举报功能并添加举报列表接口

mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PublishController.java

@@ -119,14 +119,4 @@ public class PublishController {
         return R.ok();
     }
 
-    /**
-     * 举报
-     */
-    @ApiOperation(value = "举报")
-    @PostMapping("report")
-    public R<Object> reportPublish(@RequestBody @Valid PublishReportRes publishReportRes) {
-        publishService.reportPublish(publishReportRes);
-        return R.ok();
-    }
-
 }

mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PublishReportController.java

@@ -0,0 +1,54 @@
+package com.mcwl.web.controller.communityCenter;
+
+import com.mcwl.common.core.domain.R;
+import com.mcwl.common.core.page.PageDomain;
+import com.mcwl.common.core.page.TableDataInfo;
+import com.mcwl.communityCenter.domain.dto.PublishReportRes;
+import com.mcwl.communityCenter.service.PublishReportService;
+import com.mcwl.communityCenter.service.PublishService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * 发布举报
+ */
+@Api(tags = "发布举报")
+@RestController
+@RequestMapping("publishReport")
+@RequiredArgsConstructor
+public class PublishReportController {
+
+    private final PublishService publishService;
+
+    private final PublishReportService publishReportService;
+
+
+    /**
+     * 举报
+     */
+    @ApiOperation(value = "举报")
+    @PostMapping("report")
+    public R<Object> reportPublish(@RequestBody @Valid PublishReportRes publishReportRes) {
+        publishService.reportPublish(publishReportRes);
+        return R.ok();
+    }
+
+    /**
+     * 获取举报列表
+     */
+    @ApiOperation(value = "获取举报列表")
+    @PostMapping("list")
+    public TableDataInfo getReportList(@RequestBody @Valid PageDomain pageDomain) {
+        return publishReportService.getReportList(pageDomain);
+    }
+
+
+
+}

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/PublishReport.java

@@ -41,17 +41,17 @@ public class PublishReport extends BaseEntity {
     /**
      * 举报类型 字典值
      */
-    private Long reportType;
+    private Integer reportType;
 
     /**
      * 举报内容
      */
-    private Long content;
+    private String content;
 
     /**
      * 状态（0未处理 1已处理 )
      */
-    private Long status;
+    private Integer status;
 
 
 }

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/PublishReportService.java

@@ -3,6 +3,7 @@ package com.mcwl.communityCenter.service;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mcwl.common.core.domain.R;
+import com.mcwl.common.core.page.PageDomain;
 import com.mcwl.common.core.page.TableDataInfo;
 import com.mcwl.communityCenter.domain.Publish;
 import com.mcwl.communityCenter.domain.PublishReport;
@@ -14,4 +15,6 @@ import javax.validation.Valid;
 public interface PublishReportService extends IService<PublishReport> {
 
     void saveReport(PublishReport publishReport);
+
+    TableDataInfo getReportList(@Valid PageDomain pageDomain);
 }

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishReportServiceImpl.java

@@ -1,6 +1,7 @@
 package com.mcwl.communityCenter.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -41,4 +42,17 @@ public class PublishReportServiceImpl extends ServiceImpl<PublishReportMapper, P
         baseMapper.insertReport(publishReport);
 
     }
+
+    @Override
+    public TableDataInfo getReportList(PageDomain pageDomain) {
+        Page<PublishReport> page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
+        baseMapper.selectPage(page, new LambdaQueryWrapper<PublishReport>());
+        List<PublishReport> records = page.getRecords();
+        TableDataInfo tableDataInfo = new TableDataInfo();
+        tableDataInfo.setRows(records);
+        tableDataInfo.setTotal(page.getTotal());
+        tableDataInfo.setCode(HttpStatus.SUCCESS);
+        tableDataInfo.setMsg("查询成功");
+        return tableDataInfo;
+    }
 }

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionCommentServiceImpl.java

@@ -160,7 +160,7 @@ public class QuestionCommentServiceImpl extends ServiceImpl<QuestionCommentMappe
         questionMapper.updateById(question);
 
 
-        SysUser sysUser = sysUserService.selectUserById(tenantId);
+        SysUser sysUser = sysUserService.selectUserById(questionComment.getUserId());
         BigDecimal sysWallet = new BigDecimal(sysUser.getWallet().toString());
         BigDecimal amount = new BigDecimal(question.getAmount().toString());
         // 添加钱包
@@ -170,7 +170,7 @@ public class QuestionCommentServiceImpl extends ServiceImpl<QuestionCommentMappe
 
 
         Consume consume = new Consume();
-        consume.setUserId(SecurityUtils.getUserId());
+        consume.setUserId(questionComment.getUserId());
         consume.setAmount(question.getAmount());
         consume.setType(4);
         consume.setWallet(sysUser.getWallet());
@@ -179,7 +179,7 @@ public class QuestionCommentServiceImpl extends ServiceImpl<QuestionCommentMappe
         IncomeInfo incomeInfo = new IncomeInfo();
         incomeInfo.setTenantId(tenantId);
         incomeInfo.setCommunityId(communityId);
-        incomeInfo.setUserId(questionUserId);
+        incomeInfo.setUserId(questionComment.getUserId());
         incomeInfo.setType(1);
         incomeInfo.setAmount(question.getAmount());
         incomeInfoService.save(incomeInfo);