消息推送修改

徐泉
1 parent 3b1634ff
Showing 2 changed files with 10 additions and 10 deletions Show diff stats
cloud/dahua/src/main/java/com/example/dahua/MyTask.java
cloud/dahua/src/main/java/com/example/dahua/async/MyScheduledTask.java
@@ -443,7 +443,7 @@ public class MyTask implements ApplicationRunner {
                     mqttManager = new MqttManager();
                     mqttManager.init();
                 }
-                myScheduledTask.sendMQMess(content);
+                myScheduledTask.sendMQMess(content,deviceId);
                 //记录学生考勤签到记录
                 FileUtils.getInstance().writeLogs(content, FileUtils.qiandaoSuccess);
@@ -204,7 +204,7 @@ public class MyScheduledTask {
 //                    System.out.println("indexLineNum:"+indexLineNum+" ----------readLineNum:"+readLineNum);
                     if (indexLineNum >= readLineNum) {
                         readLineNum++;
-                        sendMQMess(content);
+                        sendMQMess(content,"");
                     }
                 }
@@ -235,21 +235,22 @@ public class MyScheduledTask {
     }
-    public void sendMQMess(String content) {
+    public void sendMQMess(String content,String deviceId) {
         String cardNum = content.substring(content.indexOf("卡号") + 3, content.indexOf("卡号") + 11);
-//        System.out.println("cardNum:" + cardNum);
-
         String inOrOut = content.substring(content.indexOf("方向：") + 3, content.indexOf("方向：") + 5).endsWith("进门") ? "0" : "1";
-        String qiandaoDevId = content.substring(content.indexOf("设备") + 3, content.indexOf("设备") + 12);
+        //判断是否一体机，发送消息看板
+        String qiandaoDevId="";
+        if(StringUtils.isEmpty(deviceId)){
+            qiandaoDevId = content.substring(content.indexOf("设备") + 3, content.indexOf("设备") + 12);
+        }else{
+            qiandaoDevId =deviceId;
+        }
         //获取寝室关联的场景id
         String placeId = userDao.getPlaceIdWithKaoqinDevid(qiandaoDevId);
-//        System.out.println("qiandaoDevId:" + qiandaoDevId);
-//        System.out.println("placeId:" + placeId);
-
         if (null != placeId) {
             //关联的显示看板设备
             List<String> kanbanIds = userDao.getKanBanIdWithPlaceId(placeId);
@@ -272,7 +273,6 @@ public class MyScheduledTask {
             }
         }
-
     }
	@@ -443,7 +443,7 @@ public class MyTask implements ApplicationRunner {		@@ -443,7 +443,7 @@ public class MyTask implements ApplicationRunner {
443	mqttManager = new MqttManager();	443	mqttManager = new MqttManager();
444	mqttManager.init();	444	mqttManager.init();
445	}	445	}
446	- myScheduledTask.sendMQMess(content);	446	+ myScheduledTask.sendMQMess(content,deviceId);
447		447
448	//记录学生考勤签到记录	448	//记录学生考勤签到记录
449	FileUtils.getInstance().writeLogs(content, FileUtils.qiandaoSuccess);	449	FileUtils.getInstance().writeLogs(content, FileUtils.qiandaoSuccess);