Merge branch 'dyf-device'

# Conflicts:
#	fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java
#	fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/LocationDataRule.java
This commit is contained in:
2025-07-31 09:16:52 +08:00
17 changed files with 674 additions and 73 deletions

View File

@ -3,6 +3,7 @@ package com.fuyuanshen.global.mqtt.rule;
import com.fuyuanshen.common.core.utils.StringUtils;
import com.fuyuanshen.common.json.utils.JsonUtils;
import com.fuyuanshen.common.redis.utils.RedisUtils;
import com.fuyuanshen.equipment.utils.map.GetAddressFromLatUtil;
import com.fuyuanshen.equipment.utils.c.map.GetAddressFromLatUtil;
import com.fuyuanshen.equipment.utils.c.map.LngLonUtil;
import com.fuyuanshen.global.mqtt.base.MqttMessageRule;