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

feat:优化空域详情增加按照修改时间倒序

This commit is contained in:
gyb 2026-03-18 15:26:18 +08:00
parent c440af9bed
commit 10fed354f8
3 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/ruoyi/airline/controller/AirlineMarkerController.java
View File

@ -96,7 +96,7 @@ public class AirlineMarkerController extends BaseController {
/** /**
* 获取用户下所有可用标注 * 获取用户下所有可用标注
*/ */
@GetMapping("/user-available") @PostMapping("/user-available")
@Operation(summary = "获取用户下所有可用标注") @Operation(summary = "获取用户下所有可用标注")
public AjaxResult getUserAvailableMarkers(AirlineMarkerVO vo) { public AjaxResult getUserAvailableMarkers(AirlineMarkerVO vo) {
AirlineMarkerDTO dto = AirlineMarkerControllerConvert.to(vo); AirlineMarkerDTO dto = AirlineMarkerControllerConvert.to(vo);
@ -109,7 +109,7 @@ public class AirlineMarkerController extends BaseController {
/** /**
* 获取全部可用标注 * 获取全部可用标注
*/ */
@GetMapping("/all-available") @PostMapping("/all-available")
@Operation(summary = "获取全部可用标注") @Operation(summary = "获取全部可用标注")
public AjaxResult getAllAvailableMarkers(AirlineMarkerVO vo) { public AjaxResult getAllAvailableMarkers(AirlineMarkerVO vo) {
AirlineMarkerDTO dto = AirlineMarkerControllerConvert.to(vo); AirlineMarkerDTO dto = AirlineMarkerControllerConvert.to(vo);

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

@ -56,19 +56,8 @@ public class AirlineAreaControllerConvert extends BaseConvert<AirlineAreaDTO, Ai
if (dto == null) { if (dto == null) {
return null; return null;
} }
AirlineAreaVO vo = new AirlineAreaVO(); AirlineAreaVO vo = super.innerFrom(dto);
vo.setId(dto.getId());
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());
vo.setMinHeight(dto.getMinHeight());
vo.setMaxHeight(dto.getMaxHeight());
vo.setRemark(dto.getRemark());
// 转换时间规则列表 // 转换时间规则列表
if (dto.getTimeRules() != null && !dto.getTimeRules().isEmpty()) { if (dto.getTimeRules() != null && !dto.getTimeRules().isEmpty()) {
List<AirlineAreaTimeRuleVO> timeRuleVOs = AirlineAreaTimeRuleControllerConvert.fromList(dto.getTimeRules()); List<AirlineAreaTimeRuleVO> timeRuleVOs = AirlineAreaTimeRuleControllerConvert.fromList(dto.getTimeRules());

2
src/main/resources/mapper/airline/AirlineMarkerMapper.xml
View File

@ -150,8 +150,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join airline_marker_group amg on amgi.group_id = amg.id left join airline_marker_group amg on amgi.group_id = amg.id
<where> <where>
amgi.del_flag = 0 amgi.del_flag = 0
and amgi.deleted_by is null
and amgi.deleted_time is null
and (amg.del_flag = 0 or amg.del_flag is null) and (amg.del_flag = 0 or amg.del_flag is null)
<if test="createBy != null and createBy != ''"> <if test="createBy != null and createBy != ''">
and am.create_by = #{createBy} and am.create_by = #{createBy}