From 2a85d6802ca46fe6e1a2c80922a59d2f54a033f4 Mon Sep 17 00:00:00 2001 From: huxin02 Date: Fri, 11 Apr 2025 17:54:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AE=A4=E8=AF=81=EF=BC=8C?= =?UTF-8?q?=E6=89=A7=E6=B3=95=E8=AE=B0=E5=BD=95=E4=BB=AA=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/views/big-screen/bigdataBack.vue | 5 +--- .../lawenforcement/service/AuthService.java | 30 ------------------- .../lawenforcement/service/ZfzbglService.java | 2 -- 3 files changed, 1 insertion(+), 36 deletions(-) diff --git a/client/src/views/big-screen/bigdataBack.vue b/client/src/views/big-screen/bigdataBack.vue index 3b1dd12..d5f88d7 100644 --- a/client/src/views/big-screen/bigdataBack.vue +++ b/client/src/views/big-screen/bigdataBack.vue @@ -2643,10 +2643,7 @@ onMounted(() => { onUnmounted(() => { if (timerId) clearInterval(timerId) // 关闭执法记录仪视频和语音通话 - if (videoInfo && Object.keys(videoInfo).length > 0) { - if (videoPlayer) stopVideoLive(deviceInfo) - if (audioPlayer) closeVoiceLive(deviceInfo) - } + // 挂断视频呼叫 hangupCall() // 关闭媒体流映射事件 diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/AuthService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/AuthService.java index 97094ce..84b6cd0 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/AuthService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/AuthService.java @@ -57,36 +57,6 @@ public class AuthService { this.agencyArr = agencyArr; } - /** - * 通过Authorization获取用户信息 - * - * @param authorization Bearer token - * @return 用户信息 - */ - @SneakyThrows - public RemoteUserInfo getUserInfo(String authorization) { - AccessToken accessToken = new AccessToken(); - accessToken.setAccess_token(authorization.split("Bearer ")[1]); - RemoteUserInfo userInfo = ssoClientService.getRemoteUserInfo(accessToken); - if (StringUtils.hasText(userInfo.getGajgjgdm()) && this.agencyArr.contains(userInfo.getGajgjgdm())) - userInfo.setGajgjgdm("01610100000000000"); - return userInfo; - } - - /** - * 通过授权码获取token - * - * @param code 授权码 - * @return 访问令牌 - */ - @SneakyThrows - public AccessToken login(String code) { - log.debug("通过授权码获取token, code:{}", code); - com.smartlx.sso.client.result.Result accessTokenResult = ssoClientService.getAccessToken(code); - AccessToken accessToken = accessTokenResult.getData(); - cacheUserInfo(accessToken); - return accessToken; - } /** * 系统级别退出登录 diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/ZfzbglService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/ZfzbglService.java index f1cb4a4..cb3d76b 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/ZfzbglService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/ZfzbglService.java @@ -118,8 +118,6 @@ public class ZfzbglService { z.setZblx("矿山执法"); } else if ("6".equals(z.getZblxdm())) { z.setZblx("危化品执法"); - } else if ("7".equals(z.getZblxdm())) { - z.setZblx("执法记录仪"); } else if ("8".equals(z.getZblxdm())) { z.setZblx("对讲机"); }