From 2da6576ce17cb18f042f561648230736945ec4c1 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期三, 10 四月 2024 19:35:16 +0800 Subject: [PATCH] 大屏数据配置接口 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbBasicDataConfigController.java | 79 ++++++++++++++++++++++++++++++++++----- 1 files changed, 69 insertions(+), 10 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbBasicDataConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbBasicDataConfigController.java index 3e0d496..a095d17 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbBasicDataConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbBasicDataConfigController.java @@ -4,6 +4,7 @@ import com.ruoyi.common.basic.PageDTO; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.enums.ShowStatusEnum; +import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.BeanUtils; import com.ruoyi.system.domain.TbBasicDataCategory; import com.ruoyi.system.dto.BasicDataConfigDTO; @@ -35,7 +36,7 @@ @Slf4j @RestController @RequiredArgsConstructor -@Api(tags = {"基础数据分类相关接口"}) +@Api(tags = {"基础数据配置相关接口"}) @RequestMapping("/basic-data-config") public class TbBasicDataConfigController { @@ -49,8 +50,16 @@ @GetMapping("/categories") @ApiOperation(value = "获取分类列表") public R<List<BasicDataCategoryVO>> queryBasicDataCategories() { - List<TbBasicDataCategory> list = tbBasicDataCategoryService.lambdaQuery().eq(TbBasicDataCategory::getStatus, ShowStatusEnum.SHOW).list(); - return R.ok(BeanUtils.copyList(list, BasicDataCategoryVO.class)); + try { + List<TbBasicDataCategory> list = tbBasicDataCategoryService.lambdaQuery().eq(TbBasicDataCategory::getStatus, ShowStatusEnum.SHOW).list(); + return R.ok(BeanUtils.copyList(list, BasicDataCategoryVO.class)); + } catch (Exception e) { + if (e instanceof ServiceException) { + return R.fail(e.getMessage()); + } + log.error("获取分类列表异常", e); + return R.fail(); + } } /** @@ -61,7 +70,15 @@ @PostMapping("/add") @ApiOperation("添加") public R<Void> add(@RequestBody @Validated BasicDataConfigDTO dto) { - tbBasicDataConfigService.add(dto); + try { + tbBasicDataConfigService.add(dto); + } catch (Exception e) { + if (e instanceof ServiceException) { + return R.fail(e.getMessage()); + } + log.error("添加异常", e); + return R.fail(); + } return R.ok(); } @@ -73,7 +90,15 @@ @PostMapping("/edit") @ApiOperation("编辑") public R<Void> edit(@RequestBody @Validated BasicDataConfigUpdateDTO dto) { - tbBasicDataConfigService.edit(dto); + try { + tbBasicDataConfigService.edit(dto); + } catch (Exception e) { + if (e instanceof ServiceException) { + return R.fail(e.getMessage()); + } + log.error("编辑异常", e); + return R.fail(); + } return R.ok(); } @@ -85,7 +110,16 @@ @GetMapping("/get-details") @ApiOperation("获取详情") public R<BasicDataConfigDetailVO> getDetails(Integer id) { - return R.ok(tbBasicDataConfigService.getDetails(id)); + try { + BasicDataConfigDetailVO details = tbBasicDataConfigService.getDetails(id); + return R.ok(details); + } catch (Exception e) { + if (e instanceof ServiceException) { + return R.fail(e.getMessage()); + } + log.error("获取详情异常", e); + return R.fail(); + } } /** @@ -96,7 +130,15 @@ @DeleteMapping("/delete") @ApiOperation("删除") public R<Void> delete(Integer id) { - tbBasicDataConfigService.delete(id); + try { + tbBasicDataConfigService.delete(id); + } catch (Exception e) { + if (e instanceof ServiceException) { + return R.fail(e.getMessage()); + } + log.error("删除异常", e); + return R.fail(); + } return R.ok(); } @@ -108,7 +150,15 @@ @PostMapping("show-hide") @ApiOperation("隐藏显示操作") public R<Void> showHide(@RequestBody ShowHideDTO dto) { - tbBasicDataConfigService.showHide(dto); + try { + tbBasicDataConfigService.showHide(dto); + } catch (Exception e) { + if (e instanceof ServiceException) { + return R.fail(e.getMessage()); + } + log.error("隐藏显示操作异常", e); + return R.fail(); + } return R.ok(); } @@ -119,8 +169,17 @@ */ @PostMapping("/page") @ApiOperation("分页条件查询") - public R<PageDTO<BasicDataConfigVO>> page(@RequestBody BasicDataConfigQuery query) { - return R.ok(tbBasicDataConfigService.queryPage(query)); + public R<PageDTO<BasicDataConfigVO>> page(@Validated @RequestBody BasicDataConfigQuery query) { + try { + PageDTO<BasicDataConfigVO> basicDataConfigVOPageDTO = tbBasicDataConfigService.queryPage(query); + return R.ok(basicDataConfigVOPageDTO); + } catch (Exception e) { + if (e instanceof ServiceException) { + return R.fail(e.getMessage()); + } + log.error("分页条件查询异常", e); + return R.fail(); + } } } -- Gitblit v1.7.1