修改多数据库分页问题

VisualInspection_server/pom.xml

@@ -40,7 +40,7 @@
 		<dependency>
 			<groupId>org.mybatis.spring.boot</groupId>
 			<artifactId>mybatis-spring-boot-starter</artifactId>
-			<version>1.2.0</version>
+			<version>1.3.0</version>
 		</dependency>
 
 		<dependency>

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/TestController.java

@@ -76,7 +76,7 @@ public class TestController {
     @ResponseBody
     public String index(){
 
-        User u = userService.getOne((long) 1);
+        User u = userService.getOne(1);
 
 
         return JSON.toJSON(u).toString();

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/UserController.java

@@ -1,27 +1,22 @@
 package com.xintong.visualinspection.controller;
 
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.alibaba.fastjson.JSON;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.err.BusinessException;
-import com.xintong.visualinspection.pojo.JwtAuthenticationResponse;
 import com.xintong.visualinspection.securityTools.RedisCacheUtil;
 import com.xintong.visualinspection.service.AuthService;
 import com.xintong.visualinspection.service.UserService;
@@ -30,6 +25,14 @@ import com.xintong.visualinspection.service.UserService;
  * 文件名：TestController
  * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
  */
+/**
+ * @author wenhongquan
+ *
+ */
+/**
+ * @author wenhongquan
+ *
+ */
 @RestController
 @RequestMapping("/user")
 public class UserController extends BaseController {
@@ -52,16 +55,17 @@ public class UserController extends BaseController {
         return returnSuccessResult("登陆成功", u);
     }
     
-    @RequestMapping(value = "/logout",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+   
+    
+    @RequestMapping(value = "/logout",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
     public String logout(){
     	//获取用户名
     	String username = SecurityContextHolder.getContext().getAuthentication().getName();
     	if(username!=null){
     		redisCacheUtil.removeForUserName(username);
     	}
-    	throw new BusinessException(20002);
     	//返回成功
-//    	return returnSuccessResult("退出成功");
+    	return returnSuccessResult("退出成功");
     }
     
     
@@ -90,13 +94,14 @@ public class UserController extends BaseController {
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/updateUser")
-    public String updateUser(@RequestBody User user){
+    @RequestMapping(value = "/updateUser/{userid}",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String updateUser(@RequestBody User user,@PathVariable int userid){
         try{
+        	user.setId(userid);
         	userService.update(user);
         	return super.returnResult(0, "修改成功", null);
         }catch(Exception e){
-        	return super.returnResult(-1, "修改失败", null);
+        	throw new BusinessException(20003);
         }
     }
     
@@ -108,10 +113,10 @@ public class UserController extends BaseController {
      * @since  1.0.0
      */
     @PreAuthorize("hasRole('ADMIN')")
-    @RequestMapping(value = "/deleteUser/{userid}",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
-    public String deleteUser(@PathVariable String userid){
+    @RequestMapping(value = "/deleteUser/{userid}",method=RequestMethod.DELETE,produces="application/json;charset=UTF-8")
+    public String deleteUser(@PathVariable Integer userid){
         try{
-        	userService.delete(Long.parseLong(userid));
+        	userService.delete((userid));
         	return returnResult(0, "删除成功", null);
         }catch(Exception e){
         	throw new BusinessException(20002);
@@ -119,18 +124,22 @@ public class UserController extends BaseController {
     }
     
     
-
-        @RequestMapping(value = "/refresh", method = RequestMethod.GET)
-        public ResponseEntity<?> refreshAndGetAuthenticationToken(
-                HttpServletRequest request) throws AuthenticationException{
-            String token = request.getHeader(tokenHeader);
-            String refreshedToken = authService.refresh(token);
-            if(refreshedToken == null) {
-                return ResponseEntity.badRequest().body(null);
-            } else {
-                return ResponseEntity.ok(new JwtAuthenticationResponse(refreshedToken));
-            }
+    @SuppressWarnings("unchecked")
+	@PreAuthorize("hasRole('ADMIN')")
+    @RequestMapping(value = "/get/all/{page}/{size}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getallUsers(@PathVariable Integer page,@PathVariable Integer size ){
+        try{
+        	PageHelper.startPage(page, size); 
+        	List<User> users= userService.getAll();
+        	
+        	return returnResult(0, "获取成功", new PageInfo(users));
+        }catch(Exception e){
+        	throw new BusinessException(20001);
         }
+    }
+    
+    
+
 
     
     

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/cluster/UserInfoDao.java

@@ -12,9 +12,9 @@ import java.util.List;
 @Mapper
 public interface UserInfoDao {
     public List<User> getAll();
-    public User getOne(Long id);
+    public User getOne(Integer id);
     public void insert(User user);
     public void update(User user);
-    public void delete(Long id);
+    public void delete(Integer id);
     public User findByUserName(String username);
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/druidTools/ClusterDataSourceConfig.java

@@ -1,9 +1,13 @@
 package com.xintong.visualinspection.druidTools;
 
 import com.alibaba.druid.pool.DruidDataSource;
+import com.github.pagehelper.PageHelper;
+
+import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -57,11 +61,16 @@ public class ClusterDataSourceConfig {
         return new DataSourceTransactionManager(clusterDataSource());
     }
 
+    @Autowired
+    private PageHelper pageHelper;
+    
     @Bean(name = "clusterSqlSessionFactory")
     public SqlSessionFactory clusterSqlSessionFactory(@Qualifier("clusterDataSource") DataSource clusterDataSource)
             throws Exception {
         final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
         sessionFactory.setDataSource(clusterDataSource);
+        Interceptor[] plugins =  new Interceptor[]{pageHelper};
+        sessionFactory.setPlugins(plugins);
         sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
                 .getResources(MAPPER_LOCATION));
         return sessionFactory.getObject();

VisualInspection_server/src/main/java/com/xintong/visualinspection/druidTools/MasterDataSourceConfig.java

@@ -1,9 +1,13 @@
 package com.xintong.visualinspection.druidTools;
 
 import com.alibaba.druid.pool.DruidDataSource;
+import com.github.pagehelper.PageHelper;
+
+import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -41,6 +45,9 @@ public class MasterDataSourceConfig {
     @Value("${master.datasource.driver-class-name}")
     private String driverClass;
 
+    @Autowired
+    private PageHelper pageHelper;
+    
     @Bean(name = "masterDataSource")
     @Primary
     public DataSource masterDataSource() {
@@ -64,6 +71,8 @@ public class MasterDataSourceConfig {
             throws Exception {
         final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
         sessionFactory.setDataSource(masterDataSource);
+        Interceptor[] plugins =  new Interceptor[]{pageHelper};
+        sessionFactory.setPlugins(plugins);
         sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
                 .getResources(MAPPER_LOCATION));
         return sessionFactory.getObject();

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/UserInfoMapper.xml

@@ -33,7 +33,7 @@
         t_sys_users
         (username,password,TRUENAME,ORGANID,BIRTH,AGE,MOBILE,POSITIONID,SEX,WORKNO,IDNO)
         VALUES
-        (#{username},#{password},#{truename},#{deptId},#{birth},#{age},#{mobile},#{positionId},#{sex},#{workno},#{idno})
+        (#{username},#{password},#{truename},#{organid},#{birth},#{age},#{mobile},#{positionid},#{sex},#{workno},#{idno})
     </insert>
 
     <update id="update" parameterType="com.xintong.visualinspection.bean.User" >

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/UserMapper.xml

@@ -34,7 +34,7 @@
         sys_user
         (username,age,password,TRUENAME,ORGANID,BIRTH,AGE,MOBILE,POSITIONID,SEX,WORKNO,IDNO)
         VALUES
-        (#{username}, #{age},#{password},#{truename},#{deptId},#{birth},#{age},#{mobile},#{positionId},#{sex},#{workno},#{idno})
+        (#{username}, #{age},#{password},#{truename},#{organid},#{birth},#{age},#{mobile},#{positionId},#{sex},#{workno},#{idno})
     </insert>
 
     <update id="update" parameterType="com.xintong.visualinspection.bean.User" >

VisualInspection_server/src/main/java/com/xintong/visualinspection/pojo/JwtAuthenticationResponse.java

@@ -1,17 +0,0 @@
-package com.xintong.visualinspection.pojo;
-
-import java.io.Serializable;
-
-public class JwtAuthenticationResponse implements Serializable {
-    private static final long serialVersionUID = 1250166508152483573L;
-
-    private final String token;
-
-    public JwtAuthenticationResponse(String token) {
-        this.token = token;
-    }
-
-    public String getToken() {
-        return this.token;
-    }
-}

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/UserService.java

@@ -12,9 +12,9 @@ import java.util.List;
  */
 public interface UserService extends UserDetailsService {
     public List<User> getAll();
-    public User getOne(Long id);
+    public User getOne(Integer id);
     public void insert(User user);
     public void update(User user);
-    public void delete(Long id);
+    public void delete(Integer id);
     public UserDetails loadUserByUsername(String username);
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/UserServiceImpl.java

@@ -60,7 +60,7 @@ public class UserServiceImpl extends BaseService implements UserService {
 
     @Override
 //    @Cacheable(value = "usercache",keyGenerator = "keyGenerator")
-    public User getOne(Long id) {
+    public User getOne(Integer id) {
 //        User user = new User();
 //        user.setUsername("aa"+count++);
 //        redisTemplate.opsForValue().set(user.getUsername(), user);
@@ -84,12 +84,12 @@ public class UserServiceImpl extends BaseService implements UserService {
     }
 
     @Override
-    public void delete(Long id) {
+    public void delete(Integer id) {
     	userInfoDao.delete(id);
     }
 
 
-    private User getUserById(Long id){
+    private User getUserById(Integer id){
         System.out.printf("数据库查询");
         return userInfoDao.getOne(id);
     }

VisualInspection_server/src/main/resources/application.properties

@@ -40,8 +40,6 @@ spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowS
 # 合并多个DruidDataSource的监控数据
 spring.datasource.useGlobalDataSourceStat=true
 
-mybatis.mapper-locations=classpath:com/xintong/visualinspection/mapper/*.xml
-mybatis.type-aliases-package=com.xintong.visualinspection.bean
 
 
 
@@ -70,11 +68,11 @@ spring.redis.timeout=0
 
 
 
-logging.level.root=INFO
+logging.level.root=DEBUG
 logging.level.org.springframework.web=DEBUG
 logging.level.org.springframework.data=DEBUG
 logging.level.org.springframework.security=DEBUG
-logging.level.org.hibernate=ERROR
+logging.level.org.mybites=DEBUG
 
 
 
@@ -83,7 +81,7 @@ spring.devtools.restart.enabled=true
 
 
 # JWT
-jwt.header=Authorization
+jwt.header=token
 jwt.secret=mySecret
 jwt.expiration=604800
 jwt.tokenHead=XinTong 

VisualInspection_server/src/main/resources/errcode.properties

@@ -9,5 +9,6 @@
 #\u901a\u7528\u4e1a\u52a1\u9519\u8bef
 20001=\u8f93\u5165\u53c2\u6570\u9519\u8bef
 20002=\u5220\u9664\u9519\u8BEF
+20003=\u4FEE\u6539\u5931\u8D25