优化举报接口

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/CommunityReportController.java

@@ -24,6 +24,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -132,7 +133,7 @@ public class CommunityReportController {
     @ApiOperation("管理员查看界面")
     @GetMapping("/adminReport")
     //@Anonymous
-    public AjaxResult adminReport(String id,Long type,String name,String reason,String userId) {
+    public AjaxResult adminReport(Long id,Long type,String name,String reason,String userId) {
         List<CommunityReportUserVo> communityReportUsers = null;
         int total = 0 ;
         try {
@@ -181,14 +182,30 @@ public class CommunityReportController {
                 }
             }
 
-
-
             String disposalType = communityReportPunishVo.getDisposalType().toString(); //封禁类型
             Long disposalTime = communityReportPunishVo.getDisposalTime();              //封禁时间
             String dispositionReason = communityReportPunishVo.getDispositionReason();  //封禁理由
 
-            //计算封禁的时间
+
+            //判断当前用户有没有被封禁或者禁言
+            SysUser sysUser = sysUserMapper.selectUserById(communityReportPunishVo.getUserId());
+            String userState = sysUser.getUserState();
+            Date reportTime = sysUser.getReportTime();
             Date date = DateUtils.parseDate(DateUtils.getTime());
+            if (reportTime != null && reportTime.after(date)) {
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-dd-MM HH:mm:ss");  // 修改日期格式
+                String formattedReportTime = sdf.format(reportTime); // 格式化日期
+                if ("1".equals(userState)){
+                    return AjaxResult.success("该用户已经被封号! 截止日期为：" + formattedReportTime);
+                }else if ("2".equals(userState)  && "2".equals(disposalType)){
+                    return AjaxResult.success("该用户已经被禁言! 截止日期为：" + formattedReportTime);
+                }
+            }
+
+
+
+            //计算封禁的时间
+
             Date futureDate = null;
             if (disposalTime != null && disposalTime >= 0) {
                 long millisecondsToAdd = TimeUnit.MINUTES.toMillis(disposalTime); //转换时间
@@ -211,11 +228,12 @@ public class CommunityReportController {
             reportUser.setUpdateBy(SecurityUtils.getUserId());
             reportUser.setUpdateTime(DateUtils.parseDate(DateUtils.getTime()));
 
-            String replyId = communityReportPunishVo.getReplyId();
+            Long replyId = communityReportPunishVo.getReplyId();
             switch (disposalType) {
                 case "0": //不处理
                     break;
                 case "1": //封号
+                    //判断当前用户是否已经被封号
                     userService.updateUserProfile(user);
                     communityReportUserMapper.updateById(reportUser);
                     break;

ruoyi-generator/src/main/java/com/ruoyi/generator/domain/Community/CommunityReportData.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -27,6 +29,7 @@ public class CommunityReportData implements Serializable {
     @NotNull(message = "[文章id]不能为空")
     @ApiModelProperty("文章id")
     @TableId(value = "id", type = IdType.AUTO)
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
     /**
      * 举报类型

ruoyi-generator/src/main/java/com/ruoyi/generator/domain/Community/CommunityReportImages.java

@@ -30,14 +30,14 @@ public class CommunityReportImages implements Serializable {
     @ApiModelProperty("图片id")
     @TableId("id")
     @JsonSerialize(using = ToStringSerializer.class)
-    private String id;
+    private Long id;
 
     /**
      * 文章id
      */
     @ApiModelProperty("文章id")
     @JsonSerialize(using = ToStringSerializer.class)
-    private String reportId;
+    private Long reportId;
 
     /**
      * 图片地址

ruoyi-generator/src/main/java/com/ruoyi/generator/domain/Community/CommunityReportUser.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -27,7 +29,8 @@ public class CommunityReportUser implements Serializable {
     @NotNull(message = "[id]不能为空")
     @ApiModelProperty("id")
     @TableId(value = "id", type = IdType.AUTO)
-    private String id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
 
 
     /**
@@ -99,6 +102,7 @@ public class CommunityReportUser implements Serializable {
      * 封禁时间
      */
     @ApiModelProperty("封禁时间")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long punishTime;
 
     /**
@@ -133,19 +137,22 @@ public class CommunityReportUser implements Serializable {
      * 文章ID
      */
     @ApiModelProperty("文章ID")
-    private String articleId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long articleId;
 
     /**
      * 评论ID
      */
     @ApiModelProperty("评论ID")
-    private String commentId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long commentId;
 
     /**
      * 子评论ID
      */
     @ApiModelProperty("子评论ID")
-    private String replyId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long replyId;
 
 
 

ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/community/CommunityReportUserMapper.java

@@ -21,7 +21,7 @@ public interface CommunityReportUserMapper extends BaseMapper<CommunityReportUse
     List<CommunityReportUserVo> selectCommunityReportUser          (@Param("offset") int offset,
                                                                       @Param("limit") int limit,
                                                                       @Param("searchType") int searchType,
-                                                                      @Param("id") String  id,
+                                                                      @Param("id") Long  id,
                                                                       @Param("type") Long  type,
                                                                       @Param("name") String  name,
                                                                       @Param("reason") String  reason,

ruoyi-generator/src/main/java/com/ruoyi/generator/service/CommunityReportUserServiceImpl.java

@@ -62,7 +62,7 @@ public class CommunityReportUserServiceImpl extends ServiceImpl<CommunityReportU
         reportUser.setCreateTime(DateUtils.parseDate(DateUtils.getTime()));
         communityReportUserMapper.insert(reportUser);
 
-        String id = reportUser.getId();
+        Long id = reportUser.getId();
         System.out.println(id);
         //插入图片日志
         List<String> images = communityReportUser.getImages();

ruoyi-generator/src/main/java/com/ruoyi/generator/vo/CommunityReportPunishVo.java

@@ -25,7 +25,7 @@ public class CommunityReportPunishVo {
     @ApiModelProperty("id")
     @TableId("id")
     @JsonSerialize(using = ToStringSerializer.class)
-    private String id;
+    private Long id;
 
     /**
      * 举报类型
@@ -76,17 +76,20 @@ public class CommunityReportPunishVo {
      * 文章ID
      */
     @ApiModelProperty("文章ID")
-    private String articleId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long articleId;
 
     /**
      * 评论ID
      */
     @ApiModelProperty("评论ID")
-    private String commentId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long commentId;
 
     /**
      * 子评论ID
      */
     @ApiModelProperty("子评论ID")
-    private String replyId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long replyId;
 }

ruoyi-generator/src/main/java/com/ruoyi/generator/vo/CommunityReportUserVo.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -28,6 +30,7 @@ public class CommunityReportUserVo implements Serializable {
     @NotNull(message = "[id]不能为空")
     @ApiModelProperty("id")
     @TableId(value = "id", type = IdType.AUTO)
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
 
@@ -128,17 +131,20 @@ public class CommunityReportUserVo implements Serializable {
      * 文章ID
      */
     @ApiModelProperty("文章ID")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long articleId;
 
     /**
      * 评论ID
      */
     @ApiModelProperty("评论ID")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long commentId;
 
     /**
      * 子评论ID
      */
     @ApiModelProperty("子评论ID")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long replyId;
 }