444

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

@@ -2,26 +2,25 @@ package com.fuzamei.entity;
 //角色表
 public class Role {
 	private Integer id;       //主键id
-	private Integer role_id;  //角色id
-	private String  role_name;//角色名称
-	
+	private Integer roleId;  //角色id
+	private String  roleName;//角色名称
 	public Integer getId() {
 		return id;
 	}
 	public void setId(Integer id) {
 		this.id = id;
 	}
-	public Integer getRole_id() {
-		return role_id;
+	public Integer getRoleId() {
+		return roleId;
 	}
-	public void setRole_id(Integer role_id) {
-		this.role_id = role_id;
+	public void setRoleId(Integer roleId) {
+		this.roleId = roleId;
 	}
-	public String getRole_name() {
-		return role_name;
+	public String getRoleName() {
+		return roleName;
 	}
-	public void setRole_name(String role_name) {
-		this.role_name = role_name;
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
 	}
 	
 	

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

@@ -2,19 +2,45 @@ package com.fuzamei.entity;
 
 import java.util.List;
 
+import javax.validation.GroupSequence;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+import org.hibernate.validator.constraints.NotBlank;
+
 //用户表
 public class User {
 	private Integer id;             //主键id
+	@NotNull(message = "用户编号不能为空字符串或者null",groups = {USERID.class})
 	private Integer userId;	        //用户id
 	
+	@NotBlank(message = "用户名不能为空字符串或者null",groups = {USERNAME.class})
 	private String  username;       //账号
 	
+	@Size(min = 6,max = 8,message = "密码必须为6到8位",groups = {PASSWORD.class})
 	private String  password;       //密码
+	
+	@NotNull(message = "用户角色名称不能为空字符串或者null",groups = {ROLEID.class})
 	private Integer roleId;        //角色id
+	@NotBlank(message = "名称不能为空字符串或者null",groups = {PERSONNAME.class})
 	private String  personName;    //人名or公司名字
+	
+	@NotBlank(message = "随机数不能为空字符串或者null",groups = {RANDOM.class})
 	private Integer random;         //随机数
+	
+	@NotNull(message = "用户添加时间不能为空字符串或者null",groups = {CREATETIME.class})
 	private Long createTime;      //添加时间
+	
+	@NotNull(message = "用户更新时间不能为空字符串或者null",groups = {UPDATETIME.class})
 	private Long updateTime;      //更新时间
+	private String roleName;
+	
+	public String getRoleName() {
+		return roleName;
+	}
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
 	public Integer getId() {
 		return id;
 	}
@@ -70,8 +96,18 @@ public class User {
 		this.updateTime = updateTime;
 	}
 	
-	
-	
+	//顺序控制
+	public interface USERID{};
+	public interface PASSWORD{};
+	public interface RANDOM{};
+	public interface USERNAME{};
+	public interface ROLEID{};
+	public interface PERSONNAME{};
+	public interface CREATETIME{};
+	public interface UPDATETIME{};
+	//该组用于添加用户
+	@GroupSequence({USERID.class, USERNAME.class,PASSWORD.class,ROLEID.class,RANDOM.class,PERSONNAME.class,CREATETIME.class,UPDATETIME.class}) 
+	public interface GroupB{};
 
 	
 	

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace = "com.fuzamei.mapperInterface.LoginMapper">
+	
+	
+	
+</mapper>

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

@@ -9,7 +9,7 @@
 	</if>
 	</select>
 	
-	<!--点击查看  根据计划员id查询所有有的供应商  --><!--以添加的供应商  -->
+	<!--点击查看  根据计划员id查询所有有的供应商  --><!--已添加的供应商  -->
 	<select id="queryAllSupplierByPlannerId" resultType="com.fuzamei.entity.User">
        select person_name from users   where user_id in(select supplier_id from planner_supplier where planner_id=#{plannerId})
 	</select>

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

@@ -3,15 +3,71 @@
 <mapper namespace = "com.fuzamei.mapperInterface.UserMapper">
 	<!--查询所有角色  -->
 	<select id="getAllRoles" resultType="com.fuzamei.entity.Role">
-		select role_id as roleId,role_name as roleName from t_role;
+		select role_id ,role_name  from role;
 	</select>
+	
+	<!--添加（id前端传来）角色，账号，密码，名称  -->
+	<insert id="insertUsers">
+		insert into  users(user_id,role_id,username,password,person_name)  values(#{userId},#{roleId},#{username},#{password},#{personName})
+	</insert>
+	
+	<!--先去数据库查询 看是否已有的账号不能在重复添加了    -->
+	<select id="findUserById" parameterType="com.fuzamei.entity.User" resultType = "com.fuzamei.entity.User">
+		select * from users where user_id = #{user_id} and  username = #{username}
+	</select>
+	
+	<select id="queryUsers" parameterType="java.util.Map" resultType="com.fuzamei.entity.User">
+		select   y.user_id,
+		         r.role_name,
+		         y.username,
+		         y.password,
+		         y.person_name,
+		         y.create_time,
+		         y.update_time 
+		 from    users y  
+		 left  join  role  r on  r.role_id=y.role_id
+		 <where>
+		      <if test="roleId!=null and roleId!=''">
+		      	   y.role_id=#{roleId}
+		      </if>
+		       <if test="username!=null and username!=''">
+		      	and  username=#{username}
+		      </if>
+		      <if test="personName!=null and personName!=''">
+		      	and  person_name=#{personName}
+		      </if>
+		 </where>
+	</select>
+	<!--根据用户id修改角色，账号，密码，名称  -->
+	<update id="updateAccountByUserId" parameterType="java.util.Map">
+		update users set role_id = #{roleId}, username=#{username} , password=#{password} , person_name=#{personName} where user_id=#{userId}
+	</update>
+	
+	<update id="updataRoleById" parameterType="com.fuzamei.entity.User">
+		update users set role_id = #{role_id} where user_id = #{user_id};
+	</update>
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	<!--  -->
 	<select id="getTokenById" parameterType="com.fuzamei.entity.Token" resultType="com.fuzamei.entity.Token">
 		select * from token where user_id = #{userId};
 	</select>
+	
 	<insert id="insertToken" parameterType="com.fuzamei.entity.Token">
 		insert into token(user_id,token)values(#{userId},#{token});
 	</insert>
+	
 	<update id="updateToken" parameterType="com.fuzamei.entity.Token">
 		update token set token = #{token} where user_id = #{userId};
 	</update>

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

@@ -0,0 +1,5 @@
+package com.fuzamei.mapperInterface;
+
+public interface LoginMapper {
+
+}

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

@@ -1,16 +1,22 @@
 package com.fuzamei.mapperInterface;
 
 import java.util.List;
+import java.util.Map;
 
 import com.fuzamei.entity.Role;
 import com.fuzamei.entity.Token;
+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 Token getTokenById(Token token);
-
 	public int insertToken(Token token);
-
 	public int updateToken(Token token);
 	
 	

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

@@ -0,0 +1,5 @@
+package com.fuzamei.service;
+
+public interface LoginService {
+
+}

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

@@ -1,5 +1,18 @@
 package com.fuzamei.service;
 
-public interface UserService {
+import java.util.List;
+import java.util.Map;
+
+import com.fuzamei.entity.Role;
+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);//添加账号角色名称
+	
+	
+	
 }

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

@@ -23,17 +23,16 @@ public class CarrierServiceImpl implements  CarrierService{
 		 List<User>  user= null; 
 			//Map<String, Object> account = new LinkedHashMap<String, Object>(); 
 		    int user_id=(int) map.get("user_id");
-			String username=(String) map.get("username");
+			//String username=(String) map.get("username");
 			String role=receivingClerkMapper.selectRoleByUserId(user_id);//通过用户id查询角色   如果角色是管理员就可以看查看承运商列表
 			if (role.equals(Roles.ADMIN)) {
 				user=carrierMapper.queryCarriers(map);
 			}
-			else if (username!=null || !username.equals("")) {
-				user=carrierMapper.queryCarriers(map);
-			}else {
+			else {
 				throw  new RuntimeException("账号异常");
 			}
 			 return user;
+			// 这几个列表判断  待改
 	}
 
 }

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

@@ -0,0 +1,12 @@
+package com.fuzamei.service.serviceImpl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.fuzamei.mapperInterface.LoginMapper;
+import com.fuzamei.service.LoginService;
+@Service
+public class LoginServiceImpl implements LoginService{
+	@Autowired
+	private LoginMapper  loginMapper;
+}

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

@@ -24,20 +24,17 @@ public class PlannerServiceImpl implements  PlannerService{
 	    List<User>  user= null; 
 		//Map<String, Object> account = new LinkedHashMap<String, Object>(); 
 	    int user_id=(int) map.get("user_id");
-		String username=(String) map.get("username");
-		System.out.println(username+"kkkkk");
+		//String username=(String) map.get("username");
 		String role=receivingClerkMapper.selectRoleByUserId(user_id);//通过用户id查询角色   如果角色是管理员就可以看查看收货员列表
 	    System.out.println(role+"lllllll");
 		if (role.equals(Roles.ADMIN)) {
 			user=plannerMapper.queryPlanner(map);
 		}
-		else if (username!=null || !username.equals("")) {
-			user=plannerMapper.queryPlanner(map);
-		}else {
+		else {
 			throw  new RuntimeException("账号异常5");
 		}
 		 return user;
-		
+		// 这几个列表判断  待改
     }
 
 

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

@@ -24,22 +24,23 @@ public class ReceivingClerkServiceImpl implements  ReceivingClerkService{
 	    List<User>  user= null; 
 		//Map<String, Object> account = new LinkedHashMap<String, Object>(); 
 	    int user_id=(int) map.get("user_id");
-		String username=(String) map.get("username");
-		System.out.println(username+"kkkkk");
+		//String username=(String) map.get("username");
+		//System.out.println(username+"kkkkk");
 		String role=receivingClerkMapper.selectRoleByUserId(user_id);//通过用户id查询角色   如果角色是管理员就可以看查看收货员列表
 	    System.out.println(role+"lllllll");
 		if (role.equals(Roles.ADMIN)) {
 			user=receivingClerkMapper.queryReceivingClerk(map);
 		}
-		else if (username!=null || !username.equals("")) {
-			user=receivingClerkMapper.queryReceivingClerk(map);
-		}else {
+		else {
 			throw  new RuntimeException("账号异常1");
 		}
 		 return user;
+		// 这几个列表判断  待改
 	}
 	
-
+	/**
+	 * 根据用户id查询角色
+	 */
 	@Override
 	public String  selectRoleByUserId(int user_id) {
 		

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

@@ -22,31 +22,24 @@ public class SupplierServiceImpl implements  SupplierService {
 	@Override
 	public List<User> querySupplier(Map<String, Object> map) {
 		  List<User>  user= null; 
-			//Map<String, Object> account = new LinkedHashMap<String, Object>(); 
 		    int user_id=(int) map.get("user_id");
-			String username=(String) map.get("username");
-			System.out.println(username+"kkkkk");
+			//String username=(String) map.get("username");
 			String role=receivingClerkMapper.selectRoleByUserId(user_id);//通过用户id查询角色   如果角色是管理员就可以看查看供应商列表
 		/*	if (role.equals(Roles.ADMIN)) {
 				user=supplierMapper.querySupplier(map);
 			}
-			else if (username!=null || !username.equals("")) {
-				user=supplierMapper.querySupplier(map);
-			}else {
+			else {
 				throw  new RuntimeException("账号异常3");
 			}*/
 			if (role.equals(Roles.ADMIN)) {
 				user=supplierMapper.querySupplier(map);
 			} 
-			if (!role.equals(Roles.ADMIN)){
+			if(!role.equals(Roles.ADMIN)) {
 				throw  new RuntimeException("只能管理员查看");
 			}
-			if(username!=null || !username.equals("")) {
-				user=supplierMapper.querySupplier(map);
-			}
-			
 			 return user;
-		//XXX 四个列表都一样这里要加个判断输入个错误的名字会怎样
+		    //XXX 几个列表都一样这里要加个判断输入个错误的名字和不是管理员权限的id会怎样
+			// 这几个列表判断  待改
 	}
 
 	@Override

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

@@ -1,8 +1,18 @@
 package com.fuzamei.service.serviceImpl;
 
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import com.fuzamei.constant.Roles;
+import com.fuzamei.entity.Role;
+import com.fuzamei.entity.User;
+import com.fuzamei.mapperInterface.ReceivingClerkMapper;
 import com.fuzamei.mapperInterface.UserMapper;
 import com.fuzamei.service.UserService;
 
@@ -11,4 +21,57 @@ public class UserServiceImpl  implements  UserService {
 
 	@Autowired
 	private UserMapper userMapper;
+	@Autowired
+	private ReceivingClerkMapper receivingClerkMapper;
+	@Override
+	public List<Role> getAllRoles() {
+		return userMapper.getAllRoles();
+	}
+	public List<User> queryUsers(Map<String, Object> map) {
+		List<User>  user= null; 
+		int user_id=(int) 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);
+		 }else {
+			 throw new RuntimeException("不是管理员无权查看列表");
+		 }
+		
+		 return user;
+	}
+	/**
+	 * 添加用户信息 
+	 */
+	@Override
+	public  void inserUsers(User user) {
+
+		
+		
+		
+	}
+	
+	/**
+	 * 根据u用户id  编辑修改，角色，账号，密码，名称，信息
+	 */
+	@Override
+	@Transactional(rollbackFor=Exception.class)
+	public void updateAccountByUserId(int userId) {
+		
+		
+		
+		
+	}
+	
+	
+	
+	
+	
+
+
+	
+	
+
+
 }

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

@@ -0,0 +1,16 @@
+package com.fuzamei.web;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fuzamei.service.LoginService;
+
+@RestController
+@RequestMapping(path="/login")
+public class LoginAction {
+
+	@Autowired
+	private LoginService loginService;
+	
+}

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

@@ -24,7 +24,14 @@ import com.fuzamei.util.ValidationUtil;
 public class ReceivingClerkAction {
 	@Autowired
 	private ReceivingClerkService receivingClerkService;
-	
+	/**
+	   {
+        "user_id":"1001",
+        "username":""
+       } 
+	 * @param data
+	 * @return
+	 */
 	@PostMapping(value="queryReceivingClerk")
 	public Map<String, Object> queryReceivingClerk(@RequestBody String data){
 		try {
@@ -49,6 +56,9 @@ public class ReceivingClerkAction {
 	
 	
 	//根据用户id 查询角色           test
+	/**
+	 * "user_id":"1001"
+	 */
 	@PostMapping(value="selectRoleByUserId")
 	public Map<String, Object> selectRoleByUserId(@RequestBody String data){
 		try {

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

@@ -1,14 +1,147 @@
 package com.fuzamei.web;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.alibaba.fastjson.JSON;
+import com.fuzamei.constant.HintMSG;
+import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Role;
+import com.fuzamei.entity.User;
+import com.fuzamei.entity.UserDetail;
+import com.fuzamei.entity.User.GroupB;
+import com.fuzamei.service.ReceivingClerkService;
+import com.fuzamei.service.UserAuthoricationService;
 import com.fuzamei.service.UserService;
+import com.fuzamei.util.JSONUtil;
+import com.fuzamei.util.ReadConfUtil;
+import com.fuzamei.util.ValidationUtil;
 
 @RestController
 @RequestMapping(path="/user")
 public class UserAction {
 	@Autowired
 	private UserService userService;
+	@Autowired
+	private UserAuthoricationService userAuthoricationService;
+	@Autowired
+	private ReceivingClerkService receivingClerkService;
+	/**
+	 * 查询*所有角色
+	 * @return
+	 */
+	@PostMapping(value = "getAllRoles")
+	public Map<String,Object> getAllRoles(){
+		Map<String,Object> resultMap = new LinkedHashMap<String,Object>();
+		List<Role> roles = new ArrayList<Role>();
+		try {
+			 roles = userService.getAllRoles();
+			resultMap = JSONUtil.getJsonMap(200, true, "获取角色信息成功", roles);
+		} catch (Exception e) {
+			e.printStackTrace();
+			resultMap = JSONUtil.getJsonMap(500, false, "获取角色信息失败", roles);
+		}
+		return resultMap;
+	}
+	/**
+	 {
+      "user_id":"1001",
+      "roleId":"3",
+      "username":"",
+      "personName":""
+      }
+	 *查询用户列表
+	 * @param data
+	 * @return
+	 */
+	@PostMapping(value="/queryUsers")
+	public Map<String, Object> queryUsers(@RequestBody String  data){
+		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"));
+			System.out.println(user_id+"aaaaaaaaaaaaaaaaaaaaaaa");
+			Integer roleId=ValidationUtil.checkAndAssignNullIntegerIfIsBlank(map.get("roleId"));
+			String username=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));//拿到前端传来的账号去service校验
+			String personName=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("personName"));
+			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
+			mapToService.put("user_id",user_id );
+			mapToService.put("roleId",roleId );
+			mapToService.put("username", username);
+			mapToService.put("personName", personName);
+			List<User> list=userService.queryUsers(mapToService);
+			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, list);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
+		}
+	
+	}
+	@PostMapping(value = "/insertUsers")
+	public Map<String,Object> addUser(@Validated(GroupB.class) @RequestBody User user,BindingResult result){
+		System.out.println("添加帐户信息……");
+		Map<String,Object> resultMap = new HashMap<String,Object>();	//存放最终返回结果
+		Integer userId = ValidationUtil.checkAndAssignInt(user.getUserId());//得到前端传来的用户id
+		
+		
+		
+		
+		
+		
+		return resultMap;
+	}
+	/**
+	 * 根据用户id修改账号，密码，名称，角色，信息
+	 * @param data
+	 * @return
+	 */
+	@PostMapping(value="/updateAccountByUserId")
+	public Map<String, Object> updateAccountByUserId(@RequestBody String  data){
+		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"));
+			
+			
+			
+			
+			
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		
+		return null;
+     }
+	
+	
+
+	/**
+	 * 添加用户
+	 * @param user
+	 * @param result
+	 * @return
+	 */
+	@PostMapping(value = "/insertUsers")
+	public Map<String,Object> addUser(User  user){
+        int userId= ValidationUtil.checkAndAssignInt(user.getUserId());
+		
+        
+        return null;
+	}
+	
+	
+	
 }