设备向服务器发送消息

ljq
1 parent 44050385
Showing 5 changed files with 10 additions and 9 deletions
src/main/java/com/bsth/data/msg_queue/WebSocketPushQueue.java
src/main/java/com/bsth/repository/subject/SubjectUserRepository.java
src/main/java/com/bsth/websocket/handler/SendUtils.java
src/main/resources/static/real_control_v2/js/utils/tts.js
src/main/resources/static/real_control_v2/js/websocket/sch_websocket.js
@@ -46,7 +46,7 @@ public class WebSocketPushQueue {
         }
         linkedList.clear();
         thread = new DataPushThread();
-        //thread.start();
+        thread.start();
     }
     public static int size(){
@@ -13,7 +13,7 @@ public interface SubjectUserRepository extends BaseRepository&lt;SubjectUser, Integ
-    @Query(value = "SELECT su FROM SubjectUser su where su.rq =?1 and  su.userId =?2")
+    @Query(value = "SELECT su FROM SubjectUser su where su.rq =?1 and  su.userId.id =?2")
     List<SubjectUser> userAll(String rq, Integer userId);
     @Transactional
     @Modifying
@@ -140,7 +140,7 @@ public class SendUtils{
 		d80.getData().setNbbm(BasicData.deviceId2NbbmMap.get(d80.getDeviceId()));
 		JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(d80));
 		json.put("fn", "report80");
- 		socketHandler.sendMessageToLine(d80.getData().getLineId().toString(), json.toJSONString());
+ 		socketHandler.sendMessage(json.toJSONString());
 	}
 	public void refreshSch(ScheduleRealInfo sch) {
@@ -32,7 +32,8 @@ var gb_tts = (function() {
         if (defaultConfig.queueModel == 1)
             synth.cancel();
-        var lineName=gb_data_basic.codeToLine[lineCode].name;
+        //var lineName=gb_data_basic.codeToLine[lineCode].name;
+        var lineName="测试线路";
         try {
             if (lineName)
                 lineName.replace('行', '航');
@@ -28,7 +28,9 @@ var gb_sch_websocket = (function () {
         schSock.onmessage = function (e) {
             try {
                 var jsonMsg = $.parseJSON(e.data);
-                msgHandle[jsonMsg.fn](jsonMsg);
+                if (jsonMsg.fn == "report80"){
+                    msgHandle[jsonMsg.fn](jsonMsg);
+                }
             } catch (e) {
                 console.log(e, e.data);
             }
@@ -68,7 +70,7 @@ var gb_sch_websocket = (function () {
      * 计算未处理消息
      */
     var calcUntreated = function (lineCode) {
-        var size = $('li.line_schedule[data-id=' + lineCode + '] .sys-mailbox .sys-mail-item').length;
+        var size = $('li.line_schedule .sys-mailbox .sys-mail-item').length;
         $('#badge_untreated_num_' + lineCode).text(size);
     };
@@ -91,7 +93,6 @@ var gb_sch_websocket = (function () {
         //tts
         var ttsMsg = $item.find('.uk-panel-title').text();
         gb_tts.speak(ttsMsg, msg.data.lineId);
-
         calcUntreated(msg.data.lineId);
     };
@@ -215,8 +216,7 @@ var gb_sch_websocket = (function () {
     function findMailBox(lineCode) {
         if (mailBoxs[lineCode])
             return mailBoxs[lineCode];
-
-        var mbox = $('li.line_schedule[data-id=' + lineCode + ']').find('div.sys-mailbox');
+        var mbox = $('li.line_schedule').find('div.sys-mailbox');
         mailBoxs[lineCode] = mbox;
         return mbox;
     }