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:
@ -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;
|
||||
|
Reference in New Issue
Block a user