用户举报功能

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -172,6 +172,13 @@ public class SysUser extends BaseEntity {
     @TableField(exist = false)
     private String classId;
 
+
+    /**
+     * 用户状态
+     */
+    private String userState;
+
+
     public SysUser() {
 
     }
@@ -356,6 +363,14 @@ public class SysUser extends BaseEntity {
         this.roleId = roleId;
     }
 
+    public String getUserState() {
+        return userState;
+    }
+
+    public void setUserState(String userState) {
+        this.userState = userState;
+    }
+
     public Date getBirthday() {
         return birthday;
     }
@@ -434,6 +449,7 @@ public class SysUser extends BaseEntity {
                 .append("updateTime", getUpdateTime())
                 .append("remark", getRemark())
                 .append("dept", getDept())
+                .append("userState", getUserState())
                 .toString();
     }
 

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

@@ -8,14 +8,12 @@ import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.exception.user.ProjectException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.generator.domain.Community.CommunityReportData;
-import com.ruoyi.generator.domain.Community.CommunityTagBlock;
-import com.ruoyi.generator.domain.Community.CommunityUserNotification;
-import com.ruoyi.generator.domain.Community.CommunityUserPrivacy;
+import com.ruoyi.generator.domain.Community.*;
 import com.ruoyi.generator.mapper.community.CommunityReportDataMapper;
 import com.ruoyi.generator.service.ICommunityNotificationService;
 import com.ruoyi.generator.service.ICommunityPrivacyService;
 import com.ruoyi.generator.service.ICommunityReportDataService;
+import com.ruoyi.generator.service.ICommunityReportUserService;
 import com.ruoyi.generator.vo.CommunityUserNotificationVo;
 import com.ruoyi.generator.vo.CommunityUserPrivacyVo;
 import io.swagger.annotations.Api;
@@ -38,13 +36,11 @@ public class CommunityReportController {
 
 
     @Autowired
-    private ICommunityNotificationService communityNotificationService;
+    private CommunityReportDataMapper communityReportDataMapper;
 
     @Autowired
-    private ICommunityPrivacyService communityPrivacyService;
+    private ICommunityReportUserService communityReportUserService;
 
-    @Autowired
-    private CommunityReportDataMapper communityReportDataMapper;
 
     /**
      * 获取举报类型信息
@@ -52,7 +48,7 @@ public class CommunityReportController {
      * @return 获取举报类型信息
      */
     @ApiOperation("获取举报类型信息")
-    @GetMapping("/reportTypes")
+    @GetMapping("/reportMessage")
     //@Anonymous
     public AjaxResult reportTypes(String type) {
 
@@ -79,4 +75,28 @@ public class CommunityReportController {
         return AjaxResult.success(communityReportData);
     }
 
+
+    /**
+     * 举报
+     * @param
+     * @return 举报
+     */
+    @ApiOperation("举报")
+    @GetMapping("/reportTypes")
+    //@Anonymous
+    public AjaxResult reportMessage(@RequestBody CommunityReportUser communityReportUser) {
+        if (Objects.isNull(communityReportUser.getUserId())) {
+            return AjaxResult.error("请传被举报人ID!");
+        }
+        CommunityReportUser reportUser = null;
+        try {
+            reportUser  = communityReportUserService.insertCommunityReportUser(communityReportUser);
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            throw new ProjectException();
+        }
+
+        return AjaxResult.success("举报成功");
+    }
+
 }

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

@@ -15,7 +15,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
-* 举报记录表
+* 举报信息表
 * @TableName community_report_data
 */
 @TableName("community_report_data")

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

@@ -0,0 +1,114 @@
+package com.ruoyi.generator.domain.Community;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+* 举报记录表
+* @TableName community_report_user
+*/
+@TableName("community_report_user")
+@Data
+public class CommunityReportUser implements Serializable {
+
+    /**
+     * id
+     */
+    @NotNull(message = "[id]不能为空")
+    @ApiModelProperty("id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 举报明细ID
+     */
+    @ApiModelProperty("举报明细ID")
+    private String reportId;
+
+
+    /**
+     * 被举报人ID
+     */
+    @ApiModelProperty("被举报人ID")
+    private Long userId;
+
+    /**
+     * 被举报人名称
+     */
+    @ApiModelProperty("被举报人名称")
+    private String userName;
+
+    /**
+     * 被举报人用户状态
+     */
+    @ApiModelProperty("被举报人用户状态")
+    private String userState;
+
+
+    /**
+     * 被举报人头像
+     */
+    @ApiModelProperty("被举报人头像")
+    private String avatar;
+
+    /**
+     * 举报类型
+     */
+    @ApiModelProperty("type")
+    private Long type;
+
+    /**
+     * 举报理由
+     */
+    @ApiModelProperty("举报理由")
+    private String content;
+
+    /**
+     * 举报图片地址
+     */
+    @ApiModelProperty("举报图片地址")
+    private String imageUrl;
+
+    /**
+     * 文章/评论ID
+     */
+    @ApiModelProperty("文章/评论ID")
+    private String typeId;
+
+    /**
+     * 是否已删除
+     */
+    @ApiModelProperty("是否已删除")
+    private Boolean isDelete;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    private Long createBy;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+
+}

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

@@ -0,0 +1,9 @@
+package com.ruoyi.generator.mapper.community;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.generator.domain.Community.CommunityReportUser;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface CommunityReportUserMapper extends BaseMapper<CommunityReportUser> {
+}

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

@@ -0,0 +1,57 @@
+package com.ruoyi.generator.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.generator.domain.Community.CommunityReportUser;
+import com.ruoyi.generator.mapper.community.CommunityReportUserMapper;
+import com.ruoyi.generator.mapper.community.CommunityTagBlockMapper;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CommunityReportUserServiceImpl extends ServiceImpl<CommunityReportUserMapper, CommunityReportUser> implements ICommunityReportUserService {
+
+
+    @Autowired
+    private CommunityReportUserMapper communityReportUserMapper;
+
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
+    @Autowired
+    private ISysUserService userService;
+    @Override
+    public CommunityReportUser insertCommunityReportUser(CommunityReportUser communityReportUser) {
+        /*SysUser user = new SysUser();
+        user.setUserId(communityReportUser.getUserId());
+        user.setUserState(communityReportUser.getUserState());
+        userService.updateUserProfile(user);*/
+
+        //创建一个新的对象匹配
+        CommunityReportUser reportUser = new CommunityReportUser();
+
+        reportUser.setUserId(communityReportUser.getUserId());
+        reportUser.setType(communityReportUser.getType());
+        reportUser.setContent(communityReportUser.getContent());
+        reportUser.setImageUrl(communityReportUser.getImageUrl());
+        reportUser.setTypeId(communityReportUser.getTypeId());
+        reportUser.setReportId(communityReportUser.getReportId());
+
+        //根据用户信息查询用户头像名称
+        SysUser sysUser = sysUserMapper.selectUserById(reportUser.getUserId());
+        reportUser.setUserName(sysUser.getUserName());
+        reportUser.setAvatar(sysUser.getAvatar());
+        reportUser.setUserState(sysUser.getUserState());
+        reportUser.setCreateBy(SecurityUtils.getUserId());
+        reportUser.setCreateTime(DateUtils.parseDate(DateUtils.getTime()));
+
+        communityReportUserMapper.insert(reportUser);
+
+        return reportUser;
+    }
+}

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

@@ -0,0 +1,15 @@
+package com.ruoyi.generator.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.generator.domain.Community.CommunityReportUser;
+import com.ruoyi.generator.domain.Community.CommunityTagBlock;
+
+public interface ICommunityReportUserService extends IService<CommunityReportUser> {
+
+    /**
+     * 插入举报信息
+     * @param communityReportUser
+     * @return
+     */
+    CommunityReportUser insertCommunityReportUser (CommunityReportUser communityReportUser);
+}

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

@@ -25,10 +25,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="openId"       column="open_id"  />
         <result property="remark"       column="remark"       />
 		<result property="isSex" 		column="is_Sex"/>
+		<result property="userState" 		column="user_state"/>
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
-	
+
     <resultMap id="deptResult" type="SysDept">
         <id     property="deptId"    column="dept_id"     />
         <result property="parentId"  column="parent_id"   />
@@ -38,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="leader"    column="leader"      />
         <result property="status"    column="dept_status" />
     </resultMap>
-	
+
     <resultMap id="RoleResult" type="SysRole">
         <id     property="roleId"       column="role_id"        />
         <result property="roleName"     column="role_name"      />
@@ -47,17 +48,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dataScope"    column="data_scope"     />
         <result property="status"       column="role_status"    />
     </resultMap>
-	
+
 	<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, 
+        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
+        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.user_state
         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
 		    left join sys_role r on r.role_id = ur.role_id
     </sql>
-    
+
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
 		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
@@ -108,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
-	
+
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
@@ -126,29 +127,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
-	
+
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
 	    <include refid="selectUserVo"/>
 		where u.user_name = #{userName} and u.del_flag = '0'
 	</select>
-	
+
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
 		where u.user_id = #{userId}
 	</select>
-	
+
 	<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1
 	</select>
-	
+
 	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
 	</select>
-	
+
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
-	
+
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(
  			<if test="userId != null and userId != 0">user_id,</if>
@@ -182,7 +183,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			sysdate()
  		)
 	</insert>
-	
+
 	<update id="updateUser" parameterType="SysUser">
  		update sys_user
  		<set>
@@ -200,32 +201,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="loginDate != null">login_date = #{loginDate},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			<if test="remark != null">remark = #{remark},</if>
+			<if test="userState != null and userState != ''">user_state = #{userState},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}
 	</update>
-	
+
 	<update id="updateUserStatus" parameterType="SysUser">
  		update sys_user set status = #{status} where user_id = #{userId}
 	</update>
-	
+
 	<update id="updateUserAvatar" parameterType="SysUser">
  		update sys_user set avatar = #{avatar} where user_name = #{userName}
 	</update>
-	
+
 	<update id="resetUserPwd" parameterType="SysUser">
  		update sys_user set password = #{password} where user_name = #{userName}
 	</update>
-	
+
 	<delete id="deleteUserById" parameterType="Long">
  		update sys_user set del_flag = '2' where user_id = #{userId}
  	</delete>
- 	
+
  	<delete id="deleteUserByIds" parameterType="Long">
  		update sys_user set del_flag = '2' where user_id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}
-        </foreach> 
+        </foreach>
  	</delete>
-	
-</mapper> 
+
+</mapper>