From ca19c6a0bcc1eee3a37fbf27036b93e208f8e839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E6=96=87=E9=9D=99WWW?= <15144434+wen-wenjing-www@user.noreply.gitee.com> Date: Mon, 4 Aug 2025 16:44:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B7=AF=E7=BA=BF=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../route/controller/CpRouteController.java | 14 +++++++------- .../modules/route/mapper/CpRouteMapper.java | 3 ++- .../modules/route/service/CpRouteService.java | 3 ++- .../route/service/impl/CpRouteServiceImpl.java | 5 +++-- .../resources/mapper/route/CpRouteMapper.xml | 18 ++++++++++++------ 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/aircraft-system/src/main/java/com/aircraft/modules/route/controller/CpRouteController.java b/aircraft-system/src/main/java/com/aircraft/modules/route/controller/CpRouteController.java index 602e1a7..1989f18 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/route/controller/CpRouteController.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/route/controller/CpRouteController.java @@ -54,19 +54,19 @@ public class CpRouteController { @Autowired private UserMapper userMapper; - @ApiOperation(value = "分页查询路线（支持路线名模糊查询）", notes = "分页查询路线，可根据路线名称进行模糊搜索") + @ApiOperation(value = "分页查询路线（name模糊查询）", notes = "分页查询路线，可根据路线名称进行模糊搜索") @RequestMapping(method = RequestMethod.GET) @ApiImplicitParams({ @ApiImplicitParam(name = "size", value = "分页大小", paramType = "query"), @ApiImplicitParam(name = "current", value = "当前页面：从1开始", paramType = "query"), - @ApiImplicitParam(name = "routeName", value = "路线名称关键词，用于模糊查询", paramType = "query") + @ApiImplicitParam(name = "name", value = "路线名称关键词，用于模糊查询", paramType = "query"), + @ApiImplicitParam(name = "areaId", value = "通过区域id查询路线", paramType = "query"), + @ApiImplicitParam(name = "scenicId", value = "通过景区id查询路线", paramType = "query") }) public ResponseEntity> findByPage( - final Page page, - @RequestParam(required = false) String routeName - ) { + final Page page, CpRouteDTO cpRouteDTO) { try { - IPage records = entityService.findByPage(page,routeName); + IPage records = entityService.findByPage(page, cpRouteDTO); return new ResponseEntity<>(records, HttpStatus.OK); } catch (Exception e) { LOG.error("分页查询路线时出错", e); @@ -214,7 +214,7 @@ public class CpRouteController { return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build(); } - @ApiOperation(value = "根据景区获取景区下的所有路线") + @ApiOperation(value = "根据景区id获取景区下的所有路线") @RequestMapping(value = "getByAreaId", method = RequestMethod.GET) public ResponseEntity> getRouteByEmAreaId( @ApiParam(value = "景区ID", required = true) diff --git a/aircraft-system/src/main/java/com/aircraft/modules/route/mapper/CpRouteMapper.java b/aircraft-system/src/main/java/com/aircraft/modules/route/mapper/CpRouteMapper.java index 8ec67ae..01cd81b 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/route/mapper/CpRouteMapper.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/route/mapper/CpRouteMapper.java @@ -1,6 +1,7 @@ package com.aircraft.modules.route.mapper; import com.aircraft.modules.route.domain.CpRoute; +import com.aircraft.modules.route.domain.dto.CpRouteDTO; import com.aircraft.modules.route.domain.dto.CpRouteVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -29,5 +30,5 @@ public interface CpRouteMapper extends BaseMapper { List listRoutesByIds(List routeIds); - IPage selectVoPage(Page page, String routeName); + IPage selectVoPage(Page page, CpRouteDTO dto); } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/route/service/CpRouteService.java b/aircraft-system/src/main/java/com/aircraft/modules/route/service/CpRouteService.java index d454925..55388b8 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/route/service/CpRouteService.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/route/service/CpRouteService.java @@ -1,6 +1,7 @@ package com.aircraft.modules.route.service; import com.aircraft.modules.route.domain.CpRoute; +import com.aircraft.modules.route.domain.dto.CpRouteDTO; import com.aircraft.modules.route.domain.dto.CpRouteVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -20,7 +21,7 @@ public interface CpRouteService extends IService { void updateDelFlagById(Long id, Integer delFlag); - IPage findByPage(Page page, String routeName); + IPage findByPage(Page page, CpRouteDTO cpRouteDTO); /** * 获取所有路线信息 diff --git a/aircraft-system/src/main/java/com/aircraft/modules/route/service/impl/CpRouteServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/route/service/impl/CpRouteServiceImpl.java index 95539eb..89ff740 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/route/service/impl/CpRouteServiceImpl.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/route/service/impl/CpRouteServiceImpl.java @@ -1,6 +1,7 @@ package com.aircraft.modules.route.service.impl; import com.aircraft.modules.route.domain.CpRoute; +import com.aircraft.modules.route.domain.dto.CpRouteDTO; import com.aircraft.modules.route.domain.dto.CpRouteVo; import com.aircraft.modules.route.mapper.CpRouteMapper; import com.aircraft.modules.route.service.CpRouteService; @@ -31,8 +32,8 @@ public class CpRouteServiceImpl extends ServiceImpl impl } @Override - public IPage findByPage(Page page, String routeName) { - return cpRouteMapper.selectVoPage(page, routeName); + public IPage findByPage(Page page, CpRouteDTO cpRouteDTO) { + return cpRouteMapper.selectVoPage(page, cpRouteDTO); } @Override diff --git a/aircraft-system/src/main/resources/mapper/route/CpRouteMapper.xml b/aircraft-system/src/main/resources/mapper/route/CpRouteMapper.xml index 08f4022..6a834e9 100644 --- a/aircraft-system/src/main/resources/mapper/route/CpRouteMapper.xml +++ b/aircraft-system/src/main/resources/mapper/route/CpRouteMapper.xml @@ -5,15 +5,21 @@