Merge branch 'master-bacground-im' into dev

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

@@ -470,4 +470,20 @@ public class MsgBiz {
         return ObjectRestResponse.succ(newValue);
     }
 
+    public ObjectRestResponse deleteById(String id) {
+        if (StringUtils.isBlank(id)) {
+            return ObjectRestResponse.paramIsEmpty();
+        }
+        Query query = new Query(Criteria.where("_id").is(id));
+        Msg oldValue = mongoTemplate.findOne(query, Msg.class, "s_msg");
+        if (oldValue == null) {
+            return ObjectRestResponse.createFailedResult(ResultCode.IM_MSG_NOT_EXIST_CODE, ResultCode.getMsg(ResultCode.IM_MSG_NOT_EXIST_CODE));
+        }
+        DeleteResult deleteResult = mongoTemplate.remove(query, Msg.class, "s_msg");
+        if (deleteResult != null && deleteResult.getDeletedCount() == 1) {
+            return ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createFailedResult(ResultCode.IM_DELETE_FAIL_CODE, ResultCode.getMsg(ResultCode.IM_DELETE_FAIL_CODE));
+    }
+
 }

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/rest/MsgController.java

@@ -41,6 +41,10 @@ public class MsgController {
         return msgBiz.deleteByList(ids);
     }
 
+    @GetMapping(value = "/bg/app/unauth/delete")
+    public ObjectRestResponse deleteById(String id) {
+        return msgBiz.deleteById(id);
+    }
 
     @PostMapping(value = "/bg/app/unauth/addMsg")
     public ObjectRestResponse addMsg(@RequestBody AddMsgParam param) {
@@ -56,4 +60,6 @@ public class MsgController {
     public ObjectRestResponse getMsgList(@RequestBody MsgQueryDto msgQueryDto) {
         return msgBiz.getMsgList(msgQueryDto);
     }
+
+
 }