From 2a67051beb9af85de5abda5e7e2b33fca571ae6c Mon Sep 17 00:00:00 2001 From: feng <18691763612@163.com> Date: Tue, 14 Oct 2025 13:38:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC=E8=87=B3?= =?UTF-8?q?=E5=AE=89=E7=9C=BC=E5=A4=A7=E5=B1=8F=E9=89=B4=E6=9D=83=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/renkang/anyan/client/AnYanClient.java | 13 ++----------- .../renkang/anyan/client/AnYanClientExecutor.java | 11 +++-------- .../java/com/renkang/anyan/model/vo/AuthResult.java | 8 ++++++++ .../controller/LargeScreenNewController.java | 2 +- .../largeScreen/service/ILargeScreenService.java | 2 +- .../service/impl/LargeScreenServiceImpl.java | 2 +- 6 files changed, 16 insertions(+), 22 deletions(-) diff --git a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClient.java b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClient.java index f48c59b..361023a 100644 --- a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClient.java +++ b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClient.java @@ -4,16 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.renkang.anyan.model.dto.HealthRoomDTO; import com.renkang.anyan.model.dto.HealthSignListParam; import com.renkang.anyan.model.dto.MedicalAbnormalDTO; -import com.renkang.anyan.model.vo.BloodPressureList; -import com.renkang.anyan.model.vo.HealthSignStatVO; -import com.renkang.anyan.model.vo.MedicalPeopleNumStatisticsVO; -import com.renkang.anyan.model.vo.WeightPressureList; -import com.renkang.anyan.model.vo.BloodSugarClockSList; -import com.renkang.anyan.model.vo.HospitalListVO; -import com.renkang.anyan.model.vo.HealthRoomBaseVO; -import com.renkang.anyan.model.vo.HealthPlaceHomDetailsVO; -import com.renkang.anyan.model.vo.MedicalAbnormalStatisticsVO; -import com.renkang.anyan.model.vo.MedicalAbnormalVO; +import com.renkang.anyan.model.vo.*; import java.util.Date; import java.util.List; @@ -115,5 +106,5 @@ public interface AnYanClient { * 公网环境获取服务访问token (目前仅用于访问安眼大屏, 不走缓存, 每次用现取) * @return */ - String publicNetworkTokenNoCache(); + AuthResult publicNetworkTokenNoCache(); } diff --git a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClientExecutor.java b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClientExecutor.java index 10b774d..76c21ec 100644 --- a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClientExecutor.java +++ b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClientExecutor.java @@ -182,7 +182,7 @@ public class AnYanClientExecutor implements AnYanClient { public String publicNetworkToken(){ String token = redisClientUtil.get(new RedisKeyPrefix(AnYanConstants.AN_YAN_API_TOKEN_PREFIX) ,"publicToken",String.class); if(StrUtil.isEmpty(token)){ - AuthResult authResult = queryPublicToken(); + AuthResult authResult = publicNetworkTokenNoCache(); if(null != authResult){ token = authResult.getAccess_token(); int expireSeconds = ObjectUtil.isNotEmpty(authResult.getExpires_in())? authResult.getExpires_in() : 7200; @@ -192,7 +192,8 @@ public class AnYanClientExecutor implements AnYanClient { return token; } - private AuthResult queryPublicToken(){ + @Override + public AuthResult publicNetworkTokenNoCache(){ JSONObject param = new JSONObject(); String password = anYanProperties.getPublicPassWrod(); String userName = anYanProperties.getPublicUserNmae(); @@ -222,10 +223,4 @@ public class AnYanClientExecutor implements AnYanClient { return null; } - @Override - public String publicNetworkTokenNoCache(){ - AuthResult authResult = queryPublicToken(); - return null != authResult? authResult.getAccess_token() : null; - } - } diff --git a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/AuthResult.java b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/AuthResult.java index 7184f5b..5115ca0 100644 --- a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/AuthResult.java +++ b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/AuthResult.java @@ -20,4 +20,12 @@ public class AuthResult { * token */ private String access_token; + /** + * refresh_token + */ + private String refresh_token; + /** + * satoken + */ + private String satoken; } diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/controller/LargeScreenNewController.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/controller/LargeScreenNewController.java index f06d9ba..2a397f8 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/controller/LargeScreenNewController.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/controller/LargeScreenNewController.java @@ -283,7 +283,7 @@ public class LargeScreenNewController { * @return */ @GetMapping("queryAnYanToken") - public Result queryAnYanToken(){ + public Result queryAnYanToken(){ return Result.ok(largeScreenService.queryAnYanToken()); } } diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenService.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenService.java index 4e1e480..bbdd6e7 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenService.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenService.java @@ -55,5 +55,5 @@ public interface ILargeScreenService extends IService { */ void syncAnYanHospital(); - String queryAnYanToken(); + AuthResult queryAnYanToken(); } diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenServiceImpl.java index 14069a8..b8409b4 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenServiceImpl.java @@ -535,7 +535,7 @@ public class LargeScreenServiceImpl extends ServiceImpl