1、新增收到好友申请接口

fs-service/src/main/java/com/fs/im/service/OpenIMService.java

@@ -89,4 +89,5 @@ public interface OpenIMService {
 
     OpenImResponseDTO doctorSendMsgToUser(Long userId,Long doctorId);
 
+    OpenImResponseDTO getFriendApplyList(String userID, int pageNumber, int showNumber);
 }

fs-user-app/src/main/java/com/fs/app/controller/AppLoginController.java

@@ -34,6 +34,7 @@ import com.fs.his.service.IFsUserNewTaskService;
 import com.fs.his.service.IFsUserService;
 import com.fs.his.utils.ConfigUtil;
 import com.fs.his.vo.FsUserRegisterParam;
+import com.fs.im.service.OpenIMService;
 import com.fs.qw.domain.QwUser;
 import com.fs.qw.service.ILuckyBagService;
 import com.fs.voice.utils.StringUtil;
@@ -89,6 +90,7 @@ public class AppLoginController extends AppBaseController{
     private ISmsService smsService;
     @Autowired
     private IFsCoursePlaySourceConfigService fsCoursePlaySourceConfigService;
+    private OpenIMService openIMService;
 
     @ApiOperation("注册app用户")
     @PostMapping("/register")
@@ -313,6 +315,7 @@ public class AppLoginController extends AppBaseController{
                 }
                 userService.insertFsUser(user);
                 String token = jwtUtils.generateToken(user.getUserId());
+                redisCache.setCacheObject("userToken:" + user.getUserId(), token, 604800, TimeUnit.SECONDS);
                 map.put("token", token);
                 map.put("isNew", true);
                 map.put("user", user);
@@ -334,6 +337,7 @@ public class AppLoginController extends AppBaseController{
                 }
                 if (StringUtils.isEmpty(user.getPhone())) {
                     String token = jwtUtils.generateToken(user.getUserId());
+                    redisCache.setCacheObject("userToken:" + user.getUserId(), token, 604800, TimeUnit.SECONDS);
                     map.put("token", token);
                     map.put("isNew", true);
                     map.put("user", user);
@@ -1026,4 +1030,17 @@ public class AppLoginController extends AppBaseController{
         List<LuckyBag> list = luckyBagService.selectLuckyBagList(reward);
         return getDataTable(list);
     }
+
+
+    /**
+     * 获取收到好友申请列表
+     *
+     * @param userRequestParam
+     * @return
+     */
+    @PostMapping("/getFriendApplyList")
+    public R getFriendApplyList(@RequestBody UserRequestParam userRequestParam)
+    {
+       return R.ok().put("date",openIMService.getFriendApplyList(userRequestParam.getUserID(),userRequestParam.getPagination().getPageNumber(),userRequestParam.getPagination().getShowNumber()));
+    }
 }

fs-user-app/src/main/java/com/fs/app/param/Pagination.java

@@ -0,0 +1,28 @@
+package com.fs.app.param;
+
+public class Pagination {
+    private int pageNumber;
+    private int showNumber;
+
+    public Pagination(int pageNumber, int showNumber) {
+        this.pageNumber = pageNumber;
+        this.showNumber = showNumber;
+    }
+
+    // Getters and Setters
+    public int getPageNumber() {
+        return pageNumber;
+    }
+
+    public void setPageNumber(int pageNumber) {
+        this.pageNumber = pageNumber;
+    }
+
+    public int getShowNumber() {
+        return showNumber;
+    }
+
+    public void setShowNumber(int showNumber) {
+        this.showNumber = showNumber;
+    }
+}

fs-user-app/src/main/java/com/fs/app/param/UserRequestParam.java

@@ -0,0 +1,30 @@
+package com.fs.app.param;
+
+public class UserRequestParam {
+    private String userID;
+    private Pagination pagination;
+
+    public UserRequestParam(String userID, Pagination pagination) {
+        this.userID = userID;
+        this.pagination = pagination;
+    }
+
+    // Getters and Setters
+    public String getUserID() {
+        return userID;
+    }
+
+    public void setUserID(String userID) {
+        this.userID = userID;
+    }
+
+    public Pagination getPagination() {
+        return pagination;
+    }
+
+    public void setPagination(Pagination pagination) {
+        this.pagination = pagination;
+    }
+}
+
+