new

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

@@ -16,6 +16,6 @@
 	
 	<!--点击查看    根据计划员id查询没有得供应商  --><!--未添加的供应商  -->
 	<select id="queryAllNoSupplierByPlannerId" resultType="com.fuzamei.entity.User">
-		select person_name from users   where user_id not in(select supplier_id from planner_supplier where planner_id=#{plannerId})
+		select person_name from users   where role_id=2 and user_id not in(select supplier_id from planner_supplier where planner_id=#{plannerId})
 	</select>
 </mapper>

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

@@ -11,26 +11,16 @@ import com.fuzamei.entity.User;
 import com.fuzamei.mapperInterface.CarrierMapper;
 import com.fuzamei.mapperInterface.ReceivingClerkMapper;
 import com.fuzamei.service.CarrierService;
+
 @Service
-public class CarrierServiceImpl implements  CarrierService{
-	@Autowired
-	private CarrierMapper  carrierMapper;
+public class CarrierServiceImpl implements CarrierService {
+
 	@Autowired
-	private ReceivingClerkMapper receivingClerkMapper;
-	
+	private CarrierMapper carrierMapper;
+
 	@Override
 	public List<User> queryCarriers(Map<String, Object> map) {
-		 List<User>  user= null; 
-		 Integer user_id=(Integer) map.get("user_id");
-			String role=receivingClerkMapper.selectRoleByUserId(user_id);//通过用户id查询角色   如果角色是管理员就可以看查看承运商列表
-			if (Roles.ADMIN.equals(role)) {
-				user=carrierMapper.queryCarriers(map);
-			}
-			else {
-				throw  new RuntimeException("只能管理员查看");
-			}
-			 return user;
-			// 这几个列表判断  待改
+		return carrierMapper.queryCarriers(map);
 	}
 
 }

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

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

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

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

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

@@ -16,22 +16,10 @@ import com.fuzamei.service.SupplierService;
 public class SupplierServiceImpl implements  SupplierService {
 	@Autowired
 	private  SupplierMapper supplierMapper;
-	@Autowired
-	private ReceivingClerkMapper receivingClerkMapper;
 	
 	@Override
 	public List<User> querySupplier(Map<String, Object> map) {
-		  List<User>  user= null; 
-		  Integer user_id=(Integer) map.get("user_id");
-			String role=receivingClerkMapper.selectRoleByUserId(user_id);//通过用户id查询角色   如果角色是管理员就可以看查看供应商列表
-			if (Roles.ADMIN.equals(role)) {
-				user=supplierMapper.querySupplier(map);
-			} 
-			else {
-				throw  new RuntimeException("只能管理员查看");
-			}
-			 return user;
-			//TODO 这几个列表判断  待
+		return supplierMapper.querySupplier(map);
 	}
 
 	@Override

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

@@ -13,6 +13,7 @@ import com.fuzamei.entity.User;
 import com.fuzamei.mapperInterface.ReceivingClerkMapper;
 import com.fuzamei.mapperInterface.UserMapper;
 import com.fuzamei.service.UserService;
+import com.fuzamei.util.PageDTO;
 
 @Service
 public class UserServiceImpl  implements  UserService {
@@ -34,16 +35,12 @@ public class UserServiceImpl  implements  UserService {
 	 * 查看列表
 	 */
 	public List<User> queryUsers(Map<String, Object> map) {
-		List<User>  user= null; 
-		Integer user_id=(Integer) map.get("user_id");
-		String role=receivingClerkMapper.selectRoleByUserId(user_id);//通过id 查角色
-		System.out.println(role+"hhhhhhhhhhhhhhh");
-		if (Roles.ADMIN.equals(role)) {
-		   user=userMapper.queryUsers(map);
-		 }else {
-			 throw new RuntimeException("不是管理员,无权操作");
-		 }
-		 return user;
+		PageDTO pageDTO = new PageDTO();
+		List<User> users = userMapper.queryUsers(map);
+		pageDTO.setRows(users);
+		/*int count = userMapper.findCounts(map);
+		pageDTO.setTotal(total);*/
+		 return users;
 	}
 	/**
 	 * 添加用户信息 

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

@@ -12,8 +12,10 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
 import com.fuzamei.constant.HintMSG;
+import com.fuzamei.constant.Role;
 import com.fuzamei.entity.User;
 import com.fuzamei.service.CarrierService;
+import com.fuzamei.service.UserAuthoricationService;
 import com.fuzamei.util.JSONUtil;
 import com.fuzamei.util.ValidationUtil;
 
@@ -23,28 +25,40 @@ public class CarriersAction {
 
 	@Autowired
 	private CarrierService carrierService;
+	
+	@Autowired
+	private UserAuthoricationService userAuthoricationService;
+	
+	/**
+	 * 
+	* @Title: queryCarriers
+	* @Description: TODO(这里用一句话描述这个方法的作用)
+	{
+		"user_id":"",
+		"username":""
+	}
+	* @param @return    设定文件
+	* @return Map<String,Object>    返回类型
+	* @author ylx
+	* @date 2018年1月29日 下午7:55:37
+	* @throws
+	 */
 	@PostMapping(value="queryCarriers")
 	public Map<String, Object> queryCarriers(@RequestBody String data){
-	
 		try {
-			List<User> list=null;
 			@SuppressWarnings("unchecked")
-			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
-			Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));//   ————————》给个用户id 判断用户id是什么权限
-			
+			Map<String, Object> map = JSON.parseObject(data,Map.class);
+			Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
+			userAuthoricationService.queryUserAuthority(user_id, Role.ADMIN);
 			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=carrierService.queryCarriers(mapToService);
+			List<User> list=carrierService.queryCarriers(mapToService);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, list);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
 		}
-		
 	}
 	
-	
-	
-	
 }

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

@@ -14,8 +14,10 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
 import com.fuzamei.constant.HintMSG;
+import com.fuzamei.constant.Role;
 import com.fuzamei.entity.User;
 import com.fuzamei.service.PlannerService;
+import com.fuzamei.service.UserAuthoricationService;
 import com.fuzamei.util.JSONUtil;
 import com.fuzamei.util.ValidationUtil;
 
@@ -25,19 +27,35 @@ public class PlannerAction {
 	@Autowired
 	private PlannerService plannerService;
 	
+	@Autowired
+	private UserAuthoricationService userAuthoricationService;
+	
+	/**
+	 * 
+	* @Title: queryPlanner
+	* @Description: TODO(查询计划员用户信息列表)
+	{
+		"user_id":"xxx",
+		"username":""
+	}
+	* @param @return    设定文件
+	* @return Map<String,Object>    返回类型
+	* @author ylx
+	* @date 2018年1月29日 下午8:22:50
+	* @throws
+	 */
 	@PostMapping(value="queryPlanner")
 	public Map<String, Object> queryPlanner(@RequestBody String data){
 		try {
-			List<User> list=null;
 			@SuppressWarnings("unchecked")
-			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
-			Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));//   ————————》给个用户id 判断用户id是什么权限
-			
+			Map<String, Object> map = JSON.parseObject(data,Map.class);
+			Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
+			userAuthoricationService.queryUserAuthority(user_id, Role.ADMIN);
 			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);
+			List<User> list=plannerService.queryPlanner(mapToService);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, list);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
@@ -46,7 +64,8 @@ public class PlannerAction {
 	 }
 	/**
 	   {
-       "plannerId":"1002"
+	   	"user_id":"xxx",
+       	"plannerId":"1002"
        }
 	 * 配置供应商
 	 * 通过计划员id  查询已经添加的供应商 和  未添加的供应商
@@ -59,17 +78,17 @@ public class PlannerAction {
 			List<User> SupplierList=null;
 			List<User> SupplierList2=null;
 			@SuppressWarnings("unchecked")
-			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
-			int userId = ValidationUtil.checkAndAssignInt(map.get("plannerId"));// 传的是计划员id    其实就是用户id  
-		
-		    SupplierList=plannerService.queryAllSupplierByPlannerId(userId);
-		    SupplierList2=plannerService.queryAllNoSupplierByPlannerId(userId);
+			Map<String, Object> map = JSON.parseObject(data,Map.class);
+			Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
+			userAuthoricationService.queryUserAuthority(user_id, Role.ADMIN);
+			int plannerId = ValidationUtil.checkAndAssignInt(map.get("plannerId"));// 传的是计划员id    其实就是用户id  
+		    SupplierList=plannerService.queryAllSupplierByPlannerId(plannerId);
+		    SupplierList2=plannerService.queryAllNoSupplierByPlannerId(plannerId);
 		    Map<String, Object>  twolist =new HashMap<String, Object>();
 		    twolist.put("SupplierList", SupplierList);
 		    twolist.put("SupplierList2", SupplierList2);
 		    return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, twolist);
 		} catch (Exception e) {
-			e.printStackTrace();
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
 		}
 	

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

@@ -13,9 +13,11 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
 import com.fuzamei.constant.HintMSG;
+import com.fuzamei.constant.Role;
 import com.fuzamei.constant.Roles;
 import com.fuzamei.entity.User;
 import com.fuzamei.service.ReceivingClerkService;
+import com.fuzamei.service.UserAuthoricationService;
 import com.fuzamei.util.JSONUtil;
 import com.fuzamei.util.ValidationUtil;
 
@@ -24,6 +26,9 @@ import com.fuzamei.util.ValidationUtil;
 public class ReceivingClerkAction {
 	@Autowired
 	private ReceivingClerkService receivingClerkService;
+	
+	@Autowired
+	private UserAuthoricationService userAuthoricationService;
 	/**
 	   {
         "user_id":"1001",
@@ -35,21 +40,19 @@ public class ReceivingClerkAction {
 	@PostMapping(value="queryReceivingClerk")
 	public Map<String, Object> queryReceivingClerk(@RequestBody String data){
 		try {
-			List<User> list=null;
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
 			Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));//   ————————》给个用户id 判断用户id是什么权限
-			
+			userAuthoricationService.queryUserAuthority(user_id, Role.ADMIN);
 			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);
+			List<User> list=receivingClerkService.queryReceivingClerk(mapToService);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, list);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
 		}
-		
 	 }
 	
 	

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

@@ -12,8 +12,10 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
 import com.fuzamei.constant.HintMSG;
+import com.fuzamei.constant.Role;
 import com.fuzamei.entity.User;
 import com.fuzamei.service.SupplierService;
+import com.fuzamei.service.UserAuthoricationService;
 import com.fuzamei.util.JSONUtil;
 import com.fuzamei.util.ValidationUtil;
 
@@ -22,57 +24,70 @@ import com.fuzamei.util.ValidationUtil;
 public class SupplierAction {
 	@Autowired
 	private SupplierService supplierService;
+	
+	@Autowired
+	private UserAuthoricationService userAuthoricationService;
+	
 	/**
-	   {
+	 * 
+	* @Title: querySupplier
+	* @Description: TODO(查询供应商信息列表)
+	{
          "user_id":"1001",
          "username":"小张"
-       }
-	 * @param data
-	 * @return
+    }
+	* @param @return    设定文件
+	* @return Map<String,Object>    返回类型
+	* @author ylx
+	* @date 2018年1月29日 下午8:18:52
+	* @throws
 	 */
 	@PostMapping(value="querySupplier")
 	public Map<String, Object> querySupplier(@RequestBody String data){
 		try {
-			List<User> list=null;
 			@SuppressWarnings("unchecked")
-			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
-			Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));//   ————————》给个用户id 判断用户id是什么权限
-			
+			Map<String, Object> map = JSON.parseObject(data,Map.class);
+			Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
+			userAuthoricationService.queryUserAuthority(user_id, Role.ADMIN);
 			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);
+			List<User> list=supplierService.querySupplier(mapToService);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, list);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
 		}
 	}
+	
 	/**
-	 * {
-	   "supplierId":"1005"
-       }
-	 * @param data
-	 * @return
+	 * 
+	* @Title: queryPlannerBySupplierId
+	* @Description: TODO(查询该供应商对应的计划员有哪几个)
+	{
+	 	"user_id":"",
+	 	"supplierId":"1005"
+     }
+	* @param @return    设定文件
+	* @return Map<String,Object>    返回类型
+	* @author ylx
+	* @date 2018年1月29日 下午8:19:35
+	* @throws
 	 */
 	@PostMapping(value="queryPlannerBySupplierId")
 	public Map<String, Object> queryPlannerBySupplierId(@RequestBody String data){
 		try {
 			@SuppressWarnings("unchecked")
-			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
-			int userId = ValidationUtil.checkAndAssignInt(map.get("supplierId"));// 传的是供应商id    其实就是用户id  
-			
-		    List<User> PlannerList=supplierService.queryPlannerBySupplierId(userId);
-		    return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, PlannerList);
+			Map<String, Object> map = JSON.parseObject(data,Map.class);
+			Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
+			userAuthoricationService.queryUserAuthority(user_id, Role.ADMIN);
+			int supplierId = ValidationUtil.checkAndAssignInt(map.get("supplierId"));
+			userAuthoricationService.queryUserAuthority(supplierId, Role.SUPPLIER);
+		    List<User> plannerList=supplierService.queryPlannerBySupplierId(supplierId);
+		    return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, plannerList);
 		} 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

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson.JSON;
 import com.fuzamei.constant.HintMSG;
+import com.fuzamei.constant.Roles;
 import com.fuzamei.entity.Role;
 import com.fuzamei.entity.User;
 import com.fuzamei.service.UserAuthoricationService;
@@ -19,7 +20,7 @@ import com.fuzamei.util.JSONUtil;
 import com.fuzamei.util.ValidationUtil;
 
 @RestController
-@RequestMapping(path="/user")
+@RequestMapping(path = "/user")
 public class UserAction {
 	@Autowired
 	private UserService userService;
@@ -28,149 +29,129 @@ public class UserAction {
 
 	/**
 	 * 查询*得到所有的角色
+	 * 
 	 * @return
 	 */
 	@PostMapping(value = "getAllRoles")
-	public Map<String,Object> getAllRoles(){
-		Map<String,Object> resultMap = new LinkedHashMap<String,Object>();
-		List<Role> roles = new ArrayList<Role>();
+	public Map<String, Object> getAllRoles(@RequestBody String data) {
 		try {
-			 roles = userService.getAllRoles();
-			resultMap = JSONUtil.getJsonMap(200, true, "获取角色信息成功", roles);
+			@SuppressWarnings("unchecked")
+			Map<String, Object> map = JSON.parseObject(data, Map.class);
+			Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
+			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
+			List<Role> roles = userService.getAllRoles();
+			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, roles);
 		} catch (Exception e) {
-			resultMap = JSONUtil.getJsonMap(500, false, "获取角色信息失败", roles);
+			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
 		}
-		return resultMap;
+
 	}
+
 	/**
-	 {
-      "user_id":"1001",
-      "roleId":"3",
-      "username":"",
-      "personName":""
-      }
-	      查看账户列表
+	 * { "user_id":"1001", "roleId":"3", "username":"", "personName":"" } 查看账户列表
+	 * 
 	 * @param data
 	 * @return
 	 */
-	@PostMapping(value="/queryUsers")
-	public Map<String, Object> queryUsers(@RequestBody String  data){
+	@PostMapping(value = "/queryUsers")
+	public Map<String, Object> queryUsers(@RequestBody String data) {
 		try {
 			@SuppressWarnings("unchecked")
-			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
-			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"));
+			Map<String, Object> map = JSON.parseObject(data, Map.class);
+			Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
+			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
+			Integer roleId = ValidationUtil.checkAndAssignNullIntegerIfIsBlank(map.get("roleId"));
+			String username = ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));
+			String personName = ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("personName"));
 			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
-			mapToService.put("user_id",user_id );
-			mapToService.put("roleId",roleId );
+			mapToService.put("user_id", user_id);
+			mapToService.put("roleId", roleId);
 			mapToService.put("username", username);
 			mapToService.put("personName", personName);
-			List<User> list=userService.queryUsers(mapToService);
+			List<User> list = userService.queryUsers(mapToService);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, list);
 		} catch (Exception e) {
-			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
+			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL + ":" + e.getMessage(), null);
 		}
-	
+
 	}
+
 	/**
-	 * 编辑修改
-	 * 根据用户id修改账号，密码，名称，角色，信息
+	 * 编辑修改 根据用户id修改账号，密码，名称，角色，信息
+	 * 
 	 * @param data
-	 * @return
-		{ 	
-	      "userId": "5556",
-	      "username": "王五998",
-	      "password": "123456",
-	      "roleId": "1",
-	      "personName": "张三7"
-	    } 
+	 * @return { "userId": "5556", "username": "王五998", "password": "123456",
+	 *         "roleId": "1", "personName": "张三7" }
 	 */
-	@PostMapping(value="/updateAccountByUserId")
-	public Map<String, Object> updateAccountByUserId(@RequestBody  User  user){
+	@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);
-	        }
-			
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(user.getUserId()), Roles.ADMIN);
+			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);
+			}
+
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, "修改失败", null);
 		}
-		
-     }
-	
+
+	}
+
 	/**
 	 * 添加用户
+	 * 
 	 * @param user
 	 * @param result
-	 * @return
-		{ 	
-	      "userId": "5556",
-	      "username": "王五998",
-	      "password": "123456",
-	      "roleId": "1",
-	      "personName": "张三7"
-	    } 
+	 * @return { "userId": "5556", "username": "王五998", "password": "123456",
+	 *         "roleId": "1", "personName": "张三7" }
 	 */
 	@PostMapping(value = "/insertUsers")
-	public Map<String,Object> insertUsers(@RequestBody User  user){
-        //是否还要校验密码？？？？？？
+	public Map<String, Object> insertUsers(@RequestBody User user) {
 		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);
-	         }
+			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
+	 * 让前端传过来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){
+	/*
+	 * @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
+			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);
 		}
-		
+
 	}
-	
-	
-	
-	
-	
-	
+
 }

saicLogistics/src/test/java/com/fuzamei/web/UserTest.java

@@ -0,0 +1,67 @@
+package com.fuzamei.web;
+
+import java.util.Map;
+
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.alibaba.fastjson.JSON;
+import com.fuzamei.baseTest.BaseJunit4Test;
+
+public class UserTest extends BaseJunit4Test{
+	
+	@Autowired
+	private ReceivingClerkAction receivingClerkAction;
+	
+	@Autowired
+	private CarriersAction carriersAction;
+	@Autowired
+	private SupplierAction supplierAction;
+	@Autowired
+	private PlannerAction plannerAction;
+	@Autowired
+	private UserAction userAction;
+
+	@Test
+	public void test01(){
+		Map<String, Object> map = receivingClerkAction.queryReceivingClerk("{'user_id':1001,'username':'商应供'}");
+		System.out.println(JSON.toJSONString(map,true));
+	}
+	
+	@Test
+	public void test02(){
+		Map<String, Object> map = carriersAction.queryCarriers("{'user_id':1001,'username':'王五'}");
+		System.out.println(JSON.toJSONString(map,true));
+	}
+	@Test
+	public void test03(){
+		Map<String, Object> map = supplierAction.queryPlannerBySupplierId("{'user_id':1001,'supplierId':'1006'}");
+		System.out.println(JSON.toJSONString(map,true));
+	}
+	@Test
+	public void test04(){
+		Map<String, Object> map = supplierAction.querySupplier("{'user_id':1001,'username':''}");
+		System.out.println(JSON.toJSONString(map,true));
+	}
+	@Test
+	public void test05(){
+		Map<String, Object> map = plannerAction.queryPlanner("{'user_id':1001,'username':''}");
+		System.out.println(JSON.toJSONString(map,true));
+	}
+	@Test
+	public void test06(){
+		Map<String, Object> map = plannerAction.queryYesOrNoSupplierByPlannerId("{'user_id':1001,'plannerId':'1002'}");
+		System.out.println(JSON.toJSONString(map,true));
+	}
+	@Test
+	public void test07(){
+		Map<String, Object> map = userAction.getAllRoles("{'user_id':1001}");
+		System.out.println(JSON.toJSONString(map,true));
+	}
+	@Test
+	public void test08(){
+		Map<String, Object> map = userAction.queryUsers("{'user_id':1001}");
+		System.out.println(JSON.toJSONString(map,true));
+	}
+	
+}