From cc560edc4af2755297b4b8368e8fb816b35e1ed3 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 17 九月 2026 14:00:58 +0800
Subject: [PATCH] 【丽水】ssoGoServiceSubtaskList 调整
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 11 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/sso/SSOController.java | 83 +++++++++++++++--------------------------
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java | 8 ++++
3 files changed, 50 insertions(+), 52 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 7134d02..eeb9416 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
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.sso;
import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.exception.base.BaseException;
@@ -11,6 +12,7 @@
import com.ruoyi.framework.web.service.SysLoginService;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
import com.smartor.domain.SSOTokenResponse;
import com.smartor.domain.SSOUserInfo;
@@ -95,6 +97,9 @@
@Autowired
private ISysConfigService sysConfigService;
+
+ @Autowired
+ private ISysDeptService sysDeptService;
private final RestTemplate restTemplate;
@@ -189,68 +194,42 @@
/**
* ssoGoServiceSubtaskList
- * code 鏄�/mediinfo-lyra-authserver/connect/authorize 鐢県is鎻愪緵
- * 鐧诲綍瀹㈡埛绔疘D鏄浐瀹氱殑 clientId = 1553588321874087936 clientSecret = suifangxt
*/
- @GetMapping("ssoGoServiceSubtaskList")
- public RedirectView ssoGoServiceSubtaskList(@RequestParam(value = "code", required = false) String code,
- @RequestParam(value = "sfzh", required = false) String sfzh) {
+ @PostMapping("ssoGoServiceSubtaskList")
+ public RedirectView ssoGoServiceSubtaskList(@RequestBody SysUser sysUserVo) {
// 閲嶅畾鍚戝湴鍧�瀵硅薄(閲嶅畾鍚戝湴鍧�
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";
- String lyraPath = "https://9.0.124.104:13021";
- String clientId = "1553588321874087936";
- 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";
+ String userName = sysUserVo.getUserName();
+ String orgid = sysUserVo.getOrgid();
+ String campusid = sysUserVo.getCampusid();
+ Long deptId = sysUserVo.getDeptId();
+ List<String> deptCodes = sysUserVo.getDeptCodes();
+ List<String> wardCodes = sysUserVo.getWardCodes();
try {
- SSOTokenResponse accessToken = getAccessTokenLyra(code, accessTokenUrl, clientId, clientSecret, redirectUri,true);
- log.info("鑾峰彇鍒扮殑token锛�" + accessToken);
- SSOUserInfo userInfo = getUserInfoLyra(accessToken.getAccess_token(), userInfoUrl,true);
- log.info("鑾峰彇鍒扮殑鐢ㄦ埛淇℃伅锛�" + userInfo);
-// createLocalSession(userInfo);
if (StringUtils.isEmpty(path)) {
throw new BaseException("璇烽厤缃墠绔湴鍧�");
}
-
- String userName = userInfo.getZhiGongID();
- String orgid = userInfo.getZuZhiJGID();
- String campusid = "1";
- String deptId = null;
- String token = null;
- log.info("銆怱SO鐧诲綍銆戣幏鍙栫敤鎴稵oken鍙傛暟锛�" + userInfo);
- String loginToken = loginService.ssoLogin(userName, orgid, deptId, campusid, token);
- if (StringUtils.isEmpty(loginToken)) {
- log.error("銆怱SO鐧诲綍銆戠櫥褰曞け璐ワ紝userName={}, orgid={}", userName, orgid);
- return buildRedirect(path + "/login");
+ if(ObjectUtils.isEmpty(deptId)){
+ SysDept sysDeptVo = new SysDept();
+ sysDeptVo.setOrgid(orgid);
+ sysDeptVo.setCampusid(campusid);
+ if(CollectionUtils.isNotEmpty(deptCodes)){
+ sysDeptVo.setDeptType("1");
+ sysDeptVo.setDeptCodes(deptCodes);
+ }else {
+ sysDeptVo.setDeptType("2");
+ sysDeptVo.setDeptCodes(wardCodes);
+ }
+ List<SysDept> sysDepts = sysDeptService.selectSysDeptList(sysDeptVo);
+ if(CollectionUtils.isNotEmpty(sysDepts)){
+ deptId = sysDepts.get(0).getDeptId();
+ }
}
-
- String voiceType = (StringUtils.isNotEmpty(serviceSubtask.getType())
- && serviceSubtask.getType().equals("1")) ? "1" : "0";
+ String loginToken = loginService.loginByUserName(userName + "&" + orgid + "&null" + "&" + campusid);
String redirectUrl = path + "/loginSSO?token=" + loginToken +
- "&orgid=" + orgid + "&campusid=" + serviceSubtask.getCampusid() +
- "&taskid=" + serviceSubtask.getTaskid() + "&patid=" + serviceSubtask.getPatid() +
- "&id=" + serviceSubtask.getId() + "&voiceType=" + voiceType +
- "&visitCount=" + serviceSubtask.getVisitCount() + "&sfzh=" + sfzh +
- "&orgname=null&ZuHuID=null&deptCode=null";
+ "&orgid=" + orgid + "&campusid=" + campusid +
+ "&deptId=" + deptId + "&orgname=null&ZuHuID=null&deptCode=null";
log.info("銆怱SO鐧诲綍銆戦噸瀹氬悜鍦板潃锛歿}", redirectUrl);
return buildRedirect(redirectUrl);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
index 9b59e1d..3eeca5e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
@@ -23,6 +23,14 @@
public List<SysDept> selectDeptList(SysDept dept);
/**
+ * 鏌ヨ閮ㄩ棬绠＄悊鏁版嵁
+ *
+ * @param dept 閮ㄩ棬淇℃伅
+ * @return 閮ㄩ棬淇℃伅闆嗗悎
+ */
+ public List<SysDept> selectSysDeptList(SysDept dept);
+
+ /**
* 鑾峰彇鎵�鏈夌殑閮ㄩ棬淇℃伅
* @return
*/
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
index 08677d9..6db8841 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
@@ -53,6 +53,17 @@
return deptMapper.selectDeptList(dept);
}
+ /**
+ * 鏌ヨ閮ㄩ棬绠＄悊鏁版嵁
+ *
+ * @param dept 閮ㄩ棬淇℃伅
+ * @return 閮ㄩ棬淇℃伅闆嗗悎
+ */
+ @Override
+ public List<SysDept> selectSysDeptList(SysDept dept) {
+ return deptMapper.selectDeptList(dept);
+ }
+
@Override
public Map<String, String> selectDept(String orgid) {
SysDept sysDept = new SysDept();
--
Gitblit v1.9.3