From b8086d8c8bf084ed20488a005f957e29ee3cbc8e Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期二, 03 五月 2022 20:08:57 +0800
Subject: [PATCH] 最新版本
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/MQTT.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/MQTT.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/MQTT.java
index 09a0001..551aa74 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/MQTT.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/MQTT.java
@@ -15,6 +15,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.List;
+
@Component
public class MQTT {
@@ -96,17 +98,27 @@
JSONObject jsonObject1 = JSONUtil.parseObj(s1);
String data = jsonObject1.get("data").toString();
JSONObject jsonObject2 = JSONUtil.parseObj(data);
- //System.out.println(jsonObject2.get("alarmId"));//鎶ヨid
- //System.out.println(jsonObject2.get("vehicleIndexCode"));//杞﹁締code
- //System.out.println(jsonObject2.get("eventType"));//鎶ヨ绫诲瀷
- //鏈郴瀹夊叏甯︼細132376
- //鎶界儫锛�132375
- //鎺ユ墦鐢佃瘽锛�132374
- //鐤插姵椹鹃┒锛�132371
String eventType = jsonObject2.get("eventType").toString();
String vehicleIndexCode = jsonObject2.get("vehicleIndexCode").toString();
String alarmId = jsonObject2.get("alarmId").toString();
String alarmTime = jsonObject2.get("alarmTime").toString();
+
+ QueryWrapper<Car> wrapper = new QueryWrapper<Car>();
+ wrapper.eq("code",vehicleIndexCode);
+ Car car = iCarService.getOne(wrapper);
+ if(car==null){
+ return;
+ }
+
+ String format = alarmTime.substring(0,17);
+ QueryWrapper<Alarm> awrapper = new QueryWrapper<>();
+ awrapper.between("create_time",format+"00",format+"59");
+ awrapper.eq("car_no",car.getCarNo());
+ awrapper.eq("type",1);
+ List<Alarm> list = iAlarmService.list(awrapper);
+ if(list.size()>0){
+ return;
+ }
Alarm alarm = new Alarm();
if(eventType.equals("132371")){
@@ -125,13 +137,6 @@
alarm.setType(7);
alarm.setValue("瓒呴��");
}else{
- return;
- }
-
- QueryWrapper<Car> wrapper = new QueryWrapper<Car>();
- wrapper.eq("code",vehicleIndexCode);
- Car car = iCarService.getOne(wrapper);
- if(car==null){
return;
}
--
Gitblit v1.9.1