msb-public-java
/
RuoYi-Cloud
mirror of https://gitee.com/y_project/RuoYi-Cloud.git
1
0
Code Issues Projects Releases Wiki Activity

1、后端用户模块实现统计登录次数

Browse Source
pull/254/head
xjs 4 years ago
parent dc7d738062
commit 7254cbb9ca
10 changed files with 178 additions and 87 deletions
Show Stats Download Patch File Download Diff File

23
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java
Unescape View File

@ -1,11 +1,7 @@
package com.ruoyi.system.api; package com.ruoyi.system.api;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
@ -14,9 +10,10 @@ import com.ruoyi.system.api.factory.RemoteUserFallbackFactory;
import com.ruoyi.system.api.model.LoginUser; import com.ruoyi.system.api.model.LoginUser;
/** /**
* 用户服务 * 用户服务 <br>
* * 新增修改用户remote
* @author ruoyi * @since 2022-01-21
* @author ruoyi,xjs
*/ */
@FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class) @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
public interface RemoteUserService public interface RemoteUserService
@ -40,4 +37,14 @@ public interface RemoteUserService
*/ */
@PostMapping("/user/register") @PostMapping("/user/register")
public R<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); public R<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
/**
* 修改用户登录次数
* @param id 用户id
* @param count 登录次数
* @return int
*/
@PutMapping("/user/updateForRPC/{id}")
R<Integer> updateForRPC(@PathVariable("id") String id,@RequestBody Integer count,@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
} }

47
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
Unescape View File

@ -1,10 +1,5 @@
package com.ruoyi.system.api.domain; package com.ruoyi.system.api.domain;
import java.util.Date;
import java.util.List;
import javax.validation.constraints.*;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.ruoyi.common.core.annotation.Excel.ColumnType;
@ -12,11 +7,19 @@ import com.ruoyi.common.core.annotation.Excel.Type;
import com.ruoyi.common.core.annotation.Excels; import com.ruoyi.common.core.annotation.Excels;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.ruoyi.common.core.web.domain.BaseEntity;
import com.ruoyi.common.core.xss.Xss; import com.ruoyi.common.core.xss.Xss;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import java.util.Date;
import java.util.List;
/** /**
* 用户对象 sys_user * 用户对象 sys_user
* * @since 2022-01-21 11:06:11
* @author ruoyi * @author ruoyi,xjs
*/ */
public class SysUser extends BaseEntity public class SysUser extends BaseEntity
{ {
@ -56,6 +59,19 @@ public class SysUser extends BaseEntity
/** 密码 */ /** 密码 */
private String password; private String password;
/**
* 登录次数
*/
private Integer loginCount;
/**
* 登录总时长
*/
private Long loginTimes;
/** 帐号状态（0正常 1停用） */ /** 帐号状态（0正常 1停用） */
@Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用") @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
private String status; private String status;
@ -100,6 +116,23 @@ public class SysUser extends BaseEntity
this.userId = userId; this.userId = userId;
} }
public Integer getLoginCount() {
return loginCount;
}
public void setLoginCount(Integer loginCount) {
this.loginCount = loginCount;
}
public Long getLoginTimes() {
return loginTimes;
}
public void setLoginTimes(Long loginTimes) {
this.loginTimes = loginTimes;
}
public Long getUserId() public Long getUserId()
{ {
return userId; return userId;

5
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
Unescape View File

@ -36,6 +36,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
{ {
return R.fail("注册用户失败:" + throwable.getMessage()); return R.fail("注册用户失败:" + throwable.getMessage());
} }
@Override
public R<Integer> updateForRPC(String id, Integer count, String source) {
return R.fail("修改用户登录次数失败:" + throwable.getMessage());
}
}; };
} }
} }

14
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
Unescape View File

@ -19,9 +19,10 @@ import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.model.LoginUser; import com.ruoyi.system.api.model.LoginUser;
/** /**
* 登录校验方法 * 登录校验方法<br>
* * 新增功能统计用户登录次数
* @author ruoyi * @since 2022-01-21 11:22:16
* @author ruoyi,xjs
*/ */
@Component @Component
public class SysLoginService public class SysLoginService
@ -88,6 +89,13 @@ public class SysLoginService
throw new ServiceException("用户不存在/密码错误"); throw new ServiceException("用户不存在/密码错误");
} }
recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功"); recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
//累加登录次数
if (StringUtils.isNull(user.getLoginCount())) {
user.setLoginCount(0);
}
Integer count = user.getLoginCount() + 1;
remoteUserService.updateForRPC(String.valueOf(user.getUserId()),count,SecurityConstants.INNER);
return userInfo; return userInfo;
} }

56
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
Unescape View File

@ -1,22 +1,5 @@
package com.ruoyi.system.controller; package com.ruoyi.system.controller;
import java.io.IOException;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.StringUtils;
@ -32,16 +15,24 @@ import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysRole; import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.model.LoginUser; import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.*;
import com.ruoyi.system.service.ISysPermissionService; import org.apache.commons.lang3.ArrayUtils;
import com.ruoyi.system.service.ISysPostService; import org.springframework.beans.factory.annotation.Autowired;
import com.ruoyi.system.service.ISysRoleService; import org.springframework.validation.annotation.Validated;
import com.ruoyi.system.service.ISysUserService; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/** /**
* 用户信息 * 用户信息<br>
* * 新增修改用户信息接口远程调用
* @author ruoyi * @since 2022-01-21 10:53:38
* @author ruoyi、xjs
*/ */
@RestController @RestController
@RequestMapping("/user") @RequestMapping("/user")
@ -126,6 +117,21 @@ public class SysUserController extends BaseController
return R.ok(sysUserVo); return R.ok(sysUserVo);
} }
/**
* 远程登录之后累加登录次数
* @param id userId主键
* @param count 累加次数
* @return R<LoginUser>
*/
@InnerAuth
@PutMapping("/updateForRPC/{id}")
public R<Integer> updateForRPC(@PathVariable("id") String id,@RequestBody Integer count) {
int c=userService.updateUserLoginCount(id,count);
return R.ok(c);
}
/** /**
* 注册用户信息 * 注册用户信息
*/ */

13
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
Unescape View File

@ -1,8 +1,9 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.domain.SysUser;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* 用户表 数据层 * 用户表 数据层
@ -124,4 +125,12 @@ public interface SysUserMapper
* @return 结果 * @return 结果
*/ */
public SysUser checkEmailUnique(String email); public SysUser checkEmailUnique(String email);
/**
* 修改用户登录次数（统计）
* @param id 用户id
* @param count 登录次数
* @return int
*/
int updateUserLoginCount(@Param("id")String id, @Param("count")Integer count);
} }

15
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
Unescape View File

@ -1,12 +1,13 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import java.util.List;
import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.domain.SysUser;
import java.util.List;
/** /**
* 用户 业务层 * 用户 业务层
* * @since 2022-01-21
* @author ruoyi * @author ruoyi,xjs
*/ */
public interface ISysUserService public interface ISysUserService
{ {
@ -203,4 +204,12 @@ public interface ISysUserService
* @return 结果 * @return 结果
*/ */
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName); public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
/**
* 修改用户登录次数（统计）
* @param id 用户id
* @param count 登录次数
* @return int
*/
int updateUserLoginCount(String id, Integer count);
} }

34
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
Unescape View File

@ -1,16 +1,5 @@
package com.ruoyi.system.service.impl; package com.ruoyi.system.service.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import javax.validation.Validator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.SpringUtils; import com.ruoyi.common.core.utils.SpringUtils;
@ -23,13 +12,20 @@ import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost; import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.mapper.SysPostMapper; import com.ruoyi.system.mapper.*;
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.mapper.SysUserPostMapper;
import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.validation.Validator;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/** /**
* 用户 业务层处理 * 用户 业务层处理
@ -561,4 +557,10 @@ public class SysUserServiceImpl implements ISysUserService
return successMsg.toString(); return successMsg.toString();
} }
@Override
@Transactional
public int updateUserLoginCount(String id, Integer count) {
return userMapper.updateUserLoginCount(id,count);
}
} }

14
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
Unescape View File

@ -14,6 +14,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="sex" column="sex" /> <result property="sex" column="sex" />
<result property="avatar" column="avatar" /> <result property="avatar" column="avatar" />
<result property="password" column="password" /> <result property="password" column="password" />
<!--2022-01-21新增字段用来统计登录次数和时长(Author:xjs)-->
<result property="loginCount" column="login_count" />
<result property="loginTimes" column="login_times" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="delFlag" column="del_flag" /> <result property="delFlag" column="del_flag" />
<result property="loginIp" column="login_ip" /> <result property="loginIp" column="login_ip" />
@ -46,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectUserVo"> <sql id="selectUserVo">
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, select u.login_count, u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status, d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
from sys_user u from sys_user u
@ -217,4 +222,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach> </foreach>
</delete> </delete>
<update id="updateUserLoginCount">
update sys_user set login_count = #{count} where user_id= #{id}
</update>
</mapper> </mapper>

6
ruoyi-ui/src/views/business/tools/apitools/index.vue
Unescape View File

@ -3,7 +3,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="top_col"> <div class="top_col">
<span style="cursor: crosshair">小工具</span> <span style="cursor: pointer">小工具</span>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
@ -102,7 +102,7 @@
placement="bottom" placement="bottom"
width="300" width="300"
v-model="idCardVisible"> v-model="idCardVisible">
<el-card shadow="hover"> <el-card shadow="hover" v-loading="loading4">
<div style="font-size: 12px"> <div style="font-size: 12px">
<span>身份证号：{{ idCardData.idCardNum }}</span> <br> <span>身份证号：{{ idCardData.idCardNum }}</span> <br>
<hr> <hr>
@ -129,7 +129,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="top_col"> <div class="top_col">
<span style="cursor: crosshair">实用工具</span> <span style="cursor: pointer">实用工具</span>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>

Write Preview
Loading…
Cancel
Save