223344new

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

@@ -12,7 +12,8 @@ public class Roles {
 	}
 	//TRAN is abbreviation of transactor
 	public static final String ADMIN = "管理员";
-
+	public static final String SUPPLIER= "供应商";
+	public static final String PLANNER = "计划员";
 	
 	
 }

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

@@ -8,6 +8,7 @@ package com.fuzamei.entity;
  * @version v1.0
  */
 public class User {
+	private String tokenId;	
 	private Integer id;             //主键id
 	private Integer userId;	        //用户id
 	private String  username;       //账号
@@ -19,6 +20,14 @@ public class User {
 	private Long updateTime;      	//更新时间
 	private String roleName;		//角色名称
 	private String token;			//令牌
+	
+	
+	public String getTokenId() {
+		return tokenId;
+	}
+	public void setTokenId(String tokenId) {
+		this.tokenId = tokenId;
+	}
 	public String getToken() {
 		return token;
 	}

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

@@ -6,7 +6,7 @@
 		select role_id ,role_name  from role;
 	</select>
 	
-	<!--添加（id前端传来）角色，账号，密码，名称  -->
+	<!--添加（id前端传来的）角色，账号，密码，名称  -->
 	<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>

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

@@ -1,5 +1,7 @@
 package com.fuzamei.service.serviceImpl;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -54,6 +56,12 @@ public class UserServiceImpl  implements  UserService {
 		userMapper.insertUsers(user);
 		
 	}
+	public static void main(String[] args) {
+		SimpleDateFormat sdf=new SimpleDateFormat("s");
+		String str=sdf.format(new Date());
+		System.out.println(str+"随机数是");
+		System.err.println();
+	}
 
 	/**
 	 * 根据用户id查询用户是否存在

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

@@ -13,6 +13,7 @@ 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.CarrierService;
 import com.fuzamei.service.UserAuthoricationService;
@@ -48,8 +49,10 @@ public class CarriersAction {
 		try {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data,Map.class);
-			Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
-			userAuthoricationService.queryUserAuthority(user_id, Role.ADMIN);
+			//Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
+			String tokenId= (String) map.get("tokenId");
+			Integer user_id = ValidationUtil.checkAndAssignInt(tokenId.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);

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

@@ -15,6 +15,7 @@ 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.PlannerService;
 import com.fuzamei.service.UserAuthoricationService;
@@ -49,8 +50,10 @@ public class PlannerAction {
 		try {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data,Map.class);
-			Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
-			userAuthoricationService.queryUserAuthority(user_id, Role.ADMIN);
+			//Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
+			String tokenId= (String) map.get("tokenId");
+			Integer user_id = ValidationUtil.checkAndAssignInt(tokenId.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 );
@@ -79,9 +82,12 @@ public class PlannerAction {
 			List<User> SupplierList2=null;
 			@SuppressWarnings("unchecked")
 			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  
+			//Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
+			String tokenId= (String) map.get("tokenId");
+			Integer user_id = ValidationUtil.checkAndAssignInt(tokenId.split("&")[1]);
+			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
+			int plannerId = ValidationUtil.checkAndAssignInt(map.get("plannerId"));// 传的是计划员id  
+			userAuthoricationService.queryUserAuthority(plannerId, Role.PLANNER);//？？？？？？由计划员来配置？？---TODO
 		    SupplierList=plannerService.queryAllSupplierByPlannerId(plannerId);
 		    SupplierList2=plannerService.queryAllNoSupplierByPlannerId(plannerId);
 		    Map<String, Object>  twolist =new HashMap<String, Object>();

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

@@ -41,9 +41,11 @@ public class ReceivingClerkAction {
 	public Map<String, Object> queryReceivingClerk(@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"));//   ————————》给个用户id 判断用户id是什么权限
-			userAuthoricationService.queryUserAuthority(user_id, Role.ADMIN);
+			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]);
+			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 );
@@ -65,7 +67,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"));  
+			Integer 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

@@ -13,6 +13,7 @@ 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.SupplierService;
 import com.fuzamei.service.UserAuthoricationService;
@@ -47,8 +48,10 @@ public class SupplierAction {
 		try {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data,Map.class);
-			Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
-			userAuthoricationService.queryUserAuthority(user_id, Role.ADMIN);
+			//Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
+			String tokenId= (String) map.get("tokenId");
+			Integer user_id = ValidationUtil.checkAndAssignInt(tokenId.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 );
@@ -79,9 +82,11 @@ public class SupplierAction {
 		try {
 			@SuppressWarnings("unchecked")
 			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"));
+			//Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
+			String tokenId= (String) map.get("tokenId");
+			Integer user_id = ValidationUtil.checkAndAssignInt(tokenId.split("&")[1]);
+			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
+			Integer 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);

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

@@ -38,11 +38,14 @@ public class UserAction {
 		try {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data, Map.class);
-			Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
+			//Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
+			String tokenId= (String) map.get("tokenId");
+			Integer user_id = ValidationUtil.checkAndAssignInt(tokenId.split("&")[1]);
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
 			List<Role> roles = userService.getAllRoles();
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, roles);
 		} catch (Exception e) {
+			e.printStackTrace();
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
 		}
 
@@ -59,7 +62,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"));
+			//Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
+			String tokenId= (String) map.get("tokenId");
+			Integer user_id = ValidationUtil.checkAndAssignInt(tokenId.split("&")[1]);
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
 			Integer roleId = ValidationUtil.checkAndAssignNullIntegerIfIsBlank(map.get("roleId"));
 			String username = ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));
@@ -82,7 +87,10 @@ public class UserAction {
 	 * 
 	 * @param data
 	 * @return 
-	  { "userId": "5556", 
+	 * 
+	  {
+	    "tokenId":"Bearer8df740431cd24b81ad34dce61177efe6&1001",//管理员
+	    "userId": "5556", 
 	    "username": "王五998",
 	    "password": "123456",
 	    "roleId": "1",
@@ -92,8 +100,12 @@ public class UserAction {
 	@PostMapping(value = "/updateAccountByUserId")
 	public Map<String, Object> updateAccountByUserId(@RequestBody User user) {
 		try {
-			//userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(user.getUserId()));
-			ValidationUtil.checkAndAssignInt(user.getUserId());
+			
+			String userId = user.getTokenId().split("&")[1];
+			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);
 			if (us == null || us.size() < 1) {
 				userService.updateAccountByUserId(user);
@@ -114,7 +126,9 @@ public class UserAction {
 	 * @param user
 	 * @param result
 	 * @return 
-	    { "userId": "xxx", 
+	    { 
+	      "tokenId":"Bearer8df740431cd24b81ad34dce61177efe6&1001",//管理员
+	      "userId": "xxx", 
 	      "username": "王五998",
 	      "password": "123456",
 	      "roleId": "1",
@@ -124,7 +138,9 @@ public class UserAction {
 	@PostMapping(value = "/insertUsers")
 	public Map<String, Object> insertUsers(@RequestBody User user) {
 		try {
-			ValidationUtil.checkAndAssignInt(user.getUserId());
+			//ValidationUtil.checkAndAssignInt(user.getUserId());
+			String userId = user.getTokenId().split("&")[1];
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Roles.ADMIN);
 			List<User> us = userService.findUserById(user);
 			if (us == null || us.size() < 1) {
 				userService.insertUsers(user);
@@ -159,13 +175,17 @@ public class UserAction {
 		try {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data, Map.class);
-			String userIds = ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("userIds"));// 校验前端传来的参数是不是数字（userIds）正则表达式 XXX
+			String tokenId= (String) map.get("tokenId");
+			Integer user_id = ValidationUtil.checkAndAssignInt(tokenId.split("&")[1]);
+			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
+			
+			String userIds = ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("userIds"),RegexConstant.NUMBER_NO);// 校验前端传来的参数是不是数字（userIds）正则表达式 XXX
 			userService.deleteFromUserId(userIds);
 			return JSONUtil.getJsonMap(200, true, "删除成功", null);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, "删除失败", null);
 		}
 
-	}
+	} 
 
 }

saicLogistics/src/main/resources/spring-mvc.xml

@@ -35,12 +35,12 @@
 	<tx:annotation-driven transaction-manager="transactionManager"
 		proxy-target-class="true" />
 	<!-- 对token拦截验证 (为方便测试,测试环境给注释掉) -->
-	<mvc:interceptors>
+<!-- 	<mvc:interceptors>
 		<mvc:interceptor>
-			<!-- 拦截路径 -->
+			拦截路径
 			<mvc:mapping path="/**" />
 			<mvc:exclude-mapping path="/login"/>
 			<bean class="com.fuzamei.interceptor.TokenInterceptor" />
 		</mvc:interceptor>
-	</mvc:interceptors>
+	</mvc:interceptors> -->
 </beans>

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

@@ -25,60 +25,61 @@ public class UserTest extends BaseJunit4Test{
 
 	@Test
 	public void test01(){
-		Map<String, Object> map = receivingClerkAction.queryReceivingClerk("{'user_id':1001,'username':'商应供'}");
+		Map<String, Object> map = receivingClerkAction.queryReceivingClerk("{'tokenId':'Bearer8df740431cd24b81ad34dce61177efe6&1001','username':'商应供'}");
 		System.out.println(JSON.toJSONString(map,true));
 	}
 	
 	@Test
 	public void test02(){
-		Map<String, Object> map = carriersAction.queryCarriers("{'user_id':1001,'username':'王五'}");
+		Map<String, Object> map = carriersAction.queryCarriers("{'tokenId':'Bearer8df740431cd24b81ad34dce61177efe6&1001','username':'王五'}");
 		System.out.println(JSON.toJSONString(map,true));
 	}
 	@Test
 	public void test03(){
-		Map<String, Object> map = supplierAction.queryPlannerBySupplierId("{'user_id':1001,'supplierId':'1006'}");
+		Map<String, Object> map = supplierAction.queryPlannerBySupplierId("{'tokenId':'Bearer8df740431cd24b81ad34dce61177efe6&1001','supplierId':'1006'}");
 		System.out.println(JSON.toJSONString(map,true));
 	}
 	@Test
 	public void test04(){
-		Map<String, Object> map = supplierAction.querySupplier("{'user_id':1001,'username':''}");
+		Map<String, Object> map = supplierAction.querySupplier("{'tokenId':'Bearer8df740431cd24b81ad34dce61177efe6&1001','username':''}");
 		System.out.println(JSON.toJSONString(map,true));
 	}
 	@Test
 	public void test05(){
-		Map<String, Object> map = plannerAction.queryPlanner("{'user_id':1001,'username':''}");
+		Map<String, Object> map = plannerAction.queryPlanner("{'tokenId':'Bearer8df740431cd24b81ad34dce61177efe6&1001','username':''}");
 		System.out.println(JSON.toJSONString(map,true));
 	}
 	@Test
 	public void test06(){
-		Map<String, Object> map = plannerAction.queryYesOrNoSupplierByPlannerId("{'user_id':1001,'plannerId':'1002'}");
+		Map<String, Object> map = plannerAction.queryYesOrNoSupplierByPlannerId("{'tokenId':'Bearer8df740431cd24b81ad34dce61177efe6&1001','plannerId':'1002'}");
 		System.out.println(JSON.toJSONString(map,true));
 	}
 	@Test
-	public void test07(){
-		Map<String, Object> map = userAction.getAllRoles("{'user_id':1001}");
+	public void test07(){//NO   待改
+		Map<String, Object> map = userAction.getAllRoles("{'user_id':'1001'}");
+		//Map<String, Object> map = userAction.getAllRoles("{'tokenId':'Bearer8df740431cd24b81ad34dce61177efe6&1001'}");
 		System.out.println(JSON.toJSONString(map,true));
 	}
 	@Test
 	public void test08(){
-		Map<String, Object> map = userAction.queryUsers("{'user_id':1001,'username':'','roleId':'3','personName':''}");
+		Map<String, Object> map = userAction.queryUsers("{'tokenId':'Bearer8df740431cd24b81ad34dce61177efe6&1001','username':'','roleId':'','personName':'计划员ylx002'}");
 		System.out.println(JSON.toJSONString(map,true));
 	}
 	
-	@Test
+	@Test//tianjia        得加个tokenId，令牌Id测试
 	public void test09(){
 		User  user=new User();
-		user.setUserId(1000003);
-		user.setUsername("jack1234");
-		user.setPassword("503621");
+		user.setUserId(88888);
+		user.setUsername("jack963");
+		user.setPassword("123456");
 		user.setRoleId(3);
-		user.setPersonName("杰克");
+		user.setPersonName("杰克35");
 		Map<String, Object> result = userAction.insertUsers(user);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}
-	@Test
-	public void test10(){
+	@Test//修改
+	public void test10(){//  得加个tokenId，令牌Id测试
 		User  user=new User();
 		user.setUserId(1000003);
 		user.setUsername("jack1234");