From 7e426b3bc7cf31bbe488b6949f9446ecf1721958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=A4=A7?= <1504665037@qq.com> Date: Thu, 29 Jan 2026 11:38:50 +0800 Subject: [PATCH] =?UTF-8?q?fit:=E5=A2=9E=E5=8A=A0=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=88=86=E7=BB=84=E8=88=AA=E7=BA=BF=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AirlineFileController.java | 2 +- .../AirlineFileGroupInfoController.java | 23 +++++++++++++++++++ .../api/IAirlineFileGroupInfoDomain.java | 9 ++++++++ .../impl/AirlineFileGroupInfoDomainImpl.java | 5 ++++ .../mapper/AirlineFileGroupInfoMapper.java | 9 ++++++++ .../api/IAirlineFileGroupInfoService.java | 9 ++++++++ .../impl/AirlineFileServiceGroupInfoImpl.java | 10 ++++++++ .../airline/AirlineFileGroupInfoMapper.xml | 13 +++++++++++ .../mapper/airline/AirlineFileMapper.xml | 18 +++++++++++++++ 9 files changed, 97 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ruoyi/airline/controller/AirlineFileController.java b/src/main/java/com/ruoyi/airline/controller/AirlineFileController.java index 571a974..e7066f9 100644 --- a/src/main/java/com/ruoyi/airline/controller/AirlineFileController.java +++ b/src/main/java/com/ruoyi/airline/controller/AirlineFileController.java @@ -48,7 +48,7 @@ public class AirlineFileController extends BaseController { @Operation(summary = "编辑航线文件描述信息") public AjaxResult edit(@RequestBody AirlineFileVO entity) { AirlineFileDTO dto = AirlineFileControllerConvert.to(entity); - return success(airlineFileService.save(dto)); + return success(airlineFileService.update(dto)); } diff --git a/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupInfoController.java b/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupInfoController.java index 1acf2be..a466512 100644 --- a/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupInfoController.java +++ b/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupInfoController.java @@ -1,5 +1,6 @@ package com.ruoyi.airline.controller; +import com.alibaba.nacos.client.naming.utils.CollectionUtils; import com.ruoyi.airline.api.domain.AirlineFileGroupInfoVO; import com.ruoyi.airline.controller.convert.AirlineFileGroupInfoControllerConvert; import com.ruoyi.airline.service.api.IAirlineFileGroupInfoService; @@ -127,6 +128,28 @@ public class AirlineFileGroupInfoController extends BaseController { throw new BaseException("删除失败"); } + /*** + * 批量删除分组详情 + * @param airLineIds + * @return + * @throws BaseException + */ + @DeleteMapping("/batchDelete/{groupId}") + @Operation(summary = "批量删除分组详情") + public AjaxResult delete(@RequestBody List airLineIds, @PathVariable("groupId") Long groupId) throws BaseException { + if (groupId == null) { + throw new BaseException("分组ID不能为空"); + } + if (CollectionUtils.isEmpty(airLineIds)) { + throw new BaseException("没有需要删除的航线"); + } + Long result = iAirlineFileGroupInfoService.deleteGroupInfoBatch(airLineIds, groupId); + if (result > 0) { + return success(result); + } + throw new BaseException("删除失败"); + } + /*** * 移动分组详情到新分组 * @param vo diff --git a/src/main/java/com/ruoyi/airline/domain/api/IAirlineFileGroupInfoDomain.java b/src/main/java/com/ruoyi/airline/domain/api/IAirlineFileGroupInfoDomain.java index 77b4ce8..bba9718 100644 --- a/src/main/java/com/ruoyi/airline/domain/api/IAirlineFileGroupInfoDomain.java +++ b/src/main/java/com/ruoyi/airline/domain/api/IAirlineFileGroupInfoDomain.java @@ -41,4 +41,13 @@ public interface IAirlineFileGroupInfoDomain { * @return 结果 */ Long moveGroupInfo(Long oldGroupId, Long newGroupId, Long airlineId); + + /** + * 批量删除分组详情 + * + * @param airLineIds 航线ID列表 + * @param groupId 分组ID + * @return 结果 + */ + Long deleteGroupInfoBatch(List airLineIds, Long groupId); } diff --git a/src/main/java/com/ruoyi/airline/domain/impl/AirlineFileGroupInfoDomainImpl.java b/src/main/java/com/ruoyi/airline/domain/impl/AirlineFileGroupInfoDomainImpl.java index 9a5b70a..3499bb7 100644 --- a/src/main/java/com/ruoyi/airline/domain/impl/AirlineFileGroupInfoDomainImpl.java +++ b/src/main/java/com/ruoyi/airline/domain/impl/AirlineFileGroupInfoDomainImpl.java @@ -58,4 +58,9 @@ public class AirlineFileGroupInfoDomainImpl implements IAirlineFileGroupInfoDoma public Long moveGroupInfo(Long oldGroupId, Long newGroupId, Long airlineId) { return airlineFileGroupInfoMapper.updateGroupId(oldGroupId, newGroupId, airlineId); } + + @Override + public Long deleteGroupInfoBatch(List airLineIds, Long groupId) { + return airlineFileGroupInfoMapper.deleteGroupInfoBatch(airLineIds, groupId); + } } diff --git a/src/main/java/com/ruoyi/airline/mapper/AirlineFileGroupInfoMapper.java b/src/main/java/com/ruoyi/airline/mapper/AirlineFileGroupInfoMapper.java index b2c1056..157257a 100644 --- a/src/main/java/com/ruoyi/airline/mapper/AirlineFileGroupInfoMapper.java +++ b/src/main/java/com/ruoyi/airline/mapper/AirlineFileGroupInfoMapper.java @@ -36,4 +36,13 @@ public interface AirlineFileGroupInfoMapper { * @return 影响的行数 */ Long updateGroupId(Long oldGroupId, Long newGroupId, Long airlineId); + + /** + * 批量删除分组详情 + * + * @param airLineIds 航线ID列表 + * @param groupId 分组ID + * @return 影响的行数 + */ + Long deleteGroupInfoBatch(List airLineIds, Long groupId); } diff --git a/src/main/java/com/ruoyi/airline/service/api/IAirlineFileGroupInfoService.java b/src/main/java/com/ruoyi/airline/service/api/IAirlineFileGroupInfoService.java index f4ccd05..03be456 100644 --- a/src/main/java/com/ruoyi/airline/service/api/IAirlineFileGroupInfoService.java +++ b/src/main/java/com/ruoyi/airline/service/api/IAirlineFileGroupInfoService.java @@ -26,4 +26,13 @@ public interface IAirlineFileGroupInfoService { * @throws BaseException */ Long moveGroupInfo(AirlineFileGroupInfoDTO dto, Long groupId) throws BaseException; + + /** + * 批量删除分组详情 + * @param airLineIds 航线ID列表 + * @param groupId 分组ID + * @return + * @throws BaseException + */ + Long deleteGroupInfoBatch(List airLineIds, Long groupId) throws BaseException; } diff --git a/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupInfoImpl.java b/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupInfoImpl.java index 3af968b..98917ed 100644 --- a/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupInfoImpl.java +++ b/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupInfoImpl.java @@ -101,4 +101,14 @@ public class AirlineFileServiceGroupInfoImpl implements IAirlineFileGroupInfoSer return iAirlineFileGroupInfoDomain.moveGroupInfo(dto.getGroupId(), groupId, dto.getAirlineId()); } + @Override + public Long deleteGroupInfoBatch(List airLineIds, Long groupId) throws BaseException { + // 检查参数 + if (groupId == null || airLineIds == null || airLineIds.isEmpty()) { + throw new BaseException("分组ID和航线ID列表不能为空"); + } + + // 调用domain层批量删除方法 + return iAirlineFileGroupInfoDomain.deleteGroupInfoBatch(airLineIds, groupId); + } } \ No newline at end of file diff --git a/src/main/resources/mapper/airline/AirlineFileGroupInfoMapper.xml b/src/main/resources/mapper/airline/AirlineFileGroupInfoMapper.xml index 22fa66a..ee1aca0 100644 --- a/src/main/resources/mapper/airline/AirlineFileGroupInfoMapper.xml +++ b/src/main/resources/mapper/airline/AirlineFileGroupInfoMapper.xml @@ -75,4 +75,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and group_id = #{oldGroupId} and airline_id = #{airlineId} + + + + update airline_file_group_info + set del_flag = 1, + deleted_time = now() + where del_flag = 0 + and group_id = #{groupId} + and airline_id in + + #{airlineId} + + \ No newline at end of file diff --git a/src/main/resources/mapper/airline/AirlineFileMapper.xml b/src/main/resources/mapper/airline/AirlineFileMapper.xml index 8aa7bd9..6b4565d 100644 --- a/src/main/resources/mapper/airline/AirlineFileMapper.xml +++ b/src/main/resources/mapper/airline/AirlineFileMapper.xml @@ -55,4 +55,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and afgi.group_id = #{groupId} and af.name like concat(#{name}, '%') + + + + update airline_file + set name = #{name}, + air_vendor = #{airVendor}, + air_type = #{airType}, + file_name = #{fileName}, + file_url = #{fileUrl}, + type = #{type}, + source = #{source}, + status = #{status}, + file_md5 = #{fileMd5}, + update_by = #{updateBy}, + update_time = now(), + remark = #{remark} + where id = #{id} + \ No newline at end of file