Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

@@ -171,6 +171,16 @@ public class TaDrainageController extends BaseController {
                 return responseBean;
             }
 
+            QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",drainage.getOrgId());
+            queryWrapper.eq("content_type",CommConstant.EVENT_H5);
+            queryWrapper.eq("target_id",drainage.getDrainageId());
+            List<ExtendContent> list = iExtendContentService.list(queryWrapper);
+            if (list.size() > 0){
+                responseBean.addError("此H5活动已有用户提交数据，删除项目会删除全部数据，不建议删除数据。可以点击下架按钮终止活动。");
+                return responseBean;
+            }
+
             if(iTaDrainageService.removeById(id)){
                 responseBean.addSuccess("success");
             }else {

src/main/java/com/huiju/estateagents/service/impl/TaChatServiceImpl.java

@@ -119,6 +119,7 @@ public class TaChatServiceImpl extends ServiceImpl<TaChatMapper, TaChat> impleme
 
     @Override
     public ResponseBean chat(JSONObject message) {
+        System.out.println("进入聊天");
         TaChat taChat = new TaChat();
         taChat.setCreateDate(LocalDateTime.now());
         taChat.setMessage((String) message.get("message"));

src/main/java/com/huiju/estateagents/websocket/ChatServer.java

@@ -3,6 +3,7 @@ package com.huiju.estateagents.websocket;
 import com.alibaba.fastjson.JSONObject;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaChat;
+import com.huiju.estateagents.service.ISysButtonInMenuService;
 import com.huiju.estateagents.service.ITaChatService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -74,7 +75,9 @@ public class ChatServer {
         if ("ping" == message) {
             try {
                 this.sendMessage("pong");
-            } catch (IOException e) {}
+            } catch (IOException e) {
+                System.out.println("断链"+ e.getMessage());
+            }
             return;
         }
 
@@ -83,7 +86,7 @@ public class ChatServer {
         if ( null == ChatServer.taChatService) {
             ChatServer.taChatService = applicationContext.getBean(ITaChatService.class);
         }
-
+        System.out.println("收到的聊天消息的信息=========" + jsnMsg.toJSONString());
         ResponseBean resp = ChatServer.taChatService.chat(jsnMsg);
         TaChat taChat = (TaChat) resp.getData();