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

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

@@ -32,6 +32,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/userver/getSmsWithResetPassword").permitAll()
                 .antMatchers("/userver/verifySmsVerification").permitAll()
                 .antMatchers("/user/resetPassword").permitAll()
+                .antMatchers("/userInfo/getUserInfoPag").permitAll()
                 .antMatchers("/**").authenticated();
 //        .antMatchers("/**").permitAll();
     }

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

@@ -46,6 +46,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/userver/getSmsWithRegister", request)
                 || matchers("/userver/getSmsWithResetPassword", request)
                 || matchers("/userver/verifySmsVerification", request)
+                || matchers("/userInfo/getUserInfoPag", request)
 
                 || matchers("/", request)){
                     return;

user-service/src/main/java/com/diagbot/entity/User.java

@@ -71,10 +71,23 @@ public class User implements Serializable {
      * 邮箱
      */
     private String email;
+    
+    /**
+     * 用户类型
+     */
+    private String type;
+
+
 
+    public String getType() {
+		return type;
+	}
 
+	public void setType(String type) {
+		this.type = type;
+	}
 
-    public Long getId() {
+	public Long getId() {
         return id;
     }
 
@@ -167,6 +180,7 @@ public class User implements Serializable {
                 ", username='" + username + '\'' +
                 ", linkman='" + linkman + '\'' +
                 ", email='" + email + '\'' +
+                ", type=" + type +
                 '}';
     }
 }

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

@@ -22,4 +22,6 @@ public interface UserMapper extends BaseMapper<User> {
     User findByName(String username);
 
     IPage<User> selectUserListPage(Page page, @Param("user") User user);
+    
+    IPage<User> selectUserInfoListPage(Page page);
 }

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

@@ -22,4 +22,6 @@ public interface UserService extends IService<User> {
     User findByName(String username);
 
     IPage<User> selectUserListPage(Page<User> page, User user);
+    
+    public IPage<User>  selectUserInfoListPage(Page<User> page);
 }

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

@@ -30,4 +30,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     public IPage<User> selectUserListPage(Page<User> page, User user) {
         return baseMapper.selectUserListPage(page, user);
     }
+    @Override
+    public IPage<User>  selectUserInfoListPage(Page<User> page){
+    	return baseMapper.selectUserInfoListPage(page);
+    	
+    }
 }

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

@@ -0,0 +1,40 @@
+package com.diagbot.web;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.User;
+import com.diagbot.facade.UserFacade;
+
+import io.swagger.annotations.ApiOperation;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * @Description: 外部用户信息
+ * @author: wangfeng
+ * @time: 2018年9月17日 下午1:53:53
+ */
+@RestController
+@RequestMapping("/userInfo")
+public class UserInfoController {
+	
+	@Autowired
+    private UserFacade userFacade;
+	
+	    @ApiOperation(value = "分页查询获取用户信息", notes = "根据每页显示条数，默认 10，和当前页")
+	    @PostMapping("/getUserInfoPag")
+	    @SysLogger("getUserInfoPag")
+//	    @ApiIgnore
+	    public RespDTO getUserInfoPag(Page page){
+	        IPage<User> user=  userFacade.selectUserInfoListPage(page);
+	        return RespDTO.onSuc(user);
+	    }
+	
+	
+}

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

@@ -14,6 +14,7 @@
         <result column="username" property="username" />
         <result column="linkman" property="linkman" />
         <result column="email" property="email" />
+        <result column="type" property="type" />
     </resultMap>
 
     <select id="findByName" resultMap="BaseResultMap" parameterType="java.lang.String">
@@ -32,4 +33,13 @@
         </if>
     </select>
 
+	<select id="selectUserInfoListPage" resultMap="BaseResultMap">
+		select u.*
+		LEFT JOIN sys_user_role ur on u.id= ur.user_id
+		LEFT JOIN
+		sys_role r on ur.role_id=r.id
+		where u.is_deleted = 'N' and type = "0"
+		ORDER BY gmt_create DESC
+	</select>
+
 </mapper>