From ba86a0d01167520d5cda895b81ab2880eada87fa Mon Sep 17 00:00:00 2001
From: gyb <gyb@example.com>
Date: Sat, 28 Feb 2026 14:03:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=B0=83=E8=AF=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AirlineFileGroupInfoController.java | 14 ++++++--------
 .../service/api/IAirlineFileGroupInfoService.java  |  3 ++-
 .../impl/AirlineFileServiceGroupInfoImpl.java      |  6 +++---
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupInfoController.java b/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupInfoController.java
index 311aa21..62b3fef 100644
--- a/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupInfoController.java
+++ b/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupInfoController.java
@@ -3,6 +3,7 @@ package com.ruoyi.airline.controller;
 import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.ruoyi.airline.api.domain.AirlineFileGroupInfoVO;
 import com.ruoyi.airline.api.domain.AirlineFileVO;
+import com.ruoyi.airline.controller.convert.AirlineFileControllerConvert;
 import com.ruoyi.airline.controller.convert.AirlineFileGroupInfoControllerConvert;
 import com.ruoyi.airline.service.api.IAirlineFileGroupInfoService;
 import com.ruoyi.airline.service.api.IAirlineFileService;
@@ -85,14 +86,14 @@ public class AirlineFileGroupInfoController extends BaseController {
         AirlineFileGroupInfoDTO infoDTO = new AirlineFileGroupInfoDTO();
         infoDTO.setGroupId(groupId);
         infoDTO.setAirlineFileDTO(dto);
-        return success(iAirlineFileGroupInfoService.save(infoDTO));
+        AirlineFileDTO result = iAirlineFileGroupInfoService.save(infoDTO);
+        return success(AirlineFileControllerConvert.from(result));
     }
 
     /**
      * 在当前分组下添加初始航线（空的航线）
      *
      * @param vo 实体对象
-     * @return
      */
     @PostMapping()
     @Operation(summary = "在当前分组下添加初始航线,必须上传分组ID")
@@ -100,12 +101,9 @@ public class AirlineFileGroupInfoController extends BaseController {
         if (vo.getGroupId() == null) {
             throw new BaseException("分组ID不能为空");
         }
-        AirlineFileGroupInfoDTO dto = AirlineFileGroupInfoControllerConvert.to(vo);
-        Long result = iAirlineFileGroupInfoService.save(dto);
-        if (result > 0) {
-            return success(result);
-        }
-        throw new BaseException("新增失败");
+        AirlineFileGroupInfoDTO infoDTO = AirlineFileGroupInfoControllerConvert.to(vo);
+        AirlineFileDTO result = iAirlineFileGroupInfoService.save(infoDTO);
+        return success(AirlineFileControllerConvert.from(result));
     }
 
 
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 067c925..c996eb3 100644
--- a/src/main/java/com/ruoyi/airline/service/api/IAirlineFileGroupInfoService.java
+++ b/src/main/java/com/ruoyi/airline/service/api/IAirlineFileGroupInfoService.java
@@ -1,5 +1,6 @@
 package com.ruoyi.airline.service.api;
 
+import com.ruoyi.airline.service.dto.AirlineFileDTO;
 import com.ruoyi.airline.service.dto.AirlineFileGroupInfoDTO;
 import com.ruoyi.common.core.exception.base.BaseException;
 
@@ -14,7 +15,7 @@ public interface IAirlineFileGroupInfoService {
     List<AirlineFileGroupInfoDTO> selectGroupInfoListById(Long groupId);
 
 
-    Long save(AirlineFileGroupInfoDTO dto) throws BaseException;
+    AirlineFileDTO save(AirlineFileGroupInfoDTO dto) throws BaseException;
 
     Long deleteGroupInfo(AirlineFileGroupInfoDTO dto) 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 a4f0c33..8eb6580 100644
--- a/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupInfoImpl.java
+++ b/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupInfoImpl.java
@@ -60,7 +60,7 @@ public class AirlineFileServiceGroupInfoImpl implements IAirlineFileGroupInfoSer
     }
 
     @Override
-    public Long save(AirlineFileGroupInfoDTO dto) throws BaseException {
+    public AirlineFileDTO save(AirlineFileGroupInfoDTO dto) throws BaseException {
 
         String name = dto.getAirlineFileDTO().getName();
         name =  iAirlineFileService.getNewFileNameLikeByGroupId(name, dto.getGroupId());
@@ -73,9 +73,9 @@ public class AirlineFileServiceGroupInfoImpl implements IAirlineFileGroupInfoSer
         AirlineFileGroupInfo model = AirlineFileGroupInfoServiceConvert.to(dto);
 
         // 检查唯一性：同一个分组下不能有相同的航线
+        iAirlineFileGroupInfoDomain.save(model);
 
-
-        return iAirlineFileGroupInfoDomain.save(model);
+        return result;
     }
 
     @Override