bug:bug修复
This commit is contained in:
parent
89f8739c18
commit
888659deae
|
|
@ -33,10 +33,13 @@ public class WayPointUitls {
|
||||||
KmlMissionConfig missionConfig = kmlInfo.getDocument().getKmlMissionConfig();
|
KmlMissionConfig missionConfig = kmlInfo.getDocument().getKmlMissionConfig();
|
||||||
//其他场景下都可以从missionConfig 拿航点和动作集合
|
//其他场景下都可以从missionConfig 拿航点和动作集合
|
||||||
List<KmlPlacemark> placeMarkList = kmlInfo.getDocument().getFolder().getPlacemarkList();
|
List<KmlPlacemark> placeMarkList = kmlInfo.getDocument().getFolder().getPlacemarkList();
|
||||||
|
|
||||||
|
if (placeMarkList == null || placeMarkList.isEmpty()) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
//获取kml文件中的第一个坐标
|
//获取kml文件中的第一个坐标
|
||||||
String[] takeoffCoords;
|
String[] takeoffCoords;
|
||||||
if (missionConfig.getTakeOffRefPoint() != null) {
|
if (missionConfig.getTakeOffRefPoint() != null) {
|
||||||
|
|
||||||
takeoffCoords = missionConfig.getTakeOffRefPoint().split(",");
|
takeoffCoords = missionConfig.getTakeOffRefPoint().split(",");
|
||||||
} else {
|
} else {
|
||||||
// M300/M350:使用第一个航点的坐标
|
// M300/M350:使用第一个航点的坐标
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="airlineId != null">
|
<if test="airlineId != null">
|
||||||
and airline_id = #{airlineId}
|
and airline_id = #{airlineId}
|
||||||
</if>
|
</if>
|
||||||
|
order by update_time desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<!-- 删除分组详情(软删除) -->
|
<!-- 删除分组详情(软删除) -->
|
||||||
|
|
|
||||||
|
|
@ -105,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
left join (
|
left join (
|
||||||
select afgi.group_id, count(afgi.id) as count
|
select afgi.group_id, count(afgi.id) as count
|
||||||
from airline_file_group_info afgi
|
from airline_file_group_info afgi
|
||||||
|
WHERE afgi.del_flag = 0
|
||||||
group by afgi.group_id
|
group by afgi.group_id
|
||||||
) airline_count on afg.group_id = airline_count.group_id
|
) airline_count on afg.group_id = airline_count.group_id
|
||||||
<where>
|
<where>
|
||||||
|
|
@ -116,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
and afg.user_id = #{userId}
|
and afg.user_id = #{userId}
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
order by afg.create_time desc
|
order by afg.update_time desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue