From e94241fc70d1308ea88fec5b57e771c6ecad1cee Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期六, 29 七月 2023 10:37:57 +0800 Subject: [PATCH] 推送app位置优化在线离线 --- ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java index 3ee4de7..42a3bad 100644 --- a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java +++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java @@ -58,6 +58,13 @@ return getDataTable(list); } + @PreAuthorize("@ss.hasPermi('alarmpoints:well:list')") + @GetMapping("/nonPageList") + @ApiOperation("鏌ヨ浜曞垪琛�-涓嶅垎椤�") + public AjaxResult nonPageList(ArdAlarmpointsWell ardAlarmpointsWell) { + List<ArdAlarmpointsWell> list = ardAlarmpointsWellService.selectArdAlarmpointsWellList(ardAlarmpointsWell); + return success(list); + } /** * 瀵煎嚭浜曠鐞嗗垪琛� */ @@ -91,8 +98,8 @@ public AjaxResult add(@RequestBody ArdAlarmpointsWell ardAlarmpointsWell) { try { return toAjax(ardAlarmpointsWellService.insertArdAlarmpointsWell(ardAlarmpointsWell)); - } catch (DuplicateKeyException e) { - return AjaxResult.error("浜曞彿閲嶅"); + } catch (Exception e) { + return AjaxResult.error(e.getMessage()); } } @@ -105,9 +112,9 @@ @ApiOperation("淇敼浜�") public AjaxResult edit(@RequestBody ArdAlarmpointsWell ardAlarmpointsWell) { try { - return toAjax(ardAlarmpointsWellService.updateArdAlarmpointsWell(ardAlarmpointsWell)); - } catch (DuplicateKeyException e) { - return AjaxResult.error("浜曞彿閲嶅"); + return toAjax(ardAlarmpointsWellService.updateArdAlarmpointsWell(ardAlarmpointsWell)); + } catch (Exception e) { + return AjaxResult.error(e.getMessage()); } } -- Gitblit v1.9.3