2018

saicLogistics/src/main/java/com/fuzamei/constant/Roles.java

@@ -0,0 +1,18 @@
+package com.fuzamei.constant;
+
+/**
+ * 
+ * @author ylx
+ * @DESCRIBE: 角色名称常量表
+ * @Date:2017-12-28 10:08 am
+ */
+public class Roles {
+	private Roles() {
+		throw new AssertionError("禁止实例化");
+	}
+	//TRAN is abbreviation of transactor
+	public static final String ADMIN = "管理员";
+
+	
+	
+}

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

@@ -4,29 +4,28 @@ import java.util.List;
 
 //用户表
 public class User {
-
 	private Integer id;             //主键id
-	private Integer user_id;        //用户id
+	private Integer userId;	        //用户id
 	
 	private String  username;       //账号
 	
 	private String  password;       //密码
-	private Integer role_id;        //角色id
-	private String  person_name;    //人名or公司名字
+	private Integer roleId;        //角色id
+	private String  personName;    //人名or公司名字
 	private Integer random;         //随机数
-	private Long create_time;      //添加时间
-	private Long update_time;      //更新时间
+	private Long createTime;      //添加时间
+	private Long updateTime;      //更新时间
 	public Integer getId() {
 		return id;
 	}
 	public void setId(Integer id) {
 		this.id = id;
 	}
-	public Integer getUser_id() {
-		return user_id;
+	public Integer getUserId() {
+		return userId;
 	}
-	public void setUser_id(Integer user_id) {
-		this.user_id = user_id;
+	public void setUserId(Integer userId) {
+		this.userId = userId;
 	}
 	public String getUsername() {
 		return username;
@@ -40,17 +39,17 @@ public class User {
 	public void setPassword(String password) {
 		this.password = password;
 	}
-	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 getPerson_name() {
-		return person_name;
+	public String getPersonName() {
+		return personName;
 	}
-	public void setPerson_name(String person_name) {
-		this.person_name = person_name;
+	public void setPersonName(String personName) {
+		this.personName = personName;
 	}
 	public Integer getRandom() {
 		return random;
@@ -58,20 +57,23 @@ public class User {
 	public void setRandom(Integer random) {
 		this.random = random;
 	}
-	public long getCreate_time() {
-		return create_time;
+	public Long getCreateTime() {
+		return createTime;
 	}
-	public void setCreate_time(long create_time) {
-		this.create_time = create_time;
+	public void setCreateTime(Long createTime) {
+		this.createTime = createTime;
 	}
-	public long getUpdate_time() {
-		return update_time;
+	public Long getUpdateTime() {
+		return updateTime;
 	}
-	public void setUpdate_time(long update_time) {
-		this.update_time = update_time;
+	public void setUpdateTime(Long updateTime) {
+		this.updateTime = updateTime;
 	}
 	
 	
 	
+
+	
+	
 	
 }

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

@@ -1,6 +1,13 @@
 <?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.CarrierMapper">
+	<!--承运商列表，带（账号）条件查询  -->
+	<select id="queryCarriers"  resultType="com.fuzamei.entity.User">
+	  select user_id,username,person_name,create_time,update_time from users  where role_id = 3
+	  <if test="username!=null and username!='' ">
+	    and username=#{username}
+	  </if>
+	</select>
 	
 	
 	

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

@@ -1,7 +1,21 @@
 <?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.PlannerMapper">
+	<!--查询计划员列表  带条件账号查询  -->
+	<select id="queryPlanner"  resultType="com.fuzamei.entity.User">
+	    select user_id,username,person_name,create_time,update_time from users  where role_id = 1
+	<if test="username!=null and username!='' ">
+	   and username=#{username}
+	</if>
+	</select>
 	
+	<!--点击查看  根据计划员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>
 	
-	
+	<!--点击查看    根据计划员id查询没有得供应商  --><!--未添加的供应商  -->
+	<select id="queryAllNoSupplierByPlannerId" resultType="com.fuzamei.entity.User">
+		select person_name from users   where user_id not in(select supplier_id from planner_supplier where planner_id=#{plannerId})
+	</select>
 </mapper>

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

@@ -2,19 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace = "com.fuzamei.mapperInterface.ReceivingClerkMapper">
 	<!--仓库收货员列表，带（账号）条件查询  -->
-	<select id="queryReceivingClerk" parameterType="java.util.Map" resultType="com.fuzamei.entity.User">
-		select   
-		       user_id,
-		       username,
-		       person_name,
-		       create_time,
-		       update_time 
-		 from  
-		       users
-		where  
-		       role_id  
-		  in   (select role_id  from  role where role_id=4) and  username=#{username} 
+	<select id="queryReceivingClerk"  resultType="com.fuzamei.entity.User">
+	select user_id,username,person_name,create_time,update_time from users  where role_id = 4
+	<if test="username!=null and username!='' ">
+	   and username=#{username}
+	</if>
+	</select>
+	<!-- 根据用户id的  查询角色  test-->
+	<select id="selectRoleByUserId"  resultType="String">
+	  select role_name from role where role_id  in (select role_id from users where user_id=#{user_id})
 	</select>
-	
-	
 </mapper>

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

@@ -1,7 +1,18 @@
 <?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.SupplierMapper">
-	
+	<!--查询供应商列表  带条件账号查询  -->
+	<select id="querySupplier"  resultType="com.fuzamei.entity.User">
+	   select user_id,username,person_name,create_time,update_time from users  where role_id = 2
+	<if test="username!=null and username!='' ">
+	   and username=#{username}
+	</if>
+
+	</select>
+	<!--点击查看  根据供应商id（用户id）  查询所有得所属计划员  -->
+	<select id="queryPlannerBySupplierId"  parameterType="int"  resultType="com.fuzamei.entity.User">
+		select person_name from users  where user_id in(select planner_id from planner_supplier where supplier_id=#{supplierId})
+	</select>
 	
 	
 </mapper>

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

@@ -1,7 +1,19 @@
 <?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.UserMapper">
-	
-	
+	<!--查询所有角色  -->
+	<select id="getAllRoles" resultType="com.fuzamei.entity.Role">
+		select role_id as roleId,role_name as roleName from t_role;
+	</select>
+	<!--  -->
+	<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>
 	
 </mapper>

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

@@ -1,5 +1,12 @@
 package com.fuzamei.mapperInterface;
 
+import java.util.List;
+import java.util.Map;
+
+import com.fuzamei.entity.User;
+
 public interface CarrierMapper {
 
+	public List<User> queryCarriers(Map<String, Object> map);//查询承运商待账号条件查询
+
 }

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

@@ -1,5 +1,12 @@
 package com.fuzamei.mapperInterface;
 
-public interface PlannerMapper {
+import java.util.List;
+import java.util.Map;
+
+import com.fuzamei.entity.User;
 
+public interface PlannerMapper {
+	 public List<User> queryPlanner(Map<String, Object> map);//查询计划人列表
+	 public List<User> queryAllSupplierByPlannerId(int plannerId);//查询已添加的供应商
+	 public List<User> queryAllNoSupplierByPlannerId(int plannerId);//查询未添加的供应商
 }

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

@@ -3,10 +3,11 @@ package com.fuzamei.mapperInterface;
 import java.util.List;
 import java.util.Map;
 
+import com.fuzamei.entity.Role;
 import com.fuzamei.entity.User;
 
 
 public interface ReceivingClerkMapper {
 	public List<User> queryReceivingClerk(Map<String, Object> map);//查询仓库收货人列表
-	
+	public String  selectRoleByUserId(int  user_id);
 }

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

@@ -1,5 +1,12 @@
 package com.fuzamei.mapperInterface;
 
-public interface SupplierMapper {
+import java.util.List;
+import java.util.Map;
+
+import com.fuzamei.entity.User;
 
+public interface SupplierMapper {
+	
+	public List<User> querySupplier(Map<String, Object> map);
+	public List<User> queryPlannerBySupplierId(int supplierId);
 }

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

@@ -1,5 +1,17 @@
 package com.fuzamei.mapperInterface;
 
+import java.util.List;
+
+import com.fuzamei.entity.Role;
+import com.fuzamei.entity.Token;
+
 public interface UserMapper {
+	public List<Role> getAllRoles();//查询所有角色
+	public Token getTokenById(Token token);
+
+	public int insertToken(Token token);
 
+	public int updateToken(Token token);
+	
+	
 }

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

@@ -1,5 +1,12 @@
 package com.fuzamei.service;
 
+import java.util.List;
+import java.util.Map;
+
+import com.fuzamei.entity.User;
+
 public interface CarrierService {
 
+	public List<User> queryCarriers(Map<String, Object> mapToService);
+
 }

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

@@ -1,5 +1,12 @@
 package com.fuzamei.service;
 
-public interface PlannerService {
+import java.util.List;
+import java.util.Map;
+
+import com.fuzamei.entity.User;
 
+public interface PlannerService {
+	public List<User> queryPlanner(Map<String, Object> map);//查询计划人列表
+	public List<User> queryAllSupplierByPlannerId(int plannerId);//查询已添加的供应商
+	public List<User> queryAllNoSupplierByPlannerId(int plannerId);//查询未添加的供应商
 }

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

@@ -3,8 +3,10 @@ package com.fuzamei.service;
 import java.util.List;
 import java.util.Map;
 
+import com.fuzamei.entity.Role;
 import com.fuzamei.entity.User;
 
 public interface ReceivingClerkService {
 	public List<User> queryReceivingClerk(Map<String, Object> map);//查询仓库收货人列表
+	public String  selectRoleByUserId(int  user_id);
 }

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

@@ -1,5 +1,11 @@
 package com.fuzamei.service;
 
-public interface SupplierService {
+import java.util.List;
+import java.util.Map;
+
+import com.fuzamei.entity.User;
 
+public interface SupplierService {
+	public List<User> querySupplier(Map<String, Object> map);
+	public List<User> queryPlannerBySupplierId(int supplierId);
 }

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

@@ -1,13 +1,39 @@
 package com.fuzamei.service.serviceImpl;
 
+import java.util.List;
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.fuzamei.constant.Roles;
+import com.fuzamei.entity.User;
 import com.fuzamei.mapperInterface.CarrierMapper;
+import com.fuzamei.mapperInterface.ReceivingClerkMapper;
 import com.fuzamei.service.CarrierService;
 @Service
 public class CarrierServiceImpl implements  CarrierService{
 	@Autowired
 	private CarrierMapper  carrierMapper;
+	@Autowired
+	private ReceivingClerkMapper receivingClerkMapper;
+	
+	@Override
+	public List<User> queryCarriers(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");
+			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 {
+				throw  new RuntimeException("账号异常");
+			}
+			 return user;
+	}
 
 }

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

@@ -1,13 +1,55 @@
 package com.fuzamei.service.serviceImpl;
 
+import java.util.List;
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.fuzamei.constant.Roles;
+import com.fuzamei.entity.User;
 import com.fuzamei.mapperInterface.PlannerMapper;
+import com.fuzamei.mapperInterface.ReceivingClerkMapper;
 import com.fuzamei.service.PlannerService;
 @Service
 public class PlannerServiceImpl implements  PlannerService{
   @Autowired
   private PlannerMapper  plannerMapper;
+  @Autowired
+  private ReceivingClerkMapper receivingClerkMapper;
+
+
+	@Override
+	public List<User> queryPlanner(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 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 {
+			throw  new RuntimeException("账号异常5");
+		}
+		 return user;
+		
+    }
+
+
+	@Override
+	public List<User> queryAllSupplierByPlannerId(int plannerId) {//根据计划员id查询已经有的供应商
+		return plannerMapper.queryAllSupplierByPlannerId(plannerId);
+	}
+
+
+	@Override
+	public List<User> queryAllNoSupplierByPlannerId(int plannerId) {////根据计划员id查询未添加的供应商
+		return plannerMapper.queryAllNoSupplierByPlannerId(plannerId);
+	}
 	
 }

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

@@ -1,11 +1,14 @@
 package com.fuzamei.service.serviceImpl;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.fuzamei.constant.Roles;
+import com.fuzamei.entity.Role;
 import com.fuzamei.entity.User;
 import com.fuzamei.mapperInterface.ReceivingClerkMapper;
 import com.fuzamei.service.ReceivingClerkService;
@@ -19,18 +22,29 @@ public class ReceivingClerkServiceImpl implements  ReceivingClerkService{
 	@Override
 	public List<User> queryReceivingClerk(Map<String, Object> map) {
 	    List<User>  user= null; 
-		@SuppressWarnings("unchecked")
 		//Map<String, Object> account = new LinkedHashMap<String, Object>(); 
+	    int user_id=(int) map.get("user_id");
 		String username=(String) map.get("username");
-		if (username!=null || username.equals("")) {
+		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 {
-			throw  new RuntimeException("账号异常");
+			throw  new RuntimeException("账号异常1");
 		}
 		 return user;
 	}
 	
-	
+
+	@Override
+	public String  selectRoleByUserId(int user_id) {
+		
+		return receivingClerkMapper.selectRoleByUserId(user_id);
+	}
 	
 	
 }

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

@@ -1,8 +1,14 @@
 package com.fuzamei.service.serviceImpl;
 
+import java.util.List;
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.fuzamei.constant.Roles;
+import com.fuzamei.entity.User;
+import com.fuzamei.mapperInterface.ReceivingClerkMapper;
 import com.fuzamei.mapperInterface.SupplierMapper;
 import com.fuzamei.service.SupplierService;
 
@@ -10,4 +16,41 @@ import com.fuzamei.service.SupplierService;
 public class SupplierServiceImpl implements  SupplierService {
 	@Autowired
 	private  SupplierMapper supplierMapper;
+	@Autowired
+	private ReceivingClerkMapper receivingClerkMapper;
+	
+	@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 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 {
+				throw  new RuntimeException("账号异常3");
+			}*/
+			if (role.equals(Roles.ADMIN)) {
+				user=supplierMapper.querySupplier(map);
+			} 
+			if (!role.equals(Roles.ADMIN)){
+				throw  new RuntimeException("只能管理员查看");
+			}
+			if(username!=null || !username.equals("")) {
+				user=supplierMapper.querySupplier(map);
+			}
+			
+			 return user;
+		//XXX 四个列表都一样这里要加个判断输入个错误的名字会怎样
+	}
+
+	@Override
+	public List<User> queryPlannerBySupplierId(int supplierId) {//点击查看  根据供应商id   查询所有所属计划员
+		return supplierMapper.queryPlannerBySupplierId(supplierId);
+	}
 }

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

@@ -1,10 +1,21 @@
 package com.fuzamei.web;
 
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
+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.RestController;
 
+import com.alibaba.fastjson.JSON;
+import com.fuzamei.constant.HintMSG;
+import com.fuzamei.entity.User;
 import com.fuzamei.service.CarrierService;
+import com.fuzamei.util.JSONUtil;
+import com.fuzamei.util.ValidationUtil;
 
 @RestController
 @RequestMapping(path="/carrier")
@@ -12,4 +23,30 @@ public class CarriersAction {
 
 	@Autowired
 	private CarrierService carrierService;
+	@PostMapping(value="queryCarriers")
+	public Map<String, Object> queryCarriers(@RequestBody String data){
+	
+		try {
+			List<User> list=null;
+			@SuppressWarnings("unchecked")
+			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
+			int user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));//   ————————》给个用户id 判断用户id是什么权限
+			
+			String username=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));//拿到前端传来的账号去service校验
+			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
+			mapToService.put("user_id",user_id );
+			mapToService.put("username", username);
+			list=carrierService.queryCarriers(mapToService);
+			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, list);
+		} catch (Exception e) {
+			e.printStackTrace();
+			//System.out.println(e.getMessage()+"aa");
+			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
+		}
+		
+	}
+	
+	
+	
+	
 }

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

@@ -1,14 +1,81 @@
 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.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.alibaba.fastjson.JSON;
+import com.fuzamei.constant.HintMSG;
+import com.fuzamei.entity.User;
 import com.fuzamei.service.PlannerService;
+import com.fuzamei.util.JSONUtil;
+import com.fuzamei.util.ValidationUtil;
 
 @RestController
 @RequestMapping(path="/planner")
 public class PlannerAction {
 	@Autowired
 	private PlannerService plannerService;
+	
+	@PostMapping(value="queryPlanner")
+	public Map<String, Object> queryPlanner(@RequestBody String data){
+		try {
+			List<User> list=null;
+			@SuppressWarnings("unchecked")
+			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
+			int user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));//   ————————》给个用户id 判断用户id是什么权限
+			
+			String username=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));//拿到前端传来的账号去service校验
+			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
+			mapToService.put("user_id",user_id );
+			mapToService.put("username", username);
+			list=plannerService.queryPlanner(mapToService);
+			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, list);
+		} catch (Exception e) {
+			e.printStackTrace();
+			//System.out.println(e.getMessage()+"aa");
+			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
+		}
+		
+	 }
+	/**
+	   {
+       "plannerId":"1002"
+       }
+	 * 配置供应商
+	 * 通过计划员id  查询已经添加的供应商 和  未添加的供应商
+	 * @param data
+	 * @return
+	 */
+	@PostMapping(value="queryYesOrNoSupplierByPlannerId")
+	public Map<String, Object> queryYesOrNoSupplierByPlannerId(@RequestBody String data){
+		try {
+			List<User> SupplierList=null;
+			List<User> SupplierList2=null;
+			@SuppressWarnings("unchecked")
+			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
+			int userId = ValidationUtil.checkAndAssignInt(map.get("plannerId"));// 传的是计划员id    其实就是用户id  
+		
+		    SupplierList=plannerService.queryAllSupplierByPlannerId(userId);
+		    SupplierList2=plannerService.queryAllNoSupplierByPlannerId(userId);
+		    Map<String, Object>  twolist =new HashMap<String, Object>();
+		    twolist.put("SupplierList", SupplierList);
+		    twolist.put("SupplierList2", SupplierList2);
+		    return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, twolist);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
+		}
+	
+	}
+	
+	
 }

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

@@ -1,5 +1,6 @@
 package com.fuzamei.web;
 
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
 import com.fuzamei.constant.HintMSG;
+import com.fuzamei.constant.Roles;
 import com.fuzamei.entity.User;
 import com.fuzamei.service.ReceivingClerkService;
 import com.fuzamei.util.JSONUtil;
@@ -23,23 +25,44 @@ public class ReceivingClerkAction {
 	@Autowired
 	private ReceivingClerkService receivingClerkService;
 	
-	@PostMapping(path="queryReceivingClerk")
+	@PostMapping(value="queryReceivingClerk")
 	public Map<String, Object> queryReceivingClerk(@RequestBody String data){
 		try {
-			
+			List<User> list=null;
+			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
-			//int userId = ValidationUtil.checkAndAssignInt(map.getUser_id());// 首先校验用户权限问题
+			int user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));//   ————————》给个用户id 判断用户id是什么权限
 			
 			String username=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));//拿到前端传来的账号去service校验
 			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
+			mapToService.put("user_id",user_id );
 			mapToService.put("username", username);
-			List<User> list=receivingClerkService.queryReceivingClerk(map);
-		    return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, list);
+			list=receivingClerkService.queryReceivingClerk(mapToService);
+			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, list);
 		} catch (Exception e) {
+			e.printStackTrace();
+			//System.out.println(e.getMessage()+"aa");
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
 		}
-	}
+		
+	 }
+	
 	
+	//根据用户id 查询角色           test
+	@PostMapping(value="selectRoleByUserId")
+	public Map<String, Object> selectRoleByUserId(@RequestBody String data){
+		try {
+			@SuppressWarnings("unchecked")
+			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
+			int userId = ValidationUtil.checkAndAssignInt(map.get("user_id"));//   
+			
+			String ss=receivingClerkService.selectRoleByUserId(userId);
+			System.out.println(ss+"fffffffffff");
+		    return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, ss);
+		} catch (Exception e) {
+			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
+		}
+	}
 	
 	
 }

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

@@ -1,10 +1,79 @@
 package com.fuzamei.web;
 
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.RestController;
 
+import com.alibaba.fastjson.JSON;
+import com.fuzamei.constant.HintMSG;
+import com.fuzamei.entity.User;
+import com.fuzamei.service.SupplierService;
+import com.fuzamei.util.JSONUtil;
+import com.fuzamei.util.ValidationUtil;
+
 @RestController
 @RequestMapping(path="/supplier")
 public class SupplierAction {
-
+	@Autowired
+	private SupplierService supplierService;
+	/**
+	   {
+         "user_id":"1001",
+         "username":"小张"
+       }
+	 * @param data
+	 * @return
+	 */
+	@PostMapping(value="querySupplier")
+	public Map<String, Object> querySupplier(@RequestBody String data){
+		try {
+			List<User> list=null;
+			@SuppressWarnings("unchecked")
+			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
+			int user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));//   ————————》给个用户id 判断用户id是什么权限
+			
+			String username=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));//拿到前端传来的账号去service校验
+			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
+			mapToService.put("user_id",user_id );
+			mapToService.put("username", username);
+			list=supplierService.querySupplier(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);
+		}
+	}
+	/**
+	 * {
+	   "supplierId":"1005"
+       }
+	 * @param data
+	 * @return
+	 */
+	@PostMapping(value="queryPlannerBySupplierId")
+	public Map<String, Object> queryPlannerBySupplierId(@RequestBody String data){
+		try {
+			@SuppressWarnings("unchecked")
+			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
+			int userId = ValidationUtil.checkAndAssignInt(map.get("supplierId"));// 传的是供应商id    其实就是用户id  
+			
+		    List<User> PlannerList=supplierService.queryPlannerBySupplierId(userId);
+		    return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, PlannerList);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
+		}
+	}
+		
+		
+		
+	
+	
+	
 }