查询用户是否被封禁功能上线

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

@@ -11,14 +11,13 @@ import com.ruoyi.common.exception.user.ProjectException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.ip.IpUtils;
 import com.ruoyi.generator.domain.Community.*;
 import com.ruoyi.generator.mapper.community.CommunityReportDataMapper;
 import com.ruoyi.generator.mapper.community.CommunityReportUserMapper;
 import com.ruoyi.generator.service.*;
-import com.ruoyi.generator.vo.CommunityReportPunishVo;
-import com.ruoyi.generator.vo.CommunityReportUserVo;
-import com.ruoyi.generator.vo.CommunityUserNotificationVo;
-import com.ruoyi.generator.vo.CommunityUserPrivacyVo;
+import com.ruoyi.generator.vo.*;
+import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.service.ISysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -59,6 +58,9 @@ public class CommunityReportController {
 
     @Autowired
     private ICommunityCommentReplyService communityCommentReplyService;
+
+    @Autowired
+    private SysUserMapper sysUserMapper;
     /**
      * 获取举报类型信息
      * @param
@@ -143,7 +145,7 @@ public class CommunityReportController {
      * @return
      */
     @ApiOperation("管理员处罚")
-    @PostMapping("/ReportPunish")
+    @PostMapping("/reportPunish")
     //@Anonymous
     public AjaxResult adminReportPunish(@RequestBody CommunityReportPunishVo communityReportPunishVo) {
         if (communityReportPunishVo.getId() == null) {
@@ -174,6 +176,7 @@ public class CommunityReportController {
             reportUser.setId(communityReportPunishVo.getId());
             reportUser.setUserState(disposalType);
             reportUser.setPunishContent(dispositionReason);
+            reportUser.setPunishTime(disposalTime);
             reportUser.setUpdateBy(SecurityUtils.getUserId());
             reportUser.setUpdateTime(DateUtils.parseDate(DateUtils.getTime()));
 
@@ -224,4 +227,33 @@ public class CommunityReportController {
         return AjaxResult.success(communityReportPunishVo);
     }
 
+
+    /**
+     * 查询用户是否被封禁
+     * @param
+     * @return
+     */
+    @ApiOperation("查询用户是否被封禁")
+    @GetMapping("/reportUser")
+    //@Anonymous
+    public AjaxResult adminReportPunish(Long userId) {
+        if (Objects.isNull(userId)) {
+            return AjaxResult.error("userId不能为空");
+        }
+        System.out.println(userId);
+        CommunityUserReportVo communityUserReportVo = new CommunityUserReportVo();
+        try {
+
+            SysUser sysUser = sysUserMapper.selectUserById(userId);
+
+            communityUserReportVo.setUserId(sysUser.getUserId());
+            communityUserReportVo.setUserState(sysUser.getUserState());
+            communityUserReportVo.setReportTime(sysUser.getReportTime());
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println(e.getMessage());
+            throw new ProjectException();
+        }
+        return AjaxResult.success(communityUserReportVo);
+    }
 }

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

@@ -95,6 +95,11 @@ public class CommunityReportUser implements Serializable {
     @ApiModelProperty("封禁理由")
     private String punishContent;
 
+    /**
+     * 封禁时间
+     */
+    @ApiModelProperty("封禁时间")
+    private Long punishTime;
 
     /**
      * 是否已删除
@@ -125,4 +130,6 @@ public class CommunityReportUser implements Serializable {
     private Date updateTime;
 
 
+
+
 }

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

@@ -1165,6 +1165,8 @@ public class CommunityArticleServiceImpl extends ServiceImpl<CommunityArticleMap
     @Override
     public CommunityUserInfoVo selectCommunityUserInfoById(Long userId,boolean isToken) {
         SysUser sysUser = sysUserMapper.selectUserById(userId);
+
+        System.out.println(sysUser);
         CommunityUserInfo communityUserInfo = communityUserInfoMapper.selectOne(new QueryWrapper<CommunityUserInfo>().eq("user_id", userId));
         CommunityUserInfoVo communityUserInfoVo = new CommunityUserInfoVo();
         BeanUtils.copyProperties(communityUserInfo, communityUserInfoVo);
@@ -1172,6 +1174,8 @@ public class CommunityArticleServiceImpl extends ServiceImpl<CommunityArticleMap
         communityUserInfoVo.setNickName(sysUser.getNickName());
         communityUserInfoVo.setSex(sysUser.getSex());
         communityUserInfoVo.setUserId(userId);
+        communityUserInfoVo.setUserState(sysUser.getUserState());
+        communityUserInfoVo.setReportTime(sysUser.getReportTime());
 
         //设置关注,粉丝,陪伴天数 文章数量
         communityUserInfoVo.setLikeCount(communityUserLikeMapper.selectList(new QueryWrapper<CommunityUserLike>().eq("user_id", userId)).size());

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

@@ -127,5 +127,17 @@ public class CommunityUserInfoVo implements Serializable {
     @ApiModelProperty("板块排序")
     private String classId;
 
+    /**
+     * 用户状态
+     */
+    @ApiModelProperty("用户状态")
+    private String userState;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("封禁截止时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reportTime;
 
 }

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

@@ -0,0 +1,40 @@
+package com.ruoyi.generator.vo;
+
+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;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+*
+* @TableName community_user_info
+*/
+@Data
+public class CommunityUserReportVo implements Serializable {
+
+
+    /**
+    * 用户id
+    */
+    @ApiModelProperty("用户id")
+    private Long userId;
+
+    /**
+     * 用户状态
+     */
+    @ApiModelProperty("用户状态")
+    private String userState;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("封禁截止时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reportTime;
+
+}

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"       column="remark"       />
 		<result property="isSex" 		column="is_Sex"/>
 		<result property="userState" 		column="user_state"/>
+		<result property="reportTime" 		column="report_time"/>
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
@@ -52,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<sql id="selectUserVo">
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
-        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.user_state
+        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.user_state,u.report_time
         from sys_user u
 		    left join sys_dept d on u.dept_id = d.dept_id
 		    left join sys_user_role ur on u.user_id = ur.user_id