diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/sysSapUser/SysSapUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/sysSapUser/SysSapUserController.java index d89b048..e68120e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/sysSapUser/SysSapUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/sysSapUser/SysSapUserController.java @@ -79,7 +79,7 @@ public class SysSapUserController extends BaseController @PostMapping public AjaxResult add(@RequestBody SysSapUser sysSapUser) { - sysSapUser.setSapUserId(UUID.fastUUID().toString()); + //sysSapUser.setSapUserId(UUID.fastUUID().toString()); return toAjax(sysSapUserService.insertSysSapUser(sysSapUser)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 98c5229..37adeb3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletResponse; import com.ruoyi.common.constant.CacheConstants; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.system.service.*; +import com.ruoyi.web.utils.SHA1; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -62,6 +63,20 @@ public class SysUserController extends BaseController @Autowired private ISysPostService postService; + /** + * 获取切换账号的OA登录 token + */ + @PreAuthorize("@ss.hasPermi('system:user:OAtoken')") + @GetMapping("/getSwitchAccountToken/{account}") + public AjaxResult getSwitchAccountToken(@PathVariable("account") String account) + { + AjaxResult ajax = AjaxResult.success(); + //OA验证 + String newToken = SHA1.shaEncode("uy4MbH"+account); + ajax.put("token", newToken); + return ajax; + } + /** * 获取用户列表 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SHA1.java b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SHA1.java index c061297..3fa50bf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SHA1.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SHA1.java @@ -30,4 +30,8 @@ public class SHA1 { return ""; } } + + public static void main(String[] args) { + System.out.println(shaEncode("uy4MbH"+"8879")); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/sysSapUser/domain/SysSapUser.java b/ruoyi-system/src/main/java/com/ruoyi/sysSapUser/domain/SysSapUser.java index 0c9bcab..7dbc46b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/sysSapUser/domain/SysSapUser.java +++ b/ruoyi-system/src/main/java/com/ruoyi/sysSapUser/domain/SysSapUser.java @@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * SAP账户对象 sys_sap_user - * + * * @author ruoyi * @date 2024-04-02 */ @@ -34,52 +34,60 @@ public class SysSapUser extends BaseEntity @Excel(name = "系统账户名称") private String sysUserNickName; - public void setSapUserId(String sapUserId) + /** 片区 */ + @Excel(name = "片区") + private String sysUserPianqu; + + public void setSapUserId(String sapUserId) { this.sapUserId = sapUserId; } - public String getSapUserId() + public String getSapUserId() { return sapUserId; } - public void setSapUserBm(String sapUserBm) + public void setSapUserBm(String sapUserBm) { this.sapUserBm = sapUserBm; } - public String getSapUserBm() + public String getSapUserBm() { return sapUserBm; } - public void setSapUserName(String sapUserName) + public void setSapUserName(String sapUserName) { this.sapUserName = sapUserName; } - public String getSapUserName() + public String getSapUserName() { return sapUserName; } - public void setSysUserName(String sysUserName) + public void setSysUserName(String sysUserName) { this.sysUserName = sysUserName; } - public String getSysUserName() + public String getSysUserName() { return sysUserName; } - public void setSysUserNickName(String sysUserNickName) + public void setSysUserNickName(String sysUserNickName) { this.sysUserNickName = sysUserNickName; } - public String getSysUserNickName() + public String getSysUserNickName() { return sysUserNickName; } + public String getSysUserPianqu() { return sysUserPianqu; } + + public void setSysUserPianqu(String sysUserPianqu) { this.sysUserPianqu = sysUserPianqu; } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-system/src/main/resources/mapper/sysSapUser/SysSapUserMapper.xml b/ruoyi-system/src/main/resources/mapper/sysSapUser/SysSapUserMapper.xml index 2763bc3..2c5006d 100644 --- a/ruoyi-system/src/main/resources/mapper/sysSapUser/SysSapUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/sysSapUser/SysSapUserMapper.xml @@ -3,34 +3,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + + - select sap_user_id, sap_user_bm, sap_user_name, sys_user_name, sys_user_nick_name from sys_sap_user + select sap_user_id, sap_user_bm, sap_user_name, sys_user_name, sys_user_nick_name, sys_user_pianqu from sys_sap_user - + - + insert into sys_sap_user @@ -39,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sap_user_name, sys_user_name, sys_user_nick_name, + sys_user_pianqu, #{sapUserId}, @@ -46,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{sapUserName}, #{sysUserName}, #{sysUserNickName}, + #{sysUserPianqu}, @@ -56,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sap_user_name = #{sapUserName}, sys_user_name = #{sysUserName}, sys_user_nick_name = #{sysUserNickName}, + sys_user_pianqu = #{sysUserPianqu}, where sap_user_id = #{sapUserId} @@ -65,9 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_sap_user where sap_user_id in + delete from sys_sap_user where sap_user_id in #{sapUserId} - \ No newline at end of file + diff --git a/ruoyi-ui/src/api/system/user.js b/ruoyi-ui/src/api/system/user.js index dbf1809..a8571a5 100644 --- a/ruoyi-ui/src/api/system/user.js +++ b/ruoyi-ui/src/api/system/user.js @@ -145,3 +145,12 @@ export function deptTreeSelect() { method: 'get' }) } + +// 获取切换账号的OA登录 token +export function getSwitchAccountToken(account) { + return request({ + url: '/system/user/getSwitchAccountToken/'+account, + method: 'get' + }) +} + diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue index 5de08b6..71c207c 100644 --- a/ruoyi-ui/src/layout/components/Navbar.vue +++ b/ruoyi-ui/src/layout/components/Navbar.vue @@ -25,6 +25,17 @@ + + + + + + + +
+ 确 定 +
+ @@ -39,6 +50,9 @@ 布局设置 + + 切换账号 + 退出登录 @@ -61,7 +75,19 @@ import RuoYiDoc from '@/components/RuoYi/Doc' import settings from '@/settings' import NavbarNotice from "@/layout/components/NavbarNotice.vue"; +import { getSwitchAccountToken } from "@/api/system/user"; +import { checkRole } from "@/utils/permission"; // 权限判断函数 + export default { + data() { + return { + // 弹出层标题 + switchAccountTitle: "", + // 是否显示弹出层 + switchAccountOpen: false, + form: {} + } + }, components: { Breadcrumb, TopNav, @@ -97,6 +123,18 @@ export default { } }, methods: { + checkRole, + switchAccount() { + this.switchAccountTitle = "账号切换"; + this.switchAccountOpen = true; + }, + switchAccountConfirm(account){ + //获取 OA登录-token + getSwitchAccountToken(account).then(response => { + this.switchAccountOpen = false; + window.open('http://localhost:3335/ssoLogin?loginid='+account+'&token='+response.token, '_self'); + }) + }, toggleSideBar() { this.$store.dispatch('app/toggleSideBar') }, diff --git a/ruoyi-ui/src/views/sysSapUser/sysSapUser/index.vue b/ruoyi-ui/src/views/sysSapUser/sysSapUser/index.vue index 3ed3c0a..2c781dd 100644 --- a/ruoyi-ui/src/views/sysSapUser/sysSapUser/index.vue +++ b/ruoyi-ui/src/views/sysSapUser/sysSapUser/index.vue @@ -25,14 +25,14 @@ @keyup.enter.native="handleQuery" /> - + 搜索 重置 @@ -92,6 +92,7 @@ +