fix:修复接口500的问题,增加BaseController getDataTable 的空表处理
This commit is contained in:
parent
4d4b85dd7f
commit
acc087cd72
|
|
@ -9,7 +9,6 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
|
||||||
import com.ruoyi.common.core.web.page.TableDataInfo;
|
import com.ruoyi.common.core.web.page.TableDataInfo;
|
||||||
import com.ruoyi.common.log.annotation.Log;
|
import com.ruoyi.common.log.annotation.Log;
|
||||||
import com.ruoyi.common.log.enums.BusinessType;
|
import com.ruoyi.common.log.enums.BusinessType;
|
||||||
import com.ruoyi.common.security.annotation.RequiresPermissions;
|
|
||||||
import com.ruoyi.common.security.utils.SecurityUtils;
|
import com.ruoyi.common.security.utils.SecurityUtils;
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
|
|
@ -42,7 +41,7 @@ public class AirlineFileGroupController extends BaseController {
|
||||||
*/
|
*/
|
||||||
// @RequiresPermissions("airline:group:list")
|
// @RequiresPermissions("airline:group:list")
|
||||||
@GetMapping()
|
@GetMapping()
|
||||||
@Operation(summary = "获取所有的航线分组")
|
@Operation(summary = "获取所有的航线分组")
|
||||||
public TableDataInfo index(AirlineFileGroupVO airlineFileVO) {
|
public TableDataInfo index(AirlineFileGroupVO airlineFileVO) {
|
||||||
startPage();
|
startPage();
|
||||||
airlineFileVO.setUserId(SecurityUtils.getUserId());
|
airlineFileVO.setUserId(SecurityUtils.getUserId());
|
||||||
|
|
@ -57,8 +56,8 @@ public class AirlineFileGroupController extends BaseController {
|
||||||
*/
|
*/
|
||||||
// @RequiresPermissions("airline:group:query")
|
// @RequiresPermissions("airline:group:query")
|
||||||
@GetMapping(value = "/{groupId}")
|
@GetMapping(value = "/{groupId}")
|
||||||
@Operation(summary = "根据分组ID 获取分组详情信息")
|
@Operation(summary = "根据分组ID 获取分组详情信息")
|
||||||
public AjaxResult getInfo(@PathVariable Long groupId) {
|
public AjaxResult getInfo(@PathVariable("groupId") Long groupId) {
|
||||||
return success(iAirlineFileGroupService.selectAirLineListsByGroupId(SecurityUtils.getUserId(), groupId));
|
return success(iAirlineFileGroupService.selectAirLineListsByGroupId(SecurityUtils.getUserId(), groupId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -68,11 +67,11 @@ public class AirlineFileGroupController extends BaseController {
|
||||||
// @RequiresPermissions("airline:group:add")
|
// @RequiresPermissions("airline:group:add")
|
||||||
@Log(title = "新增分组", businessType = BusinessType.INSERT)
|
@Log(title = "新增分组", businessType = BusinessType.INSERT)
|
||||||
@PostMapping
|
@PostMapping
|
||||||
@Operation(summary = "新增分组")
|
@Operation(summary = "新增分组")
|
||||||
public AjaxResult add(@Validated @RequestBody AirlineFileGroupVO group) {
|
public AjaxResult add(@Validated @RequestBody AirlineFileGroupVO group) {
|
||||||
group.setUserId(SecurityUtils.getUserId());
|
group.setUserId(SecurityUtils.getUserId());
|
||||||
AirlineFileGroupDTO dto = AirlineFileGroupControllerConvert.toDTO(group);
|
AirlineFileGroupDTO dto = AirlineFileGroupControllerConvert.toDTO(group);
|
||||||
if (!iAirlineFileGroupService.checkGroupNameUnique(dto)) {
|
if (iAirlineFileGroupService.checkGroupNameUnique(dto)) {
|
||||||
return error("新增分组'" + group.getGroupName() + "'失败,分组名称已存在");
|
return error("新增分组'" + group.getGroupName() + "'失败,分组名称已存在");
|
||||||
}
|
}
|
||||||
return toAjax(iAirlineFileGroupService.insertGroup(dto));
|
return toAjax(iAirlineFileGroupService.insertGroup(dto));
|
||||||
|
|
@ -84,11 +83,11 @@ public class AirlineFileGroupController extends BaseController {
|
||||||
// @RequiresPermissions("airline:group:edit")
|
// @RequiresPermissions("airline:group:edit")
|
||||||
@Log(title = "修改分组", businessType = BusinessType.UPDATE)
|
@Log(title = "修改分组", businessType = BusinessType.UPDATE)
|
||||||
@PutMapping
|
@PutMapping
|
||||||
@Operation(summary = "修改分组")
|
@Operation(summary = "修改分组")
|
||||||
public AjaxResult edit(@Validated @RequestBody AirlineFileGroupVO group) {
|
public AjaxResult edit(@Validated @RequestBody AirlineFileGroupVO group) {
|
||||||
group.setUserId(SecurityUtils.getUserId());
|
group.setUserId(SecurityUtils.getUserId());
|
||||||
AirlineFileGroupDTO dto = AirlineFileGroupControllerConvert.toDTO(group);
|
AirlineFileGroupDTO dto = AirlineFileGroupControllerConvert.toDTO(group);
|
||||||
if (!iAirlineFileGroupService.checkGroupNameUnique(dto)) {
|
if (iAirlineFileGroupService.checkGroupNameUnique(dto)) {
|
||||||
return error("修改分组'" + group.getGroupName() + "'失败,分组名称已存在");
|
return error("修改分组'" + group.getGroupName() + "'失败,分组名称已存在");
|
||||||
}
|
}
|
||||||
return toAjax(iAirlineFileGroupService.updateGroup(dto));
|
return toAjax(iAirlineFileGroupService.updateGroup(dto));
|
||||||
|
|
@ -100,8 +99,8 @@ public class AirlineFileGroupController extends BaseController {
|
||||||
// @RequiresPermissions("airline:group:remove")
|
// @RequiresPermissions("airline:group:remove")
|
||||||
@Log(title = "删除分组", businessType = BusinessType.DELETE)
|
@Log(title = "删除分组", businessType = BusinessType.DELETE)
|
||||||
@DeleteMapping("/{groupId}")
|
@DeleteMapping("/{groupId}")
|
||||||
@Operation(summary = "删除分组")
|
@Operation(summary = "删除分组")
|
||||||
public AjaxResult remove(@PathVariable Long groupId) {
|
public AjaxResult remove(@PathVariable("groupId") Long groupId) {
|
||||||
return toAjax(iAirlineFileGroupService.deletegroupById(SecurityUtils.getUserId(), groupId));
|
return toAjax(iAirlineFileGroupService.deletegroupById(SecurityUtils.getUserId(), groupId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -45,9 +45,9 @@ public class AirlineFileGroupInfoController extends BaseController {
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
// @RequiresPermissions("airline:groupInfo:list")
|
// @RequiresPermissions("airline:groupInfo:list")
|
||||||
@GetMapping()
|
@GetMapping("/{groupId}")
|
||||||
@Operation(summary = "编辑航线文件内容,生产航点新文件")
|
@Operation(summary = "编辑航线文件内容,生产航点新文件")
|
||||||
public TableDataInfo selectGroupInfoListById(Long groupId) {
|
public TableDataInfo selectGroupInfoListById(@PathVariable("groupId") Long groupId) {
|
||||||
startPage();
|
startPage();
|
||||||
List<AirlineFileGroupInfoDTO> list = iAirlineFileGroupInfoService.selectGroupInfoListById(groupId);
|
List<AirlineFileGroupInfoDTO> list = iAirlineFileGroupInfoService.selectGroupInfoListById(groupId);
|
||||||
List<AirlineFileGroupInfoVO> result = AirlineFileGroupInfoControllerConvert.toApiDomainList(list);
|
List<AirlineFileGroupInfoVO> result = AirlineFileGroupInfoControllerConvert.toApiDomainList(list);
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@ public class AirlineFileServiceGroupImpl implements IAirlineFileGroupService {
|
||||||
@Override
|
@Override
|
||||||
public boolean checkGroupNameUnique(AirlineFileGroupDTO group) {
|
public boolean checkGroupNameUnique(AirlineFileGroupDTO group) {
|
||||||
AirlineFileGroup model = AirlineFileGroupServiceConvert.toModel(group);
|
AirlineFileGroup model = AirlineFileGroupServiceConvert.toModel(group);
|
||||||
return iAirlineFileGroupDomain.checkgroupNameUnique(model);
|
return iAirlineFileGroupDomain.checkgroupNameUnique(model) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue