作者 唐俊升

update:

1. 用户列表新增根据更新时间查询,为查询时间以后数据。
@@ -28,6 +28,7 @@ spring: @@ -28,6 +28,7 @@ spring:
28 # host: 127.0.0.1 28 # host: 127.0.0.1
29 host: 192.168.1.53 29 host: 192.168.1.53
30 port: 6379 30 port: 6379
  31 + password: vmvnv1v2VV.
31 jackson: 32 jackson:
32 serialization: 33 serialization:
33 FAIL_ON_EMPTY_BEANS: false 34 FAIL_ON_EMPTY_BEANS: false
@@ -101,6 +102,8 @@ eureka: @@ -101,6 +102,8 @@ eureka:
101 name: "admin" #These two are needed so that the server 102 name: "admin" #These two are needed so that the server
102 password: "123456" 103 password: "123456"
103 client: 104 client:
  105 +# register-with-eureka: false
  106 +# fetch-registry: false
104 #eureka注册中心服务器地址 107 #eureka注册中心服务器地址
105 service-url: 108 service-url:
106 # defaultZone: http://127.0.0.1:12345/eureka/ 109 # defaultZone: http://127.0.0.1:12345/eureka/
@@ -28,6 +28,7 @@ import io.swagger.annotations.ApiOperation; @@ -28,6 +28,7 @@ import io.swagger.annotations.ApiOperation;
28 import lombok.extern.slf4j.Slf4j; 28 import lombok.extern.slf4j.Slf4j;
29 import org.springframework.beans.factory.annotation.Autowired; 29 import org.springframework.beans.factory.annotation.Autowired;
30 import org.springframework.context.annotation.Bean; 30 import org.springframework.context.annotation.Bean;
  31 +import org.springframework.format.annotation.DateTimeFormat;
31 import org.springframework.security.core.context.SecurityContextHolder; 32 import org.springframework.security.core.context.SecurityContextHolder;
32 import org.springframework.security.core.userdetails.UserDetails; 33 import org.springframework.security.core.userdetails.UserDetails;
33 import org.springframework.validation.BindingResult; 34 import org.springframework.validation.BindingResult;
@@ -42,6 +43,7 @@ import javax.servlet.http.HttpServletResponse; @@ -42,6 +43,7 @@ import javax.servlet.http.HttpServletResponse;
42 import javax.servlet.http.HttpSession; 43 import javax.servlet.http.HttpSession;
43 import java.awt.image.BufferedImage; 44 import java.awt.image.BufferedImage;
44 import java.io.IOException; 45 import java.io.IOException;
  46 +import java.util.Date;
45 import java.util.List; 47 import java.util.List;
46 import java.util.Map; 48 import java.util.Map;
47 import java.util.Properties; 49 import java.util.Properties;
@@ -71,10 +73,12 @@ public class UserController { @@ -71,10 +73,12 @@ public class UserController {
71 @RequestParam(value = "pageSize",required = false,defaultValue = "5") 73 @RequestParam(value = "pageSize",required = false,defaultValue = "5")
72 int pageSize, 74 int pageSize,
73 @RequestParam(value = "userName",required = false) String username, 75 @RequestParam(value = "userName",required = false) String username,
74 - @RequestParam(value = "realName",required = false) String realname) 76 + @RequestParam(value = "realName",required = false) String realname,
  77 + @RequestParam(value = "updatetime", required = false)
  78 + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date updatetime)
75 { 79 {
76 80
77 - PageInfo<KakoUser> usersPageInfo = userService.selectAllUser(pageNum,pageSize, username, realname); 81 + PageInfo<KakoUser> usersPageInfo = userService.selectAllUser(pageNum,pageSize, username, realname, updatetime);
78 return new ResultJson("200","success",usersPageInfo); 82 return new ResultJson("200","success",usersPageInfo);
79 } 83 }
80 84
@@ -6,6 +6,7 @@ import com.tianbo.warehouse.model.KakoUserRole; @@ -6,6 +6,7 @@ import com.tianbo.warehouse.model.KakoUserRole;
6 import com.tianbo.warehouse.model.USERS; 6 import com.tianbo.warehouse.model.USERS;
7 import org.springframework.stereotype.Service; 7 import org.springframework.stereotype.Service;
8 8
  9 +import java.util.Date;
9 import java.util.List; 10 import java.util.List;
10 11
11 12
@@ -13,7 +14,7 @@ public interface KakoUserService { @@ -13,7 +14,7 @@ public interface KakoUserService {
13 14
14 KakoUser loadByUsername(String username); 15 KakoUser loadByUsername(String username);
15 16
16 - PageInfo<KakoUser> selectAllUser(int pageNum, int pageSize, String username, String realName); 17 + PageInfo<KakoUser> selectAllUser(int pageNum, int pageSize, String username, String realName, Date updatetime);
17 18
18 int insertSelective(KakoUser record); 19 int insertSelective(KakoUser record);
19 20
@@ -59,11 +59,12 @@ public class KakoUserServiceImpl implements KakoUserService{ @@ -59,11 +59,12 @@ public class KakoUserServiceImpl implements KakoUserService{
59 } 59 }
60 60
61 @Override 61 @Override
62 - public PageInfo<KakoUser> selectAllUser(int pageNum, int pageSize,String username, String realName){ 62 + public PageInfo<KakoUser> selectAllUser(int pageNum, int pageSize,String username, String realName, Date updatetime){
63 Page<KakoUser> page = PageHelper.startPage(pageNum,pageSize); 63 Page<KakoUser> page = PageHelper.startPage(pageNum,pageSize);
64 KakoUser users = new KakoUser(); 64 KakoUser users = new KakoUser();
65 users.setLoginName(username); 65 users.setLoginName(username);
66 users.setName(realName); 66 users.setName(realName);
  67 + users.setUpdateDate(updatetime);
67 List<KakoUser> list = kakoUserMapper.selectAllUser(users); 68 List<KakoUser> list = kakoUserMapper.selectAllUser(users);
68 for (KakoUser user: list) { 69 for (KakoUser user: list) {
69 // List<PERMISSION> permissionList = permissionMapper.findByUserId(user.getUserId()); 70 // List<PERMISSION> permissionList = permissionMapper.findByUserId(user.getUserId());
@@ -47,6 +47,9 @@ @@ -47,6 +47,9 @@
47 <if test="name != null" > 47 <if test="name != null" >
48 and name like concat('%',#{name,jdbcType=VARCHAR},'%') 48 and name like concat('%',#{name,jdbcType=VARCHAR},'%')
49 </if> 49 </if>
  50 + <if test="updateDate != null ">
  51 + and update_date &gt; #{updateDate,jdbcType=TIMESTAMP}
  52 + </if>
50 </select> 53 </select>
51 <select id="selectByUsername" resultMap="BaseResultMap" parameterType="java.lang.String" > 54 <select id="selectByUsername" resultMap="BaseResultMap" parameterType="java.lang.String" >
52 select 55 select