1、删除好友并拉黑

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

@@ -39,6 +39,15 @@ public interface OpenIMService {
 
     OpenImResponseDTO updateUserInfo(CompanyUser companyUser);
 
+    /**
+     * 删除好友并拉黑
+     *
+     * @param ownerUserID 需要删除好友的用户
+     * @param friendUserID 待删除的好友
+     * @return
+     */
+    OpenImResponseDTO deleteUserInfo(String ownerUserID,String friendUserID);
+
     OpenImResponseDTO sendPackageUtil(String sendID, String recvID, Integer contentType, String payloadData,String packageName,String packageId);
 
     /**

fs-service/src/main/java/com/fs/im/service/impl/OpenIMServiceImpl.java

@@ -475,6 +475,38 @@ public class OpenIMServiceImpl implements OpenIMService {
 
         return responseDTO;
     }
+
+    @Override
+    public OpenImResponseDTO deleteUserInfo(String ownerUserID,String friendUserID) {
+        OpenImResponseDTO responseDTO = null;
+        String adminToken = getAdminToken();
+        //删除好友
+        Map<String, Object> bodyMap = new HashMap<>();
+        bodyMap.put("ownerUserID", ownerUserID);
+        bodyMap.put("friendUserID", friendUserID);
+        String jsonBody1 = JSONUtil.toJsonStr(bodyMap);
+        String result1 = HttpRequest.post(IMConfig.URL+"/friend/delete_friend")
+                .header("operationID", String.valueOf(System.currentTimeMillis()))
+                .header("token", adminToken)
+                .body(jsonBody1)
+                .execute()
+                .body();
+
+        //增加黑名单
+        Map<String, Object> bodyMap1 = new HashMap<>();
+        bodyMap1.put("ownerUserID", ownerUserID);
+        bodyMap1.put("blackUserID", friendUserID);
+        String jsonBody2 = JSONUtil.toJsonStr(bodyMap1);
+        String result2 = HttpRequest.post(IMConfig.URL+"/friend/add_black")
+                .header("operationID", String.valueOf(System.currentTimeMillis()))
+                .header("token", adminToken)
+                .body(jsonBody2)
+                .execute()
+                .body();
+        responseDTO= JSONUtil.toBean(result2,OpenImResponseDTO.class);
+        return responseDTO;
+    }
+
     @Data
     public static class UpdateUserInfo {
         private String userID;

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.dto.OpenImResponseDTO;
 import com.fs.im.service.OpenIMService;
 import com.fs.qw.domain.QwUser;
 import com.fs.qw.service.ILuckyBagService;
@@ -1069,4 +1070,17 @@ public class AppLoginController extends AppBaseController{
     {
         return R.ok().put("data",openIMService.getFriendList(userRequestParam.getUserID(),userRequestParam.getPagination().getPageNumber(),userRequestParam.getPagination().getShowNumber(),userRequestParam.getApplyType()));
     }
+
+
+
+
+    @ApiOperation("删除好友并拉黑")
+    @PostMapping("/deleteFriend")
+    public R deleteUserInfo(@RequestBody HashMap<String,String> map){
+        String ownerUserID = map.get("ownerUserID");
+        String friendUserID =map.get("friendUserID");
+        OpenImResponseDTO openImResponseDTO = openIMService.deleteUserInfo(ownerUserID, friendUserID);
+        return R.ok().put("data",openImResponseDTO);
+    }
+
 }