From 371603a0eb9f3a279cf77073734e991b5851b792 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 05 九月 2025 16:21:01 +0800
Subject: [PATCH] 市一短信接口同步服务对接

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java |   41 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 06a2955..a5e2dd6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -1,21 +1,22 @@
 package com.ruoyi.web.controller.system;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginBody;
+import com.ruoyi.common.utils.RSAPublicKeyExample;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.web.service.SysLoginService;
 import com.ruoyi.framework.web.service.SysPermissionService;
+import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysMenuService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.security.PermitAll;
 import javax.servlet.http.HttpServletResponse;
@@ -38,7 +39,17 @@
     private ISysMenuService menuService;
 
     @Autowired
+    private ISysDeptService sysDeptService;
+
+    @Autowired
     private SysPermissionService permissionService;
+
+
+    @Value("${pri_key}")
+    private String pri_key;
+
+    @Value("${isEncryp}")
+    private Integer isEncryp;
 
     /**
      * 鐧诲綍鏂规硶
@@ -56,7 +67,7 @@
     }
 
     /**
-     * 鐧诲綍鏂规硶
+     * 鍗曠偣鐧诲綍鏂规硶
      *
      * @param loginBody 鍗曠偣鐧诲綍淇℃伅
      * @return 缁撴灉
@@ -66,10 +77,21 @@
         AjaxResult ajax = AjaxResult.success();
         // 鐢熸垚浠ょ墝
         if (StringUtils.isEmpty(loginBody.getUsername()) || StringUtils.isEmpty(loginBody.getOrgid())) {
-            return AjaxResult.error("鐢ㄦ埛鍚嶆垨缁勭粐鏈烘瀯涓嶈兘涓虹┖");
+            return AjaxResult.error("鐢ㄦ埛鍚嶆垨缁勭粐鏈烘瀯鎴栭儴闂ㄤ笉鑳戒负绌�");
         }
 
-        String token = loginService.loginByUserName(loginBody.getUsername() + "&" + loginBody.getOrgid()+"&" + loginBody.getDeptId());
+        if (StringUtils.isEmpty(loginBody.getDeptId())) {
+            loginBody.setDeptId(null);
+        }
+        String userName = loginBody.getUsername();
+        if (isEncryp == 1) {
+            RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
+            userName = rsaPublicKeyExample.decryptedData(loginBody.getUsername(), pri_key);
+        }
+        String token = loginService.loginByUserName(userName + "&" + loginBody.getOrgid() + "&" + loginBody.getDeptId());
+        if (StringUtils.isEmpty(token)) {
+            return AjaxResult.error("鐧婚檰澶辫触");
+        }
         ajax.put(Constants.TOKEN, token);
         return ajax;
     }
@@ -117,4 +139,9 @@
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
         return AjaxResult.success(menuService.buildMenus(menus));
     }
+
+    @GetMapping("/getDept/{orgid}")
+    public AjaxResult getDept(@PathVariable String orgid) {
+        return AjaxResult.success(sysDeptService.selectDept(orgid));
+    }
 }

--
Gitblit v1.9.3