From f68f81917ae301f57ddca376688a6a968880681c Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 07 九月 2026 15:25:05 +0800
Subject: [PATCH] 【丽水】SSO重定向跳转详情页面
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/sso/SSOController.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/sso/SSOController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/sso/SSOController.java
index 3824360..da15e57 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/sso/SSOController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/sso/SSOController.java
@@ -14,12 +14,18 @@
import com.ruoyi.system.service.ISysUserService;
import com.smartor.domain.SSOTokenResponse;
import com.smartor.domain.SSOUserInfo;
+import com.smartor.domain.ServiceSubtask;
import com.smartor.domain.VO.ServiceSubtaskVO;
+import com.smartor.domain.entity.ServiceSubtaskEntity;
+import com.smartor.service.IServiceSubtaskService;
+import com.smartor.service.impl.ServiceSubtaskServiceImpl;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.*;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
+
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.util.ObjectUtils;
@@ -32,9 +38,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.*;
/**
* SSO鍗曠偣鐧诲綍鎺у埗鍣�
@@ -93,6 +97,9 @@
private ISysConfigService sysConfigService;
private final RestTemplate restTemplate;
+
+ @Autowired
+ private IServiceSubtaskService serviceSubtaskService;
public SSOController() {
// 閰嶇疆RestTemplate瓒呮椂
@@ -188,6 +195,9 @@
@GetMapping("ssoGoServiceSubtaskList")
public RedirectView ssoGoServiceSubtaskList(@RequestParam(value = "code", required = false) String code,
@RequestParam(value = "sfzh", required = false) String sfzh) {
+ // 閲嶅畾鍚戝湴鍧�瀵硅薄(閲嶅畾鍚戝湴鍧�
+ RedirectView redirectView = new RedirectView();
+
log.info("鏀跺埌ssoGoServiceSubtaskList璇锋眰锛屽紑濮嬮噸瀹氬悜鍒版巿鏉冩湇鍔″櫒,code = {}, sfzh = {}",code, sfzh);
String path = sysConfigService.selectConfigByKey("sys.qddz");
String redirectUri = "https://9.208.2.190:8092/prod-api/sso/ssoLoginLyra";
@@ -196,11 +206,21 @@
String clientSecret = "suifangxt";
String scope = "openid";
+ ServiceSubtaskEntity subtask = new ServiceSubtaskEntity();
+ subtask.setSfzh(sfzh);
+ subtask.setSort(0);
+ List<ServiceSubtask> serviceSubtaskList = serviceSubtaskService.selectServiceSubtaskList(subtask);
+ ServiceSubtask serviceSubtask = null;
+ if(CollectionUtils.isNotEmpty(serviceSubtaskList)){
+ serviceSubtask = serviceSubtaskList.get(0);
+ }else {
+ redirectView.setUrl(path + "/login?error=sso_failed");
+ return redirectView;
+ }
+
// String authorizeUrl = lyraPath + "/mediinfo-lyra-authserver/connect/authorize";
String accessTokenUrl = lyraPath + "/mediinfo-lyra-authserver/connect/token";
String userInfoUrl = lyraPath + "/mediinfo-lyra-authserver/connect/userinfo";
- // 閲嶅畾鍚戝湴鍧�瀵硅薄(閲嶅畾鍚戝湴鍧�
- RedirectView redirectView = new RedirectView();
try {
SSOTokenResponse accessToken = getAccessTokenLyra(code, accessTokenUrl, clientId, clientSecret, redirectUri,true);
log.info("鑾峰彇鍒扮殑token锛�" + accessToken);
@@ -223,8 +243,13 @@
return buildRedirect(path + "/login");
}
+ String voiceType = (StringUtils.isNotEmpty(serviceSubtask.getType())
+ && serviceSubtask.getType().equals("1")) ? "1" : "0";
String redirectUrl = path + "/loginSSO?token=" + loginToken + "&orgid=" + orgid +
- "&sfzh=" + sfzh + "&orgname=null&ZuHuID=null&deptCode=null";
+ "&taskid=" + serviceSubtask.getTaskid() + "&patid=" + serviceSubtask.getPatid() +
+ "&id=" + serviceSubtask.getId() + "&voiceType=" + voiceType +
+ "&visitCount=" + serviceSubtask.getVisitCount() + "&sfzh=" + sfzh +
+ "&orgname=null&ZuHuID=null&deptCode=null";
log.info("銆怱SO鐧诲綍銆戦噸瀹氬悜鍦板潃锛歿}", redirectUrl);
return buildRedirect(redirectUrl);
--
Gitblit v1.9.3