44

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

@@ -15,52 +15,21 @@ public class User {
 	private String  password;       //密码
 	private Integer roleId;        	//角色id
 	private String  personName;    	//人名or公司名字
-	private Integer random;         //随机数
+	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;			//起始页
-	
-	public Integer getPage() {
-		return page;
-	}
-	public void setPage(Integer page) {
-		this.page = page;
-	}
-	public Integer getRowNum() {
-		return rowNum;
-	}
-	public void setRowNum(Integer rowNum) {
-		this.rowNum = rowNum;
-	}
-	public Integer getStartPage() {
-		return startPage;
-	}
-	public void setStartPage(Integer startPage) {
-		this.startPage = startPage;
-	}
 	public String getTokenId() {
 		return tokenId;
 	}
 	public void setTokenId(String tokenId) {
 		this.tokenId = tokenId;
 	}
-	public String getToken() {
-		return token;
-	}
-	public void setToken(String token) {
-		this.token = token;
-	}
-	public String getRoleName() {
-		return roleName;
-	}
-	public void setRoleName(String roleName) {
-		this.roleName = roleName;
-	}
 	public Integer getId() {
 		return id;
 	}
@@ -97,10 +66,10 @@ public class User {
 	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 Long getCreateTime() {
@@ -115,4 +84,44 @@ public class User {
 	public void setUpdateTime(Long updateTime) {
 		this.updateTime = updateTime;
 	}
+	public String getRoleName() {
+		return roleName;
+	}
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+	public String getToken() {
+		return token;
+	}
+	public void setToken(String token) {
+		this.token = token;
+	}
+	public String getSign() {
+		return sign;
+	}
+	public void setSign(String sign) {
+		this.sign = sign;
+	}
+	public Integer getPage() {
+		return page;
+	}
+	public void setPage(Integer page) {
+		this.page = page;
+	}
+	public Integer getRowNum() {
+		return rowNum;
+	}
+	public void setRowNum(Integer rowNum) {
+		this.rowNum = rowNum;
+	}
+	public Integer getStartPage() {
+		return startPage;
+	}
+	public void setStartPage(Integer startPage) {
+		this.startPage = startPage;
+	}
+	
+	
+	
+
 }

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

@@ -8,7 +8,7 @@
 	
 	<!--添加（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 into  users(user_id,role_id,username,password,person_name,random,create_time,update_time)  values(#{userId},#{roleId},#{username},#{password},#{personName},#{random},#{createTime},#{updateTime})
 	</insert>
 	
 	<!--先去数据库查询 看是否已有的账号不能在重复添加了    -->
@@ -93,4 +93,11 @@
 	  select max(user_id) from users
 	</select>
 	
+	<!-- 查询数据库得随机数是不是又是一样得 -->
+	<select id="queryRondomRepetition" parameterType="com.fuzamei.entity.User" resultType="int" >
+			select count(*)  from  users where random=#{random}
+	</select>
+	
+	
+
 </mapper>

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

@@ -19,7 +19,7 @@ public interface UserMapper {
 	public void deleteFromUserId(String[] userIds);//批量删除，前端传个id字符串来
 	
 	public  int queryUserIdMax();//查询用户表最大id然后+1
-
+	public int queryRondomRepetition(String random);//查询前端传来得随机数  数据库是否有一样得
 	
 	
 }

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

@@ -16,6 +16,6 @@ public interface UserService {
 	public List<User> findUserByuserIdandusername(User user);
 	//public int queryUserscount(Map<String, Object> map);//查询总条数
 	public void deleteFromUserId(String userIds);//批量删除
-	
+	public  int queryRondomRepetition(String random);//查询前端传来得随机数  数据库是否有一样得
 	public  int queryUserIdMax();
 }

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

@@ -92,10 +92,15 @@ public class UserServiceImpl  implements  UserService {
 	}
 
 	@Override
-	public int queryUserIdMax() {
+	public int queryUserIdMax() {//查询最大得userid+1
 		return userMapper.queryUserIdMax();
 	}
 
+	@Override
+	public int queryRondomRepetition(String random) {//查询前端传来得随机数  数据库是否有一样得
+		return userMapper.queryRondomRepetition(random);
+	}
+
 
 	
 	

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

@@ -163,19 +163,21 @@ public class UserAction {
 			Integer user_id = ValidationUtil.checkAndAssignInt(req.getHeader("Authorization").split("&")[1]);
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(user_id), Roles.ADMIN);
 		    ValidationUtil.checkAndAssignInt(user.getRoleId());//校验角色
+		    ValidationUtil.checkEmptyAndAssignString(user.getSign());////校验签名 
 			ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(user.getUsername());//校验账号
 			ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(user.getPassword());//校验密码
 			ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(user.getPersonName());//校验名称
+			 String random=user.getRandom(); //得到前端传来得随机数
+		    int uu=userService.queryRondomRepetition(random);//校验拿到的随机数和数据库得随机数校验
 			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);
-			}
+		    if(uu!=0) throw new RuntimeException("随机数重复");
+		    if (us.size()!=0) throw new RuntimeException("id和账号异常");
+			userService.insertUsers(user);
+			return JSONUtil.getJsonMap(200, true, "添加成功", null);
 		} catch (Exception e) {
-			return JSONUtil.getJsonMap(500, false, "添加失败", null);
+			return JSONUtil.getJsonMap(500, false, "添加失败:"+e.getMessage(), 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>