From 1b64b271b15f72fbc97d26a796eedc133dcdf49d Mon Sep 17 00:00:00 2001 From: xuhaoxiang <1216720373@qq.com> Date: Fri, 20 Aug 2021 09:12:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BD=9B=E5=B1=B13=E9=99=A2?= =?UTF-8?q?=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/controller/LoginController.java | 22 ++++++++++++++----- .../java/com/manage/controller/SsoLogin.java | 16 ++++++++++++-- .../java/com/manage/dao/Power_UserMapper.java | 2 +- .../resources/mapper/Power_UserMapper.xml | 2 +- 4 files changed, 33 insertions(+), 9 deletions(-) diff --git a/power-admin/src/main/java/com/manage/controller/LoginController.java b/power-admin/src/main/java/com/manage/controller/LoginController.java index 21174bb..0fb87a2 100644 --- a/power-admin/src/main/java/com/manage/controller/LoginController.java +++ b/power-admin/src/main/java/com/manage/controller/LoginController.java @@ -19,6 +19,7 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -40,6 +41,15 @@ public class LoginController { @Autowired private Power_Login_SetMapper powerLoginSetMapper; + @Value("${EMRMEDICALRECORD_URLHEAD}") + private String EMRMEDICALRECORD_URLHEAD; + + @Value("${EMRMEDICALRECORD_IP}") + private String ip; + + @Value("${EMRMEDICALRECORD_PORT}") + private String port; + @RequestMapping(value = "login",method = RequestMethod.GET) public String toLogin(Model model){ Power_Login_Set loginSet = powerLoginSetMapper.selectByPrimaryKey(1); @@ -49,7 +59,7 @@ public class LoginController { } @RequestMapping(value = "login",method = RequestMethod.POST) - public String login(Power_User powerUser,HttpServletResponse response, HttpServletRequest request,Model model){ + public void login(Power_User powerUser,HttpServletResponse response, HttpServletRequest request,Model model){ try { Power_UserVo user = powerUserService.findPowerUserByUserNameAndUserPwd(powerUser); //添加进操作日志 @@ -113,7 +123,12 @@ public class LoginController { CacheManager.putCache(token,new Cache(user,System.currentTimeMillis(),TOKEN_EXPIRE_TIME*1000)); ActionScopeUtils.setSessionAttribute("token",token,Integer.valueOf(String.valueOf(TOKEN_EXPIRE_TIME))); ActionScopeUtils.setSessionAttribute("CURRENT_USER",user,Integer.valueOf(String.valueOf(TOKEN_EXPIRE_TIME))); - return "redirect:gatewayPage"; + //单点登录跳转 + String url=EMRMEDICALRECORD_URLHEAD+"/login?token="+token+"&userName="+user.getUserName()+"&flag=1"; + //request.getRequestDispatcher(result).forward(request, response); + + response.sendRedirect(url); + // return "redirect:gatewayPage"; }else{ //登录失败 Integer wrongNum = 1; @@ -137,9 +152,6 @@ public class LoginController { e.printStackTrace(); CacheManager.addExcCount("exc"); } - Power_Login_Set loginSet = powerLoginSetMapper.selectByPrimaryKey(1); - model.addAttribute("loginSet",loginSet); - return "loginDir/login"; } @RequestMapping("refuse") public String refuse(){ diff --git a/power-admin/src/main/java/com/manage/controller/SsoLogin.java b/power-admin/src/main/java/com/manage/controller/SsoLogin.java index 02b46d0..720adab 100644 --- a/power-admin/src/main/java/com/manage/controller/SsoLogin.java +++ b/power-admin/src/main/java/com/manage/controller/SsoLogin.java @@ -11,6 +11,7 @@ import com.manage.service.Power_MenuService; import com.manage.service.Power_UserService; import com.manage.service.cache.Cache; import com.manage.service.cache.CacheManager; +import com.manage.service.webSocket.WsPool; import com.manage.util.ActionScopeUtils; import com.manage.util.DateUtils; import com.manage.util.Msg; @@ -130,7 +131,7 @@ public class SsoLogin { paramMap.put("redirect_uri",urlAddress); String param="client_id="+clientId+"&client_secret="+clientSecret+"&code="+code+"&grant_type=authorization_code&redirect_uri="+StringUrl; String returnObject =doPost(url,paramMap,null); - String userName=null; + String userName=""; if(returnObject!=null){ // 把json字符串转换成json对象 jsonResultToken = JSONObject.parseObject(returnObject); @@ -156,7 +157,8 @@ public class SsoLogin { userName=jsonResult.getString("username"); }*/ if((jsonResult.getString("name"))!=null&&!"".equals(jsonResult.getString("name"))) { - userName=jsonResult.getString("name"); + //接口返回的登录名为4位，我们系统为6位，接口登录名前追加两个0变成我们的6位 + userName="00"+jsonResult.getString("name"); //根据登录名获取用户（需要确保用户登录名唯一） Power_UserVo user = powerUserService.selectByUserName(userName); if (user != null) { @@ -323,4 +325,14 @@ public class SsoLogin { return result; } + /** + * @MethodName sendMessage + * @Description: 获取用户信息 + */ + @RequestMapping(value ="getUser",method = RequestMethod.GET) + @ResponseBody + public Power_UserVo sendMessage(String userName) throws Exception{ + return powerUserService.selectByUserName(userName); + } + } diff --git a/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java b/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java index 135655e..1e6415a 100644 --- a/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java +++ b/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java @@ -28,7 +28,7 @@ public interface Power_UserMapper { int getTotal(Power_UserVo powerUser); - List selectList(); + //List selectList(); List selectAllByDeptId(@Param("deptId") Integer deptId,@Param("userName")String userName); List selectAllBySysRole(@Param("dictId") Integer dictId); diff --git a/power-dao/src/main/resources/mapper/Power_UserMapper.xml b/power-dao/src/main/resources/mapper/Power_UserMapper.xml index 1985887..529600e 100644 --- a/power-dao/src/main/resources/mapper/Power_UserMapper.xml +++ b/power-dao/src/main/resources/mapper/Power_UserMapper.xml @@ -32,7 +32,7 @@ user_id, user_name,name, user_pwd, user_sex, user_age, user_tel, user_email, user_position, - role_id, dept_id, effective, create_date, creater, update_date, updater, remark + role_id, dept_id, effective, create_date, creater, update_date, updater, remark,dept_code