From 8573ebde936fcc45bf45d4a556ca75c154b83a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=82=96=E6=99=8B=E9=A3=9E?= <378266566@qq.com> Date: Thu, 25 Dec 2025 10:45:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=9A=82=E6=97=B6=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/exa/EXAController.java | 18 +++++++++--------- .../admin/instant/InstantController.java | 18 +++++++++--------- .../admin/model/RunModelController.java | 4 ++-- .../controller/admin/warn/warnController.java | 8 ++++---- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/exa/EXAController.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/exa/EXAController.java index e68dc1b..3e4e6bf 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/exa/EXAController.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/exa/EXAController.java @@ -38,7 +38,7 @@ public class EXAController { @GetMapping("/page") @Operation(summary = "获取测点分页列表") - @PreAuthorize("@ss.hasPermission('alert:exa:query')") +// @PreAuthorize("@ss.hasPermission('alert:exa:query')") public CommonResult> getEXAList(EXAPageReqVO reqVO) throws IOException, URISyntaxException { PageResult pageResult = exaService.getEXAPage(reqVO); return success(BeanUtils.toBean(pageResult, EXAHttp.class)); @@ -46,7 +46,7 @@ public class EXAController { @GetMapping("/nowList") @Operation(summary = "获取带实时值的列表") - @PreAuthorize("@ss.hasPermission('alert:exa:query')") +// @PreAuthorize("@ss.hasPermission('alert:exa:query')") public CommonResult> getNowDataList(List list) throws IOException, URISyntaxException { List nowList=exaService.getEXAListNow(list); return success(nowList); @@ -54,7 +54,7 @@ public class EXAController { @PostMapping("/nowListReal") @Operation(summary = "获取带实时值的列表") - @PreAuthorize("@ss.hasPermission('alert:exa:query')") +// @PreAuthorize("@ss.hasPermission('alert:exa:query')") public CommonResult getNowList(@RequestBody EXANowListReqVO list) throws IOException, URISyntaxException { EXAResult nowList=exaService.getEXAListNowReal(list); return success(nowList); @@ -63,7 +63,7 @@ public class EXAController { @GetMapping("/now") @Operation(summary = "根据点号获取测点实时值-单点或多点") - @PreAuthorize("@ss.hasPermission('alert:exa:query')") +// @PreAuthorize("@ss.hasPermission('alert:exa:query')") public CommonResult getNowData(String itemName) throws IOException, URISyntaxException { String nowData=exaService.getEXANow(itemName); return success(nowData); @@ -72,7 +72,7 @@ public class EXAController { @GetMapping("/historys") @Operation(summary = "获取点号历史-支持多点(点号之间用逗号分割)") - @PreAuthorize("@ss.hasPermission('alert:exa:query')") +// @PreAuthorize("@ss.hasPermission('alert:exa:query')") public CommonResult>>> getEXAHistorys(EXAHistoryReqVO exaHistoryReqVo) { List>> historyLists=exaService.getEXAHistorys(exaHistoryReqVo); return success(historyLists); @@ -80,7 +80,7 @@ public class EXAController { @PostMapping("/create") @Operation(summary = "新增EXA点号") - @PreAuthorize("@ss.hasPermission('alert:exa:create')") +// @PreAuthorize("@ss.hasPermission('alert:exa:create')") public CommonResult createPoint(@Valid @RequestBody Point pointVo) throws IOException { String id = exaService.createPoint(pointVo); return success(id); @@ -88,7 +88,7 @@ public class EXAController { @GetMapping("/group") @Operation(summary = "获取EXA所有组名") - @PreAuthorize("@ss.hasPermission('alert:exa:query')") +// @PreAuthorize("@ss.hasPermission('alert:exa:query')") public CommonResult>> getEXAGroupInfo() throws URISyntaxException, IOException { List> groupList=exaService.getEXAGroupInfo(); return success(groupList); @@ -97,7 +97,7 @@ public class EXAController { @DeleteMapping("/delete") @Operation(summary = "删除点号") @Parameter(name = "ItemName", description = "点号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('alert:exa:delete')") +// @PreAuthorize("@ss.hasPermission('alert:exa:delete')") public CommonResult deleteUser(@RequestParam("ItemName") String ItemName) { String result= exaService.deletePoint(ItemName); @@ -129,7 +129,7 @@ public class EXAController { @Parameter(name = "file", description = "Excel 文件", required = true), @Parameter(name = "updateSupport", description = "是否支持更新，默认为 false", example = "true") }) - @PreAuthorize("@ss.hasPermission('system:user:import')") +// @PreAuthorize("@ss.hasPermission('system:user:import')") public CommonResult importExcel(@RequestParam("file") MultipartFile file, @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws Exception { System.out.println(file.getInputStream()); diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/InstantController.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/InstantController.java index dab647b..36401a5 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/InstantController.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/InstantController.java @@ -34,7 +34,7 @@ public class InstantController { @GetMapping("/page") @Operation(summary = "获得模型实例分页列表") - @PreAuthorize("@ss.hasPermission('run:instant:list')") +// @PreAuthorize("@ss.hasPermission('run:instant:list')") public CommonResult> getInstantPage(@Valid InstantPageReqVO pageReqVO) { PageResult pageResult = instantService.getInstantPage(pageReqVO); return success(BeanUtils.toBean(pageResult, InstantRespVO.class)); @@ -43,7 +43,7 @@ public class InstantController { @GetMapping("/get") @Operation(summary = "获得实例信息") - @PreAuthorize("@ss.hasPermission('run:instant:query')") +// @PreAuthorize("@ss.hasPermission('run:instant:query')") public CommonResult getInstant(@RequestParam("id") Long id) { InstantDO instant = instantService.getInstant(id); return success(BeanUtils.toBean(instant, InstantRespVO.class)); @@ -52,7 +52,7 @@ public class InstantController { @GetMapping("/getPoint") @Operation(summary = "获得某实例的测点列表") - @PreAuthorize("@ss.hasPermission('run:instant:query')") +// @PreAuthorize("@ss.hasPermission('run:instant:query')") public CommonResult> getInstantPoint(@RequestParam("id") Long id) { List instantPointList= instantService.getInstantPoint(id); return success(instantPointList); @@ -61,7 +61,7 @@ public class InstantController { @PostMapping("/getChart") @Operation(summary = "获得某实例的曲线数据--默认-读历史") - @PreAuthorize("@ss.hasPermission('run:instant:query')") +// @PreAuthorize("@ss.hasPermission('run:instant:query')") public CommonResult> getInstantChart( @Valid @RequestBody InstantChartReqVO instantChartReqVO) { List instantChartList= instantService.getInstantChart(instantChartReqVO); return success(instantChartList); @@ -79,7 +79,7 @@ public class InstantController { @PutMapping("/update") @Operation(summary = "修改模型实例") - @PreAuthorize("@ss.hasPermission('run:instant:update')") +// @PreAuthorize("@ss.hasPermission('run:instant:update')") public CommonResult updateInstant(@Valid @RequestBody InstantSaveReqVO updateReqVO) { instantService.updateInstant(updateReqVO); return success(true); @@ -87,7 +87,7 @@ public class InstantController { @GetMapping("/count") @Operation(summary = "获得各状态数量列表") - @PreAuthorize("@ss.hasPermission('run:instant:query')") +// @PreAuthorize("@ss.hasPermission('run:instant:query')") public CommonResult getInstantPage() { InstantCountRespVO instantCountRespVO= instantService.getInstantCount(); return success(BeanUtils.toBean(instantCountRespVO, InstantCountRespVO.class)); @@ -97,7 +97,7 @@ public class InstantController { @PostMapping("/create") @Operation(summary = "创建模型实例") - @PreAuthorize("@ss.hasPermission('run:instant:create')") +// @PreAuthorize("@ss.hasPermission('run:instant:create')") public CommonResult> createInstant(@RequestBody InstantSaveReqVO createReqVO) throws IOException { return success(instantService.createInstant(createReqVO)); } @@ -105,7 +105,7 @@ public class InstantController { @DeleteMapping("/delete") @Operation(summary = "删除模型实例") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('run:instant:delete')") +// @PreAuthorize("@ss.hasPermission('run:instant:delete')") public CommonResult deleteInstant(@RequestParam("id") Long id) { instantService.deleteInstant(id); return success(true); @@ -114,7 +114,7 @@ public class InstantController { @PostMapping("/calc") @Operation(summary = "回算模型实例" ) - @PreAuthorize("@ss.hasPermission('run:instant:calc')") +// @PreAuthorize("@ss.hasPermission('run:instant:calc')") public CommonResult calcInstant( @Valid @RequestBody InstantCalcReqVO instantCalcReqVO) { InstantCalcResultVO instantCalcResult= instantService.calcInstant(instantCalcReqVO); return success(instantCalcResult); diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/RunModelController.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/RunModelController.java index 3c7fe7c..cc326a9 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/RunModelController.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/RunModelController.java @@ -36,7 +36,7 @@ public class RunModelController { @GetMapping("/page") @Operation(summary = "获得模型分页列表") - @PreAuthorize("@ss.hasPermission('run:model:query')") +// @PreAuthorize("@ss.hasPermission('run:model:query')") public CommonResult> getModelPage(@Valid ModelPageReqVO pageReqVO) { PageResult pageResult = runModelService.getModelPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ModelRespVO.class)); @@ -44,7 +44,7 @@ public class RunModelController { @GetMapping("/version/page") @Operation(summary = "获得模型版本分页列表") - @PreAuthorize("@ss.hasPermission('run:model:query')") +// @PreAuthorize("@ss.hasPermission('run:model:query')") public CommonResult> getModelVersionPage(@Valid ModelVersionPageReqVO pageReqVO) { PageResult pageResult = runModelService.getModelVersionPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ModelVersionRespVO.class)); diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/warnController.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/warnController.java index 14caf09..6a1349b 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/warnController.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/warnController.java @@ -38,14 +38,14 @@ public class warnController { @GetMapping("/page") @Operation(summary = "获得预警分页列表") - @PreAuthorize("@ss.hasPermission('run:warn:query')") +// @PreAuthorize("@ss.hasPermission('run:warn:query')") public CommonResult> getWarnPage(@Valid WarnPageReqVO pageReqVO) { PageResult pageResult = warnService.getWarnPage(pageReqVO); return success(BeanUtils.toBean(pageResult, WarnRespVO.class)); } @GetMapping("/page-real") @Operation(summary = "获得预警分页列表") - @PreAuthorize("@ss.hasPermission('run:warn:query')") +// @PreAuthorize("@ss.hasPermission('run:warn:query')") public CommonResult> getWarnPageReal(@Valid WarnPageReqVO pageReqVO) { pageReqVO.setStatusRealTime(0L); pageReqVO.setWarnStatus1(1L); @@ -54,7 +54,7 @@ public class warnController { } @GetMapping("/get") @Operation(summary = "获得预警信息") - @PreAuthorize("@ss.hasPermission('run:warn:query')") +// @PreAuthorize("@ss.hasPermission('run:warn:query')") public CommonResult getWarn(@RequestParam("id") Long id) { WarnDO warn = warnService.getWarn(id); return success(BeanUtils.toBean(warn, WarnRespVO.class)); @@ -62,7 +62,7 @@ public class warnController { @PutMapping("/update") @Operation(summary = "修改预警") - @PreAuthorize("@ss.hasPermission('run:warn:update')") +// @PreAuthorize("@ss.hasPermission('run:warn:update')") public CommonResult updateWarn(@Valid @RequestBody WarnSaveReqVO updateReqVO) { warnService.updateWarn(updateReqVO); return success(true);