4561

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

@@ -12,86 +12,10 @@ public class User {
 	private Integer id;             //主键id
 	private Integer userId;	        //用户id
 	private Integer userIdb;	 
-	public Integer getUserIdb() {
-		return userIdb;
-	}
-	public void setUserIdb(Integer userIdb) {
-		this.userIdb = userIdb;
-	}
+
 	private String  username;       //账号
 	private String  password;       //密码
 	private Integer roleId;        	//角色id
-	private String  personName;    	//人名or公司名字
-	private String random;         //随机数
-	private Long createTime;      	//添加时间
-	private Long updateTime;      	//更新时间
-	private String roleName;		//角色名称
-	private String token;			//令牌
-	private String  sign;         //签名
-	private Integer page;				//页数
-	private Integer rowNum;				//每页显示得条数
-	private Integer startPage;			//起始页
-	
-	//下面 【操作记录表数据】
-	private Integer  operatorId;         //操作人
-	private String operatorName;		//操作人名
-	private Integer operationTypeId;	//操作类型id
-	private String operationTypeName;	//操作类型名
-	private Integer beOperatedId;       //被操作人id
-	private String beOperatedName;		//被操作人名
-	private Long operationTime;			//操作时间
-	private String hash;				//操作hash
-	
-	
-
-	public Integer getOperatorId() {
-		return operatorId;
-	}
-	public void setOperatorId(Integer operatorId) {
-		this.operatorId = operatorId;
-	}
-	public Integer getBeOperatedId() {
-		return beOperatedId;
-	}
-	public void setBeOperatedId(Integer beOperatedId) {
-		this.beOperatedId = beOperatedId;
-	}
-	public String getOperatorName() {
-		return operatorName;
-	}
-	public void setOperatorName(String operatorName) {
-		this.operatorName = operatorName;
-	}
-	public Integer getOperationTypeId() {
-		return operationTypeId;
-	}
-	public void setOperationTypeId(Integer operationTypeId) {
-		this.operationTypeId = operationTypeId;
-	}
-	public String getOperationTypeName() {
-		return operationTypeName;
-	}
-	public void setOperationTypeName(String operationTypeName) {
-		this.operationTypeName = operationTypeName;
-	}
-	public String getBeOperatedName() {
-		return beOperatedName;
-	}
-	public void setBeOperatedName(String beOperatedName) {
-		this.beOperatedName = beOperatedName;
-	}
-	public Long getOperationTime() {
-		return operationTime;
-	}
-	public void setOperationTime(Long operationTime) {
-		this.operationTime = operationTime;
-	}
-	public String getHash() {
-		return hash;
-	}
-	public void setHash(String hash) {
-		this.hash = hash;
-	}
 	public String getTokenId() {
 		return tokenId;
 	}
@@ -110,6 +34,12 @@ public class User {
 	public void setUserId(Integer userId) {
 		this.userId = userId;
 	}
+	public Integer getUserIdb() {
+		return userIdb;
+	}
+	public void setUserIdb(Integer userIdb) {
+		this.userIdb = userIdb;
+	}
 	public String getUsername() {
 		return username;
 	}
@@ -164,7 +94,6 @@ public class User {
 	public void setToken(String token) {
 		this.token = token;
 	}
-
 	public String getSign() {
 		return sign;
 	}
@@ -189,13 +118,78 @@ public class User {
 	public void setStartPage(Integer startPage) {
 		this.startPage = startPage;
 	}
-	@Override
-	public String toString() {
-		return "User [tokenId=" + tokenId + ", id=" + id + ", userId=" + userId + ", username=" + username
-				+ ", password=" + password + ", roleId=" + roleId + ", personName=" + personName + ", random=" + random
-				+ ", createTime=" + createTime + ", updateTime=" + updateTime + ", roleName=" + roleName + ", token="
-				+ token + ", sign=" + sign + ", page=" + page + ", rowNum=" + rowNum + ", startPage=" + startPage + "]";
+	public Integer getOperatorId() {
+		return operatorId;
+	}
+	public void setOperatorId(Integer operatorId) {
+		this.operatorId = operatorId;
+	}
+	public String getOperatorName() {
+		return operatorName;
+	}
+	public void setOperatorName(String operatorName) {
+		this.operatorName = operatorName;
+	}
+	public Integer getOperationTypeId() {
+		return operationTypeId;
+	}
+	public void setOperationTypeId(Integer operationTypeId) {
+		this.operationTypeId = operationTypeId;
+	}
+	public String getOperationTypeName() {
+		return operationTypeName;
+	}
+	public void setOperationTypeName(String operationTypeName) {
+		this.operationTypeName = operationTypeName;
+	}
+	public Integer getBeOperatedId() {
+		return beOperatedId;
+	}
+	public void setBeOperatedId(Integer beOperatedId) {
+		this.beOperatedId = beOperatedId;
+	}
+	public String getBeOperatedName() {
+		return beOperatedName;
+	}
+	public void setBeOperatedName(String beOperatedName) {
+		this.beOperatedName = beOperatedName;
+	}
+	public Long getOperationTime() {
+		return operationTime;
+	}
+	public void setOperationTime(Long operationTime) {
+		this.operationTime = operationTime;
+	}
+	public String getHash() {
+		return hash;
+	}
+	public void setHash(String hash) {
+		this.hash = hash;
 	}
+	private String  personName;    	//人名or公司名字
+	private String random;         //随机数
+	private Long createTime;      	//添加时间
+	private Long updateTime;      	//更新时间
+	private String roleName;		//角色名称
+	private String token;			//令牌
+	private String  sign;         //签名
+	private Integer page;				//页数
+	private Integer rowNum;				//每页显示得条数
+	private Integer startPage;			//起始页
+	
+	//下面 【操作记录表数据】
+	private Integer  operatorId;         //操作人
+	private String operatorName;		//操作人名
+	private Integer operationTypeId;	//操作类型id
+	private String operationTypeName;	//操作类型名
+	private Integer beOperatedId;       //被操作人id
+	private String beOperatedName;		//被操作人名
+	private Long operationTime;			//操作时间
+	private String hash;				//操作hash
+	
+	
+
+	
 	
 	
 

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

@@ -18,7 +18,7 @@ public class UserDetail {
 	private Integer roleId;				//角色id
 	private String roleName;			//角色名称
 	private String personName;			//人名
-	private Integer random;				//随机数(用于产生公钥私钥)
+	private String random;				//随机数(用于产生公钥私钥)
 	private String token;				//令牌
 	private Long createTime;			//用户创建时间
 	private Long updateTime;			//更新时间
@@ -72,10 +72,10 @@ public class UserDetail {
 	public void setPersonName(String personName) {
 		this.personName = personName;
 	}
-	public Integer getRandom() {
+	public String getRandom() {
 		return random;
 	}
-	public void setRandom(Integer random) {
+	public void setRandom(String random) {
 		this.random = random;
 	}
 	public String getToken() {
@@ -108,13 +108,7 @@ public class UserDetail {
 	public void setUsers(List<UserDetail> users) {
 		this.users = users;
 	}
-	@Override
-	public String toString() {
-		return "UserDetail [id=" + id + ", userId=" + userId + ", username=" + username + ", password=" + password
-				+ ", pId=" + pId + ", roleId=" + roleId + ", roleName=" + roleName + ", personName=" + personName
-				+ ", random=" + random + ", token=" + token + ", createTime=" + createTime + ", updateTime="
-				+ updateTime + ", modules=" + modules + ", users=" + users + "]";
-	}
+	
 	
 	
 }

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

@@ -69,7 +69,7 @@ public class UserServiceImpl  implements  UserService {
 		String hash = (String) map.get("sid");
 		user.setUserId(user.getUserId());//操作人（管理员）
 		user.setOperationTypeId(OperationType.ADD);//操作类型 (添加)
-		user.setUserIdb(user.getUserId());//被操作人账号  ？？？？？？？？？？？？？？待
+		user.setUserIdb(user.getUserIdb());//被操作人账号  ？？？？？？？？？？？？？？待
 		user.setOperationTime(currentTime);//操作时间
 		user.setHash(hash);//操作hash
 		userMapper.insertOperationHistory(user);
@@ -101,10 +101,9 @@ public class UserServiceImpl  implements  UserService {
 		String hash = (String) map.get("sid");
 		user.setUserId(user.getUserId());//操作人（管理员）
 		user.setOperationTypeId(OperationType.EDIT);//操作类型 (编辑)
-		user.setUserIdb(user.getUserId());//被操作人账号  ？？？？？？？？？？？？？？待
+		user.setUserIdb(user.getUserIdb());//被操作人账号  ？？？？？？？？？？？？？？待
 		user.setOperationTime(currentTime);//操作时间
 		user.setHash(hash);//操作hash
-		userMapper.insertOperationHistory(user);
 		userMapper.insertOperationHistory(user);//插入到操作记录表去
 		
 		/*boolean flag = blockChainUtil.sendBlockChain(user.getSign());//发送签名直接转发到区块链

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

@@ -35,11 +35,11 @@
 	<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>