update...

潘钊
1 parent 1888aaab
Showing 2 changed files with 25 additions and 4 deletions
src/main/java/com/bsth/controller/realcontrol/AdminUtilsController.java
src/main/java/com/bsth/websocket/handler/SendUtils.java
@@ -7,7 +7,7 @@ import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.msg_queue.WebSocketPushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.websocket.handler.RealControlSocketHandler;
+import com.bsth.websocket.handler.SendUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +39,7 @@ public class AdminUtilsController {
     DayOfDirectives dayOfDirectives;
     @Autowired
-    RealControlSocketHandler realControlSocketHandler;
+    SendUtils sendUtils;
     /**
      * 出现重复班次的车辆
@@ -140,8 +140,8 @@ public class AdminUtilsController {
     }
     @RequestMapping(value = "/websocketRadioText")
-    public int radioText(String t){
-        realControlSocketHandler.sendMessage(t);
+    public int radioText(String t, String lineCode){
+        sendUtils.sendRadioText(t, lineCode);
         return 0;
     }
 }
@@ -10,6 +10,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.websocket.dto.WsScheduleRealInfo;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -195,4 +196,24 @@ public class SendUtils{
 			logger.error("", e);
 		}
 	}
+
+	/**
+	 * 对所有线调用户进行广播
+	 * @param t
+	 */
+	public void sendRadioText(String t, String lineCode){
+		Map<String, Object> map = new HashMap<>();
+		map.put("fn", "admin_radio_text");
+		map.put("t", t);
+		ObjectMapper mapper = new ObjectMapper();
+
+		try {
+			if(StringUtils.isNotEmpty(lineCode))
+				socketHandler.sendMessageToLine(lineCode, mapper.writeValueAsString(map));
+			else
+				socketHandler.sendMessage(mapper.writeValueAsString(map));
+		} catch (JsonProcessingException e) {
+			logger.error("", e);
+		}
+	}
 }