Merge branch 'zx_online_0407_black' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/ImUserFriendController.java

@@ -106,22 +106,5 @@ public class ImUserFriendController extends BaseController {
         return succeed(imMessageUser);
 
     }
-
-    @ApiOperation("拉黑好友")
-    @PostMapping(value = "/blackFriend")
-    public HttpResponseResult<ImUserFriendVO.ImUserFriend> blackFriend(String imUserId,Boolean blackFlag) {
-        if(StringUtils.isEmpty(imUserId)){
-            throw new BizException("参数校验失败");
-        }
-        Long userId = sysUserService.getUserId();
-        String friendId = imGroupService.analysisImUserId(imUserId);
-        imUserFriendService.lambdaUpdate()
-                .eq(ImUserFriend::getUserId, userId)
-                .eq(ImUserFriend::getFriendId, friendId)
-                .eq(ImUserFriend::getClientType, ClientEnum.STUDENT)
-                .set(ImUserFriend::getBlackFlag, blackFlag)
-                .update();
-        return succeed();
-    }
 }
 

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/ImUserFriendController.java

@@ -114,22 +114,5 @@ public class ImUserFriendController extends BaseController {
         return succeed(imMessageUser);
 
     }
-
-    @ApiOperation("拉黑好友")
-    @PostMapping(value = "/blackFriend")
-    public HttpResponseResult<ImUserFriendVO.ImUserFriend> blackFriend(String imUserId,Boolean blackFlag) {
-        if(StringUtils.isEmpty(imUserId)){
-            throw new BizException("参数校验失败");
-        }
-        Long userId = sysUserService.getUserId();
-        String friendId = imGroupService.analysisImUserId(imUserId);
-        imUserFriendService.lambdaUpdate()
-                .eq(ImUserFriend::getUserId, userId)
-                .eq(ImUserFriend::getFriendId, friendId)
-                .eq(ImUserFriend::getClientType, ClientEnum.TEACHER)
-                .set(ImUserFriend::getBlackFlag, blackFlag)
-                .update();
-        return succeed();
-    }
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ImUserFriend.java

@@ -70,10 +70,6 @@ public class ImUserFriend implements Serializable {
     @ApiModelProperty(value = "建立好友时，标记建立身份，TEACHER:以老师身份建立，CUSTOMER:以客服身份建立")
     private EImUserFriendSourceForm sourceForm;
 
-    @TableField("black_flag_")
-    @ApiModelProperty(value = "黑名单标记")
-    private Boolean blackFlag;
-
 
     public ImUserFriend clientType(ClientEnum clientType) {
         this.clientType = clientType;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImUserFriendServiceImpl.java

@@ -30,11 +30,7 @@ import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.MK;
 import com.yonge.cooleshow.biz.dal.enums.im.EImUserFriendSourceForm;
 import com.yonge.cooleshow.biz.dal.mapper.SysUserMapper;
-import com.yonge.cooleshow.biz.dal.service.ImGroupService;
-import com.yonge.cooleshow.biz.dal.service.ImUserFriendService;
-import com.yonge.cooleshow.biz.dal.service.SubjectService;
-import com.yonge.cooleshow.biz.dal.service.SysConfigService;
-import com.yonge.cooleshow.biz.dal.service.VipCardRecordService;
+import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.vo.StudentVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.biz.dal.vo.im.ImUserFriendVO;
@@ -56,12 +52,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -623,7 +614,6 @@ public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUser
         List<ImUserFriend> records = lambdaQuery()
                 .eq(ImUserFriend::getUserId, userId)
                 .eq(ImUserFriend::getClientType, clientType)
-                .eq(ImUserFriend::getBlackFlag, friendQuery.getBlackFlag())
                 .and(StringUtils.isNotEmpty(friendQuery.getSearch()),
                         e -> e.eq(ImUserFriend::getFriendId, friendQuery.getSearch()).or().like(ImUserFriend::getFriendNickname, friendQuery.getSearch()))
                 .orderByDesc(ImUserFriend::getId).list();

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/im/ImUserWrapper.java

@@ -76,9 +76,6 @@ public class ImUserWrapper {
 
         @ApiModelProperty(value = "模糊匹配")
         private String search;
-
-        @ApiModelProperty(value = "黑名单标记")
-        private Boolean blackFlag = false;
     }
 
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/ImUserFriendMapper.xml

@@ -9,13 +9,12 @@
         <result column="friend_avatar_" jdbcType="VARCHAR" property="friendAvatar"/>
         <result column="memo_" jdbcType="VARCHAR" property="memo"/>
         <result column="source_form_" jdbcType="VARCHAR" property="sourceForm"/>
-        <result column="black_flag_" property="blackFlag"/>
         <result column="create_time_" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        id_, user_id_, friend_id_, friend_nickname_,friend_avatar_, memo_,black_flag_, create_time_, update_time_
+        id_, user_id_, friend_id_, friend_nickname_,friend_avatar_, memo_, create_time_, update_time_
     </sql>
 
     <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"