From 236a898bbe850ba8fa64ccbe28b5a1196de29789 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 13 Jul 2020 11:34:35 +0800
Subject: [PATCH] 增加登录日志写入用户当前系统分辨率
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
index d4febe3..2a05a44 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
@@ -115,6 +115,7 @@
sysUserLogs.setLoginAgentSystem(request.getHeader(CommonConstant.USER_AGENT_SYSTEM));
sysUserLogs.setLoginAgentBrowser(request.getHeader(CommonConstant.USER_AGENT_BROWSER));
sysUserLogs.setLoginIp(request.getHeader(CommonConstant.USER_AGENT_IP));
+ sysUserLogs.setLoginSystemScreen(request.getHeader(CommonConstant.USER_AGENT_SYSTEM_SCREEN));
sysUserLogs.setLoginTime(new Date());
sysUserLogs.setUserid(sysUser.getId());
sysUserLogs.setUsername(sysUser.getUsername());
@@ -211,9 +212,9 @@
*/
@ApiOperation(value = "用户查询列表")
@GetMapping("/users/HDoctorusers")
- public ResultBody hospitalDoctorList(@RequestParam Long hospitalId, Long departmentId) {
+ public ResultBody hospitalDoctorList(@RequestParam Long hospitalId, Long departmentId,boolean isIncluddel) {
if (StringUtils.isNotBlank(hospitalId.toString()) && StringUtils.isNotBlank(departmentId.toString())) {
- return appUserService.hospitalDoctorList(hospitalId, departmentId);
+ return appUserService.hospitalDoctorList(hospitalId, departmentId,isIncluddel);
} else {
return ResultBody.failed("查询参数有误");
}
@@ -293,7 +294,14 @@
* @return
*/
@PutMapping(value = "/users/updateusertel")
- public ResultBody updateUserTel(@RequestParam Map<String, Object> params) {
+ public ResultBody updateUserTel(@RequestParam Map<String, Object> params,@LoginUser SysUser sysUser) {
+ String oldTel = MapUtils.getString(params, "oldTel");
+ if (oldTel==null){
+ return ResultBody.failed("请输入原账号");
+ }
+ if(!sysUser.getUsername().equals(oldTel)){
+ return ResultBody.failed("请输入正确的原账号");
+ }
return appUserService.updateUserTel(params);
}
--
Gitblit v1.8.0