From 5dec8dcc45b40a1d7acdf05be2f2ffd00759535e Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期六, 07 六月 2025 16:11:30 +0800 Subject: [PATCH] 1、*-global.yml配置文件中增加有关萤石云应用的配置; 2、萤石云视频监控相关数据库设计(萤石应用+视频监控站); 3、remote模块增加定时下载萤石应用AccessToken的监听器,及网络下载逻辑,数据库存储等功能实现; --- pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java index 4bca493..c5c3917 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java @@ -64,7 +64,7 @@ if(res.itemTotal != null && res.itemTotal > 0) { return BaseResponseUtils.buildSuccess(res); }else { - return BaseResponseUtils.buildFail(SystemResultCode.NO_ROLES.getMessage()); + return BaseResponseUtils.buildSuccess(SystemResultCode.NO_ROLES.getMessage()); } } catch (Exception e) { @@ -104,7 +104,7 @@ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } - Long roleId = Optional.ofNullable(po.getRoleid()).orElse(0L); + Long roleId = Optional.ofNullable(po.getRoleId()).orElse(0L); String roleName = Optional.ofNullable(po.getRoleName()).orElse(""); JSONArray permissions = Optional.ofNullable(JSONArray.parseArray(po.getPermissions())).orElse(JSONArray.parseArray("[]")); Long operator = Optional.ofNullable(po.getOperator()).orElse(0L); -- Gitblit v1.8.0