20180130

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

@@ -11,5 +11,6 @@ public class RegexConstant {
 	public static final String ORDER_ID="^\\d{9}$";
 	//箱号正则表达式
 	public static final String BOX_NO="^[a-zA-Z0-9]{8}$";
-
+	
+	public static final String NUMBER_NO="\\d+(,\\d+)*";//校验传的id是数字，以逗号隔开
 }

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

@@ -48,17 +48,11 @@ public class UserServiceImpl  implements  UserService {
 	@Override
 	@Transactional(rollbackFor=Exception.class)
 	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);
+		
 	}
 
 	/**
@@ -83,6 +77,7 @@ public class UserServiceImpl  implements  UserService {
 		user.setUpdateTime(System.currentTimeMillis());
 		userMapper.updateAccountByUserId(user);
 	}
+	
     /**
      * 批量删除
      */

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.RegexConstant;
 import com.fuzamei.constant.Roles;
 import com.fuzamei.entity.Role;
 import com.fuzamei.entity.User;
@@ -80,13 +81,19 @@ public class UserAction {
 	 * 编辑修改 根据用户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) {
 		try {
-			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(user.getUserId()), Roles.ADMIN);
+			//userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(user.getUserId()));
+			ValidationUtil.checkAndAssignInt(user.getUserId());
 			List<User> us = userService.findUserByuserIdandusername(user);
 			if (us == null || us.size() < 1) {
 				userService.updateAccountByUserId(user);
@@ -106,8 +113,13 @@ public class UserAction {
 	 * 
 	 * @param user
 	 * @param result
-	 * @return { "userId": "5556", "username": "王五998", "password": "123456",
-	 *         "roleId": "1", "personName": "张三7" }
+	 * @return 
+	    { "userId": "xxx", 
+	      "username": "王五998",
+	      "password": "123456",
+	      "roleId": "1",
+	      "personName": "张三7" 
+	    }
 	 */
 	@PostMapping(value = "/insertUsers")
 	public Map<String, Object> insertUsers(@RequestBody User user) {
@@ -131,21 +143,23 @@ public class UserAction {
 	 * @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="/deleteFromUserId2")
+	  public Map<String,Object> deleteFromUserId2(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
+			String userIds = ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("userIds"));// 校验前端传来的参数是不是数字（userIds）正则表达式 XXX
 			userService.deleteFromUserId(userIds);
 			return JSONUtil.getJsonMap(200, true, "删除成功", null);
 		} catch (Exception e) {

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

@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.alibaba.fastjson.JSON;
 import com.fuzamei.baseTest.BaseJunit4Test;
+import com.fuzamei.entity.User;
 
 public class UserTest extends BaseJunit4Test{
 	
@@ -60,8 +61,40 @@ public class UserTest extends BaseJunit4Test{
 	}
 	@Test
 	public void test08(){
-		Map<String, Object> map = userAction.queryUsers("{'user_id':1001}");
+		Map<String, Object> map = userAction.queryUsers("{'user_id':1001,'username':'','roleId':'3','personName':''}");
 		System.out.println(JSON.toJSONString(map,true));
 	}
 	
+	@Test
+	public void test09(){
+		User  user=new User();
+		user.setUserId(1000003);
+		user.setUsername("jack1234");
+		user.setPassword("503621");
+		user.setRoleId(3);
+		user.setPersonName("杰克");
+		Map<String, Object> result = userAction.insertUsers(user);
+		String jsonString = JSON.toJSONString(result,true);
+		System.out.println(jsonString);
+	}
+	@Test
+	public void test10(){
+		User  user=new User();
+		user.setUserId(1000003);
+		user.setUsername("jack1234");
+		user.setPassword("503621");
+		user.setRoleId(3);
+		user.setPersonName("杰克2");
+		Map<String, Object> result = userAction.updateAccountByUserId(user);
+		String jsonString = JSON.toJSONString(result,true);
+		System.out.println(jsonString);
+	}
+	@Test
+	public void  test11() {
+		Map<String, Object> map =userAction.deleteFromUserId("{'userIds':'1990,503621'}");
+		System.out.println(JSON.toJSONString(map,true));
+	}
+	
+	
+	
 }