liwenlong/fys-Multi-tenant
1
0
Fork 0
forked from dyf/fys-Multi-tenant
Code Pull Requests Activity

历史轨迹1

Browse Source
This commit is contained in:
chenyouting
2025-10-10 09:26:52 +08:00
parent 7b8c626cb6
commit 2c3effa683
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqLocationDataRule.java
View File

@ -56,7 +56,11 @@ public class BjqLocationDataRule implements MqttMessageRule {
// Latitude, longitude // Latitude, longitude
String latitude = convertArr[1].toString(); String latitude = convertArr[1].toString();
String longitude = convertArr[2].toString(); String longitude = convertArr[2].toString();
// 判断 latitude 和 longitude 是否都为 0
if ("0".equals(latitude) && "0".equals(longitude)) {
log.info("位置信息为0，不存储到Redis: device={}, lat={}, lon={}", context.getDeviceImei(), latitude, longitude);
return;
}
// 异步发送经纬度到Redis // 异步发送经纬度到Redis
asyncSendLocationToRedisWithFuture(context.getDeviceImei(), latitude, longitude); asyncSendLocationToRedisWithFuture(context.getDeviceImei(), latitude, longitude);
// 异步保存数据 // 异步保存数据
@ -122,6 +126,7 @@ public class BjqLocationDataRule implements MqttMessageRule {
if (StringUtils.isBlank(latitude) || StringUtils.isBlank(longitude)) { if (StringUtils.isBlank(latitude) || StringUtils.isBlank(longitude)) {
return; return;
} }
// String[] latArr = latitude.split("\\."); // String[] latArr = latitude.split("\\.");
// String[] lonArr = longitude.split("\\."); // String[] lonArr = longitude.split("\\.");
// // 将位置信息存储到Redis中 // // 将位置信息存储到Redis中

4
fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java
View File

@ -395,6 +395,10 @@ public class DeviceBizService {
JSONObject jsonObject = JSONObject.parseObject(obj); JSONObject jsonObject = JSONObject.parseObject(obj);
Long timestamp = jsonObject.getLong("timestamp"); Long timestamp = jsonObject.getLong("timestamp");
LocalDate date = LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault()).toLocalDate(); LocalDate date = LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault()).toLocalDate();
String address = jsonObject.getString("address");
if(StringUtils.isBlank( address) || "[]".equals(address)){
continue;
}
if (map.containsKey(date.toString())) { if (map.containsKey(date.toString())) {
map.get(date.toString()).add(jsonObject); map.get(date.toString()).add(jsonObject);
} else { } else {

3
fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
View File

@ -274,6 +274,9 @@
<if test="criteria.deviceImei != null and criteria.deviceImei != ''"> <if test="criteria.deviceImei != null and criteria.deviceImei != ''">
and a.device_imei like concat('%',#{criteria.deviceImei}, '%') and a.device_imei like concat('%',#{criteria.deviceImei}, '%')
</if> </if>
<if test="criteria.deviceMac != null and criteria.deviceMac != ''">
and a.device_mac like concat('%',#{criteria.deviceMac}, '%')
</if>
<if test="criteria.content != null and criteria.content != ''"> <if test="criteria.content != null and criteria.content != ''">
AND (a.device_imei like concat('%',#{criteria.content}, '%') or a.device_mac like concat('%',#{criteria.content}, '%') ) AND (a.device_imei like concat('%',#{criteria.content}, '%') or a.device_mac like concat('%',#{criteria.content}, '%') )
</if> </if>