1212

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

@@ -32,7 +32,7 @@ public class CarriersAction {
 	@Autowired
 	private UserAuthoricationService userAuthoricationService;
 	@Autowired
-	private HttpServletRequest request;
+	private HttpServletRequest req;
 	/**
 	 * 
 	* @Title: queryCarriers
@@ -54,7 +54,7 @@ public class CarriersAction {
 			Map<String, Object> map = JSON.parseObject(data,Map.class);
 			//Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
 			//String tokenId= (String) map.get("tokenId");
-			Integer user_id = ValidationUtil.checkAndAssignInt(request.getHeader("Authorization"));
+			Integer user_id = ValidationUtil.checkAndAssignInt(req.getHeader("Authorization").split("&")[1]);
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
 			String username=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));
 			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();

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

@@ -33,7 +33,7 @@ public class PlannerAction {
 	@Autowired
 	private UserAuthoricationService userAuthoricationService;
 	@Autowired
-	private HttpServletRequest request;
+	private HttpServletRequest req;
 	
 	/**
 	 * 
@@ -56,7 +56,7 @@ public class PlannerAction {
 			Map<String, Object> map = JSON.parseObject(data,Map.class);
 			//Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
 			//String tokenId= (String) map.get("tokenId");
-			Integer user_id = ValidationUtil.checkAndAssignInt(request.getHeader("Authorization"));
+			Integer user_id = ValidationUtil.checkAndAssignInt(req.getHeader("Authorization").split("&")[1]);
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
 			String username=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));
 			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
@@ -88,7 +88,7 @@ public class PlannerAction {
 			Map<String, Object> map = JSON.parseObject(data,Map.class);
 			//Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
 			//String tokenId= (String) map.get("tokenId");
-			Integer user_id = ValidationUtil.checkAndAssignInt(request.getHeader("Authorization"));
+			Integer user_id = ValidationUtil.checkAndAssignInt(req.getHeader("Authorization").split("&")[1]);
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
 			int plannerId = ValidationUtil.checkAndAssignInt(map.get("plannerId"));// 传的是计划员id  
 			userAuthoricationService.queryUserAuthority(plannerId, Role.PLANNER);//？？？？？？由计划员来配置？？---TODO

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

@@ -32,7 +32,7 @@ public class ReceivingClerkAction {
 	@Autowired
 	private UserAuthoricationService userAuthoricationService;
 	@Autowired
-	private HttpServletRequest request;
+	private HttpServletRequest req;
 	/**
 	   {
         "user_id":"1001",
@@ -46,23 +46,22 @@ public class ReceivingClerkAction {
 		try {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data,Map.class);
-			//Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
-			//String tokenId= (String) map.get("tokenId");
-			Integer user_id = ValidationUtil.checkAndAssignInt(request.getHeader("Authorization"));
+			Integer user_id = ValidationUtil.checkAndAssignInt(req.getHeader("Authorization").split("&")[1]);
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
 			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<User> list=receivingClerkService.queryReceivingClerk(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 查询角色     test
+	//根据用户id 查询角色     test   此方法不用
 	/**
 	 * "user_id":"1001"
 	 */

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

@@ -31,7 +31,7 @@ public class SupplierAction {
 	@Autowired
 	private UserAuthoricationService userAuthoricationService;
 	@Autowired
-	private HttpServletRequest request;
+	private HttpServletRequest req;
 	/**
 	 * 
 	* @Title: querySupplier
@@ -53,7 +53,8 @@ public class SupplierAction {
 			Map<String, Object> map = JSON.parseObject(data,Map.class);
 			//Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
 			//String tokenId= (String) map.get("tokenId");
-			Integer user_id = ValidationUtil.checkAndAssignInt(request.getHeader("Authorization"));
+			
+			Integer user_id = ValidationUtil.checkAndAssignInt(req.getHeader("Authorization").split("&")[1]);
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
 			String username=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));
 			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
@@ -86,8 +87,8 @@ public class SupplierAction {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data,Map.class);
 			//Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
-			String tokenId= (String) map.get("tokenId");
-			Integer user_id = ValidationUtil.checkAndAssignInt(request.getHeader("Authorization"));
+			//String tokenId= (String) map.get("tokenId");
+			Integer user_id = ValidationUtil.checkAndAssignInt(req.getHeader("Authorization").split("&")[1]);
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
 			Integer supplierId = ValidationUtil.checkAndAssignInt(map.get("supplierId"));
 			userAuthoricationService.queryUserAuthority(supplierId, Role.SUPPLIER);

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

@@ -32,7 +32,7 @@ public class UserAction {
 	@Autowired
 	private UserAuthoricationService userAuthoricationService;
 	@Autowired
-	private HttpServletRequest request;
+	private HttpServletRequest req;
 
 	/**
 	 * 查询*得到所有的角色
@@ -40,13 +40,9 @@ public class UserAction {
 	 * @return
 	 */
 	@PostMapping(value = "getAllRoles")
-	public Map<String, Object> getAllRoles(@RequestBody String data) {
+	public Map<String, Object> getAllRoles() {
 		try {
-			@SuppressWarnings("unchecked")
-			Map<String, Object> map = JSON.parseObject(data, Map.class);
-			//Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
-			//String tokenId= (String) map.get("tokenId");
-			Integer user_id = ValidationUtil.checkAndAssignInt(request.getHeader("Authorization"));
+			Integer user_id = ValidationUtil.checkAndAssignInt(req.getHeader("Authorization").split("&")[1]);
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
 			List<Role> roles = userService.getAllRoles();
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, roles);
@@ -68,11 +64,9 @@ public class UserAction {
 		try {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data, Map.class);
-			//Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
-			//String tokenId= (String) map.get("tokenId");
-			Integer user_id = ValidationUtil.checkAndAssignInt(request.getHeader("Authorization"));
+			Integer user_id = ValidationUtil.checkAndAssignInt(req.getHeader("Authorization").split("&")[1]);
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
-			Integer roleId = ValidationUtil.checkAndAssignNullIntegerIfIsBlank(map.get("roleId"));
+			Integer roleId = ValidationUtil.checkAndAssignInt(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>();
@@ -96,7 +90,6 @@ public class UserAction {
 	 * 
 	  {
 	    "tokenId":"Bearer8df740431cd24b81ad34dce61177efe6&1001",//管理员
-	    "userId": "5556", 
 	    "username": "王五998",
 	    "password": "123456",
 	    "roleId": "1",
@@ -106,13 +99,13 @@ public class UserAction {
 	@PostMapping(value = "/updateAccountByUserId")
 	public Map<String, Object> updateAccountByUserId(@RequestBody User user) {
 		try {
-			
-			String userId = request.getHeader("Authorization");
-			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Roles.ADMIN);
-			
-		   //userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(user.getUserId()));
-			////userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(user.getUserId()),Roles.ADMIN);
-			List<User> us = userService.findUserByuserIdandusername(user);
+			 Integer user_id = ValidationUtil.checkAndAssignInt(req.getHeader("Authorization").split("&")[1]);
+			 userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(user_id), Roles.ADMIN);
+			 ValidationUtil.checkAndAssignInt(user.getRoleId());//校验角色
+			 ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(user.getUsername());//校验账号
+			 ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(user.getPassword());//校验密码
+			 ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(user.getPersonName());//校验名称
+			 List<User> us = userService.findUserByuserIdandusername(user);
 			if (us == null || us.size() < 1) {
 				userService.updateAccountByUserId(user);
 				return JSONUtil.getJsonMap(200, true, "修改成功", null);
@@ -145,8 +138,13 @@ public class UserAction {
 	public Map<String, Object> insertUsers(@RequestBody User user) {
 		try {
 			//ValidationUtil.checkAndAssignInt(user.getUserId());
-			String userId = request.getHeader("Authorization");
-			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Roles.ADMIN);
+			
+			Integer user_id = ValidationUtil.checkAndAssignInt(req.getHeader("Authorization").split("&")[1]);
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(user_id), Roles.ADMIN);
+		    ValidationUtil.checkAndAssignInt(user.getRoleId());//校验角色
+			ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(user.getUsername());//校验账号
+			ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(user.getPassword());//校验密码
+			ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(user.getPersonName());//校验名称
 			List<User> us = userService.findUserById(user);
 			if (us == null || us.size() < 1) {
 				userService.insertUsers(user);
@@ -155,6 +153,7 @@ public class UserAction {
 				return JSONUtil.getJsonMap(500, false, "用户已存在，添加失败", null);
 			}
 		} catch (Exception e) {
+			e.printStackTrace();
 			return JSONUtil.getJsonMap(500, false, "添加失败", null);
 		}
 	}
@@ -182,7 +181,7 @@ public class UserAction {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data, Map.class);
 			//String tokenId= (String) map.get("tokenId");
-			Integer user_id = ValidationUtil.checkAndAssignInt( request.getHeader("Authorization"));
+			Integer user_id = ValidationUtil.checkAndAssignInt(req.getHeader("Authorization").split("&")[1]);
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
 			
 			String userIds = ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("userIds"),RegexConstant.NUMBER_NO);// 校验前端传来的参数是不是数字（userIds）正则表达式 XXX

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

@@ -25,7 +25,7 @@ public class UserTest extends BaseJunit4Test{
 
 	@Test
 	public void test01(){
-		Map<String, Object> map = receivingClerkAction.queryReceivingClerk("{'tokenId':'Bearer8df740431cd24b81ad34dce61177efe6&1001','username':'商应供'}");
+		Map<String, Object> map = receivingClerkAction.queryReceivingClerk("{'username':'商应供'}");
 		System.out.println(JSON.toJSONString(map,true));
 	}
 	
@@ -56,7 +56,7 @@ public class UserTest extends BaseJunit4Test{
 	}
 	@Test
 	public void test07(){//NO   待改
-		Map<String, Object> map = userAction.getAllRoles("{'user_id':'1001'}");
+		Map<String, Object> map = userAction.getAllRoles();
 		//Map<String, Object> map = userAction.getAllRoles("{'tokenId':'Bearer8df740431cd24b81ad34dce61177efe6&1001'}");
 		System.out.println(JSON.toJSONString(map,true));
 	}
@@ -69,11 +69,11 @@ public class UserTest extends BaseJunit4Test{
 	@Test//tianjia        得加个tokenId，令牌Id测试
 	public void test09(){
 		User  user=new User();
-		user.setUserId(88888);
-		user.setUsername("jack963");
-		user.setPassword("123456");
+		user.setUserId(2356);
+		user.setUsername("jack96355");
+		user.setPassword("12345655");
 		user.setRoleId(3);
-		user.setPersonName("杰克35");
+		user.setPersonName("杰克355");
 		Map<String, Object> result = userAction.insertUsers(user);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);