From fc96e4d7fc20dbec5d2d96c6e8c557c1cc3212d3 Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期一, 08 四月 2024 18:53:10 +0800
Subject: [PATCH] 修改密码错误登录bug
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/MQTT.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 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..aab6372 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
@@ -6,6 +6,7 @@
import cn.exrick.xboot.your.service.IAlarmService;
import cn.exrick.xboot.your.service.ICarService;
import cn.exrick.xboot.your.service.IEventLogService;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
@@ -14,6 +15,9 @@
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
@Component
@@ -96,17 +100,17 @@
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;
+ }
Alarm alarm = new Alarm();
if(eventType.equals("132371")){
@@ -128,10 +132,17 @@
return;
}
- QueryWrapper<Car> wrapper = new QueryWrapper<Car>();
- wrapper.eq("code",vehicleIndexCode);
- Car car = iCarService.getOne(wrapper);
- if(car==null){
+ Date date1 = new Date();
+ long time = date1.getTime()-2*60*1000;
+ Date date = new Date(time);
+ String format1 = DateUtil.format(date,"yyyy-MM-dd HH:mm:ss");
+ String format2 = DateUtil.format(date1,"yyyy-MM-dd HH:mm:ss");
+ QueryWrapper<Alarm> awrapper = new QueryWrapper<>();
+ awrapper.between("create_time",format1,format2);
+ awrapper.eq("car_no",car.getCarNo());
+ awrapper.eq("type",alarm.getType());
+ List<Alarm> list = iAlarmService.list(awrapper);
+ if(list.size()>0){
return;
}
--
Gitblit v1.9.1