20180131new

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

@@ -4,6 +4,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -29,7 +31,8 @@ public class CarriersAction {
 	
 	@Autowired
 	private UserAuthoricationService userAuthoricationService;
-	
+	@Autowired
+	private HttpServletRequest request;
 	/**
 	 * 
 	* @Title: queryCarriers
@@ -50,8 +53,8 @@ public class CarriersAction {
 			@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(tokenId.split("&")[1]);
+			//String tokenId= (String) map.get("tokenId");
+			Integer user_id = ValidationUtil.checkAndAssignInt(request.getHeader("Authorization"));
 			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

@@ -6,6 +6,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -30,6 +32,8 @@ public class PlannerAction {
 	
 	@Autowired
 	private UserAuthoricationService userAuthoricationService;
+	@Autowired
+	private HttpServletRequest request;
 	
 	/**
 	 * 
@@ -51,8 +55,8 @@ public class PlannerAction {
 			@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(tokenId.split("&")[1]);
+			//String tokenId= (String) map.get("tokenId");
+			Integer user_id = ValidationUtil.checkAndAssignInt(request.getHeader("Authorization"));
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
 			String username=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));
 			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
@@ -83,8 +87,8 @@ public class PlannerAction {
 			@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(tokenId.split("&")[1]);
+			//String tokenId= (String) map.get("tokenId");
+			Integer user_id = ValidationUtil.checkAndAssignInt(request.getHeader("Authorization"));
 			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

@@ -5,6 +5,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -29,6 +31,8 @@ public class ReceivingClerkAction {
 	
 	@Autowired
 	private UserAuthoricationService userAuthoricationService;
+	@Autowired
+	private HttpServletRequest request;
 	/**
 	   {
         "user_id":"1001",
@@ -43,8 +47,8 @@ public class ReceivingClerkAction {
 			@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(tokenId.split("&")[1]);
+			//String tokenId= (String) map.get("tokenId");
+			Integer user_id = ValidationUtil.checkAndAssignInt(request.getHeader("Authorization"));
 			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/SupplierAction.java

@@ -4,6 +4,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -28,7 +30,8 @@ public class SupplierAction {
 	
 	@Autowired
 	private UserAuthoricationService userAuthoricationService;
-	
+	@Autowired
+	private HttpServletRequest request;
 	/**
 	 * 
 	* @Title: querySupplier
@@ -49,8 +52,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(tokenId.split("&")[1]);
+			//String tokenId= (String) map.get("tokenId");
+			Integer user_id = ValidationUtil.checkAndAssignInt(request.getHeader("Authorization"));
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
 			String username=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));
 			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
@@ -84,7 +87,7 @@ 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(tokenId.split("&")[1]);
+			Integer user_id = ValidationUtil.checkAndAssignInt(request.getHeader("Authorization"));
 			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

@@ -181,8 +181,8 @@ public class UserAction {
 		try {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data, Map.class);
-			String tokenId= (String) map.get("tokenId");
-			Integer user_id = ValidationUtil.checkAndAssignInt(tokenId.split("&")[1]);
+			//String tokenId= (String) map.get("tokenId");
+			Integer user_id = ValidationUtil.checkAndAssignInt( request.getHeader("Authorization"));
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
 			
 			String userIds = ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("userIds"),RegexConstant.NUMBER_NO);// 校验前端传来的参数是不是数字（userIds）正则表达式 XXX