Merge remote-tracking branch 'origin/dev/one' into dev/one

user-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -37,6 +37,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/user/getPermission").permitAll()
                 .antMatchers("/userInfo/updateUserInfoAll").permitAll()
                 .antMatchers("/userInfo/updateDeleted").permitAll()
+                .antMatchers("/user/index").permitAll()
                 .antMatchers("/**").authenticated();
 //        .antMatchers("/**").permitAll();
     }

user-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -49,6 +49,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/getUserEnumsData", request)
                 || matchers("/userInfo/getUserInfoPag", request)
                 || matchers("/user/getPermission", request)
+                || matchers("/user/index", request)
                 || matchers("/userInfo/updateUserInfoAll", request)
                 || matchers("/userInfo/updateDeleted", request)
                 

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -1,5 +1,7 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.AuthServiceClient;
 import com.diagbot.dto.LoginDTO;
 import com.diagbot.dto.RespDTO;
@@ -91,6 +93,15 @@ public class UserFacade extends UserServiceImpl {
         return  user;
     }
 
+
+    public RespDTO<IPage<User>> index(Page page, UserSaveVO userSaveVO){
+        User user = new User();
+        BeanUtil.copyProperties(userSaveVO, user);
+        IPage<User> res = this.indexPage(page, user);
+        return RespDTO.onSuc(res);
+    }
+
+
     //添加一条默认用户认证信息
     public void doUserAuthentication(UserSaveVO userSaveVO, User user) {
         UserAuthentication ua = new UserAuthentication();

user-service/src/main/java/com/diagbot/mapper/UserMapper.java

@@ -6,10 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.UserInfoDTO;
 import com.diagbot.entity.User;
 import com.diagbot.vo.UserInfoOrganizationsVO;
-
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,7 +23,9 @@ public interface UserMapper extends BaseMapper<User> {
     User findByName(String username);
 
     IPage<User> selectUserListPage(Page page, @Param("user") User user);
-    
+
+    IPage<User> indexPage(Page page, @Param("user") User user);
+
     IPage<UserInfoDTO> selectUserInfoListPage(Page page,@Param("userInfo") UserInfoDTO userInfo);
     
     public Integer updateUserInfoAll(UserInfoOrganizationsVO userInfo);

user-service/src/main/java/com/diagbot/service/UserService.java

@@ -7,9 +7,6 @@ import com.diagbot.dto.UserInfoDTO;
 import com.diagbot.entity.User;
 import com.diagbot.vo.UserInfoOrganizationsVO;
 
-import javafx.scene.control.Pagination;
-
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -31,4 +28,6 @@ public interface UserService extends IService<User> {
     public Integer updateUserInfoAll(UserInfoOrganizationsVO userInfo);
 
 	Integer updateDeleted(Map<String, String> map);
+
+    IPage<User> indexPage(Page<User> page, User user);
 }

user-service/src/main/java/com/diagbot/service/impl/UserServiceImpl.java

@@ -8,10 +8,8 @@ import com.diagbot.entity.User;
 import com.diagbot.mapper.UserMapper;
 import com.diagbot.service.UserService;
 import com.diagbot.vo.UserInfoOrganizationsVO;
-
 import org.springframework.stereotype.Service;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -49,4 +47,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 		return baseMapper.updateDeleted(map);
 		
 	}
+
+    @Override
+    public IPage<User> indexPage(Page<User> page, User user) {
+        return baseMapper.indexPage(page, user);
+    }
+
+
 }

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -77,6 +77,18 @@ public class UserController {
     }
 
 
+    /**
+     * @Description: 用来测试分页，未用
+     * @Author: ztg
+     * @Date: 2018/9/19 18:43
+     */
+    @PostMapping("/index")
+    @SysLogger("index")
+    @ApiIgnore
+    public RespDTO<IPage<User>> indexUser(Page page, UserSaveVO userSaveVO){
+        return userFacade.index(page, userSaveVO);
+    }
+
     @ApiOperation(value = "获取资源信息",
             notes = "appkey：用户名,必填<br>" +
                     "secret：密码, 必填<br> ")

user-service/src/main/resources/mapper/UserMapper.xml

@@ -33,6 +33,18 @@
         </if>
     </select>
 
+
+	<select id="indexPage" resultMap="BaseResultMap">
+		select u.* from sys_user u where u.is_deleted = 'N'
+		<if test="user.id != null">
+			and u.id = #{user.id}
+		</if>
+		<if test="user.username != null and user.username != '' ">
+			and u.username like concat('%',#{user.username},'%')
+		</if>
+	</select>
+
+
 <!-- 	<select id="selectUserInfoListPage" resultMap="BaseResultMap">
 		select u.*
 		LEFT JOIN sys_user_role ur on u.id= ur.user_id