222

saicLogistics/src/main/java/com/fuzamei/constant/RegexConstant.java

@@ -8,5 +8,5 @@ public class RegexConstant {
 	public static final String CAR_NO="^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$";
 	//订单正则表达式
 	public static final String ORDER_ID="^\\d{8}$";
-	
+
 }

saicLogistics/src/main/java/com/fuzamei/entity/Token.java

@@ -2,7 +2,7 @@ package com.fuzamei.entity;
 //token表
 public class Token {
 	private Integer id;      //主键id
-	private Integer user_id; //用户id
+	private Integer userId; //用户id
 	private String token;    //令牌
 	
 	public Integer getId() {
@@ -11,11 +11,11 @@ public class Token {
 	public void setId(Integer id) {
 		this.id = id;
 	}
-	public Integer getUser_id() {
-		return user_id;
+	public Integer getUserId() {
+		return userId;
 	}
-	public void setUser_id(Integer user_id) {
-		this.user_id = user_id;
+	public void setUserId(Integer userId) {
+		this.userId = userId;
 	}
 	public String getToken() {
 		return token;

saicLogistics/src/main/java/com/fuzamei/entity/User.java

@@ -8,6 +8,9 @@ import javax.validation.constraints.Size;
 
 import org.hibernate.validator.constraints.NotBlank;
 
+import com.fuzamei.entity.User.PASSWORD;
+import com.fuzamei.entity.User.USERID;
+
 //用户表
 public class User {
 	private Integer id;             //主键id
@@ -109,7 +112,9 @@ public class User {
 	@GroupSequence({USERID.class, USERNAME.class,PASSWORD.class,ROLEID.class,RANDOM.class,PERSONNAME.class,CREATETIME.class,UPDATETIME.class}) 
 	public interface GroupB{};
 
-	
+	//该组用于用户登录
+	@GroupSequence({USERID.class,USERNAME.class, PASSWORD.class}) 
+	public interface GroupA{}
 	
 	
 }

saicLogistics/src/main/java/com/fuzamei/mapper/LoginMapper.xml

@@ -1,6 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace = "com.fuzamei.mapperInterface.LoginMapper">
+	<!--根据id查询token  -->
+	<select id="getTokenById" parameterType="com.fuzamei.entity.Token" resultType="com.fuzamei.entity.Token">
+		select * from token where user_id = #{userId};
+	</select>
+	
+	<!--插入token -->
+	<insert id="insertToken" parameterType="com.fuzamei.entity.Token">
+		insert into token(user_id,token)values(#{userId},#{token});
+	</insert>
+	
+	<!--根据用户id去修改token  -->
+	<update id="updateToken" parameterType="com.fuzamei.entity.Token">
+		update token set token = #{token} where user_id = #{userId};
+	</update>
+	
+	<select id="getUserCount" parameterType="com.fuzamei.entity.User" resultType="com.fuzamei.entity.User">
+		select
+			a.user_id,
+			a.role_id,
+			c.role_name,
+			a.username,
+			a.password,
+			a.person_name,
+			a.random
+		from
+			users a
+		left  join role c on a.role_id=c.role_id 
+		where a.username=#{username} and a.password=#{password} and user_id=#{userId}
+	
+	</select>
+	
+	
+	
+	
+	
+	
+	
+	
 	
 	
 	

saicLogistics/src/main/java/com/fuzamei/mapper/ReceivingClerkMapper.xml

@@ -3,13 +3,15 @@
 <mapper namespace = "com.fuzamei.mapperInterface.ReceivingClerkMapper">
 	<!--仓库收货员列表，带（账号）条件查询  -->
 	<select id="queryReceivingClerk"  resultType="com.fuzamei.entity.User">
-	select user_id,username,person_name,create_time,update_time from users  where role_id = 4
-	<if test="username!=null and username!='' ">
-	   and username=#{username}
-	</if>
+	  select user_id,username,person_name,create_time,update_time from users  where role_id = 4
+	  <if test="username!=null and username!='' ">
+	    and username=#{username}
+	  </if>
 	</select>
+	
 	<!-- 根据用户id的  查询角色  test-->
 	<select id="selectRoleByUserId"  resultType="String">
 	  select role_name from role where role_id  in (select role_id from users where user_id=#{user_id})
+	 <!--  select r.role_name from   users y left  join  role r on r.role_id=y.role_id  where user_id=1003 -->
 	</select>
 </mapper>

saicLogistics/src/main/java/com/fuzamei/mapper/UserMapper.xml

@@ -7,8 +7,8 @@
 	</select>
 	
 	<!--添加（id前端传来）角色，账号，密码，名称  -->
-	<insert id="insertUsers">
-		insert into  users(user_id,role_id,username,password,person_name)  values(#{userId},#{roleId},#{username},#{password},#{personName})
+	<insert id="insertUsers" parameterType="com.fuzamei.entity.User">
+		insert into  users(user_id,role_id,username,password,person_name,create_time,update_time)  values(#{userId},#{roleId},#{username},#{password},#{personName},#{createTime},#{updateTime})
 	</insert>
 	
 	<!--先去数据库查询 看是否已有的账号不能在重复添加了    -->
@@ -20,11 +20,15 @@
 	<select id="findUserByuserIdandusername" parameterType="com.fuzamei.entity.User" resultType = "com.fuzamei.entity.User">
 		select * from users where user_id != #{userId} and  username = #{username}
 	</select>
-	
+	<!--根据用户id  查询角色名称  --><!-- ？？？？？？？？？？待待？？？ -->
+	<select id="selectRoleNameByuserId">
+		select r.role_name from   users y left  join  role r on r.role_id=y.role_id  where user_id=1003
+	</select>
 	<!-- 查询账号设置的列表 -->
 	<select id="queryUsers" parameterType="java.util.Map" resultType="com.fuzamei.entity.User">
 		select   y.user_id,
 		         r.role_name,
+		         y.role_id,
 		         y.username,
 		         y.password,
 		         y.person_name,
@@ -49,7 +53,12 @@
 		update users set role_id = #{roleId}, username=#{username} , password=#{password} , person_name=#{personName},update_time=#{updateTime} where user_id=#{userId}
 	</update>
 	
-	
-
+	<!--参数类型为1001,1002,1003等， 批量删除 -->
+	<delete id="deleteFromUserId" parameterType="string">
+		delete  from   users   where  user_id in 
+		<foreach item="userids" collection="array" open="(" separator="," close=")">
+            #{userids}
+        </foreach>
+	</delete>
 	
 </mapper>

saicLogistics/src/main/java/com/fuzamei/mapperInterface/LoginMapper.java

@@ -1,5 +1,13 @@
 package com.fuzamei.mapperInterface;
 
-public interface LoginMapper {
+import java.util.List;
+
+import com.fuzamei.entity.Token;
+import com.fuzamei.entity.User;
 
+public interface LoginMapper {
+	public Token getTokenById(Token token);
+	public int insertToken(Token token);
+	public int updateToken(Token token);
+	public List<User> getUserCount(User user);
 }

saicLogistics/src/main/java/com/fuzamei/mapperInterface/UserMapper.java

@@ -4,17 +4,17 @@ import java.util.List;
 import java.util.Map;
 
 import com.fuzamei.entity.Role;
-import com.fuzamei.entity.Token;
 import com.fuzamei.entity.User;
 
 public interface UserMapper {
-	public List<Role> getAllRoles();//查询所有角色
-	public List<User> queryUsers(Map<String, Object> map);//查询所有账户列表
+	public List<Role> getAllRoles();//查询得到所有角色
+	public List<User> queryUsers(Map<String, Object> map);//查看所有账户列表
 	public void updateAccountByUserId(User user);//编辑修改用户  根据id
 	public  void insertUsers(User user);//添加账号角色名称
 	public List<User> findUserById(User user);//根据id查询账号是否已存在
-	public List<User> findUserByuserIdandusername(User user);
+	public List<User> findUserByuserIdandusername(User user);//根据id 账户查询用户存在吗  能否修改
 	
+	public void deleteFromUserId(String[] userIds);//批量删除，前端传个id字符串来
 	
 	
 

saicLogistics/src/main/java/com/fuzamei/service/LoginService.java

@@ -1,5 +1,13 @@
 package com.fuzamei.service;
 
+import java.util.List;
+import com.fuzamei.entity.Token;
+import com.fuzamei.entity.User;
+
 public interface LoginService {
+	public Token getTokenById(Token token);
+	public int insertToken(Token token);
+	public int updateToken(Token token);
+	public List<User> getUserCount(User user);
 
 }

saicLogistics/src/main/java/com/fuzamei/service/UserService.java

@@ -7,11 +7,12 @@ import com.fuzamei.entity.Role;
 import com.fuzamei.entity.User;
 
 public interface UserService {
-	public List<Role> getAllRoles();//查询所有角色
-	public List<User> queryUsers(Map<String, Object> map);//查询所有账户列表
+	public List<Role> getAllRoles();//查询得到所有角色
+	public List<User> queryUsers(Map<String, Object> map);//查看所有账户列表
 	public void updateAccountByUserId(User user);//编辑修改用户
 	public  void  insertUsers(User user);//添加账号角色名称
 	public List<User> findUserById(User user);//根据id查询账号是否已存在
 	public List<User> findUserByuserIdandusername(User user);
 	
+	public void deleteFromUserId(String userIds);//批量删除
 }

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/CarrierServiceImpl.java

@@ -21,15 +21,13 @@ public class CarrierServiceImpl implements  CarrierService{
 	@Override
 	public List<User> queryCarriers(Map<String, Object> map) {
 		 List<User>  user= null; 
-			//Map<String, Object> account = new LinkedHashMap<String, Object>(); 
 		 Integer user_id=(Integer) map.get("user_id");
-			//String username=(String) map.get("username");
 			String role=receivingClerkMapper.selectRoleByUserId(user_id);//通过用户id查询角色   如果角色是管理员就可以看查看承运商列表
-			if (role.equals(Roles.ADMIN)) {
+			if (Roles.ADMIN.equals(role)) {
 				user=carrierMapper.queryCarriers(map);
 			}
 			else {
-				throw  new RuntimeException("账号异常");
+				throw  new RuntimeException("只能管理员查看");
 			}
 			 return user;
 			// 这几个列表判断  待改

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/LoginServiceImpl.java

@@ -1,12 +1,80 @@
 package com.fuzamei.service.serviceImpl;
 
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import com.fuzamei.entity.Token;
+import com.fuzamei.entity.User;
 import com.fuzamei.mapperInterface.LoginMapper;
 import com.fuzamei.service.LoginService;
+import com.fuzamei.util.JSONUtil;
 @Service
 public class LoginServiceImpl implements LoginService{
 	@Autowired
 	private LoginMapper  loginMapper;
+	
+	@Transactional
+	public Map<String,Object> login2(User user) {
+       // TODO 检查用户的用户名、密码和随机数，能不能对应得上          ????????
+		Map<String,Object> resultMap = new LinkedHashMap<String,Object>();
+		List<User> userInfo = loginMapper.getUserCount(user);//待   待？？？
+		resultMap = JSONUtil.getJsonMap(500, false, "账号登录失败", null);
+		Token token1 = new Token();
+		if(userInfo.size() == 1){
+			String tokenRandom = UUID.randomUUID().toString().replace("-", "");
+			//更新token
+			token1.setUserId(user.getUserId());
+			token1.setToken(tokenRandom);
+			Token token = loginMapper.getTokenById(token1);
+			if(token == null){
+				int tokenCount = loginMapper.insertToken(token1);
+				if(tokenCount != 1){
+					throw new RuntimeException();
+				}
+			}
+			else{
+				int updateCount = loginMapper.updateToken(token1);
+				if(updateCount != 1){
+					throw new RuntimeException();
+				}
+			}
+			
+			resultMap = JSONUtil.getJsonMap(200, true, "账号登录成功", userInfo);
+		}
+		return  resultMap;
+	}
+	
+	
+	
+	
+	@Override
+	public Token getTokenById(Token token) {
+		
+		return loginMapper.getTokenById(token);
+	}
+
+	@Override
+	public int insertToken(Token token) {
+		return loginMapper.insertToken(token);
+	}
+
+	@Override
+	public int updateToken(Token token) {
+		return loginMapper.updateToken(token);
+	}
+
+	@Override
+	public List<User> getUserCount(User user) {
+		return loginMapper.getUserCount(user);
+	}
+	
+	
+	
+	
 }

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/PlannerServiceImpl.java

@@ -22,16 +22,14 @@ public class PlannerServiceImpl implements  PlannerService{
 	@Override
 	public List<User> queryPlanner(Map<String, Object> map) {
 	    List<User>  user= null; 
-		//Map<String, Object> account = new LinkedHashMap<String, Object>(); 
 	    Integer user_id=(Integer) map.get("user_id");
-		//String username=(String) map.get("username");
-		String role=receivingClerkMapper.selectRoleByUserId(user_id);//通过用户id查询角色   如果角色是管理员就可以看查看收货员列表
+		String role=receivingClerkMapper.selectRoleByUserId(user_id);//通过用户id查询角色   如果角色是管理员就可以看查看计划员列表
 	    System.out.println(role+"lllllll");
-		if (role.equals(Roles.ADMIN)) {
+		if (Roles.ADMIN.equals(role)) {
 			user=plannerMapper.queryPlanner(map);
 		}
 		else {
-			throw  new RuntimeException("账号异常5");
+			throw  new RuntimeException("只能管理员查看");
 		}
 		 return user;
 		// 这几个列表判断  待改

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/ReceivingClerkServiceImpl.java

@@ -22,24 +22,22 @@ public class ReceivingClerkServiceImpl implements  ReceivingClerkService{
 	@Override
 	public List<User> queryReceivingClerk(Map<String, Object> map) {
 	    List<User>  user= null; 
-		//Map<String, Object> account = new LinkedHashMap<String, Object>(); 
 	    Integer user_id=(Integer) map.get("user_id");
-		//String username=(String) map.get("username");
 		//System.out.println(username+"kkkkk");
 		String role=receivingClerkMapper.selectRoleByUserId(user_id);//通过用户id查询角色   如果角色是管理员就可以看查看收货员列表
 	    System.out.println(role+"lllllll");
-		if (role.equals(Roles.ADMIN)) {
+		if (Roles.ADMIN.equals(role)) {
 			user=receivingClerkMapper.queryReceivingClerk(map);
 		}
 		else {
-			throw  new RuntimeException("账号异常1");
+			throw  new RuntimeException("只能管理员查看");
 		}
 		 return user;
 		// 这几个列表判断  待改
 	}
 	
 	/**
-	 * 根据用户id查询角色
+	 * 根据用户id查询角色  test
 	 */
 	@Override
 	public String  selectRoleByUserId(int user_id) {

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/SupplierServiceImpl.java

@@ -23,23 +23,15 @@ public class SupplierServiceImpl implements  SupplierService {
 	public List<User> querySupplier(Map<String, Object> map) {
 		  List<User>  user= null; 
 		  Integer user_id=(Integer) map.get("user_id");
-			//String username=(String) map.get("username");
 			String role=receivingClerkMapper.selectRoleByUserId(user_id);//通过用户id查询角色   如果角色是管理员就可以看查看供应商列表
-		/*	if (role.equals(Roles.ADMIN)) {
-				user=supplierMapper.querySupplier(map);
-			}
-			else {
-				throw  new RuntimeException("账号异常3");
-			}*/
-			if (role.equals(Roles.ADMIN)) {
+			if (Roles.ADMIN.equals(role)) {
 				user=supplierMapper.querySupplier(map);
 			} 
-			if(!role.equals(Roles.ADMIN)) {
+			else {
 				throw  new RuntimeException("只能管理员查看");
 			}
 			 return user;
-		    //XXX 几个列表都一样这里要加个判断输入个错误的名字和不是管理员权限的id会怎样
-			// 这几个列表判断  待改
+			//TODO 这几个列表判断  待
 	}
 
 	@Override

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/UserServiceImpl.java

@@ -1,7 +1,5 @@
 package com.fuzamei.service.serviceImpl;
 
-import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -39,12 +37,12 @@ public class UserServiceImpl  implements  UserService {
 		List<User>  user= null; 
 		Integer user_id=(Integer) map.get("user_id");
 		String role=receivingClerkMapper.selectRoleByUserId(user_id);//通过id 查角色
-		if (role.equals(Roles.ADMIN)) {
+		System.out.println(role+"hhhhhhhhhhhhhhh");
+		if (Roles.ADMIN.equals(role)) {
 		   user=userMapper.queryUsers(map);
 		 }else {
-			 throw new RuntimeException("不是管理员无权查看列表");
+			 throw new RuntimeException("不是管理员,无权操作");
 		 }
-		
 		 return user;
 	}
 	/**
@@ -52,14 +50,22 @@ public class UserServiceImpl  implements  UserService {
 	 */
 	@Override
 	@Transactional(rollbackFor=Exception.class)
-	public  void insertUsers(User user) {
+	public  void insertUsers(User user){
+		/*String password=user.getPassword();
+		if(password.length()<=6) {
+			user.setCreateTime(System.currentTimeMillis());
+			userMapper.insertUsers(user);
+		}else {
+			throw new RuntimeException("密码要小于等于6位数");
+		}*/
+		
 		user.setCreateTime(System.currentTimeMillis());
+		user.setUpdateTime(System.currentTimeMillis());
 		userMapper.insertUsers(user);
 	}
-	
 
 	/**
-	 * 根据用户id或账号查询用户是否存在
+	 * 根据用户id查询用户是否存在
 	 */
 	@Override
 	public List<User> findUserById(User user) {
@@ -79,7 +85,15 @@ public class UserServiceImpl  implements  UserService {
 	public void updateAccountByUserId(User user) {
 		user.setUpdateTime(System.currentTimeMillis());
 		userMapper.updateAccountByUserId(user);
-		
+	}
+    /**
+     * 批量删除
+     */
+	@Override
+	@Transactional(rollbackFor=Exception.class)
+	public void deleteFromUserId(String userIds) {
+		String[] strs=userIds.split(",");
+		userMapper.deleteFromUserId(strs);
 	}
 	
 	

saicLogistics/src/main/java/com/fuzamei/web/CarriersAction.java

@@ -30,17 +30,15 @@ public class CarriersAction {
 			List<User> list=null;
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
-			int user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));//   ————————》给个用户id 判断用户id是什么权限
+			Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));//   ————————》给个用户id 判断用户id是什么权限
 			
-			String username=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));//拿到前端传来的账号去service校验
+			String username=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));
 			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
-			mapToService.put("user_id",user_id );
+			mapToService.put("user_id",user_id);
 			mapToService.put("username", username);
 			list=carrierService.queryCarriers(mapToService);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, list);
 		} catch (Exception e) {
-			e.printStackTrace();
-			//System.out.println(e.getMessage()+"aa");
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
 		}
 		

saicLogistics/src/main/java/com/fuzamei/web/LoginAction.java

@@ -1,10 +1,22 @@
 package com.fuzamei.web;
 
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.FieldError;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.fuzamei.entity.User;
+import com.fuzamei.entity.User.GroupA;
 import com.fuzamei.service.LoginService;
+import com.fuzamei.util.JSONUtil;
 
 @RestController
 @RequestMapping(path="/login")
@@ -13,4 +25,20 @@ public class LoginAction {
 	@Autowired
 	private LoginService loginService;
 	
+	@RequestMapping(path="/loginUserName")
+	public Map<String,Object> loginUserName(@Validated(GroupA.class) @RequestBody User user,BindingResult result){
+		Map<String,Object> resultMap = new LinkedHashMap<String,Object>();	//存放最终返回结果
+		try {
+			if(result.hasErrors()){
+				List<FieldError> errors = result.getFieldErrors();
+				resultMap = JSONUtil.getJsonMap(200, false, errors.get(0).getDefaultMessage(),null);
+				return resultMap;
+			}
+			//resultMap =loginService.
+		} catch (Exception e) {
+			resultMap = JSONUtil.getJsonMap(200, false, "账号登录失败", null);
+		}
+		return resultMap;
+	}
+	
 }

saicLogistics/src/main/java/com/fuzamei/web/PlannerAction.java

@@ -31,17 +31,15 @@ public class PlannerAction {
 			List<User> list=null;
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
-			int user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));//   ————————》给个用户id 判断用户id是什么权限
+			Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));//   ————————》给个用户id 判断用户id是什么权限
 			
-			String username=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));//拿到前端传来的账号去service校验
+			String username=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));
 			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
 			mapToService.put("user_id",user_id );
 			mapToService.put("username", username);
 			list=plannerService.queryPlanner(mapToService);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, list);
 		} catch (Exception e) {
-			e.printStackTrace();
-			//System.out.println(e.getMessage()+"aa");
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
 		}
 		

saicLogistics/src/main/java/com/fuzamei/web/ReceivingClerkAction.java

@@ -38,24 +38,22 @@ public class ReceivingClerkAction {
 			List<User> list=null;
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
-			int user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));//   ————————》给个用户id 判断用户id是什么权限
+			Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));//   ————————》给个用户id 判断用户id是什么权限
 			
-			String username=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));//拿到前端传来的账号去service校验
+			String username=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));
 			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
 			mapToService.put("user_id",user_id );
 			mapToService.put("username", username);
 			list=receivingClerkService.queryReceivingClerk(mapToService);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, list);
 		} catch (Exception e) {
-			e.printStackTrace();
-			//System.out.println(e.getMessage()+"aa");
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
 		}
 		
 	 }
 	
 	
-	//根据用户id 查询角色           test
+	//根据用户id 查询角色     test
 	/**
 	 * "user_id":"1001"
 	 */
@@ -64,7 +62,7 @@ public class ReceivingClerkAction {
 		try {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
-			int userId = ValidationUtil.checkAndAssignInt(map.get("user_id"));//   
+			int userId = ValidationUtil.checkAndAssignInt(map.get("user_id"));  
 			
 			String ss=receivingClerkService.selectRoleByUserId(userId);
 			System.out.println(ss+"fffffffffff");

saicLogistics/src/main/java/com/fuzamei/web/SupplierAction.java

@@ -36,16 +36,15 @@ public class SupplierAction {
 			List<User> list=null;
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
-			int user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));//   ————————》给个用户id 判断用户id是什么权限
+			Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));//   ————————》给个用户id 判断用户id是什么权限
 			
-			String username=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));//拿到前端传来的账号去service校验
+			String username=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));
 			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
 			mapToService.put("user_id",user_id );
 			mapToService.put("username", username);
 			list=supplierService.querySupplier(mapToService);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, list);
 		} catch (Exception e) {
-			e.printStackTrace();
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
 		}
 	}

saicLogistics/src/main/java/com/fuzamei/web/UserAction.java

@@ -1,32 +1,21 @@
 package com.fuzamei.web;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 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.fuzamei.constant.HintMSG;
-import com.fuzamei.entity.Param;
 import com.fuzamei.entity.Role;
 import com.fuzamei.entity.User;
-import com.fuzamei.entity.UserDetail;
-import com.fuzamei.entity.User.GroupB;
-import com.fuzamei.service.ReceivingClerkService;
 import com.fuzamei.service.UserAuthoricationService;
 import com.fuzamei.service.UserService;
 import com.fuzamei.util.JSONUtil;
-import com.fuzamei.util.ReadConfUtil;
 import com.fuzamei.util.ValidationUtil;
 
 @RestController
@@ -36,10 +25,9 @@ public class UserAction {
 	private UserService userService;
 	@Autowired
 	private UserAuthoricationService userAuthoricationService;
-	@Autowired
-	private ReceivingClerkService receivingClerkService;
+
 	/**
-	 * 查询*所有角色
+	 * 查询*得到所有的角色
 	 * @return
 	 */
 	@PostMapping(value = "getAllRoles")
@@ -50,7 +38,6 @@ public class UserAction {
 			 roles = userService.getAllRoles();
 			resultMap = JSONUtil.getJsonMap(200, true, "获取角色信息成功", roles);
 		} catch (Exception e) {
-			e.printStackTrace();
 			resultMap = JSONUtil.getJsonMap(500, false, "获取角色信息失败", roles);
 		}
 		return resultMap;
@@ -62,7 +49,7 @@ public class UserAction {
       "username":"",
       "personName":""
       }
-	 *查询用户列表
+	      查看账户列表
 	 * @param data
 	 * @return
 	 */
@@ -71,8 +58,9 @@ public class UserAction {
 		try {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
-			int user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
-			System.out.println(user_id+"aaaaaaaaaaaaaaaaaaaaaaa");
+			Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));//————————————》TODO  待
+			//System.out.println(user_id+"aaaaaaaaaaaaaaaaaaaaaaa");
+			//userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(map.get("user_id"), com.fuzamei.constant.Role.ADMIN)); 
 			Integer roleId=ValidationUtil.checkAndAssignNullIntegerIfIsBlank(map.get("roleId"));
 			String username=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));//拿到前端传来的账号去service校验
 			String personName=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("personName"));
@@ -84,26 +72,34 @@ public class UserAction {
 			List<User> list=userService.queryUsers(mapToService);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, list);
 		} catch (Exception e) {
-			e.printStackTrace();
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
 		}
 	
 	}
 	/**
+	 * 编辑修改
 	 * 根据用户id修改账号，密码，名称，角色，信息
 	 * @param data
 	 * @return
+		{ 	
+	      "userId": "5556",
+	      "username": "王五998",
+	      "password": "123456",
+	      "roleId": "1",
+	      "personName": "张三7"
+	    } 
 	 */
 	@PostMapping(value="/updateAccountByUserId")
 	public Map<String, Object> updateAccountByUserId(@RequestBody  User  user){
 		try {
+			
 			ValidationUtil.checkAndAssignInt(user.getUserId());
 	         List<User> us=userService.findUserByuserIdandusername(user);
 	        if(us==null||us.size()<1) {
 	        	userService.updateAccountByUserId(user);
 	        	return JSONUtil.getJsonMap(200, true, "修改成功", null);
 	        }else {
-	        	return JSONUtil.getJsonMap(500, false, "修改失败,用户已存在", null);
+	        	return JSONUtil.getJsonMap(500, false, "修改失败,该账号已存在了", null);
 	        }
 			
 		} catch (Exception e) {
@@ -112,26 +108,69 @@ public class UserAction {
 		
      }
 	
-	
-
 	/**
 	 * 添加用户
 	 * @param user
 	 * @param result
 	 * @return
+		{ 	
+	      "userId": "5556",
+	      "username": "王五998",
+	      "password": "123456",
+	      "roleId": "1",
+	      "personName": "张三7"
+	    } 
 	 */
 	@PostMapping(value = "/insertUsers")
 	public Map<String,Object> insertUsers(@RequestBody User  user){
-         ValidationUtil.checkAndAssignInt(user.getUserId());
-         List<User> us=userService.findUserById(user);
-        if(us==null||us.size()<1) {
-        	userService.insertUsers(user);
-        	return JSONUtil.getJsonMap(200, true, "添加成功", null);
-        }else {
-        	return JSONUtil.getJsonMap(500, false, "用户已存在，添加失败", null);
-        }
-        
+        //是否还要校验密码？？？？？？
+		try {
+			 ValidationUtil.checkAndAssignInt(user.getUserId());
+	         List<User> us=userService.findUserById(user);
+	         if(us==null||us.size()<1) {
+	        	userService.insertUsers(user);
+	        	return JSONUtil.getJsonMap(200, true, "添加成功", null);
+	         }else {
+	        	return JSONUtil.getJsonMap(500, false, "用户已存在，添加失败", null);
+	         }
+		} catch (Exception e) {
+			return JSONUtil.getJsonMap(500, false, "添加失败", null);
+		}
+	}
+	
+	/**
+	      让前端传过来Id{1001,1002,1003,1004}以逗号隔开
+	   "userids" ——》1，2，3，4，5，6
+	 * @param userIds
+	 * @return
+	 */
+/*	@PostMapping(value="/deleteFromUserId")
+	public  Map<String,Object> deleteFromUserId(String userIds){
+		try {
+			userService.deleteFromUserId(userIds);
+			return JSONUtil.getJsonMap(200, true, "删除成功", null);
+		} catch (Exception e) {
+			return JSONUtil.getJsonMap(500, false, "删除失败", null);
+		}
+		
+	}*/
+	@PostMapping(value="/deleteFromUserId")
+	public  Map<String,Object> deleteFromUserId(@RequestBody String data){
+		try {
+			@SuppressWarnings("unchecked")
+			Map<String, Object> map = JSON.parseObject(data,Map.class);
+			String userIds=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("userIds"));//校验前端传来的参数（userIds）XXX
+			userService.deleteFromUserId(userIds);
+			return JSONUtil.getJsonMap(200, true, "删除成功", null);
+		} catch (Exception e) {
+			return JSONUtil.getJsonMap(500, false, "删除失败", null);
+		}
+		
 	}
 	
 	
+	
+	
+	
+	
 }