Merge remote-tracking branch 'origin/zjx' into zjx

# Conflicts:
#	src/main/java/cn/meteor/beyondclouds/modules/user/api/UserApi.java
#	src/main/java/cn/meteor/beyondclouds/modules/user/service/IUserService.java
#	src/main/java/cn/meteor/beyondclouds/modules/user/service/impl/UserServiceImpl.java

src/main/java/cn/meteor/beyondclouds/modules/user/entity/UserBlacklist.java

+package cn.meteor.beyondclouds.modules.user.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 段启岩
+ * @since 2020-01-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="UserBlacklist对象", description="")
+public class UserBlacklist implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "bl_id", type = IdType.AUTO)
+    private Integer blId;
+
+    @ApiModelProperty(value = "用户ID")
+    private String userId;
+
+    @ApiModelProperty(value = "被拉黑的用户的ID")
+    private String blackedId;
+
+    private LocalDateTime createTime;
+
+    private LocalDateTime updateTime;
+
+
+}

src/main/java/cn/meteor/beyondclouds/modules/user/mapper/UserBlacklistMapper.java

+package cn.meteor.beyondclouds.modules.user.mapper;
+
+import cn.meteor.beyondclouds.modules.user.entity.UserBlacklist;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 段启岩
+ * @since 2020-01-31
+ */
+public interface UserBlacklistMapper extends BaseMapper<UserBlacklist> {
+
+}

src/main/java/cn/meteor/beyondclouds/modules/user/mapper/xml/UserBlacklistMapper.xml

+<?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="cn.meteor.beyondclouds.modules.user.mapper.UserBlacklistMapper">
+
+</mapper>

src/main/java/cn/meteor/beyondclouds/modules/user/service/IUserBlacklistService.java

+package cn.meteor.beyondclouds.modules.user.service;
+
+import cn.meteor.beyondclouds.modules.user.entity.UserBlacklist;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 段启岩
+ * @since 2020-01-31
+ */
+public interface IUserBlacklistService extends IService<UserBlacklist> {
+
+    void blacklist(String blackId, String userId);
+}

src/main/java/cn/meteor/beyondclouds/modules/user/service/IUserFollowService.java

 package cn.meteor.beyondclouds.modules.user.service;
 package cn.meteor.beyondclouds.modules.user.service;
 
 
+import cn.meteor.beyondclouds.modules.user.entity.User;
 import cn.meteor.beyondclouds.modules.user.entity.UserFollow;
 import cn.meteor.beyondclouds.modules.user.entity.UserFollow;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 
+import java.util.List;
+
 /**
 /**
  * @author 段启岩
  * @author 段启岩
  * @since 2020-01-18
  * @since 2020-01-18
  */
  */
 public interface IUserFollowService extends IService<UserFollow> {
 public interface IUserFollowService extends IService<UserFollow> {
 
 
+    void follower(String userId, String myUserId);
+
+    void delFollower(String userId, String myUserId);
+
+    List<User> myFans(String userId);
+
+    List<User> Fans(String userId);
+
+    List<User> myFollower(String userId);
+
+    List<User> otherFollower(String userId);
 }
 }

src/main/java/cn/meteor/beyondclouds/modules/user/service/impl/UserBlacklistServiceImpl.java

+package cn.meteor.beyondclouds.modules.user.service.impl;
+
+import cn.meteor.beyondclouds.modules.user.entity.UserBlacklist;
+import cn.meteor.beyondclouds.modules.user.mapper.UserBlacklistMapper;
+import cn.meteor.beyondclouds.modules.user.service.IUserBlacklistService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 段启岩
+ * @since 2020-01-31
+ */
+@Service
+public class UserBlacklistServiceImpl extends ServiceImpl<UserBlacklistMapper, UserBlacklist> implements IUserBlacklistService {
+
+    @Override
+    public void blacklist(String blackId, String userId) {
+        UserBlacklist userBlacklist = new UserBlacklist();
+        userBlacklist.setBlackedId(blackId);
+        userBlacklist.setUserId(userId);
+        save(userBlacklist);
+    }
+}

src/main/java/cn/meteor/beyondclouds/modules/user/service/impl/UserFollowServiceImpl.java

 package cn.meteor.beyondclouds.modules.user.service.impl;
 package cn.meteor.beyondclouds.modules.user.service.impl;
 
 
+import cn.meteor.beyondclouds.modules.user.entity.User;
 import cn.meteor.beyondclouds.modules.user.entity.UserFollow;
 import cn.meteor.beyondclouds.modules.user.entity.UserFollow;
 import cn.meteor.beyondclouds.modules.user.mapper.IUserFollowMapper;
 import cn.meteor.beyondclouds.modules.user.mapper.IUserFollowMapper;
 import cn.meteor.beyondclouds.modules.user.service.IUserFollowService;
 import cn.meteor.beyondclouds.modules.user.service.IUserFollowService;
+import cn.meteor.beyondclouds.modules.user.service.IUserService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.util.List;
+
 /**
 /**
  * @author 段启岩
  * @author 段启岩
  * @since 2020-01-18
  * @since 2020-01-18
@@ -13,4 +19,81 @@ import org.springframework.stereotype.Service;
 @Service
 @Service
 public class UserFollowServiceImpl extends ServiceImpl<IUserFollowMapper, UserFollow> implements IUserFollowService {
 public class UserFollowServiceImpl extends ServiceImpl<IUserFollowMapper, UserFollow> implements IUserFollowService {
 
 
+    private IUserService userService;
+
+    @Autowired
+    public void setUserService(IUserService userService) {
+        this.userService = userService;
+    }
+
+    @Override
+    public void follower(String userId, String myUserId) {
+
+        //1.查询被关注用户的基本信息
+        User user = userService.getById(userId);
+        //2.查询我的基本信息
+        User myUser = userService.getById(myUserId);
+
+        UserFollow userFollow = new UserFollow();
+        userFollow.setFollowedId(userId);
+        userFollow.setFollowedNick(user.getNickName());
+        userFollow.setFollowedAvatar(user.getUserAvatar());
+        userFollow.setFollowerId(myUserId);
+        userFollow.setFollowerNick(myUser.getNickName());
+        userFollow.setFollowerAvatar(myUser.getUserAvatar());
+        userFollow.setFollowStatus(0);
+        save(userFollow);
+
+    }
+
+    @Override
+    public void delFollower(String userId, String myUserId) {
+
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("follower_id", myUserId);
+        queryWrapper.eq("followed_id", userId);
+
+        remove(queryWrapper);
+    }
+
+    @Override
+    public List<User> myFans(String userId) {
+
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("followed_id", userId);
+
+        return list(queryWrapper);
+
+    }
+
+    @Override
+    public List<User> Fans(String userId) {
+
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("followed_id", userId);
+
+        return list(queryWrapper);
+
+    }
+
+    @Override
+    public List<User> myFollower(String userId) {
+
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("follower_id", userId);
+
+        return list(queryWrapper);
+
+    }
+
+    @Override
+    public List<User> otherFollower(String userId) {
+
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("follower_id", userId);
+
+        return list(queryWrapper);
+
+    }
+
 }
 }