瀏覽代碼

更新:根据用户状态进行搜索

wuweihao 5 年之前
父節點
當前提交
fd8ada5186

+ 9 - 1
museum_dao/src/main/java/com/museum/dao/Provide/UserProvider.java

@@ -1,6 +1,7 @@
 package com.museum.dao.Provide;
 
 import cn.hutool.core.util.StrUtil;
+import com.museum.domain.request.UserPageRequest;
 import lombok.extern.log4j.Log4j2;
 
 /**
@@ -10,15 +11,22 @@ import lombok.extern.log4j.Log4j2;
 @Log4j2
 public class UserProvider {
 
-    public String findBySearchKey(String searchKey){
+    public String findBySearchKey(UserPageRequest param){
         StringBuffer sql = new StringBuffer("" +
                 "SELECT * FROM tb_user where rec_status = 'A' ");
+        String searchKey = param.getSearchKey();
         if(StrUtil.isNotBlank(searchKey)){
             sql.append(" and (");
             sql.append(" user_name like '%").append(searchKey).append("%'");
             sql.append(" or phone like '%").append(searchKey).append("%'");
             sql.append( ")");
         }
+
+        Integer status = param.getStatus();
+        if (status != null) {
+            sql.append("and status = ").append(status);
+        }
+
         sql.append(" ORDER BY create_time DESC");
         log.info("sql: {}", sql.toString());
         return sql.toString();

+ 2 - 1
museum_dao/src/main/java/com/museum/dao/UserMapper.java

@@ -3,6 +3,7 @@ package com.museum.dao;
 
 import com.museum.dao.Provide.UserProvider;
 import com.museum.domain.entity.UserEntity;
+import com.museum.domain.request.UserPageRequest;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
@@ -24,5 +25,5 @@ public interface UserMapper extends IBaseMapper<UserEntity, Long> {
     UserEntity findByPhone(String phone);
 
     @SelectProvider(type = UserProvider.class, method = "findBySearchKey")
-    List<UserEntity> findBySearchKey(String searchKey);
+    List<UserEntity> findBySearchKey(UserPageRequest param);
 }

+ 15 - 0
museum_domain/src/main/java/com/museum/domain/request/UserPageRequest.java

@@ -0,0 +1,15 @@
+package com.museum.domain.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by owen on 2020/6/19 0019 14:15
+ */
+@Data
+public class UserPageRequest extends PageRequest {
+
+
+    @ApiModelProperty(value = "状态 0:启用  1:停用 2:注销")
+    private Integer status;
+}

+ 2 - 1
museum_service/src/main/java/com/museum/service/UserService.java

@@ -3,6 +3,7 @@ package com.museum.service;
 
 import com.museum.domain.entity.UserEntity;
 import com.museum.domain.request.PageRequest;
+import com.museum.domain.request.UserPageRequest;
 import com.museum.domain.request.UserRequest;
 
 import java.util.List;
@@ -22,5 +23,5 @@ public interface UserService extends IBaseService<UserEntity, Long> {
 
 
 
-    List<UserEntity> findBySearchKey(PageRequest param);
+    List<UserEntity> findBySearchKey(UserPageRequest param);
 }

+ 3 - 2
museum_service/src/main/java/com/museum/service/impl/UserServiceImpl.java

@@ -4,6 +4,7 @@ import com.museum.dao.IBaseMapper;
 import com.museum.dao.UserMapper;
 import com.museum.domain.entity.UserEntity;
 import com.museum.domain.request.PageRequest;
+import com.museum.domain.request.UserPageRequest;
 import com.museum.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,8 +43,8 @@ public class UserServiceImpl extends IBaseServiceImpl<UserEntity, Long> implemen
     }
 
     @Override
-    public List<UserEntity> findBySearchKey(PageRequest param) {
-        return entityMapper.findBySearchKey(param.getSearchKey());
+    public List<UserEntity> findBySearchKey(UserPageRequest param) {
+        return entityMapper.findBySearchKey(param);
     }
 
 

+ 2 - 1
museum_web/src/main/java/com/museum/web/controller/UserController.java

@@ -7,6 +7,7 @@ import com.museum.common.util.Result;
 import com.museum.domain.entity.UserEntity;
 import com.museum.domain.request.PageRequest;
 import com.museum.domain.request.PasswordRequest;
+import com.museum.domain.request.UserPageRequest;
 import com.museum.domain.request.UserRequest;
 import com.museum.service.UserService;
 import com.museum.web.aop.WebControllerLog;
@@ -49,7 +50,7 @@ public class UserController extends BaseController {
     @RequiresRoles(value = {"admin"}, logical = Logical.OR)
     @ApiOperation("用户列表")
     @PostMapping("list")
-    public Result<UserEntity> list(@RequestBody PageRequest param) {
+    public Result<UserEntity> list(@RequestBody UserPageRequest param) {
         startPage(param);
         PageInfo<UserEntity> page = new PageInfo<>(userService.findBySearchKey(param));
         return Result.success(page);