修复官网曲目，专辑老师端

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/im/ImUserFriendController.java

@@ -1,31 +1,19 @@
 package com.yonge.cooleshow.admin.controller.im;
 
-
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.common.collect.Lists;
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.biz.dal.entity.ImUserFriend;
+import com.yonge.cooleshow.admin.io.request.im.UserFriendInfoVO;
 import com.yonge.cooleshow.biz.dal.service.ImUserFriendService;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 
 /**
  * 用户通讯录表(ImUserFriend)表控制层
@@ -35,7 +23,7 @@ import java.util.Objects;
  */
 @Api(tags = "用户通讯录表")
 @RestController
-@RequestMapping("/imUserFriend")
+@RequestMapping("/im")
 public class ImUserFriendController extends BaseController {
 
     // 新用户注册，默认添加官方客服联系人配置
@@ -47,20 +35,19 @@ public class ImUserFriendController extends BaseController {
      */
     @Resource
     private ImUserFriendService imUserFriendService;
-    @Resource
-    private SysUserFeignService sysUserFeignService;
 
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "search", dataType = "String", value = "根据用户编号、昵称模糊查询")
-    })
     @ApiOperation("新用户添加客服")
     @PostMapping(value = "/customerService")
-    public HttpResponseResult<Boolean> customerService(@RequestBody Map<String,Object> params) {
+    public HttpResponseResult<Boolean> customerService(@RequestBody UserFriendInfoVO info) {
+
+        if (info.invalidRequestParam()) {
+            return failed("无效的请求参数");
+        }
 
-        // 客服联系方式
-        List<String> mobiles = Lists.newArrayList(customerService.split(","));
+        // 新用户自动绑定系统客服
+        int ret = imUserFriendService.registerUserBindCustomerService(info.getUserId(), info.getFriendIds());
 
-        return succeed(true);
+        return succeed(ret > 0);
     }
 }
 

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/io/request/im/UserFriendInfoVO.java

@@ -0,0 +1,32 @@
+package com.yonge.cooleshow.admin.io.request.im;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.collections.CollectionUtils;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * 用户IM好友信息
+ * Created by Eric.Shang on 2022/9/20.
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserFriendInfoVO implements Serializable {
+
+    @ApiModelProperty(value = "新用户ID")
+    private Long userId;
+
+    @ApiModelProperty(value = "好友ID")
+    private List<Long> friendIds;
+
+    public boolean invalidRequestParam() {
+
+        return Optional.ofNullable(getUserId()).orElse(0L) <= 0 || CollectionUtils.isEmpty(getFriendIds());
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/MusicAlbumDao.java

@@ -60,7 +60,8 @@ public interface MusicAlbumDao extends BaseMapper<MusicAlbum> {
      *
      * @param page  分页信息
      * @param query 查询条件
+     * @param clientType ClientEnum
      * @return page
      */
-    List<MusicAlbumVo> selectStudentPage(@Param("page") IPage<MusicAlbumVo> page, @Param("query") MusicAlbumSearch query);
+    List<MusicAlbumVo> selectStudentPage(@Param("page") IPage<MusicAlbumVo> page, @Param("query") MusicAlbumSearch query, @Param("clientType") ClientEnum clientType);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.dao.ImUserFriendDao;
 import com.yonge.cooleshow.biz.dal.entity.ImUserFriend;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -34,5 +35,13 @@ public interface ImUserFriendService extends IService<ImUserFriend> {
     * @date 2022/3/24 12:03
     */
     ImUserFriend getDetail(Long userId);
+
+    /**
+     * 新用户自动添加客服
+     * @param userId 新用户ID
+     * @param friendIds 好友ID
+     * @return Integer
+     */
+    Integer registerUserBindCustomerService(Long userId, List<Long> friendIds);
 }
 

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

@@ -126,9 +126,10 @@ public interface MusicAlbumService extends IService<MusicAlbum> {
      *
      * @param page 分页
      * @param query 查询条件
+     * @param clientType ClientEnum
      * @return
      */
-    IPage<MusicAlbumVo> selectStudentPage(IPage<MusicAlbumVo> page, MusicAlbumSearch query);
+    IPage<MusicAlbumVo> selectStudentPage(IPage<MusicAlbumVo> page, MusicAlbumSearch query, ClientEnum clientType);
 
     /**
      * 修改专辑中 曲目的排序值

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

@@ -1,21 +1,31 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Sets;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.config.RongCloudConfig;
 import com.yonge.cooleshow.biz.dal.dao.ImUserFriendDao;
 import com.yonge.cooleshow.biz.dal.dao.TeacherDao;
 import com.yonge.cooleshow.biz.dal.dto.BasicUserInfo;
 import com.yonge.cooleshow.biz.dal.entity.ImUserFriend;
 import com.yonge.cooleshow.biz.dal.service.ImUserFriendService;
+import io.rong.messages.TxtMessage;
+import io.rong.models.message.PrivateMessage;
+import io.rong.models.message.PushExt;
+import io.rong.models.response.ResponseResult;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.*;
+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.stream.Collectors;
 
 /**
@@ -24,11 +34,10 @@ import java.util.stream.Collectors;
  * @author zx
  * @since 2022-03-22 10:46:00
  */
+@Slf4j
 @Service("imUserFriendService")
 public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUserFriend> implements ImUserFriendService {
 
-    private final static Logger log = LoggerFactory.getLogger(ImUserFriendServiceImpl.class);
-
     @Resource
     private TeacherDao teacherDao;
     @Resource
@@ -99,5 +108,46 @@ public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUser
         return imUserFriend;
     }
 
+    /**
+     * 新用户自动添加客服
+     *
+     * @param userId    新用户ID
+     * @param friendIds 好友ID
+     * @return Integer
+     */
+    @Override
+    public Integer registerUserBindCustomerService(Long userId, List<Long> friendIds) {
+
+        // 添加新用户好友
+        saveUserFriend(userId, Sets.newHashSet(friendIds));
+
+        try {
+
+            // 发送消息
+            TxtMessage txtMessage = new TxtMessage("你好！我是你的专属客服~有任何问题都可以与我联系哦！", "");
+
+            // 拓展消息
+            PushExt pushExt = PushExt.build("客服消息", 1,
+                    new PushExt.HW("channelId", "NORMAL"), new PushExt.VIVO("1"),
+                    new PushExt.APNs("", ""),
+                    new PushExt.OPPO(""));
+
+            // 发送用户IM通知消息
+            PrivateMessage privateMessage = new PrivateMessage()
+                    .setSenderId(String.valueOf(friendIds.get(0)))
+                    .setTargetId(new String[]{String.valueOf(userId)})
+                    .setObjectName(txtMessage.getType())
+                    .setContent(txtMessage)
+                    .setPushExt(pushExt);
+
+            ResponseResult privateResult = RongCloudConfig.rongCloud.message.msgPrivate.send(privateMessage);
+            log.info("registerUserBindCustomerService userId={}, ret={}", userId, privateResult.getCode());
+        } catch (Exception e) {
+            log.error("registerUserBindCustomerService userId={}", userId, e);
+        }
+
+        return CollectionUtils.size(friendIds);
+    }
+
 }
 

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

@@ -211,8 +211,8 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
     }
 
     @Override
-    public IPage<MusicAlbumVo> selectStudentPage(IPage<MusicAlbumVo> page, MusicAlbumSearch query) {
-    	List<MusicAlbumVo> records = baseMapper.selectStudentPage(page, query);
+    public IPage<MusicAlbumVo> selectStudentPage(IPage<MusicAlbumVo> page, MusicAlbumSearch query, ClientEnum clientType) {
+    	List<MusicAlbumVo> records = baseMapper.selectStudentPage(page, query, clientType);
     	/*if(records == null || records.size() == 0){
     		query.setSubjectIdList(null);
     		records = baseMapper.selectStudentPage(page, query);

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

@@ -207,7 +207,7 @@
         ,if(t2.num >0,t2.num,0) as albumFavoriteCount
         from music_album t
         left join (select count(1) as num,af.album_id_ from album_favorite af
-            left join sys_user su on af.user_id_ = su.id_
+            left join sys_user su on (af.user_id_ = su.id_ <if test="clientType != null"> AND af.client_type_ = #{clientType} </if>)
             where su.del_flag_ = 0 group by af.album_id_
         ) t2 on t2.album_id_ = t.id_
         <where>

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/MusicAlbumController.java

@@ -84,7 +84,7 @@ public class MusicAlbumController extends BaseController {
         // query.setSubjectIds(student.getSubjectId());
         query.setAlbumStatus(YesOrNoEnum.YES);
         query.setSortBy(1);
-        IPage<MusicAlbumVo> iPage = musicAlbumService.selectStudentPage(PageUtil.getPage(query),query);
+        IPage<MusicAlbumVo> iPage = musicAlbumService.selectStudentPage(PageUtil.getPage(query),query, ClientEnum.STUDENT);
         return succeed(PageUtil.pageInfo(iPage));
     }
 
@@ -113,7 +113,7 @@ public class MusicAlbumController extends BaseController {
         musicAlbumSearch.setPage(1);
         musicAlbumSearch.setRows(query.getRelatedNum() +1);
         musicAlbumSearch.setAlbumTagIds(albumDetailVo.getAlbumTag());
-        IPage<MusicAlbumVo> relatedMusicAlbum = musicAlbumService.selectStudentPage(PageUtil.getPage(musicAlbumSearch),musicAlbumSearch);
+        IPage<MusicAlbumVo> relatedMusicAlbum = musicAlbumService.selectStudentPage(PageUtil.getPage(musicAlbumSearch),musicAlbumSearch, ClientEnum.STUDENT);
         List<MusicAlbumVo> musicAlbumVos1 = relatedMusicAlbum.getRecords()
                                                       .stream()
                                                       .filter(musicAlbumVo -> !musicAlbumVo.getId()

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/MusicAlbumController.java

@@ -91,7 +91,7 @@ public class MusicAlbumController extends BaseController {
 
         query.setAlbumStatus(YesOrNoEnum.YES);
         query.setSortBy(1);
-        IPage<MusicAlbumVo> iPage = musicAlbumService.selectStudentPage(PageUtil.getPage(query),query);
+        IPage<MusicAlbumVo> iPage = musicAlbumService.selectStudentPage(PageUtil.getPage(query),query, ClientEnum.TEACHER);
         return succeed(PageUtil.pageInfo(iPage));
     }
 
@@ -120,7 +120,7 @@ public class MusicAlbumController extends BaseController {
         musicAlbumSearch.setPage(1);
         musicAlbumSearch.setRows(query.getRelatedNum() +1);
         musicAlbumSearch.setAlbumTagIds(albumDetailVo.getAlbumTag());
-        IPage<MusicAlbumVo> relatedMusicAlbum = musicAlbumService.selectStudentPage(PageUtil.getPage(musicAlbumSearch),musicAlbumSearch);
+        IPage<MusicAlbumVo> relatedMusicAlbum = musicAlbumService.selectStudentPage(PageUtil.getPage(musicAlbumSearch),musicAlbumSearch, ClientEnum.TEACHER);
         List<MusicAlbumVo> musicAlbumVos1 = relatedMusicAlbum.getRecords()
                                                       .stream()
                                                       .filter(musicAlbumVo -> !musicAlbumVo.getId()

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/open/OpenMusicAlbumController.java

@@ -22,11 +22,13 @@ import com.yonge.toolset.base.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
@@ -59,7 +61,8 @@ public class OpenMusicAlbumController extends BaseController {
 
     @ApiOperation(value = "热门专辑", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping(value="/list", consumes="application/json", produces="application/json")
-    public HttpResponseResult<PageInfo<MusicAlbumVo>> list(@RequestBody MusicAlbumSearch query) {
+    public HttpResponseResult<PageInfo<MusicAlbumVo>> list(@ApiParam(value = "客户端类型") @RequestParam(value = "clientType", required = false, defaultValue = "STUDENT") String clientType,
+                                                           @RequestBody MusicAlbumSearch query) {
 
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser != null && sysUser.getId() != null) {
@@ -80,11 +83,15 @@ public class OpenMusicAlbumController extends BaseController {
             }
         }
 
+        if (ClientEnum.invalid(clientType)) {
+            return failed("无效的客户端类型");
+        }
+
         // 检查app版本
         query.setAuditVersion(YesOrNoEnum.NO);
         query.setAlbumStatus(YesOrNoEnum.YES);
         query.setSortBy(1);
-        IPage<MusicAlbumVo> iPage = musicAlbumService.selectStudentPage(PageUtil.getPage(query),query);
+        IPage<MusicAlbumVo> iPage = musicAlbumService.selectStudentPage(PageUtil.getPage(query),query, ClientEnum.valueOf(clientType));
         return succeed(PageUtil.pageInfo(iPage));
     }
 
@@ -94,7 +101,13 @@ public class OpenMusicAlbumController extends BaseController {
      */
     @PostMapping(value = "/detail",  consumes="application/json", produces="application/json")
     @ApiOperation(value = "专辑详情",httpMethod="POST", consumes="application/json", produces="application/json")
-    public HttpResponseResult<AlbumDetailVo> detail(@Valid @RequestBody MusicAlbumDetailSearch query) {
+    public HttpResponseResult<AlbumDetailVo> detail(@ApiParam(value = "客户端类型") @RequestParam(value = "clientType", required = false, defaultValue = "STUDENT") String clientType,
+                                                    @Valid @RequestBody MusicAlbumDetailSearch query) {
+
+        if (ClientEnum.invalid(clientType)) {
+            return failed("无效的客户端类型");
+        }
+
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         YesOrNoEnum favorite = YesOrNoEnum.NO;
         if (sysUser != null && sysUser.getId() != null) {
@@ -112,7 +125,7 @@ public class OpenMusicAlbumController extends BaseController {
         musicAlbumSearch.setSortBy(1);
         musicAlbumSearch.setPage(1);
         musicAlbumSearch.setRows(query.getRelatedNum() + 1);
-        IPage<MusicAlbumVo> hotMusicAlbum = musicAlbumService.selectStudentPage(PageUtil.getPage(musicAlbumSearch),musicAlbumSearch);
+        IPage<MusicAlbumVo> hotMusicAlbum = musicAlbumService.selectStudentPage(PageUtil.getPage(musicAlbumSearch),musicAlbumSearch, ClientEnum.valueOf(clientType));
         List<MusicAlbumVo> musicAlbumVos = hotMusicAlbum.getRecords()
                                                   .stream()
                                                   .filter(musicAlbumVo -> !musicAlbumVo.getId()
@@ -125,7 +138,7 @@ public class OpenMusicAlbumController extends BaseController {
 
         // 相关专辑
         musicAlbumSearch.setAlbumTagIds(albumDetailVo.getAlbumTag());
-        IPage<MusicAlbumVo> relatedMusicAlbum = musicAlbumService.selectStudentPage(PageUtil.getPage(musicAlbumSearch),musicAlbumSearch);
+        IPage<MusicAlbumVo> relatedMusicAlbum = musicAlbumService.selectStudentPage(PageUtil.getPage(musicAlbumSearch),musicAlbumSearch, ClientEnum.valueOf(clientType));
         List<MusicAlbumVo> musicAlbumVos1 = relatedMusicAlbum.getRecords()
                                                       .stream()
                                                       .filter(musicAlbumVo -> !musicAlbumVo.getId()