THENG
/
a-tuoheng-airline
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:调整查询sql

This commit is contained in:
gyb 2026-02-26 16:00:41 +08:00
parent c2145cf08e
commit a7cea1a5fb
7 changed files with 75 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ruoyi/airline/controller/convert/AirlineAreaControllerConvert.java
View File

@ -58,6 +58,7 @@ public class AirlineAreaControllerConvert extends BaseConvert<AirlineAreaDTO, Ai
vo.setName(dto.getName());
vo.setAreaType(dto.getAreaType());
vo.setStatus(dto.getStatus());
vo.setShape(dto.getShape());
vo.setAreaArea(dto.getAreaArea());
vo.setAreaPerimeter(dto.getAreaPerimeter());
vo.setRadius(dto.getRadius());
@ -89,6 +90,7 @@ public class AirlineAreaControllerConvert extends BaseConvert<AirlineAreaDTO, Ai
dto.setName(vo.getName());
dto.setAreaType(vo.getAreaType());
dto.setStatus(vo.getStatus());
dto.setShape(vo.getShape());
dto.setAreaArea(vo.getAreaArea());
dto.setAreaPerimeter(vo.getAreaPerimeter());
dto.setRadius(vo.getRadius());

6
src/main/java/com/ruoyi/airline/domain/model/AirlineArea.java
View File

@ -40,6 +40,11 @@ public class AirlineArea extends ExBaseEntity {
*/
private String points;
/**
* 形状
*/
private String shape;
/**
* 面积
*/
@ -68,6 +73,7 @@ public class AirlineArea extends ExBaseEntity {
.append("areaType", getAreaType())
.append("status", getStatus())
.append("points", getPoints())
.append("shape", getShape())
.append("areaArea", getAreaArea())
.append("areaPerimeter", getAreaPerimeter())
.append("radius", getRadius())

6
src/main/java/com/ruoyi/airline/mapper/entity/AirlineAreaEntity.java
View File

@ -39,6 +39,11 @@ public class AirlineAreaEntity extends ExBaseEntity {
*/
private String points;
/**
* 形状
*/
private String shape;
/**
* 面积
*/
@ -62,6 +67,7 @@ public class AirlineAreaEntity extends ExBaseEntity {
.append("areaType", getAreaType())
.append("status", getStatus())
.append("points", getPoints())
.append("shape", getShape())
.append("areaArea", getAreaArea())
.append("areaPerimeter", getAreaPerimeter())
.append("radius", getRadius())

46
src/main/java/com/ruoyi/airline/service/convert/AirlineAreaServiceConvert.java
View File

@ -41,4 +41,50 @@ public class AirlineAreaServiceConvert extends BaseConvert<AirlineArea, AirlineA
{
return INSTANCE.innerToList(dtoList);
}
@Override
protected AirlineAreaDTO innerFrom(AirlineArea model) {
if (model == null) {
return null;
}
AirlineAreaDTO dto = new AirlineAreaDTO();
dto.setId(model.getId());
dto.setName(model.getName());
dto.setAreaType(model.getAreaType());
dto.setStatus(model.getStatus());
dto.setPoints(model.getPoints());
dto.setShape(model.getShape());
dto.setAreaArea(model.getAreaArea());
dto.setAreaPerimeter(model.getAreaPerimeter());
dto.setRadius(model.getRadius());
dto.setRemark(model.getRemark());
dto.setCreateBy(model.getCreateBy());
dto.setCreateTime(model.getCreateTime());
dto.setUpdateBy(model.getUpdateBy());
dto.setUpdateTime(model.getUpdateTime());
return dto;
}
@Override
protected AirlineArea innerTo(AirlineAreaDTO dto) {
if (dto == null) {
return null;
}
AirlineArea model = new AirlineArea();
model.setId(dto.getId());
model.setName(dto.getName());
model.setAreaType(dto.getAreaType());
model.setStatus(dto.getStatus());
model.setPoints(dto.getPoints());
model.setShape(dto.getShape());
model.setAreaArea(dto.getAreaArea());
model.setAreaPerimeter(dto.getAreaPerimeter());
model.setRadius(dto.getRadius());
model.setRemark(dto.getRemark());
model.setCreateBy(dto.getCreateBy());
model.setCreateTime(dto.getCreateTime());
model.setUpdateBy(dto.getUpdateBy());
model.setUpdateTime(dto.getUpdateTime());
return model;
}
}

6
src/main/java/com/ruoyi/airline/service/dto/AirlineAreaDTO.java
View File

@ -39,6 +39,11 @@ public class AirlineAreaDTO extends BaseEntity {
*/
private String points;
/**
* 形状
*/
private String shape;
/**
* 面积
*/
@ -67,6 +72,7 @@ public class AirlineAreaDTO extends BaseEntity {
.append("areaType", getAreaType())
.append("status", getStatus())
.append("points", getPoints())
.append("shape", getShape())
.append("areaArea", getAreaArea())
.append("areaPerimeter", getAreaPerimeter())
.append("radius", getRadius())

1
src/main/resources/db/migration/V2__Create_area_tables.sql
View File

@ -5,6 +5,7 @@ CREATE TABLE IF NOT EXISTS airline_area (
area_type VARCHAR(255) COMMENT '空域类型',
status INT(11) DEFAULT 1 COMMENT '1 启用 0 停用。默认启用。',
points JSON COMMENT '空域点列表',
shape VARCHAR(255) DEFAULT NULL COMMENT '形状',
area_area DOUBLE DEFAULT NULL COMMENT '面积',
area_perimeter DOUBLE DEFAULT NULL COMMENT '周长',
radius DOUBLE DEFAULT NULL COMMENT '半径',

14
src/main/resources/mapper/airline/AirlineAreaMapper.xml
View File

@ -23,8 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- 插入空域 -->
<insert id="insertArea" parameterType="com.ruoyi.airline.mapper.entity.AirlineAreaEntity" useGeneratedKeys="true" keyProperty="id">
insert into airline_area (name, area_type, status, points, area_area, area_perimeter, radius, create_by, create_time, update_by, update_time, remark)
values (#{name}, #{areaType}, #{status}, #{points}, #{areaArea}, #{areaPerimeter}, #{radius}, #{createBy}, now(), #{updateBy}, now(), #{remark})
insert into airline_area (name, area_type, status, points, shape, area_area, area_perimeter, radius, create_by, create_time, update_by, update_time, remark)
values (#{name}, #{areaType}, #{status}, #{points}, #{shape}, #{areaArea}, #{areaPerimeter}, #{radius}, #{createBy}, now(), #{updateBy}, now(), #{remark})
</insert>
<!-- 更新空域 -->
@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
area_type = #{areaType},
status = #{status},
points = #{points},
shape = #{shape},
area_area = #{areaArea},
area_perimeter = #{areaPerimeter},
radius = #{radius},
@ -54,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- 查询空域列表 -->
<select id="selectAreaList" parameterType="com.ruoyi.airline.mapper.entity.AirlineAreaEntity" resultMap="AirlineAreaResult">
select id, name, area_type, status, points, area_area, area_perimeter, radius, create_by, create_time, update_by, update_time, remark
select id, name, area_type, status, points, shape, area_area, area_perimeter, radius, create_by, create_time, update_by, update_time, remark
from airline_area
<where>
<if test="name != null and name != ''">
@ -71,14 +72,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- 根据ID查询空域 -->
<select id="selectAreaById" parameterType="java.lang.Long" resultMap="AirlineAreaResult">
select id, name, area_type, status, points, area_area, area_perimeter, radius, create_by, create_time, update_by, update_time, remark
select id, name, area_type, status, points, shape, area_area, area_perimeter, radius, create_by, create_time, update_by, update_time, remark
from airline_area
where id = #{id}
</select>
<!-- 根据ID列表查询空域 -->
<select id="selectAreaListByIds" parameterType="java.util.List" resultMap="AirlineAreaResult">
select id, name, area_type, status, points, area_area, area_perimeter, radius, create_by, create_time, update_by, update_time, remark
select id, name, area_type, status, points, shape, area_area, area_perimeter, radius, create_by, create_time, update_by, update_time, remark
from airline_area
where id in
<foreach item="id" collection="list" open="(" separator="," close=")">
@ -88,11 +89,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- 根据用户ID查询空域列表 -->
<select id="selectAreaListByUserId" parameterType="com.ruoyi.airline.mapper.entity.AirlineAreaEntity" resultMap="AirlineAreaResult">
select distinct aa.id, aa.name, aa.area_type, aa.status, aa.points, aa.area_area, aa.area_perimeter, aa.radius, aa.create_by, aa.create_time, aa.update_by, aa.update_time, aa.remark
select distinct aa.id, aa.name, aa.area_type, aa.status, aa.points, aa.shape, aa.area_area, aa.area_perimeter, aa.radius, aa.create_by, aa.create_time, aa.update_by, aa.update_time, aa.remark
from airline_area aa
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
<where>
aa.status != 0
and aagi.del_flag = 0
and aag.del_flag = 0
<if test="createBy != null">