提交航线管理逻辑和接口

src/main/java/com/ruoyi/airline/controller/AirlineFileController.java

@@ -8,6 +8,10 @@ import com.ruoyi.common.core.exception.base.BaseException;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +29,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/airline/file")
+@Tag(name = "航线管理")
 public class AirlineFileController extends BaseController {
 
     private static final Logger log = LoggerFactory.getLogger(AirlineFileController.class);
@@ -40,6 +45,8 @@ public class AirlineFileController extends BaseController {
      * @param entity 实体对象
      * @return
      */
+    @RequiresPermissions("airline:file:edit")
+    @Log(title = "修改航线属性", businessType = BusinessType.UPDATE)
     @PutMapping("/edit")
     public AjaxResult edit(@RequestBody AirlineFileVO entity) {
         AirlineFileDTO dto = AirlineFileControllerConvert.toDTO(entity);
@@ -55,8 +62,10 @@ public class AirlineFileController extends BaseController {
      *
      * @param vo
      */
+    @RequiresPermissions("airline:file:parseAndUpload")
+    @Log(title = "创建航线", businessType = BusinessType.UPDATE)
     @PostMapping("/parseAndUpload")
-    public AjaxResult createOrupdate(@RequestBody AirlineFileVO vo) {
+    public AjaxResult createOrUpdate(@RequestBody AirlineFileVO vo) {
         AirlineFileDTO airlineFile = AirlineFileControllerConvert.toDTO(vo);
         try {
             return success(airlineFileService.createOrupdate(airlineFile));

src/main/java/com/ruoyi/airline/controller/AirlineFileGroupInfoController.java

@@ -11,6 +11,7 @@ import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -25,6 +26,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/airline/fileGroupInfo")
+@Tag(name = "分组航线管理")
 public class AirlineFileGroupInfoController extends BaseController {
 
 

src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupImpl.java

@@ -4,12 +4,14 @@ import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.ruoyi.airline.domain.api.IAirlineFileDomain;
 import com.ruoyi.airline.domain.api.IAirlineFileGroupDomain;
 import com.ruoyi.airline.domain.api.IAirlineFileGroupInfoDomain;
+import com.ruoyi.airline.domain.model.AirlineFile;
 import com.ruoyi.airline.domain.model.AirlineFileGroup;
 import com.ruoyi.airline.domain.model.AirlineFileGroupInfo;
 import com.ruoyi.airline.service.api.IAirlineFileGroupInfoService;
 import com.ruoyi.airline.service.api.IAirlineFileGroupService;
 import com.ruoyi.airline.service.convert.AirlineFileGroupInfoServiceConvert;
 import com.ruoyi.airline.service.convert.AirlineFileGroupServiceConvert;
+import com.ruoyi.airline.service.convert.AirlineFileServiceConvert;
 import com.ruoyi.airline.service.dto.AirlineFileDTO;
 import com.ruoyi.airline.service.dto.AirlineFileGroupDTO;
 import com.ruoyi.airline.service.dto.AirlineFileGroupInfoDTO;
@@ -110,8 +112,8 @@ public class AirlineFileServiceGroupImpl implements IAirlineFileGroupService {
         List<AirlineFileGroupInfo> airlineFileGroupInfoDTOS = iAirlineFileGroupInfoDomain.selectGroupInfoListById(groupId);
         if (!CollectionUtils.isEmpty(airlineFileGroupInfoDTOS)) {
             List<Long> ids = airlineFileGroupInfoDTOS.stream().map(AirlineFileGroupInfo::getAirlineId).toList();
-            List<AirlineFileDTO> airlineFileDTOS = iAirlineFileDomain.selectFileListByIds(ids);
+            List<AirlineFile> airlineFileDTOS = iAirlineFileDomain.selectFileListByIds(ids);
-            dto.setGroupInfos(airlineFileDTOS);
+            dto.setGroupInfos(AirlineFileServiceConvert.toDTOList(airlineFileDTOS));
         }
         return dto;
     }

src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceImpl.java

@@ -11,7 +11,7 @@ import com.ruoyi.airline.service.api.IAirlineFileService;
 import com.ruoyi.airline.service.convert.AirlineFileServiceConvert;
 import com.ruoyi.airline.service.dto.AirlineFileDTO;
 import com.ruoyi.common.core.exception.base.BaseException;
-import com.ruoyi.file.service.ISysFileService;
+//import com.ruoyi.file.service.ISysFileService;
 import org.apache.commons.compress.archivers.ArchiveEntry;
 import org.apache.commons.compress.archivers.ArchiveInputStream;
 import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;