2018年1月2日代码提交

ccb_fund_trusteeship/src/main/java/com/fuzamei/dao/UserDao.java

@@ -29,5 +29,14 @@ public class UserDao {
 		// TODO Auto-generated method stub
 		return userMapper.addUserToUserRole(user);
 	}
+	public int updateUserById(User user) {
+		// TODO Auto-generated method stub
+		return userMapper.updateUserById(user);
+	}
+	public int updataRoleById(User user) {
+		// TODO Auto-generated method stub
+		return userMapper.updataRoleById(user);
+	}
+	
 
 }

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

@@ -1,7 +1,6 @@
 package com.fuzamei.entity;
 
 
-import java.io.Serializable;
 
 import javax.validation.GroupSequence;
 import javax.validation.constraints.NotNull;
@@ -11,7 +10,7 @@ import org.hibernate.validator.constraints.NotBlank;
 
 
 
-public class User implements Serializable{
+public class User{
 	private int id;	//主键
 	@NotNull(message = "用户编号不能为空字符串或者null",groups = {USERID.class})
 	private int user_id;	//用户id
@@ -32,6 +31,8 @@ public class User implements Serializable{
 	private String role_name;			//角色名称
 	@NotBlank(message = "签名不能为空字符串或者null",groups = {SIGN.class})
 	private String sign;			//注册时候的签名
+	private long create_time;		//创建时间
+	private long update_time;		//更新时间
 	
 	public int getId() {
 		return id;
@@ -105,14 +106,30 @@ public class User implements Serializable{
 	public void setSign(String sign) {
 		this.sign = sign;
 	}
+	
 
+	public long getCreate_time() {
+		return create_time;
+	}
+	public void setCreate_time(long create_time) {
+		this.create_time = create_time;
+	}
+	public long getUpdate_time() {
+		return update_time;
+	}
+	public void setUpdate_time(long update_time) {
+		this.update_time = update_time;
+	}
+	
 	@Override
 	public String toString() {
 		return "User [id=" + id + ", user_id=" + user_id + ", account=" + account + ", password=" + password
 				+ ", random=" + random + ", public_key=" + public_key + ", private_key=" + private_key
 				+ ", organization_name=" + organization_name + ", person_name=" + person_name + ", role_id=" + role_id
-				+ ", role_name=" + role_name + ", sign=" + sign + "]";
+				+ ", role_name=" + role_name + ", sign=" + sign + ", create_time=" + create_time + ", update_time="
+				+ update_time + "]";
 	}
+
 	//顺序控制
 	public interface USERID{};
 	public interface ACCOUNT{};

ccb_fund_trusteeship/src/main/java/com/fuzamei/mapperInterface/UserInterface.java

@@ -12,4 +12,10 @@ public interface UserInterface {
 	public int addUserToUser(User user);
 
 	public int addUserToUserRole(User user);
+
+	public int editUser(User user);
+
+	public int updateUserById(User user);
+
+	public int updataRoleById(User user);
 }

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

@@ -5,6 +5,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import javax.annotation.Resource;
+import javax.management.RuntimeErrorException;
 
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -91,6 +92,9 @@ public class UserService {
 		String public_key = KeyUtils.getPublicKey(private_key);
 		user.setPrivate_key(private_key);
 		user.setPublic_key(public_key);
+		long currentTime = System.currentTimeMillis();
+		user.setCreate_time(currentTime);
+		user.setUpdate_time(currentTime);
 		// TODO 用户添加到本地数据库
 		int userCount = userDao.addUserToUser(user);
 		int userRoleCount = userDao.addUserToUserRole(user);
@@ -104,4 +108,18 @@ public class UserService {
 		}
 		return resultMap;
 	}
+	@Transactional
+	public Map<String, Object> editUser(User user) {
+		Map<String,Object> resultMap = new HashMap<String,Object>();
+		// TODO Auto-generated method stub
+		int countUser = userDao.updateUserById(user);
+		int countRole = userDao.updataRoleById(user);
+		if((countUser == 1)&&(countRole == 1)){
+			resultMap = JSONUtil.getJsonMap(200, false, "用户信息修改成功", null);
+		}
+		else{
+			throw new RuntimeException("blockchain error!");
+		}
+		return resultMap;
+	}
 }

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

@@ -108,4 +108,29 @@ public class UserAction {
 		System.out.println("添加用户结束……");
 		return resultMap;
 	}
+	/**
+	 * 
+	* <b>Description:编辑用户信息</b><br> 
+	* @param user
+	* @return
+	* @Note
+	* <b>Author:maamin
+	* <br><b>Date:</b> 2017年12月27日 上午11:03:08
+	* <br><b>Version:</b> 1.0
+	 */
+	@RequestMapping(value = "/editUser",method = RequestMethod.POST)
+	public Map<String,Object> editUser(@Validated(GroupB.class) @RequestBody User user,BindingResult result){
+		Map<String,Object> resultMap = new HashMap<String,Object>();	//存放最终的结果
+		if(result.hasErrors()){
+			resultMap = JSONUtil.getJsonMap(12431, false,result.getFieldErrors().get(0).getDefaultMessage() , null);
+			return resultMap;
+		}
+		try{
+			resultMap = userService.editUser(user);
+		}catch(Exception e){
+//			System.out.println("错误信息："+e.getMessage());
+			resultMap = JSONUtil.getJsonMap(12431, false, "编辑用户信息失败：", null);
+		}
+		return resultMap;
+	}
 }