From acc087cd721185658e0ead2ee4078932ac821a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=A4=A7?= <1504665037@qq.com> Date: Mon, 26 Jan 2026 15:47:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3500?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A2=9E=E5=8A=A0BaseContr?= =?UTF-8?q?oller=20getDataTable=20=E7=9A=84=E7=A9=BA=E8=A1=A8=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AirlineFileGroupController.java | 19 +++++++++---------- .../AirlineFileGroupInfoController.java | 4 ++-- .../impl/AirlineFileServiceGroupImpl.java | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupController.java b/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupController.java index f4a5a40..1f4a5e5 100644 --- a/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupController.java +++ b/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupController.java @@ -9,7 +9,6 @@ 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 com.ruoyi.common.security.utils.SecurityUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -42,7 +41,7 @@ public class AirlineFileGroupController extends BaseController { */ // @RequiresPermissions("airline:group:list") @GetMapping() - @Operation(summary = "获取所有的航线分组") + @Operation(summary = "获取所有的航线分组") public TableDataInfo index(AirlineFileGroupVO airlineFileVO) { startPage(); airlineFileVO.setUserId(SecurityUtils.getUserId()); @@ -57,8 +56,8 @@ public class AirlineFileGroupController extends BaseController { */ // @RequiresPermissions("airline:group:query") @GetMapping(value = "/{groupId}") - @Operation(summary = "根据分组ID 获取分组详情信息") - public AjaxResult getInfo(@PathVariable Long groupId) { + @Operation(summary = "根据分组ID 获取分组详情信息") + public AjaxResult getInfo(@PathVariable("groupId") Long groupId) { return success(iAirlineFileGroupService.selectAirLineListsByGroupId(SecurityUtils.getUserId(), groupId)); } @@ -68,11 +67,11 @@ public class AirlineFileGroupController extends BaseController { // @RequiresPermissions("airline:group:add") @Log(title = "新增分组", businessType = BusinessType.INSERT) @PostMapping - @Operation(summary = "新增分组") + @Operation(summary = "新增分组") public AjaxResult add(@Validated @RequestBody AirlineFileGroupVO group) { group.setUserId(SecurityUtils.getUserId()); AirlineFileGroupDTO dto = AirlineFileGroupControllerConvert.toDTO(group); - if (!iAirlineFileGroupService.checkGroupNameUnique(dto)) { + if (iAirlineFileGroupService.checkGroupNameUnique(dto)) { return error("新增分组'" + group.getGroupName() + "'失败，分组名称已存在"); } return toAjax(iAirlineFileGroupService.insertGroup(dto)); @@ -84,11 +83,11 @@ public class AirlineFileGroupController extends BaseController { // @RequiresPermissions("airline:group:edit") @Log(title = "修改分组", businessType = BusinessType.UPDATE) @PutMapping - @Operation(summary = "修改分组") + @Operation(summary = "修改分组") public AjaxResult edit(@Validated @RequestBody AirlineFileGroupVO group) { group.setUserId(SecurityUtils.getUserId()); AirlineFileGroupDTO dto = AirlineFileGroupControllerConvert.toDTO(group); - if (!iAirlineFileGroupService.checkGroupNameUnique(dto)) { + if (iAirlineFileGroupService.checkGroupNameUnique(dto)) { return error("修改分组'" + group.getGroupName() + "'失败，分组名称已存在"); } return toAjax(iAirlineFileGroupService.updateGroup(dto)); @@ -100,8 +99,8 @@ public class AirlineFileGroupController extends BaseController { // @RequiresPermissions("airline:group:remove") @Log(title = "删除分组", businessType = BusinessType.DELETE) @DeleteMapping("/{groupId}") - @Operation(summary = "删除分组") - public AjaxResult remove(@PathVariable Long groupId) { + @Operation(summary = "删除分组") + public AjaxResult remove(@PathVariable("groupId") Long groupId) { return toAjax(iAirlineFileGroupService.deletegroupById(SecurityUtils.getUserId(), groupId)); } diff --git a/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupInfoController.java b/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupInfoController.java index 7b15f97..e44193b 100644 --- a/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupInfoController.java +++ b/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupInfoController.java @@ -45,9 +45,9 @@ public class AirlineFileGroupInfoController extends BaseController { * @return */ // @RequiresPermissions("airline:groupInfo:list") - @GetMapping() + @GetMapping("/{groupId}") @Operation(summary = "编辑航线文件内容，生产航点新文件") - public TableDataInfo selectGroupInfoListById(Long groupId) { + public TableDataInfo selectGroupInfoListById(@PathVariable("groupId") Long groupId) { startPage(); List list = iAirlineFileGroupInfoService.selectGroupInfoListById(groupId); List result = AirlineFileGroupInfoControllerConvert.toApiDomainList(list); 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 052dec9..24d7d71 100644 --- a/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupImpl.java +++ b/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupImpl.java @@ -64,7 +64,7 @@ public class AirlineFileServiceGroupImpl implements IAirlineFileGroupService { @Override public boolean checkGroupNameUnique(AirlineFileGroupDTO group) { AirlineFileGroup model = AirlineFileGroupServiceConvert.toModel(group); - return iAirlineFileGroupDomain.checkgroupNameUnique(model); + return iAirlineFileGroupDomain.checkgroupNameUnique(model) ; } @Override