feat:航线增加无人机类型字段
This commit is contained in:
parent
38661172ed
commit
4491b34704
|
|
@ -89,7 +89,7 @@ public class AirlineAreaControllerConvert extends BaseConvert<AirlineAreaDTO, Ai
|
||||||
dto.setId(vo.getId());
|
dto.setId(vo.getId());
|
||||||
dto.setName(vo.getName());
|
dto.setName(vo.getName());
|
||||||
dto.setAreaType(vo.getAreaType());
|
dto.setAreaType(vo.getAreaType());
|
||||||
dto.setStatus(vo.getStatus());
|
dto.setStatus(vo.getStatus() != null ? vo.getStatus() : 1); // Default to enabled
|
||||||
dto.setShape(vo.getShape());
|
dto.setShape(vo.getShape());
|
||||||
dto.setAreaArea(vo.getAreaArea());
|
dto.setAreaArea(vo.getAreaArea());
|
||||||
dto.setAreaPerimeter(vo.getAreaPerimeter());
|
dto.setAreaPerimeter(vo.getAreaPerimeter());
|
||||||
|
|
@ -103,7 +103,10 @@ public class AirlineAreaControllerConvert extends BaseConvert<AirlineAreaDTO, Ai
|
||||||
dto.setPoints(pointsJson);
|
dto.setPoints(pointsJson);
|
||||||
} catch (JsonProcessingException e) {
|
} catch (JsonProcessingException e) {
|
||||||
log.error("转换坐标点信息失败: {}", e.getMessage());
|
log.error("转换坐标点信息失败: {}", e.getMessage());
|
||||||
|
dto.setPoints("[]"); // Default to empty array
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
dto.setPoints("[]"); // Default to empty array
|
||||||
}
|
}
|
||||||
|
|
||||||
return dto;
|
return dto;
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,6 @@ CREATE TABLE IF NOT EXISTS airline_area (
|
||||||
CREATE TABLE IF NOT EXISTS airline_area_group (
|
CREATE TABLE IF NOT EXISTS airline_area_group (
|
||||||
group_id BIGINT(20) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
|
group_id BIGINT(20) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
|
||||||
group_name VARCHAR(255) NOT NULL COMMENT '分组名称',
|
group_name VARCHAR(255) NOT NULL COMMENT '分组名称',
|
||||||
user_id BIGINT(20) NOT NULL COMMENT '用户ID,分组自带用户归属。后期权限都是基于用户ID进行',
|
|
||||||
del_flag BIGINT(20) DEFAULT 0 COMMENT '删除标识,0.未删除(默认);1,已删除',
|
del_flag BIGINT(20) DEFAULT 0 COMMENT '删除标识,0.未删除(默认);1,已删除',
|
||||||
deleted_by VARCHAR(64) DEFAULT '' COMMENT '删除者',
|
deleted_by VARCHAR(64) DEFAULT '' COMMENT '删除者',
|
||||||
deleted_time DATETIME COMMENT '删除时间',
|
deleted_time DATETIME COMMENT '删除时间',
|
||||||
|
|
|
||||||
|
|
@ -94,7 +94,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
left join airline_area_group_info aagi on aa.id = aagi.area_id
|
left join airline_area_group_info aagi on aa.id = aagi.area_id
|
||||||
left join airline_area_group aag on aagi.group_id = aag.group_id
|
left join airline_area_group aag on aagi.group_id = aag.group_id
|
||||||
<where>
|
<where>
|
||||||
aa.status != 0
|
|
||||||
and aagi.del_flag = 0
|
and aagi.del_flag = 0
|
||||||
and aag.del_flag = 0
|
and aag.del_flag = 0
|
||||||
<if test="createBy != null">
|
<if test="createBy != null">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue