潘钊 / bsth_control · Commits

Commit 1e66396eba9e964a1c6ac0319423abdaa15e6252

Authored by 潘钊
1 parent 6e175f91

update...

Inline Side-by-side
Showing 3 changed files with 11 additions and 53 deletions
src/main/java/com/bsth/websocket/handler/RealControlSocketHandler.java
  View file @1e66396
1 1 package com.bsth.websocket.handler;
2 2  
3   -import java.util.ArrayList;
4   -import java.util.HashMap;
5   -import java.util.Iterator;
6   -import java.util.List;
7   -import java.util.Map;
8   -import java.util.Set;
9   -
  3 +import com.alibaba.fastjson.JSONObject;
  4 +import com.bsth.data.BasicData;
  5 +import com.google.common.base.Splitter;
  6 +import com.google.common.collect.ArrayListMultimap;
10 7 import org.slf4j.Logger;
11 8 import org.slf4j.LoggerFactory;
12 9 import org.springframework.context.annotation.Scope;
13 10 import org.springframework.stereotype.Component;
14   -import org.springframework.web.socket.CloseStatus;
15   -import org.springframework.web.socket.TextMessage;
16   -import org.springframework.web.socket.WebSocketHandler;
17   -import org.springframework.web.socket.WebSocketMessage;
18   -import org.springframework.web.socket.WebSocketSession;
  11 +import org.springframework.web.socket.*;
19 12  
20   -import com.alibaba.fastjson.JSONObject;
21   -import com.bsth.data.BasicData;
22   -import com.google.common.base.Splitter;
23   -import com.google.common.collect.ArrayListMultimap;
  13 +import java.util.*;
24 14  
25 15 /**
26 16 * @author PanZhao
... ... @@ -99,43 +89,6 @@ public class RealControlSocketHandler implements WebSocketHandler {
99 89 return false;
100 90 }
101 91  
102   - /**
103   - * 给所有在线用户发送消息
104   - *
105   - * @param message
106   -
107   - public synchronized void sendMessageToUsers(TextMessage message) {
108   - for (WebSocketSession user : users) {
109   - try {
110   - if (user.isOpen()) {
111   - user.sendMessage(message);
112   - }
113   - } catch (IOException e) {
114   - e.printStackTrace();
115   - }
116   - }
117   - }*/
118   -
119   - /**
120   - * 给某些用户发送消息
121   - *
122   - * @param userId
123   - * @param message
124   -
125   - public synchronized void sendMessageToUser(Set<String> uids, String msg) {
126   - TextMessage message = new TextMessage(msg.getBytes());
127   - for (WebSocketSession user : users) {
128   - if (uids.contains(user.getAttributes().get(Constants.SESSION_USERNAME))) {
129   - try {
130   - if (user.isOpen()) {
131   - user.sendMessage(message);
132   - }
133   - } catch (IOException e) {
134   - e.printStackTrace();
135   - }
136   - }
137   - }
138   - }*/
139 92  
140 93 /**
141 94 * 根据线路推送消息
... ...
src/main/resources/static/real_control_v2/fragments/north/nav/line_config/line_config.html
  View file @1e66396
... ... @@ -28,6 +28,7 @@
28 28 <li><a data-href="#in_park_source_panel" >原线路回场</a></li>
29 29 <li><a>到站缓冲区设置</a></li>
30 30 <li><a>应急停靠</a></li>
  31 + <li><a>社会加油站</a></li>
31 32 <li><a class="disabled">漂移判定</a></li>
32 33 <li><a class="disabled">到离站预测</a></li>
33 34 <li><a class="disabled">挂牌时刻表</a></li>
... ...
src/main/resources/static/real_control_v2/js/forms/wrap.html
  View file @1e66396
... ... @@ -62,6 +62,10 @@
62 62 $('.form-page-content').load(pageUrl, function () {
63 63 //时间默认当天
64 64 $('#date', '.form-page-content').val(moment().format('YYYY-MM-DD'));
  65 +
  66 + if($("#ddrbBody").length > 0){
  67 + $("#ddrbBody").height("620px");
  68 + }
65 69 });
66 70  
67 71 //iframe 自适应高度
... ...