From b9eded75c71a712743383907e650134615ed60d8 Mon Sep 17 00:00:00 2001 From: gyb Date: Mon, 9 Feb 2026 08:40:59 +0800 Subject: [PATCH] =?UTF-8?q?bug=EF=BC=9A=E8=88=AA=E7=BA=BF=E4=B8=80?= =?UTF-8?q?=E6=9C=9F=E5=A2=9E=E5=8A=A0=E8=88=AA=E7=BA=BF=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AirlineFileGroupController.java | 16 ++++ .../domain/api/IAirlineFileGroupDomain.java | 3 + .../impl/AirlineFileGroupDomainImpl.java | 9 +++ .../airline/domain/model/AirlineFile.java | 18 +++++ .../mapper/AirlineFileGroupMapper.java | 3 + .../mapper/entity/AirlineFileEntity.java | 15 ++++ .../service/api/IAirlineFileGroupService.java | 3 + .../airline/service/dto/AirlineFileDTO.java | 18 +++++ .../impl/AirlineFileServiceGroupImpl.java | 14 +++- .../mapper/airline/AirlineFileGroupMapper.xml | 80 +++++++++++++++++++ 10 files changed, 178 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupController.java b/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupController.java index fce59fd..541b001 100644 --- a/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupController.java +++ b/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupController.java @@ -3,6 +3,7 @@ package com.ruoyi.airline.controller; import com.ruoyi.airline.api.domain.AirlineFileGroupVO; import com.ruoyi.airline.controller.convert.AirlineFileGroupControllerConvert; import com.ruoyi.airline.service.api.IAirlineFileGroupService; +import com.ruoyi.airline.service.dto.AirlineFileDTO; import com.ruoyi.airline.service.dto.AirlineFileGroupDTO; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; @@ -104,4 +105,19 @@ public class AirlineFileGroupController extends BaseController { return toAjax(iAirlineFileGroupService.deletegroupById(SecurityUtils.getUserId(), groupId)); } + /** + * 根据用户ID查询所有符合条件的航线（包含分组信息） + * + * @param dto 查询条件 + * @return 航线列表 + */ + @GetMapping("/airlineList") + @Operation(summary = "根据用户ID查询所有符合条件的航线") + public TableDataInfo selectAirlineListByUserId(AirlineFileDTO dto) { + startPage(); + dto.setUserId(SecurityUtils.getUserId()); + List list = iAirlineFileGroupService.selectAirlineListByUserId(dto); + return getDataTable(list); + } + } diff --git a/src/main/java/com/ruoyi/airline/domain/api/IAirlineFileGroupDomain.java b/src/main/java/com/ruoyi/airline/domain/api/IAirlineFileGroupDomain.java index d4c135b..2f81fb3 100644 --- a/src/main/java/com/ruoyi/airline/domain/api/IAirlineFileGroupDomain.java +++ b/src/main/java/com/ruoyi/airline/domain/api/IAirlineFileGroupDomain.java @@ -1,5 +1,6 @@ package com.ruoyi.airline.domain.api; +import com.ruoyi.airline.domain.model.AirlineFile; import com.ruoyi.airline.domain.model.AirlineFileGroup; import java.util.List; @@ -31,4 +32,6 @@ public interface IAirlineFileGroupDomain { int insertGroup(AirlineFileGroup model); List selectGroupList(AirlineFileGroup model); + + List selectAirlineListByUserId(AirlineFile model); } diff --git a/src/main/java/com/ruoyi/airline/domain/impl/AirlineFileGroupDomainImpl.java b/src/main/java/com/ruoyi/airline/domain/impl/AirlineFileGroupDomainImpl.java index a934dd7..0e7c6ac 100644 --- a/src/main/java/com/ruoyi/airline/domain/impl/AirlineFileGroupDomainImpl.java +++ b/src/main/java/com/ruoyi/airline/domain/impl/AirlineFileGroupDomainImpl.java @@ -2,8 +2,11 @@ package com.ruoyi.airline.domain.impl; import com.ruoyi.airline.domain.api.IAirlineFileGroupDomain; import com.ruoyi.airline.domain.convert.AirlineFileGroupDomainConvert; +import com.ruoyi.airline.domain.convert.AirlineFileDomainConvert; +import com.ruoyi.airline.domain.model.AirlineFile; import com.ruoyi.airline.domain.model.AirlineFileGroup; import com.ruoyi.airline.mapper.AirlineFileGroupMapper; +import com.ruoyi.airline.mapper.entity.AirlineFileEntity; import com.ruoyi.airline.mapper.entity.AirlineFileGroupEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -51,4 +54,10 @@ public class AirlineFileGroupDomainImpl implements IAirlineFileGroupDomain { AirlineFileGroupEntity entity = AirlineFileGroupDomainConvert.to(model); return AirlineFileGroupDomainConvert.fromList(airlineFileGroupMapper.selectGroupList(entity)); } + + @Override + public List selectAirlineListByUserId(AirlineFile model) { + AirlineFileEntity entity = AirlineFileDomainConvert.to(model); + return AirlineFileDomainConvert.fromList(airlineFileGroupMapper.selectAirlineListByUserId(entity)); + } } diff --git a/src/main/java/com/ruoyi/airline/domain/model/AirlineFile.java b/src/main/java/com/ruoyi/airline/domain/model/AirlineFile.java index e730993..61f9f8f 100644 --- a/src/main/java/com/ruoyi/airline/domain/model/AirlineFile.java +++ b/src/main/java/com/ruoyi/airline/domain/model/AirlineFile.java @@ -102,6 +102,21 @@ public class AirlineFile extends BaseEntity { */ private Integer autoTakePhotoInterval; + /** + * 分组ID + */ + private Long groupId; + + /** + * 分组名称 + */ + private String groupName; + + /** + * 用户ID，分组自带用户归属。 后期权限都是基于用户ID进行 + */ + private Long userId; + @@ -123,6 +138,9 @@ public class AirlineFile extends BaseEntity { ", turnRadius=" + turnRadius + ", autoTakePhoto=" + autoTakePhoto + ", autoTakePhotoInterval=" + autoTakePhotoInterval + + ", groupId=" + groupId + + ", groupName='" + groupName + '\'' + + ", userId=" + userId + '}'; } } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/airline/mapper/AirlineFileGroupMapper.java b/src/main/java/com/ruoyi/airline/mapper/AirlineFileGroupMapper.java index a7e5d16..7da7cf8 100644 --- a/src/main/java/com/ruoyi/airline/mapper/AirlineFileGroupMapper.java +++ b/src/main/java/com/ruoyi/airline/mapper/AirlineFileGroupMapper.java @@ -1,5 +1,6 @@ package com.ruoyi.airline.mapper; +import com.ruoyi.airline.mapper.entity.AirlineFileEntity; import com.ruoyi.airline.mapper.entity.AirlineFileGroupEntity; import java.util.List; @@ -20,4 +21,6 @@ public interface AirlineFileGroupMapper { int insertGroup(AirlineFileGroupEntity entity); List selectGroupList(AirlineFileGroupEntity entity); + + List selectAirlineListByUserId(AirlineFileEntity entity); } diff --git a/src/main/java/com/ruoyi/airline/mapper/entity/AirlineFileEntity.java b/src/main/java/com/ruoyi/airline/mapper/entity/AirlineFileEntity.java index 1825e7f..dfde7cb 100644 --- a/src/main/java/com/ruoyi/airline/mapper/entity/AirlineFileEntity.java +++ b/src/main/java/com/ruoyi/airline/mapper/entity/AirlineFileEntity.java @@ -70,6 +70,21 @@ public class AirlineFileEntity extends BaseEntity { * 航线文件对应的 MD5指纹 */ private String fileMd5; + + /** + * 用户ID + */ + private Long groupId; + + /** + * 分组名称 + */ + private String groupName; + /** + * 用户ID，分组自带用户归属。 后期权限都是基于用户ID进行 + */ + private Long userId; + } diff --git a/src/main/java/com/ruoyi/airline/service/api/IAirlineFileGroupService.java b/src/main/java/com/ruoyi/airline/service/api/IAirlineFileGroupService.java index 075c6e3..fcb8097 100644 --- a/src/main/java/com/ruoyi/airline/service/api/IAirlineFileGroupService.java +++ b/src/main/java/com/ruoyi/airline/service/api/IAirlineFileGroupService.java @@ -1,5 +1,6 @@ package com.ruoyi.airline.service.api; +import com.ruoyi.airline.service.dto.AirlineFileDTO; import com.ruoyi.airline.service.dto.AirlineFileGroupDTO; import java.util.List; @@ -27,4 +28,6 @@ public interface IAirlineFileGroupService { List selectGroupList(AirlineFileGroupDTO dto); AirlineFileGroupDTO selectAirLineListsByGroupId(Long userId, Long groupId); + + List selectAirlineListByUserId(AirlineFileDTO dto); } diff --git a/src/main/java/com/ruoyi/airline/service/dto/AirlineFileDTO.java b/src/main/java/com/ruoyi/airline/service/dto/AirlineFileDTO.java index 9dd3b43..973a814 100644 --- a/src/main/java/com/ruoyi/airline/service/dto/AirlineFileDTO.java +++ b/src/main/java/com/ruoyi/airline/service/dto/AirlineFileDTO.java @@ -108,6 +108,21 @@ public class AirlineFileDTO extends BaseEntity { */ private Integer autoTakePhotoInterval; + /** + * 分组ID + */ + private Long groupId; + + /** + * 分组名称 + */ + private String groupName; + + /** + * 用户ID，分组自带用户归属。 后期权限都是基于用户ID进行 + */ + private Long userId; + @Override public String toString() { @@ -128,6 +143,9 @@ public class AirlineFileDTO extends BaseEntity { ", turnRadius=" + turnRadius + ", autoTakePhoto=" + autoTakePhoto + ", autoTakePhotoInterval=" + autoTakePhotoInterval + + ", groupId=" + groupId + + ", groupName='" + groupName + '\'' + + ", userId=" + userId + '}'; } diff --git a/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupImpl.java b/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupImpl.java index bfaf27c..bc5ba55 100644 --- a/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupImpl.java +++ b/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupImpl.java @@ -11,6 +11,7 @@ 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; import org.slf4j.Logger; @@ -40,7 +41,6 @@ public class AirlineFileServiceGroupImpl implements IAirlineFileGroupService { @Autowired private IAirlineFileDomain iAirlineFileDomain; - @Override public int deletegroupById(Long userId, Long groupId) { // 1、删除航线信息 @@ -110,5 +110,17 @@ public class AirlineFileServiceGroupImpl implements IAirlineFileGroupService { return dto; } + /** + * 根据用户ID查询所有符合条件的航线（包含分组信息） + * + * @param dto 查询条件 + * @return 航线列表 + */ + @Override + public List selectAirlineListByUserId(AirlineFileDTO dto) { + AirlineFile model = AirlineFileServiceConvert.to(dto); + return AirlineFileServiceConvert.fromList(iAirlineFileGroupDomain.selectAirlineListByUserId(model)); + } + } \ No newline at end of file diff --git a/src/main/resources/mapper/airline/AirlineFileGroupMapper.xml b/src/main/resources/mapper/airline/AirlineFileGroupMapper.xml index 68e0156..5c72fb7 100644 --- a/src/main/resources/mapper/airline/AirlineFileGroupMapper.xml +++ b/src/main/resources/mapper/airline/AirlineFileGroupMapper.xml @@ -18,6 +18,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + + + + + + + + + // 增加sql，实现 通过用户id查询 及详细信息，查询 airline_file_group 、airline_file_group_info ，airline_file表，关联出所有符合条件的航线 + + + + \ No newline at end of file