用户模块接口

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/User.java

@@ -27,6 +27,9 @@ public class User implements UserDetails {
 	private int organid;
 	// 班次
 	private int classid;
+	
+	// 班组
+	private int teamid;
 	// 电话号码
 	private String phone;
 	// 状态（-1-删除;1未删除）

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

@@ -94,7 +94,7 @@ public class UserController extends BaseController {
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/updateUser/{userid}",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    @RequestMapping(value = "/updateUser/{userid}",method=RequestMethod.PUT,produces="application/json;charset=UTF-8")
     public String updateUser(@RequestBody User user,@PathVariable int userid){
         try{
         	user.setId(userid);
@@ -123,7 +123,12 @@ public class UserController extends BaseController {
         }
     }
     
-    
+    /**
+     * 获取所用用户
+     * @param page
+     * @param size
+     * @return
+     */
     @SuppressWarnings("unchecked")
 	@PreAuthorize("hasRole('ADMIN')")
     @RequestMapping(value = "/get/all/{page}/{size}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
@@ -138,6 +143,19 @@ public class UserController extends BaseController {
         }
     }
     
+    @PreAuthorize("hasRole('ADMIN')")
+    @RequestMapping(value = "/get/list/{page}/{size}",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String getUsers(@PathVariable Integer page,@PathVariable Integer size,@RequestBody User user){
+        try{
+        	PageHelper.startPage(page, size); 
+        	List<User> users= userService.getUsers(user);
+        	
+        	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,6 +12,7 @@ import java.util.List;
 @Mapper
 public interface UserInfoDao {
     public List<User> getAll();
+    public List<User> getUsers(User user);
     public User getOne(Integer id);
     public void insert(User user);
     public void update(User user);

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

@@ -21,7 +21,7 @@
         FROM t_sys_users
     </select>
 
-    <select id="getOne" parameterType="java.lang.Long" resultMap="BaseResultMap" >
+    <select id="getOne" parameterType="java.lang.Integer" resultMap="BaseResultMap" >
         SELECT
         id,username,age,password
         FROM t_sys_users
@@ -40,7 +40,7 @@
         UPDATE
         t_sys_users
         SET
-        <if test="username != null">userName = #{username},</if>
+        <if test="username != null">username = #{username},</if>
         <if test="age != null">age = #{age},</if>
         <if test="password != null">password = #{password},</if>
         id = #{id}
@@ -56,12 +56,6 @@
         WHERE
         	id = #{id}
     </update>
-    <!-- <delete id="delete" parameterType="java.lang.Long" >
-        DELETE FROM
-        t_sys_users
-        WHERE
-        id =#{id}
-    </delete> -->
 
 
     <select id="findByUserName" parameterType="String" resultMap="userMap">
@@ -69,4 +63,17 @@
         from t_sys_users u
         where username= #{username}
     </select>
+    
+    
+    <select id="getUsers" parameterType="com.xintong.visualinspection.bean.User" resultMap="BaseResultMap"  >
+        SELECT
+        id,username,password
+        FROM t_sys_users
+        where 1=1
+        <if test="organid != null and organid != 0">and organid = #{organid} </if>
+        <if test="positionid != null and positionid != 0">and positionid = #{positionid} </if>
+        <if test="classid != null and classid != 0">and classid = #{classid} </if>
+        <if test="teamid != null and teamid != 0">and teamid = #{teamid} </if>
+        
+    </select>
 </mapper>

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

@@ -12,6 +12,7 @@ import java.util.List;
  */
 public interface UserService extends UserDetailsService {
     public List<User> getAll();
+    public List<User> getUsers(User user);
     public User getOne(Integer id);
     public void insert(User user);
     public void update(User user);

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

@@ -55,21 +55,16 @@ public class UserServiceImpl extends BaseService implements UserService {
     public List<User> getAll() {
         return userInfoDao.getAll();
     }
+    
+	@Override
+	public List<User> getUsers(User user) {
+		return userInfoDao.getUsers(user);
+	}
 
-    private int count;
 
     @Override
 //    @Cacheable(value = "usercache",keyGenerator = "keyGenerator")
     public User getOne(Integer id) {
-//        User user = new User();
-//        user.setUsername("aa"+count++);
-//        redisTemplate.opsForValue().set(user.getUsername(), user);
-//
-//        
-//        User u = (User) redisTemplate.opsForValue().get("aa"+(count-2));
-//
-//        System.out.println(u.toString()+"dsa");
-
         return getUserById(id);
     }
 
@@ -114,4 +109,6 @@ public class UserServiceImpl extends BaseService implements UserService {
         }
 
     }
+
+
 }