444

saicLogistics/src/main/java/com/fuzamei/mapperInterface/UserMapper.java

@@ -10,10 +10,10 @@ import com.fuzamei.entity.User;
 public interface UserMapper {
 	public List<Role> getAllRoles();//查询所有角色
 	public List<User> queryUsers(Map<String, Object> map);//查询所有账户列表
-	public void updateAccountByUserId(int userId);//编辑修改用户  根据id
-	public  void inserUsers(User user);//添加账号角色名称
-	
-	
+	public void updateAccountByUserId(User user);//编辑修改用户  根据id
+	public  void insertUsers(User user);//添加账号角色名称
+	public List<User> findUserById(User user);//根据id查询账号是否已存在
+	public List<User> findUserByuserIdandusername(User user);
 	
 	
 	

saicLogistics/src/main/java/com/fuzamei/service/UserService.java

@@ -9,10 +9,9 @@ import com.fuzamei.entity.User;
 public interface UserService {
 	public List<Role> getAllRoles();//查询所有角色
 	public List<User> queryUsers(Map<String, Object> map);//查询所有账户列表
-	public void updateAccountByUserId(int userId);//编辑修改用户
-	
-	public  void  inserUsers(User user);//添加账号角色名称
-	
-	
+	public void updateAccountByUserId(User user);//编辑修改用户
+	public  void  insertUsers(User user);//添加账号角色名称
+	public List<User> findUserById(User user);//根据id查询账号是否已存在
+	public List<User> findUserByuserIdandusername(User user);
 	
 }

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

@@ -30,8 +30,6 @@ 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 username=(String) map.get("username");
-		//String personName=(String) map.get("personName");
 		String role=receivingClerkMapper.selectRoleByUserId(user_id);//通过id 查角色
 		if (role.equals(Roles.ADMIN)) {
 		   user=userMapper.queryUsers(map);
@@ -41,15 +39,31 @@ public class UserServiceImpl  implements  UserService {
 		
 		 return user;
 	}
+	/**
+	 * 添加用户信息 
+	 */
 	/**
 	 * 添加用户信息 
 	 */
 	@Override
-	public  void inserUsers(User user) {
+	@Transactional(rollbackFor=Exception.class)
+	public  void insertUsers(User user) {
+		user.setCreateTime(System.currentTimeMillis());
+		userMapper.insertUsers(user);
+	}
+	
 
-		
-		
-		
+	/**
+	 * 根据用户id或账号查询用户是否存在
+	 */
+	@Override
+	public List<User> findUserById(User user) {
+		return userMapper.findUserById(user);
+	}
+
+	@Override
+	public List<User> findUserByuserIdandusername(User user){
+		return userMapper.findUserByuserIdandusername(user);
 	}
 	
 	/**
@@ -57,21 +71,11 @@ public class UserServiceImpl  implements  UserService {
 	 */
 	@Override
 	@Transactional(rollbackFor=Exception.class)
-	public void updateAccountByUserId(int userId) {
-		
-		
-		
+	public void updateAccountByUserId(User user) {
+		user.setUpdateTime(System.currentTimeMillis());
+		userMapper.updateAccountByUserId(user);
 		
 	}
 	
 	
-	
-	
-	
-
-
-	
-	
-
-
 }

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

@@ -95,22 +95,21 @@ public class UserAction {
 	 * @return
 	 */
 	@PostMapping(value="/updateAccountByUserId")
-	public Map<String, Object> updateAccountByUserId(@RequestBody String  data){
+	public Map<String, Object> updateAccountByUserId(@RequestBody  User  user){
 		try {
-			@SuppressWarnings("unchecked")
-			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
-			int user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
-			
-			
-			
-			
-			
+			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);
+	        }
 			
 		} catch (Exception e) {
-			e.printStackTrace();
+			return JSONUtil.getJsonMap(500, false, "修改失败", null);
 		}
 		
-		return null;
      }
 	
 	
@@ -122,13 +121,17 @@ public class UserAction {
 	 * @return
 	 */
 	@PostMapping(value = "/insertUsers")
-	public Map<String,Object> addUser(User  user){
-        int userId= ValidationUtil.checkAndAssignInt(user.getUserId());
-		
+	public Map<String,Object> insertUsers(@RequestBody User  user){
+         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);
+        }
         
-        return null;
 	}
 	
 	
-	
 }