new

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

@@ -7,6 +7,9 @@ public class RegexConstant {
 	//车牌号正则表达式
 	public static final String CAR_NO="^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$";
 	//订单正则表达式
-	public static final String ORDER_ID="^\\d{8}$";
+//	public static final String ORDER_ID="^\\d{8}$";
+	public static final String ORDER_ID="^\\d{9}$";
+	//箱号正则表达式
+	public static final String BOX_NO="^[a-zA-Z0-9]{8}$";
 
 }

saicLogistics/src/main/java/com/fuzamei/entity/Param.java → saicLogistics/src/main/java/com/fuzamei/entity/Params.java

@@ -6,7 +6,8 @@ package com.fuzamei.entity;
  * @date:2018年1月24日下午8:57:58
  * @version v1.0
  */
-public class Param {
+public class Params {
+	private String tokenId;				//前端返回的tokenId值，tokenId为"Bearer"+token+"&"+userId
 	private Integer userId;				//用户id
 	private Integer page;				//页数
 	private Integer rowNum;				//单页显示条目数量
@@ -38,6 +39,12 @@ public class Param {
 	private Long operationTime;			//操作时间
 	private UserDetail userDetail;		//用户详细信息对象
 	private Orders order;				//整个订单详细信息
+	public String getTokenId() {
+		return tokenId;
+	}
+	public void setTokenId(String tokenId) {
+		this.tokenId = tokenId;
+	}
 	public Integer getBoxQty() {
 		return boxQty;
 	}

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

@@ -0,0 +1,26 @@
+package com.fuzamei.entity;
+
+public class Part {
+	private Integer id;
+	private String partNo;
+	private String partName;
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public String getPartNo() {
+		return partNo;
+	}
+	public void setPartNo(String partNo) {
+		this.partNo = partNo;
+	}
+	public String getPartName() {
+		return partName;
+	}
+	public void setPartName(String partName) {
+		this.partName = partName;
+	}
+	
+}

saicLogistics/src/main/java/com/fuzamei/interceptor/TokenInterceptor.java

@@ -8,6 +8,7 @@
 package com.fuzamei.interceptor;
 
 
+import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Arrays;
 import java.util.Date;
@@ -21,7 +22,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.fuzamei.service.UserAuthoricationService;
+import com.fuzamei.util.JSONUtil;
+import com.fuzamei.util.ValidationUtil;
 
 /** 
  * @file_name: TokenFilter.java
@@ -30,55 +35,29 @@ import com.alibaba.fastjson.JSONObject;
  * @date: 2017-10-31 下午12:02:38 
  * @version 1.0
  */
-public class TokenInterceptor extends HandlerInterceptorAdapter{/*
+public class TokenInterceptor extends HandlerInterceptorAdapter{
 	@Autowired
-	private AccountService accountService;
-	 (non-Javadoc)
-	 * @see org.springframework.web.servlet.handler.HandlerInterceptorAdapter#preHandle(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, java.lang.Object)
+	private UserAuthoricationService userAuthoricationService;
 	 
 	@Override
-	public boolean preHandle(HttpServletRequest request,
-			HttpServletResponse response, Object handler) throws Exception {
-		// TODO Auto-generated method stub
-		PrintWriter out = null;
-		JSONObject json = new JSONObject();
-		if(request.getHeader("Authorization") == null){
-			json.put("code", 12431);
-			json.put("success", false);
-			json.put("message", "Authorization为空");
-			json.put("data", null);
-			out = response.getWriter();
-			out.append(json.toString());
-			return false;
-		}
-		String tokenAndUserId = request.getHeader("Authorization").toString();
-		String token = tokenAndUserId.split("&")[0].toString().replace("Bearer ", "");//token
-		int accountId = Integer.parseInt(tokenAndUserId.split("&")[1]);	//账户id
-		if(token == null){
-			json.put("code", 12431);
-			json.put("success", false);
-			json.put("message", "token为空");
-			json.put("data", null);
-			out = response.getWriter();
-			out.append(json.toString());
-			return false;
-		}
-		boolean flag = accountService.verificationToken(accountId, token);
-		if(flag){
-			json.put("code", 200);
-			json.put("success", true);
-			json.put("message", "token验证通过");
-			json.put("data", null);
-			out = response.getWriter();
-			out.append(json.toString());
+	public boolean preHandle(HttpServletRequest request,HttpServletResponse response, Object handler) throws IOException {
+		try {
+			String tokenAndUserId = request.getHeader("Authorization");
+			if(tokenAndUserId==null||"".equals(tokenAndUserId.trim())){//请求头不能为null
+				throw new RuntimeException("Authorization为空");
+			}
+			String token =ValidationUtil.checkBlankAndAssignString(tokenAndUserId.split("&")[0].replace("Bearer ", ""));//token校验
+			int userId = ValidationUtil.checkAndAssignInt(tokenAndUserId.split("&")[1]);//账户id校验
+			boolean flag = userAuthoricationService.verificationToken(userId, token);//校验userId和token值是否符合
+			if(!flag){//token校验未通过
+				throw new RuntimeException("token验证失败");
+			}
 			return true;
+		} catch (Exception e) {
+			PrintWriter writer = response.getWriter();
+			Map<String, Object> jsonMap = JSONUtil.getJsonMap(300, false, e.getMessage(), null);
+			writer.append(JSON.toJSONString(jsonMap));
+			return false;
 		}
-		json.put("code", 12431);
-		json.put("success", false);
-		json.put("message", "token验证失败");
-		json.put("data", null);
-		out = response.getWriter();
-		out.append(json.toString());
-		return false;
 	}
-*/}
+}

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

@@ -0,0 +1,12 @@
+<?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.PartMapper">
+	
+	<select id="checkIfHasThePartNo" resultType="int">
+		select count(*) from part where part_no=#{partNo}
+	</select>
+	
+	<select id="queryAllPartInformation" resultType="Part">
+		select * from part
+	</select>
+</mapper>

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

@@ -110,4 +110,10 @@
 		where 
 			r.role_name=#{roleName}
 	</select>
+	
+	<select id="" resultType="int">
+		
+	</select>
+	
+	
 </mapper>

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

@@ -3,6 +3,7 @@ package com.fuzamei.mapperInterface;
 import java.util.List;
 
 import com.fuzamei.entity.Box;
+import com.fuzamei.entity.Part;
 
 public interface BoxMapper {
 

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

@@ -2,19 +2,19 @@ package com.fuzamei.mapperInterface;
 
 import java.util.List;
 
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 import com.fuzamei.entity.SendOrder;
 
 public interface CargoConsignMapper {
 
-	List<SendOrder> queryOrdersBySupplier(Param param);//供应商查询订单信息
+	List<SendOrder> queryOrdersBySupplier(Params params);//供应商查询订单信息
 
-	int findQueryCountBySupplier(Param param);//供应商查询订单总数
+	int findQueryCountBySupplier(Params params);//供应商查询订单总数
 
-	List<SendOrder> queryOrdersByCarrier(Param param);//承运商查询订单信息
+	List<SendOrder> queryOrdersByCarrier(Params params);//承运商查询订单信息
 
-	int findQueryCountByCarrier(Param param);//承运商查询订单总数
+	int findQueryCountByCarrier(Params params);//承运商查询订单总数
 
-	void doCarry(Param param);//承运商点击承运操作
+	void doCarry(Params params);//承运商点击承运操作
 
 }

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

@@ -3,12 +3,12 @@ package com.fuzamei.mapperInterface;
 import java.util.List;
 
 import com.fuzamei.entity.DeliverOrder;
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 
 public interface CargoDeliverMapper {
 
-	List<DeliverOrder> queryOrdersByCarrier(Param param);
+	List<DeliverOrder> queryOrdersByCarrier(Params params);
 
-	int findQueryCountByCarrier(Param param);
+	int findQueryCountByCarrier(Params params);
 
 }

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

@@ -2,15 +2,15 @@ package com.fuzamei.mapperInterface;
 
 import java.util.List;
 
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 import com.fuzamei.entity.TallyOrder;
 
 public interface CargoTallyMapper {
 
-	List<TallyOrder> queryOrdersByReceiver(Param param);
+	List<TallyOrder> queryOrdersByReceiver(Params params);
 
-	int findQueryCountByReceiver(Param param);
+	int findQueryCountByReceiver(Params params);
 
-	void confirmOrReject(Param param);
+	void confirmOrReject(Params params);
 
 }

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

@@ -3,15 +3,15 @@ package com.fuzamei.mapperInterface;
 import java.util.List;
 
 import com.fuzamei.entity.OperationHistory;
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 import com.fuzamei.entity.SendOrder;
 
 public interface OperationHistoryMapper {
 
-	void addToHistory(Param param);
+	void addToHistory(Params params);
 
-	List<OperationHistory> queryOperationHistory(Param param);
+	List<OperationHistory> queryOperationHistory(Params params);
 
-	int findQueryCount(Param param);
+	int findQueryCount(Params params);
 
 }

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

@@ -4,21 +4,21 @@ import java.util.List;
 
 import com.fuzamei.entity.IssueOrder;
 import com.fuzamei.entity.Orders;
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 
 public interface OrdersIssueMapper {
 
-	List<IssueOrder> queryOrdersByPlanner(Param param);//计划员查询的订单信息
+	List<IssueOrder> queryOrdersByPlanner(Params params);//计划员查询的订单信息
 
-	int findQueryCountByPlanner(Param param);//计划员查询条数
+	int findQueryCountByPlanner(Params params);//计划员查询条数
 
-	void addOrder(Param param);//新订单生成
+	void addOrder(Params params);//新订单生成
 
-	List<IssueOrder> queryOrdersBySupplier(Param param);//供应商查询订单信息
+	List<IssueOrder> queryOrdersBySupplier(Params params);//供应商查询订单信息
 
-	int findQueryCountBySupplier(Param param);//供应商查询条数
+	int findQueryCountBySupplier(Params params);//供应商查询条数
 
-	void consignment(Param param);//供应商发货操作
+	void consignment(Params params);//供应商发货操作
 	
 	
 

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

@@ -0,0 +1,13 @@
+package com.fuzamei.mapperInterface;
+
+import java.util.List;
+
+import com.fuzamei.entity.Part;
+
+public interface PartMapper {
+
+	int checkIfHasThePartNo(String partNo);
+
+	List<Part> queryAllPartInformation();
+
+}

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

@@ -2,7 +2,9 @@ package com.fuzamei.mapperInterface;
 
 import java.util.List;
 
-import com.fuzamei.entity.Param;
+import org.apache.ibatis.annotations.Param;
+
+import com.fuzamei.entity.Params;
 import com.fuzamei.entity.UserDetail;
 
 public interface UserAuthoricationMapper {
@@ -11,6 +13,8 @@ public interface UserAuthoricationMapper {
 
 	UserDetail queryUserAuthority(Integer userId);//查询简单用户信息
 
-	List<UserDetail> showAllCarriersUnderSupplier(Param param);//查询所有承运商信息
+	List<UserDetail> showAllCarriersUnderSupplier(Params params);//查询所有承运商信息
+
+	int verificationToken(@Param("userId")int userId, @Param("token") String token);//根据用户id和token值查看用户是否存在
 
 }

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

@@ -6,7 +6,7 @@ import com.fuzamei.entity.Box;
 
 public interface BoxService {
 
-	void checkIfHasTheBoxNo(String checkBlankAndAssignString);
+	void checkIfHasTheBoxNo(String boxNo);
 
 	List<Box> queryAllBoxInformation();
 

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

@@ -2,17 +2,17 @@ package com.fuzamei.service;
 
 import java.util.Map;
 
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 import com.fuzamei.util.PageDTO;
 
 public interface CargoConsignService {
 
-	PageDTO queryOrdersBySupplier(Param param);
+	PageDTO queryOrdersBySupplier(Params params);
 
-	PageDTO queryOrdersByCarrier(Param param);
+	PageDTO queryOrdersByCarrier(Params params);
 
-	void doCarry(Param param);
+	void doCarry(Params params);
 
-	Map<String, Object> orderTracking(Param param);
+	Map<String, Object> orderTracking(Params params);
 
 }

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

@@ -2,13 +2,13 @@ package com.fuzamei.service;
 
 import java.util.Map;
 
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 import com.fuzamei.util.PageDTO;
 
 public interface CargoDeliverService {
 
-	PageDTO queryOrdersByCarrier(Param param);
+	PageDTO queryOrdersByCarrier(Params params);
 
-	Map<String, Object> orderTracking(Param param);
+	Map<String, Object> orderTracking(Params params);
 
 }

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

@@ -2,18 +2,18 @@ package com.fuzamei.service;
 
 import java.util.Map;
 
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 import com.fuzamei.entity.TallyOrder;
 import com.fuzamei.util.PageDTO;
 
 public interface CargoTallyService {
 
-	PageDTO queryOrdersByReceiver(Param param);
+	PageDTO queryOrdersByReceiver(Params params);
 
-	TallyOrder searchNewOrderByOrderId(Param param);
+	TallyOrder searchNewOrderByOrderId(Params params);
 
-	void confirmOrReject(Param param);
+	void confirmOrReject(Params params);
 
-	Map<String, Object> orderTracking(Param param);
+	Map<String, Object> orderTracking(Params params);
 
 }

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

@@ -1,10 +1,10 @@
 package com.fuzamei.service;
 
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 import com.fuzamei.util.PageDTO;
 
 public interface OperationHistoryService {
 
-	PageDTO queryOperationHistory(Param param);
+	PageDTO queryOperationHistory(Params params);
 
 }

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

@@ -3,20 +3,20 @@ package com.fuzamei.service;
 import java.util.Map;
 
 import com.fuzamei.entity.Orders;
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 import com.fuzamei.util.PageDTO;
 
 public interface OrdersIssueService {
 
-	PageDTO queryOrdersByPlanner(Param param);
+	PageDTO queryOrdersByPlanner(Params params);
 
-	void addOrder(Param param);
+	void addOrder(Params params);
 
-	Map<String, Object> orderTracking(Param param);
+	Map<String, Object> orderTracking(Params params);
 
-	PageDTO queryOrdersBySupplier(Param param);
+	PageDTO queryOrdersBySupplier(Params params);
 
-	void consignment(Param param);
+	void consignment(Params params);
 	
 	
 }

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

@@ -0,0 +1,12 @@
+package com.fuzamei.service;
+
+import java.util.List;
+
+import com.fuzamei.entity.Part;
+
+public interface PartService {
+	
+	void checkIfHasThePartNo(String partNo);
+
+	List<Part> queryAllPartInformation();
+}

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

@@ -2,7 +2,7 @@ package com.fuzamei.service;
 
 import java.util.List;
 
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 import com.fuzamei.entity.UserDetail;
 
 public interface UserAuthoricationService {
@@ -10,5 +10,7 @@ public interface UserAuthoricationService {
 
 	UserDetail queryUserAuthority(Integer userId, String... roleNames);
 
-	List<UserDetail> showAllCarriersUnderSupplier(Param param);
+	List<UserDetail> showAllCarriersUnderSupplier(Params params);
+
+	boolean verificationToken(int userId, String token);
 }

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

@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.fuzamei.entity.Box;
+import com.fuzamei.entity.Part;
 import com.fuzamei.mapperInterface.BoxMapper;
 import com.fuzamei.service.BoxService;
 @Service
@@ -24,4 +25,5 @@ public class BoxServiceImpl implements BoxService {
 	public List<Box> queryAllBoxInformation() {
 		return boxMapper.queryAllBoxInformation();
 	}
+
 }

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

@@ -11,7 +11,7 @@ import com.fuzamei.constant.OperationType;
 import com.fuzamei.constant.Status;
 import com.fuzamei.entity.IssueOrder;
 import com.fuzamei.entity.Orders;
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 import com.fuzamei.entity.SendOrder;
 import com.fuzamei.mapperInterface.CargoConsignMapper;
 import com.fuzamei.mapperInterface.OperationHistoryMapper;
@@ -28,20 +28,20 @@ public class CargoConsignServiceImpl implements CargoConsignService {
 	private OperationHistoryMapper operationHistoryMapper;
 
 	@Override
-	public PageDTO queryOrdersBySupplier(Param param) {
+	public PageDTO queryOrdersBySupplier(Params params) {
 		PageDTO pageDto=new PageDTO();
-		List<SendOrder> orderList = cargoConsignMapper.queryOrdersBySupplier(param);
-		int count = cargoConsignMapper.findQueryCountBySupplier(param);
+		List<SendOrder> orderList = cargoConsignMapper.queryOrdersBySupplier(params);
+		int count = cargoConsignMapper.findQueryCountBySupplier(params);
 		pageDto.setRows(orderList);
 		pageDto.setTotal(count);
 		return pageDto;
 	}
 
 	@Override
-	public PageDTO queryOrdersByCarrier(Param param) {
+	public PageDTO queryOrdersByCarrier(Params params) {
 		PageDTO pageDto=new PageDTO();
-		List<SendOrder> orderList = cargoConsignMapper.queryOrdersByCarrier(param);
-		int count = cargoConsignMapper.findQueryCountByCarrier(param);
+		List<SendOrder> orderList = cargoConsignMapper.queryOrdersByCarrier(params);
+		int count = cargoConsignMapper.findQueryCountByCarrier(params);
 		pageDto.setRows(orderList);
 		pageDto.setTotal(count);
 		return pageDto;
@@ -49,24 +49,24 @@ public class CargoConsignServiceImpl implements CargoConsignService {
 
 	@Override
 	@Transactional(rollbackFor=Exception.class)
-	public void doCarry(Param param) {
+	public void doCarry(Params params) {
 		Long currentTime = System.currentTimeMillis();
 		//更新【订单表】
-		param.setTransportTime(currentTime);
-		param.setUpdateTime(currentTime);
-		param.setStatusId(Status.DELIVERING);
-		param.setCarNo(param.getCarNo());
-		cargoConsignMapper.doCarry(param);
+		params.setTransportTime(currentTime);
+		params.setUpdateTime(currentTime);
+		params.setStatusId(Status.DELIVERING);
+		params.setCarNo(params.getCarNo());
+		cargoConsignMapper.doCarry(params);
 		//插入【操作记录】
-		param.setOperationTypeId(OperationType.DELIVER);
-		param.setOperatorId(param.getUserId());
-		param.setOperationTime(currentTime);
-		operationHistoryMapper.addToHistory(param);
+		params.setOperationTypeId(OperationType.DELIVER);
+		params.setOperatorId(params.getUserId());
+		params.setOperationTime(currentTime);
+		operationHistoryMapper.addToHistory(params);
 	}
 
 	@Override
-	public Map<String, Object> orderTracking(Param param) {
-		Orders order = param.getOrder();
+	public Map<String, Object> orderTracking(Params params) {
+		Orders order = params.getOrder();
 		return OrdersIssueServiceImpl.dispatchOrderInfo(order);
 	}
 	

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

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 import com.fuzamei.entity.DeliverOrder;
 import com.fuzamei.entity.Orders;
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 import com.fuzamei.entity.SendOrder;
 import com.fuzamei.mapperInterface.CargoDeliverMapper;
 import com.fuzamei.service.CargoDeliverService;
@@ -21,18 +21,18 @@ public class CargoDeliverServiceImpl implements CargoDeliverService {
 	private CargoDeliverMapper cargoDeliverMapper;
 
 	@Override
-	public PageDTO queryOrdersByCarrier(Param param) {
+	public PageDTO queryOrdersByCarrier(Params params) {
 		PageDTO pageDto=new PageDTO();
-		List<DeliverOrder> orderList = cargoDeliverMapper.queryOrdersByCarrier(param);
-		int count = cargoDeliverMapper.findQueryCountByCarrier(param);
+		List<DeliverOrder> orderList = cargoDeliverMapper.queryOrdersByCarrier(params);
+		int count = cargoDeliverMapper.findQueryCountByCarrier(params);
 		pageDto.setRows(orderList);
 		pageDto.setTotal(count);
 		return pageDto;
 	}
 
 	@Override
-	public Map<String, Object> orderTracking(Param param) {
-		Orders order = param.getOrder();
+	public Map<String, Object> orderTracking(Params params) {
+		Orders order = params.getOrder();
 		return OrdersIssueServiceImpl.dispatchOrderInfo(order);
 	}
 }

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

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 import com.fuzamei.constant.OperationType;
 import com.fuzamei.constant.Status;
 import com.fuzamei.entity.Orders;
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 import com.fuzamei.entity.SendOrder;
 import com.fuzamei.entity.TallyOrder;
 import com.fuzamei.mapperInterface.CargoTallyMapper;
@@ -27,18 +27,18 @@ public class CargoTallyServiceImpl implements CargoTallyService {
 	private OperationHistoryMapper operationHistoryMapper;
 
 	@Override
-	public PageDTO queryOrdersByReceiver(Param param) {
+	public PageDTO queryOrdersByReceiver(Params params) {
 		PageDTO pageDto=new PageDTO();
-		List<TallyOrder> orderList = cargoTallyMapper.queryOrdersByReceiver(param);
-		int count = cargoTallyMapper.findQueryCountByReceiver(param);
+		List<TallyOrder> orderList = cargoTallyMapper.queryOrdersByReceiver(params);
+		int count = cargoTallyMapper.findQueryCountByReceiver(params);
 		pageDto.setRows(orderList);
 		pageDto.setTotal(count);
 		return pageDto;
 	}
 
 	@Override
-	public TallyOrder searchNewOrderByOrderId(Param param) {
-		Orders order = param.getOrder();
+	public TallyOrder searchNewOrderByOrderId(Params params) {
+		Orders order = params.getOrder();
 		TallyOrder tallyOrder=new TallyOrder();
 		tallyOrder.setOrderId(order.getOrderId());
 		tallyOrder.setPartNo(order.getPartNo());
@@ -49,26 +49,26 @@ public class CargoTallyServiceImpl implements CargoTallyService {
 	}
 
 	@Override
-	public void confirmOrReject(Param param) {
+	public void confirmOrReject(Params params) {
 		Long currentTime = System.currentTimeMillis();
 		//更新【订单表】
-		param.setTallyTime(currentTime);
-		param.setUpdateTime(currentTime);
-		param.setReceiverId(param.getUserId());
-		if(param.getConfirmId()==1)	param.setStatusId(Status.TALLIED);
-		if(param.getConfirmId()==0)	param.setStatusId(Status.REJECTED);
-		cargoTallyMapper.confirmOrReject(param);
+		params.setTallyTime(currentTime);
+		params.setUpdateTime(currentTime);
+		params.setReceiverId(params.getUserId());
+		if(params.getConfirmId()==1)	params.setStatusId(Status.TALLIED);
+		if(params.getConfirmId()==0)	params.setStatusId(Status.REJECTED);
+		cargoTallyMapper.confirmOrReject(params);
 		//插入【操作记录】
-		if(param.getConfirmId()==1) param.setOperationTypeId(OperationType.CONFIRM);
-		if(param.getConfirmId()==0) param.setOperationTypeId(OperationType.REJECT);
-		param.setOperatorId(param.getUserId());
-		param.setOperationTime(currentTime);
-		operationHistoryMapper.addToHistory(param);
+		if(params.getConfirmId()==1) params.setOperationTypeId(OperationType.CONFIRM);
+		if(params.getConfirmId()==0) params.setOperationTypeId(OperationType.REJECT);
+		params.setOperatorId(params.getUserId());
+		params.setOperationTime(currentTime);
+		operationHistoryMapper.addToHistory(params);
 	}
 
 	@Override
-	public Map<String, Object> orderTracking(Param param) {
-		Orders order = param.getOrder();
+	public Map<String, Object> orderTracking(Params params) {
+		Orders order = params.getOrder();
 		return OrdersIssueServiceImpl.dispatchOrderInfo(order);
 	}
 }

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

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.fuzamei.entity.OperationHistory;
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 import com.fuzamei.entity.SendOrder;
 import com.fuzamei.mapperInterface.OperationHistoryMapper;
 import com.fuzamei.service.OperationHistoryService;
@@ -18,10 +18,10 @@ public class OperationHistoryServiceImpl implements OperationHistoryService {
 	private OperationHistoryMapper operationHistoryMapper;
 
 	@Override
-	public PageDTO queryOperationHistory(Param param) {
+	public PageDTO queryOperationHistory(Params params) {
 		PageDTO pageDto=new PageDTO();
-		List<OperationHistory> orderList = operationHistoryMapper.queryOperationHistory(param);
-		int count = operationHistoryMapper.findQueryCount(param);
+		List<OperationHistory> orderList = operationHistoryMapper.queryOperationHistory(params);
+		int count = operationHistoryMapper.findQueryCount(params);
 		pageDto.setRows(orderList);
 		pageDto.setTotal(count);
 		return pageDto;

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

@@ -14,7 +14,7 @@ import com.fuzamei.constant.Status;
 import com.fuzamei.entity.DeliverOrder;
 import com.fuzamei.entity.IssueOrder;
 import com.fuzamei.entity.Orders;
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 import com.fuzamei.entity.SendOrder;
 import com.fuzamei.entity.TallyOrder;
 import com.fuzamei.entity.UserDetail;
@@ -33,20 +33,20 @@ public class OrdersIssueServiceImpl implements OrdersIssueService {
 	private OperationHistoryMapper operationHistoryMapper;
 
 	@Override
-	public PageDTO queryOrdersByPlanner(Param param) {
+	public PageDTO queryOrdersByPlanner(Params params) {
 		PageDTO pageDto=new PageDTO();
-		List<IssueOrder> orderList = ordersIssueMapper.queryOrdersByPlanner(param);
-		int count = ordersIssueMapper.findQueryCountByPlanner(param);
+		List<IssueOrder> orderList = ordersIssueMapper.queryOrdersByPlanner(params);
+		int count = ordersIssueMapper.findQueryCountByPlanner(params);
 		pageDto.setRows(orderList);
 		pageDto.setTotal(count);
 		return pageDto;
 	}
 	
 	@Override
-	public PageDTO queryOrdersBySupplier(Param param) {
+	public PageDTO queryOrdersBySupplier(Params params) {
 		PageDTO pageDto=new PageDTO();
-		List<IssueOrder> orderList = ordersIssueMapper.queryOrdersBySupplier(param);
-		int count = ordersIssueMapper.findQueryCountBySupplier(param);
+		List<IssueOrder> orderList = ordersIssueMapper.queryOrdersBySupplier(params);
+		int count = ordersIssueMapper.findQueryCountBySupplier(params);
 		pageDto.setRows(orderList);
 		pageDto.setTotal(count);
 		return pageDto;
@@ -54,42 +54,42 @@ public class OrdersIssueServiceImpl implements OrdersIssueService {
 	
 	@Override
 	@Transactional(rollbackFor=Exception.class)
-	public void consignment(Param param) {
+	public void consignment(Params params) {
 		Long currentTime = System.currentTimeMillis();
 		//更新【订单表】
-		param.setSendTime(currentTime);
-		param.setUpdateTime(currentTime);
-		param.setStatusId(Status.UNDELIVER);//待运输状态
-		ordersIssueMapper.consignment(param);
+		params.setSendTime(currentTime);
+		params.setUpdateTime(currentTime);
+		params.setStatusId(Status.UNDELIVER);//待运输状态
+		ordersIssueMapper.consignment(params);
 		//插入【操作记录】
-		param.setOperationTypeId(OperationType.SEND);
-		param.setOperatorId(param.getUserId());
-		param.setOperationTime(currentTime);
-		operationHistoryMapper.addToHistory(param);
+		params.setOperationTypeId(OperationType.SEND);
+		params.setOperatorId(params.getUserId());
+		params.setOperationTime(currentTime);
+		operationHistoryMapper.addToHistory(params);
 	}
 
 	@Override
 	@Transactional(rollbackFor=Exception.class)
-	public void addOrder(Param param) {
+	public void addOrder(Params params) {
 		Long currentTime = System.currentTimeMillis();
 		//插入【订单表】
-		param.setPlannerId(param.getUserId());
-		param.setRequireTime(currentTime);
-		param.setCreateTime(currentTime);
-		param.setUpdateTime(currentTime);
-		param.setBoxQty(1);//暂时将箱子数量设置为1=======================>>TODO
-		param.setStatusId(Status.UNSEND);
-		ordersIssueMapper.addOrder(param);
+		params.setPlannerId(params.getUserId());
+		params.setRequireTime(currentTime);
+		params.setCreateTime(currentTime);
+		params.setUpdateTime(currentTime);
+		params.setBoxQty(1);//暂时将箱子数量设置为1=======================>>TODO
+		params.setStatusId(Status.UNSEND);
+		ordersIssueMapper.addOrder(params);
 		//插入【操作记录】
-		param.setOperationTypeId(OperationType.ADD_ORDER);
-		param.setOperatorId(param.getUserId());
-		param.setOperationTime(currentTime);
-		operationHistoryMapper.addToHistory(param);
+		params.setOperationTypeId(OperationType.ADD_ORDER);
+		params.setOperatorId(params.getUserId());
+		params.setOperationTime(currentTime);
+		operationHistoryMapper.addToHistory(params);
 	}
 
 	@Override
-	public Map<String, Object> orderTracking(Param param) {
-		Orders order = param.getOrder();
+	public Map<String, Object> orderTracking(Params params) {
+		Orders order = params.getOrder();
 		return dispatchOrderInfo(order);
 	}
 	
@@ -97,8 +97,8 @@ public class OrdersIssueServiceImpl implements OrdersIssueService {
 	 * 
 	* @Title: dispatchOrderInfo
 	* @Description: TODO(将order表中的所有数据分发给各个小订单表中，然后根据当时订单的状态包装成map)
-	* @param @param order
-	* @param @return    设定文件
+	* @params @params order
+	* @params @return    设定文件
 	* @return Map<String,Object>    返回类型
 	* @author ylx
 	* @date 2018年1月25日 下午9:11:39

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

@@ -0,0 +1,29 @@
+package com.fuzamei.service.serviceImpl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.fuzamei.entity.Part;
+import com.fuzamei.mapperInterface.PartMapper;
+import com.fuzamei.service.PartService;
+
+@Service
+public class PartServiceImpl implements PartService {
+
+	@Autowired
+	private PartMapper partMapper;
+	
+	@Override
+	public void checkIfHasThePartNo(String partNo) {
+		int count = partMapper.checkIfHasThePartNo(partNo);
+		if(count==0) throw new RuntimeException("该零件号不存在");
+	}
+
+	@Override
+	public List<Part> queryAllPartInformation() {
+		return partMapper.queryAllPartInformation();
+	}
+
+}

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

@@ -5,7 +5,7 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 import com.fuzamei.entity.UserDetail;
 import com.fuzamei.mapperInterface.UserAuthoricationMapper;
 import com.fuzamei.service.UserAuthoricationService;
@@ -60,8 +60,15 @@ public class UserAuthoricationServiceImpl implements UserAuthoricationService {
 	}
 
 	@Override
-	public List<UserDetail> showAllCarriersUnderSupplier(Param param) {
-		return userAuthoricationMapper.showAllCarriersUnderSupplier(param);
+	public List<UserDetail> showAllCarriersUnderSupplier(Params params) {
+		return userAuthoricationMapper.showAllCarriersUnderSupplier(params);
+	}
+
+	@Override
+	public boolean verificationToken(int userId, String token) {
+		int count = userAuthoricationMapper.verificationToken(userId,token);
+		if(count!=1) return false;
+		return true;
 	}
 
 }

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

@@ -14,7 +14,7 @@ import com.fuzamei.constant.RegexConstant;
 import com.fuzamei.constant.Role;
 import com.fuzamei.constant.Status;
 import com.fuzamei.entity.Orders;
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 import com.fuzamei.entity.UserDetail;
 import com.fuzamei.service.CargoConsignService;
 import com.fuzamei.service.OrderService;
@@ -60,18 +60,18 @@ public class CargoConsignAction {
 	* @throws
 	 */
 	@RequestMapping(value="/queryOrdersBySupplier",method=RequestMethod.POST)
-	public Map<String, Object> queryOrdersBySupplier(@RequestBody Param param){
+	public Map<String, Object> queryOrdersBySupplier(@RequestBody Params params){
 		try {
-			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(param.getUserId()), Role.SUPPLIER);
-			int page = ValidationUtil.checkMinAndAssignInt(param.getPage(), 1);
-			Long startTime=ValidationUtil.checkAndAssignDefaultLong(param.getStartTime(), 0L);
-			Long endTime=ValidationUtil.checkAndAssignDefaultLong(param.getEndTime(), Long.MAX_VALUE);
-			param.setStartTime(startTime);
-			if(startTime<=endTime) param.setEndTime(endTime);
-			else param.setEndTime(Long.MAX_VALUE);
-			param.setStartPage((page - 1) * ROWNUM);
-			param.setRowNum(ROWNUM);
-			PageDTO pageDto = cargoConsignService.queryOrdersBySupplier(param);
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(params.getUserId()), Role.SUPPLIER);
+			int page = ValidationUtil.checkMinAndAssignInt(params.getPage(), 1);
+			Long startTime=ValidationUtil.checkAndAssignDefaultLong(params.getStartTime(), 0L);
+			Long endTime=ValidationUtil.checkAndAssignDefaultLong(params.getEndTime(), Long.MAX_VALUE);
+			params.setStartTime(startTime);
+			if(startTime<=endTime) params.setEndTime(endTime);
+			else params.setEndTime(Long.MAX_VALUE);
+			params.setStartPage((page - 1) * ROWNUM);
+			params.setRowNum(ROWNUM);
+			PageDTO pageDto = cargoConsignService.queryOrdersBySupplier(params);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, pageDto);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
@@ -98,18 +98,18 @@ public class CargoConsignAction {
 	* @throws
 	 */
 	@RequestMapping(value="/queryOrdersByCarrier",method=RequestMethod.POST)
-	public Map<String, Object> queryOrdersByCarrier(@RequestBody Param param){
+	public Map<String, Object> queryOrdersByCarrier(@RequestBody Params params){
 		try {
-			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(param.getUserId()), Role.CARRIER);
-			int page = ValidationUtil.checkMinAndAssignInt(param.getPage(), 1);
-			Long startTime=ValidationUtil.checkAndAssignDefaultLong(param.getStartTime(), 0L);
-			Long endTime=ValidationUtil.checkAndAssignDefaultLong(param.getEndTime(), Long.MAX_VALUE);
-			param.setStartTime(startTime);
-			if(startTime<=endTime) param.setEndTime(endTime);
-			else param.setEndTime(Long.MAX_VALUE);
-			param.setStartPage((page - 1) * ROWNUM);
-			param.setRowNum(ROWNUM);
-			PageDTO pageDto = cargoConsignService.queryOrdersByCarrier(param);
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(params.getUserId()), Role.CARRIER);
+			int page = ValidationUtil.checkMinAndAssignInt(params.getPage(), 1);
+			Long startTime=ValidationUtil.checkAndAssignDefaultLong(params.getStartTime(), 0L);
+			Long endTime=ValidationUtil.checkAndAssignDefaultLong(params.getEndTime(), Long.MAX_VALUE);
+			params.setStartTime(startTime);
+			if(startTime<=endTime) params.setEndTime(endTime);
+			else params.setEndTime(Long.MAX_VALUE);
+			params.setStartPage((page - 1) * ROWNUM);
+			params.setRowNum(ROWNUM);
+			PageDTO pageDto = cargoConsignService.queryOrdersByCarrier(params);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, pageDto);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
@@ -132,15 +132,15 @@ public class CargoConsignAction {
 	* @throws
 	 */
 	@RequestMapping(value="/doCarry",method=RequestMethod.POST)
-	public Map<String, Object> doCarry(@RequestBody Param param){
+	public Map<String, Object> doCarry(@RequestBody Params params){
 		try {
-			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(param.getUserId()), Role.CARRIER);
-			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(param.getOrderId()));
-			ValidationUtil.checkBlankAndAssignString(param.getCarNo());//车牌号校验
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(params.getUserId()), Role.CARRIER);
+			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(params.getOrderId()));
+			ValidationUtil.checkBlankAndAssignString(params.getCarNo());//车牌号校验
 			if(order==null) throw new RuntimeException("订单不存在");
 			if(!Status.UNDELIVER.equals(order.getStatusId())) throw new RuntimeException("非法操作");
-			if(!param.getUserId().equals(order.getCarrierId())) throw new RuntimeException("无权操作");
-			cargoConsignService.doCarry(param);
+			if(!params.getUserId().equals(order.getCarrierId())) throw new RuntimeException("无权操作");
+			cargoConsignService.doCarry(params);
 			return JSONUtil.getJsonMap(200, true, HintMSG.OPERATION_SUCCESS, null);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.OPERATION_FAIL+":"+e.getMessage(), null);
@@ -162,11 +162,11 @@ public class CargoConsignAction {
 	* @throws
 	 */
 	@RequestMapping(value="/showAllCarriersUnderSupplier",method=RequestMethod.POST)
-	public Map<String, Object> showAllCarriersUnderSupplier(@RequestBody Param param){
+	public Map<String, Object> showAllCarriersUnderSupplier(@RequestBody Params params){
 		try {
-			userAuthoricationService.queryUserDetail(ValidationUtil.checkAndAssignInt(param.getUserId()), Role.SUPPLIER);
-			param.setRoleName(Role.CARRIER);
-			List<UserDetail> carrierList = userAuthoricationService.showAllCarriersUnderSupplier(param);
+			userAuthoricationService.queryUserDetail(ValidationUtil.checkAndAssignInt(params.getUserId()), Role.SUPPLIER);
+			params.setRoleName(Role.CARRIER);
+			List<UserDetail> carrierList = userAuthoricationService.showAllCarriersUnderSupplier(params);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, carrierList);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
@@ -189,18 +189,18 @@ public class CargoConsignAction {
 	* @throws
 	 */
 	@RequestMapping(value="/orderTracking",method=RequestMethod.POST)
-	public Map<String, Object> orderTracking(@RequestBody Param param){
+	public Map<String, Object> orderTracking(@RequestBody Params params){
 		try {
-			UserDetail userDetail = userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(param.getUserId()),Role.CARRIER,Role.SUPPLIER);//检测当前操作用户权限
-			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(param.getOrderId()));
+			UserDetail userDetail = userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(params.getUserId()),Role.CARRIER,Role.SUPPLIER);//检测当前操作用户权限
+			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(params.getOrderId()));
 			if(Role.SUPPLIER.equals(userDetail.getRoleName())){
-				if(!param.getUserId().equals(order.getSupplierId())) throw new RuntimeException("无权查看");
+				if(!params.getUserId().equals(order.getSupplierId())) throw new RuntimeException("无权查看");
 			}
 			if(Role.CARRIER.equals(userDetail.getRoleName())){
-				if(!param.getUserId().equals(order.getCarrierId())) throw new RuntimeException("无权查看");
+				if(!params.getUserId().equals(order.getCarrierId())) throw new RuntimeException("无权查看");
 			}
-			param.setOrder(order);
-			Map<String, Object> map = cargoConsignService.orderTracking(param);
+			params.setOrder(order);
+			Map<String, Object> map = cargoConsignService.orderTracking(params);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, map);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);

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

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.fuzamei.constant.HintMSG;
 import com.fuzamei.constant.Role;
 import com.fuzamei.entity.Orders;
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 import com.fuzamei.service.CargoDeliverService;
 import com.fuzamei.service.OrderService;
 import com.fuzamei.service.UserAuthoricationService;
@@ -48,25 +48,25 @@ public class CargoDeliverAction {
 		"startTime":"",
 		"endTime":""
 	}
-	* @param @return    设定文件
+	* @Paramss @return    设定文件
 	* @return Map<String,Object>    返回类型
 	* @author ylx
 	* @date 2018年1月26日 下午1:51:37
 	* @throws
 	 */
 	@RequestMapping(value="/queryOrdersByCarrier",method=RequestMethod.POST)
-	public Map<String, Object> queryOrdersByCarrier(@RequestBody Param param){
+	public Map<String, Object> queryOrdersByCarrier(@RequestBody Params Paramsss){
 		try {
-			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(param.getUserId()), Role.CARRIER);
-			int page = ValidationUtil.checkMinAndAssignInt(param.getPage(), 1);
-			Long startTime=ValidationUtil.checkAndAssignDefaultLong(param.getStartTime(), 0L);
-			Long endTime=ValidationUtil.checkAndAssignDefaultLong(param.getEndTime(), Long.MAX_VALUE);
-			param.setStartTime(startTime);
-			if(startTime<=endTime) param.setEndTime(endTime);
-			else param.setEndTime(Long.MAX_VALUE);
-			param.setStartPage((page - 1) * ROWNUM);
-			param.setRowNum(ROWNUM);
-			PageDTO pageDto = cargoDeliverService.queryOrdersByCarrier(param);
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(Paramsss.getUserId()), Role.CARRIER);
+			int page = ValidationUtil.checkMinAndAssignInt(Paramsss.getPage(), 1);
+			Long startTime=ValidationUtil.checkAndAssignDefaultLong(Paramsss.getStartTime(), 0L);
+			Long endTime=ValidationUtil.checkAndAssignDefaultLong(Paramsss.getEndTime(), Long.MAX_VALUE);
+			Paramsss.setStartTime(startTime);
+			if(startTime<=endTime) Paramsss.setEndTime(endTime);
+			else Paramsss.setEndTime(Long.MAX_VALUE);
+			Paramsss.setStartPage((page - 1) * ROWNUM);
+			Paramsss.setRowNum(ROWNUM);
+			PageDTO pageDto = cargoDeliverService.queryOrdersByCarrier(Paramsss);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, pageDto);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
@@ -81,20 +81,20 @@ public class CargoDeliverAction {
 		"userId":"",
 		"orderId":""
 	}
-	* @param @return    设定文件
+	* @Paramss @return    设定文件
 	* @return Map<String,Object>    返回类型
 	* @author ylx
 	* @date 2018年1月26日 下午2:07:25
 	* @throws
 	 */
 	@RequestMapping(value="/orderTracking",method=RequestMethod.POST)
-	public Map<String, Object> orderTracking(@RequestBody Param param){
+	public Map<String, Object> orderTracking(@RequestBody Params Paramss){
 		try {
-			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(param.getUserId()),Role.CARRIER);//检测当前操作用户权限
-			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(param.getOrderId()));
-			if(!param.getUserId().equals(order.getCarrierId())) throw new RuntimeException("无权查看");
-			param.setOrder(order);
-			Map<String, Object> map = cargoDeliverService.orderTracking(param);
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(Paramss.getUserId()),Role.CARRIER);//检测当前操作用户权限
+			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(Paramss.getOrderId()));
+			if(!Paramss.getUserId().equals(order.getCarrierId())) throw new RuntimeException("无权查看");
+			Paramss.setOrder(order);
+			Map<String, Object> map = cargoDeliverService.orderTracking(Paramss);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, map);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);

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

@@ -12,7 +12,7 @@ import com.fuzamei.constant.HintMSG;
 import com.fuzamei.constant.Role;
 import com.fuzamei.constant.Status;
 import com.fuzamei.entity.Orders;
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 import com.fuzamei.entity.TallyOrder;
 import com.fuzamei.service.CargoTallyService;
 import com.fuzamei.service.OrderService;
@@ -49,25 +49,25 @@ public class CargoTallyAction {
 		"startTime":"",
 		"endTime":""
 	}
-	* @param @return    设定文件
+	* @params @return    设定文件
 	* @return Map<String,Object>    返回类型
 	* @author ylx
 	* @date 2018年1月26日 下午2:12:02
 	* @throws
 	 */
 	@RequestMapping(value="/queryOrdersByReceiver",method=RequestMethod.POST)
-	public Map<String, Object> queryOrdersByReceiver(@RequestBody Param param){
+	public Map<String, Object> queryOrdersByReceiver(@RequestBody Params params){
 		try {
-			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(param.getUserId()), Role.STOCKER);
-			int page = ValidationUtil.checkMinAndAssignInt(param.getPage(), 1);
-			Long startTime=ValidationUtil.checkAndAssignDefaultLong(param.getStartTime(), 0L);
-			Long endTime=ValidationUtil.checkAndAssignDefaultLong(param.getEndTime(), Long.MAX_VALUE);
-			param.setStartTime(startTime);
-			if(startTime<=endTime) param.setEndTime(endTime);
-			else param.setEndTime(Long.MAX_VALUE);
-			param.setStartPage((page - 1) * ROWNUM);
-			param.setRowNum(ROWNUM);
-			PageDTO pageDto = cargoTallyService.queryOrdersByReceiver(param);
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(params.getUserId()), Role.STOCKER);
+			int page = ValidationUtil.checkMinAndAssignInt(params.getPage(), 1);
+			Long startTime=ValidationUtil.checkAndAssignDefaultLong(params.getStartTime(), 0L);
+			Long endTime=ValidationUtil.checkAndAssignDefaultLong(params.getEndTime(), Long.MAX_VALUE);
+			params.setStartTime(startTime);
+			if(startTime<=endTime) params.setEndTime(endTime);
+			else params.setEndTime(Long.MAX_VALUE);
+			params.setStartPage((page - 1) * ROWNUM);
+			params.setRowNum(ROWNUM);
+			PageDTO pageDto = cargoTallyService.queryOrdersByReceiver(params);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, pageDto);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
@@ -82,21 +82,21 @@ public class CargoTallyAction {
 		"userId":"",
 		"orderId":""
 	}
-	* @param @return    设定文件
+	* @params @return    设定文件
 	* @return Map<String,Object>    返回类型
 	* @author ylx
 	* @date 2018年1月26日 下午2:24:02
 	* @throws
 	 */
 	@RequestMapping(value="/searchNewOrderByOrderId",method=RequestMethod.POST)
-	public Map<String, Object> searchNewOrderByOrderId(@RequestBody Param param){
+	public Map<String, Object> searchNewOrderByOrderId(@RequestBody Params params){
 		try {
-			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(param.getUserId()), Role.STOCKER);
-			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(param.getOrderId()));
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(params.getUserId()), Role.STOCKER);
+			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(params.getOrderId()));
 			if(order==null) throw new RuntimeException("订单不存在");
 			if(!Status.DELIVERING.equals(order.getStatusId())) throw new RuntimeException("非法操作");
-			param.setOrder(order);
-			TallyOrder tallyOrder=cargoTallyService.searchNewOrderByOrderId(param);
+			params.setOrder(order);
+			TallyOrder tallyOrder=cargoTallyService.searchNewOrderByOrderId(params);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, tallyOrder);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
@@ -112,21 +112,21 @@ public class CargoTallyAction {
 		"orderId":"",
 		"confirmId":""
 	}
-	* @param @return    设定文件
+	* @params @return    设定文件
 	* @return Map<String,Object>    返回类型
 	* @author ylx
 	* @date 2018年1月26日 下午2:35:06
 	* @throws
 	 */
 	@RequestMapping(value="/confirmOrReject",method=RequestMethod.POST)
-	public Map<String, Object> confirmOrReject(@RequestBody Param param){
+	public Map<String, Object> confirmOrReject(@RequestBody Params params){
 		try {
-			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(param.getUserId()), Role.STOCKER);
-			ValidationUtil.checkRangeAndAssignInt(param.getConfirmId(), 0, 1);//确认id只能是0和1
-			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(param.getOrderId()));
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(params.getUserId()), Role.STOCKER);
+			ValidationUtil.checkRangeAndAssignInt(params.getConfirmId(), 0, 1);//确认id只能是0和1
+			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(params.getOrderId()));
 			if(order==null) throw new RuntimeException("订单不存在");
 			if(!Status.DELIVERING.equals(order.getStatusId())) throw new RuntimeException("非法操作");
-			cargoTallyService.confirmOrReject(param);
+			cargoTallyService.confirmOrReject(params);
 			return JSONUtil.getJsonMap(200, true, HintMSG.OPERATION_SUCCESS, null);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.OPERATION_FAIL+":"+e.getMessage(), null);
@@ -141,20 +141,20 @@ public class CargoTallyAction {
 		"userId":"",
 		"orderId":""
 	}
-	* @param @return    设定文件
+	* @params @return    设定文件
 	* @return Map<String,Object>    返回类型
 	* @author ylx
 	* @date 2018年1月26日 下午2:48:12
 	* @throws
 	 */
 	@RequestMapping(value="/orderTracking",method=RequestMethod.POST)
-	public Map<String, Object> orderTracking(@RequestBody Param param){
+	public Map<String, Object> orderTracking(@RequestBody Params params){
 		try {
-			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(param.getUserId()),Role.STOCKER);//检测当前操作用户权限
-			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(param.getOrderId()));
-			if(!param.getUserId().equals(order.getReceiverId())) throw new RuntimeException("无权查看");
-			param.setOrder(order);
-			Map<String, Object> map = cargoTallyService.orderTracking(param);
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(params.getUserId()),Role.STOCKER);//检测当前操作用户权限
+			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(params.getOrderId()));
+			if(!params.getUserId().equals(order.getReceiverId())) throw new RuntimeException("无权查看");
+			params.setOrder(order);
+			Map<String, Object> map = cargoTallyService.orderTracking(params);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, map);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);

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

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.fuzamei.constant.HintMSG;
 import com.fuzamei.constant.Role;
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 import com.fuzamei.service.OperationHistoryService;
 import com.fuzamei.service.UserAuthoricationService;
 import com.fuzamei.util.JSONUtil;
@@ -41,25 +41,25 @@ public class OperationHistoryAction {
 		"startTime":"",
 		"endTime":""
 	}
-	* @param @return    设定文件
+	* @params @return    设定文件
 	* @return Map<String,Object>    返回类型
 	* @author ylx
 	* @date 2018年1月26日 下午6:34:22
 	* @throws
 	 */
 	@RequestMapping(value="/queryOperationHistory",method=RequestMethod.POST)
-	public Map<String, Object> queryOperationHistory(@RequestBody Param param){
+	public Map<String, Object> queryOperationHistory(@RequestBody Params params){
 		try {
-			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(param.getUserId()), Role.ADMIN);
-			int page = ValidationUtil.checkMinAndAssignInt(param.getPage(), 1);
-			Long startTime=ValidationUtil.checkAndAssignDefaultLong(param.getStartTime(), 0L);
-			Long endTime=ValidationUtil.checkAndAssignDefaultLong(param.getEndTime(), Long.MAX_VALUE);
-			param.setStartTime(startTime);
-			if(startTime<=endTime) param.setEndTime(endTime);
-			else param.setEndTime(Long.MAX_VALUE);
-			param.setStartPage((page - 1) * ROWNUM);
-			param.setRowNum(ROWNUM);
-			PageDTO pageDto = operationHistoryService.queryOperationHistory(param);
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(params.getUserId()), Role.ADMIN);
+			int page = ValidationUtil.checkMinAndAssignInt(params.getPage(), 1);
+			Long startTime=ValidationUtil.checkAndAssignDefaultLong(params.getStartTime(), 0L);
+			Long endTime=ValidationUtil.checkAndAssignDefaultLong(params.getEndTime(), Long.MAX_VALUE);
+			params.setStartTime(startTime);
+			if(startTime<=endTime) params.setEndTime(endTime);
+			else params.setEndTime(Long.MAX_VALUE);
+			params.setStartPage((page - 1) * ROWNUM);
+			params.setRowNum(ROWNUM);
+			PageDTO pageDto = operationHistoryService.queryOperationHistory(params);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, pageDto);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);

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

@@ -16,11 +16,13 @@ import com.fuzamei.constant.Role;
 import com.fuzamei.constant.Status;
 import com.fuzamei.entity.Box;
 import com.fuzamei.entity.Orders;
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
+import com.fuzamei.entity.Part;
 import com.fuzamei.entity.UserDetail;
 import com.fuzamei.service.BoxService;
 import com.fuzamei.service.OrderService;
 import com.fuzamei.service.OrdersIssueService;
+import com.fuzamei.service.PartService;
 import com.fuzamei.service.UserAuthoricationService;
 import com.fuzamei.util.JSONUtil;
 import com.fuzamei.util.PageDTO;
@@ -43,6 +45,9 @@ public class OrdersIssueAction {
 	@Autowired
 	private BoxService boxService;
 	
+	@Autowired
+	private PartService partService;
+	
 	private static final Integer ROWNUM=Integer.parseInt(ReadConfUtil.getProperty("rowNum"));
 	
 	public static final String ORDER_ID_PATTERN=RegexConstant.ORDER_ID;
@@ -66,18 +71,18 @@ public class OrdersIssueAction {
 	* @throws
 	 */
 	@RequestMapping(value="/queryOrdersByPlanner",method=RequestMethod.POST)
-	public Map<String, Object> queryOrdersByPlanner(@RequestBody Param param){
+	public Map<String, Object> queryOrdersByPlanner(@RequestBody Params params){
 		try {
-			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(param.getUserId()), Role.PLANNER);
-			int page = ValidationUtil.checkMinAndAssignInt(param.getPage(), 1);
-			Long startTime=ValidationUtil.checkAndAssignDefaultLong(param.getStartTime(), 0L);
-			Long endTime=ValidationUtil.checkAndAssignDefaultLong(param.getEndTime(), Long.MAX_VALUE);
-			param.setStartTime(startTime);
-			if(startTime<=endTime) param.setEndTime(endTime);
-			else param.setEndTime(Long.MAX_VALUE);
-			param.setStartPage((page - 1) * ROWNUM);
-			param.setRowNum(ROWNUM);
-			PageDTO pageDto = ordersIssueService.queryOrdersByPlanner(param);
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(params.getUserId()), Role.PLANNER);
+			int page = ValidationUtil.checkMinAndAssignInt(params.getPage(), 1);
+			Long startTime=ValidationUtil.checkAndAssignDefaultLong(params.getStartTime(), 0L);
+			Long endTime=ValidationUtil.checkAndAssignDefaultLong(params.getEndTime(), Long.MAX_VALUE);
+			params.setStartTime(startTime);
+			if(startTime<=endTime) params.setEndTime(endTime);
+			else params.setEndTime(Long.MAX_VALUE);
+			params.setStartPage((page - 1) * ROWNUM);
+			params.setRowNum(ROWNUM);
+			PageDTO pageDto = ordersIssueService.queryOrdersByPlanner(params);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, pageDto);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
@@ -97,25 +102,25 @@ public class OrdersIssueAction {
 		"startTime":"",
 		"endTime":""
 	}
-	* @param @return    设定文件
+	* @params @return    设定文件
 	* @return Map<String,Object>    返回类型
 	* @author ylx
 	* @date 2018年1月26日 上午10:34:41
 	* @throws
 	 */
 	@RequestMapping(value="/queryOrdersBySupplier",method=RequestMethod.POST)
-	public Map<String, Object> queryOrdersBySupplier(@RequestBody Param param){
+	public Map<String, Object> queryOrdersBySupplier(@RequestBody Params params){
 		try {
-			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(param.getUserId()), Role.SUPPLIER);
-			int page = ValidationUtil.checkMinAndAssignInt(param.getPage(), 1);
-			Long startTime=ValidationUtil.checkAndAssignDefaultLong(param.getStartTime(), 0L);
-			Long endTime=ValidationUtil.checkAndAssignDefaultLong(param.getEndTime(), Long.MAX_VALUE);
-			param.setStartTime(startTime);
-			if(startTime<=endTime) param.setEndTime(endTime);
-			else param.setEndTime(Long.MAX_VALUE);
-			param.setStartPage((page - 1) * ROWNUM);
-			param.setRowNum(ROWNUM);
-			PageDTO pageDto = ordersIssueService.queryOrdersBySupplier(param);
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(params.getUserId()), Role.SUPPLIER);
+			int page = ValidationUtil.checkMinAndAssignInt(params.getPage(), 1);
+			Long startTime=ValidationUtil.checkAndAssignDefaultLong(params.getStartTime(), 0L);
+			Long endTime=ValidationUtil.checkAndAssignDefaultLong(params.getEndTime(), Long.MAX_VALUE);
+			params.setStartTime(startTime);
+			if(startTime<=endTime) params.setEndTime(endTime);
+			else params.setEndTime(Long.MAX_VALUE);
+			params.setStartPage((page - 1) * ROWNUM);
+			params.setRowNum(ROWNUM);
+			PageDTO pageDto = ordersIssueService.queryOrdersBySupplier(params);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, pageDto);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
@@ -131,22 +136,22 @@ public class OrdersIssueAction {
 		"orderId":"",
 		"carrierId":""
 	}
-	* @param @return    设定文件
+	* @params @return    设定文件
 	* @return Map<String,Object>    返回类型
 	* @author ylx
 	* @date 2018年1月26日 上午11:07:58
 	* @throws
 	 */
 	@RequestMapping(value="/consignment",method=RequestMethod.POST)
-	public Map<String, Object> consignment(@RequestBody Param param){
+	public Map<String, Object> consignment(@RequestBody Params params){
 		try {
-			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(param.getUserId()), Role.SUPPLIER);
-			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(param.getCarrierId()), Role.CARRIER);
-			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(param.getOrderId()));
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(params.getUserId()), Role.SUPPLIER);
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(params.getCarrierId()), Role.CARRIER);
+			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(params.getOrderId()));
 			if(order==null) throw new RuntimeException("订单不存在");
 			if(!Status.UNSEND.equals(order.getStatusId())) throw new RuntimeException(HintMSG.ILLEGAL);
-			if(!param.getUserId().equals(order.getSupplierId())) throw new RuntimeException(HintMSG.NO_AUTH);
-			ordersIssueService.consignment(param);
+			if(!params.getUserId().equals(order.getSupplierId())) throw new RuntimeException(HintMSG.NO_AUTH);
+			ordersIssueService.consignment(params);
 			return JSONUtil.getJsonMap(200, true, HintMSG.OPERATION_SUCCESS, null);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.OPERATION_FAIL+":"+e.getMessage(), null);
@@ -165,20 +170,20 @@ public class OrdersIssueAction {
 		"boxNo":"",
 		"inboxQty":""
 	}
-	* @param @return    设定文件
+	* @params @return    设定文件
 	* @return Map<String,Object>    返回类型
 	* @author ylx
 	* @date 2018年1月25日 下午1:58:45
 	* @throws
 	 */
 	@RequestMapping(value="/addOrder",method=RequestMethod.POST)
-	public Map<String, Object> addOrder(@RequestBody Param param){
+	public Map<String, Object> addOrder(@RequestBody Params params){
 		try {
-			orderService.checkIfHasTheSameId(ValidationUtil.checkAndAssignInt(param.getOrderId(),ORDER_ID_PATTERN));
-			UserDetail userDetail = userAuthoricationService.queryUserDetail(ValidationUtil.checkAndAssignInt(param.getUserId()), Role.PLANNER);//检测当前操作用户权限
-			ValidationUtil.checkBlankString(param.getPartNo());
+			orderService.checkIfHasTheSameId(ValidationUtil.checkAndAssignInt(params.getOrderId(),ORDER_ID_PATTERN));
+			UserDetail userDetail = userAuthoricationService.queryUserDetail(ValidationUtil.checkAndAssignInt(params.getUserId()), Role.PLANNER);//检测当前操作用户权限
+			ValidationUtil.checkBlankString(params.getPartNo());
 			List<UserDetail> users = userDetail.getUsers();
-			int supplierId = ValidationUtil.checkAndAssignInt(param.getSupplierId());
+			int supplierId = ValidationUtil.checkAndAssignInt(params.getSupplierId());
 			boolean flag=false;
 			for (UserDetail user : users) {
 				if(user.getUserId().equals(supplierId)){
@@ -187,9 +192,9 @@ public class OrdersIssueAction {
 				}
 			}
 			if(!flag) throw new RuntimeException("查无此供应商");
-			boxService.checkIfHasTheBoxNo(ValidationUtil.checkBlankAndAssignString(param.getBoxNo()));//检测箱号是否存在
-			ValidationUtil.checkMinAndAssignInt(param.getInboxQty(),0);
-			ordersIssueService.addOrder(param);//生成新订单
+			boxService.checkIfHasTheBoxNo(ValidationUtil.checkBlankAndAssignString(params.getBoxNo()));//检测箱号是否存在
+			ValidationUtil.checkMinAndAssignInt(params.getInboxQty(),0);
+			ordersIssueService.addOrder(params);//生成新订单
 			return JSONUtil.getJsonMap(200, true, HintMSG.OPERATION_SUCCESS, null);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.OPERATION_FAIL+":"+e.getMessage(), null);
@@ -209,9 +214,9 @@ public class OrdersIssueAction {
 	* @throws
 	 */
 	@RequestMapping(value="/showSuppliersUnderPlanner",method=RequestMethod.POST)
-	public Map<String, Object> showSuppliersUnderPlanner(@RequestBody Param param){
+	public Map<String, Object> showSuppliersUnderPlanner(@RequestBody Params params){
 		try {
-			UserDetail userDetail = userAuthoricationService.queryUserDetail(ValidationUtil.checkAndAssignInt(param.getUserId()), Role.PLANNER);//检测当前操作用户权限
+			UserDetail userDetail = userAuthoricationService.queryUserDetail(ValidationUtil.checkAndAssignInt(params.getUserId()), Role.PLANNER);//检测当前操作用户权限
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, userDetail.getUsers());
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
@@ -226,21 +231,45 @@ public class OrdersIssueAction {
 	{
 		"userId":"xxx"
 	}
-	* @param @return    设定文件
+	* @params @return    设定文件
 	* @return Map<String,Object>    返回类型
 	* @author ylx
 	* @date 2018年1月25日 下午3:57:17
 	* @throws
 	 */
-	@RequestMapping(value="/showAllBoxNo",method=RequestMethod.POST)
-	public Map<String, Object> showAllBoxNo(@RequestBody Param param){
+	/*@RequestMapping(value="/showAllBoxNo",method=RequestMethod.POST)
+	public Map<String, Object> showAllBoxNo(@RequestBody Params params){
 		try {
-			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(param.getUserId()), Role.PLANNER);//检测当前操作用户权限
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(params.getUserId()), Role.PLANNER);//检测当前操作用户权限
 			List<Box> boxList = boxService.queryAllBoxInformation();
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, boxList);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
 		}
+	}*/
+	
+	/**
+	 * 
+	* @Title: showAllPartNo
+	* @Description: TODO(当计划员点击零件号，显示所有零件号)
+	{
+		"userId":"xxx"
+	}
+	* @params @return    设定文件
+	* @return Map<String,Object>    返回类型
+	* @author ylx
+	* @date 2018年1月25日 下午3:57:17
+	* @throws
+	 */
+	@RequestMapping(value="/showAllPartNo",method=RequestMethod.POST)
+	public Map<String, Object> showAllPartNo(@RequestBody Params params){
+		try {
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(params.getUserId()), Role.PLANNER);//检测当前操作用户权限
+			List<Part> partList = partService.queryAllPartInformation();
+			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, partList);
+		} catch (Exception e) {
+			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
+		}
 	}
 	
 	/**
@@ -251,25 +280,25 @@ public class OrdersIssueAction {
 		"userId":"xxx",
 		"orderId":""
 	}
-	* @param @return    设定文件
+	* @params @return    设定文件
 	* @return Map<String,Object>    返回类型
 	* @author ylx
 	* @date 2018年1月25日 下午7:41:16
 	* @throws
 	 */
 	@RequestMapping(value="/orderTracking",method=RequestMethod.POST)
-	public Map<String, Object> orderTracking(@RequestBody Param param){
+	public Map<String, Object> orderTracking(@RequestBody Params params){
 		try {
-			UserDetail userDetail = userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(param.getUserId()),Role.PLANNER,Role.SUPPLIER);//检测当前操作用户权限
-			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(param.getOrderId()));
+			UserDetail userDetail = userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(params.getUserId()),Role.PLANNER,Role.SUPPLIER);//检测当前操作用户权限
+			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(params.getOrderId()));
 			if(Role.PLANNER.equals(userDetail.getRoleName())){
-				if(!param.getUserId().equals(order.getPlannerId())) throw new RuntimeException(HintMSG.NO_AUTH);
+				if(!params.getUserId().equals(order.getPlannerId())) throw new RuntimeException(HintMSG.NO_AUTH);
 			}
 			if(Role.SUPPLIER.equals(userDetail.getRoleName())){
-				if(!param.getUserId().equals(order.getSupplierId())) throw new RuntimeException(HintMSG.NO_AUTH);
+				if(!params.getUserId().equals(order.getSupplierId())) throw new RuntimeException(HintMSG.NO_AUTH);
 			}
-			param.setOrder(order);
-			Map<String, Object> map = ordersIssueService.orderTracking(param);
+			params.setOrder(order);
+			Map<String, Object> map = ordersIssueService.orderTracking(params);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, map);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);

saicLogistics/src/test/java/com/fuzamei/web/CargoConsignActionTest.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.alibaba.fastjson.JSON;
 import com.fuzamei.baseTest.BaseJunit4Test;
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 
 public class CargoConsignActionTest extends BaseJunit4Test{
 	@Autowired
@@ -15,60 +15,60 @@ public class CargoConsignActionTest extends BaseJunit4Test{
 	
 	@Test//测试【供应商】查询订单功能
 	public void test01(){
-		Param param=new Param();
-		param.setUserId(9003);
-		param.setPage(1);
-		param.setOrderId(100000001);
-		param.setBoxNo(null);
-		param.setStatusId(null);
-		param.setStartTime(null);
-		param.setEndTime(1516955480353L);
-		Map<String, Object> result = cargoConsignAction.queryOrdersBySupplier(param);
+		Params params=new Params();
+		params.setUserId(9003);
+		params.setPage(1);
+		params.setOrderId(100000001);
+		params.setBoxNo(null);
+		params.setStatusId(null);
+		params.setStartTime(null);
+		params.setEndTime(1516955480353L);
+		Map<String, Object> result = cargoConsignAction.queryOrdersBySupplier(params);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}
 	
 	@Test//测试【承运商】查询订单功能
 	public void test02(){
-		Param param=new Param();
-		param.setUserId(9007);
-		param.setPage(1);
-		param.setOrderId(null);
-		param.setBoxNo(null);
-		param.setStatusId(null);
-		param.setStartTime(null);
-		param.setEndTime(null);
-		Map<String, Object> result = cargoConsignAction.queryOrdersByCarrier(param);
+		Params params=new Params();
+		params.setUserId(9007);
+		params.setPage(1);
+		params.setOrderId(null);
+		params.setBoxNo(null);
+		params.setStatusId(null);
+		params.setStartTime(null);
+		params.setEndTime(null);
+		Map<String, Object> result = cargoConsignAction.queryOrdersByCarrier(params);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}
 	
 	@Test//显示所有供应商下的承运商
 	public void test03(){
-		Param param=new Param();
-		param.setUserId(9005);
-		Map<String, Object> result = cargoConsignAction.showAllCarriersUnderSupplier(param);
+		Params params=new Params();
+		params.setUserId(9005);
+		Map<String, Object> result = cargoConsignAction.showAllCarriersUnderSupplier(params);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}
 	
 	@Test//承运操作
 	public void test04(){
-		Param param=new Param();
-		param.setUserId(9007);
-		param.setOrderId(100000004);
-		param.setCarNo("浙A9819Y");
-		Map<String, Object> result = cargoConsignAction.doCarry(param);
+		Params params=new Params();
+		params.setUserId(9007);
+		params.setOrderId(100000004);
+		params.setCarNo("浙A9819Y");
+		Map<String, Object> result = cargoConsignAction.doCarry(params);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}
 	
 	@Test//查看订单跟踪记录
 	public void test05(){
-		Param param=new Param();
-		param.setUserId(9007);
-		param.setOrderId(100000001);
-		Map<String, Object> result = cargoConsignAction.orderTracking(param);
+		Params params=new Params();
+		params.setUserId(9007);
+		params.setOrderId(100000001);
+		Map<String, Object> result = cargoConsignAction.orderTracking(params);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}

saicLogistics/src/test/java/com/fuzamei/web/CargoDeliverActionTest.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.alibaba.fastjson.JSON;
 import com.fuzamei.baseTest.BaseJunit4Test;
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 
 public class CargoDeliverActionTest extends BaseJunit4Test{
 
@@ -16,15 +16,15 @@ public class CargoDeliverActionTest extends BaseJunit4Test{
 	
 	@Test//测试【供应商】查询订单功能
 	public void test01(){
-		Param param=new Param();
-		param.setUserId(9008);
-		param.setPage(1);
-		param.setOrderId(100000001);
-		param.setCarNo("浙A9819Y");
-		param.setStatusId(null);
-		param.setStartTime(null);
-		param.setEndTime(1516955480353L);
-		Map<String, Object> result = cargoDeliverAction.queryOrdersByCarrier(param);
+		Params params=new Params();
+		params.setUserId(9008);
+		params.setPage(1);
+		params.setOrderId(100000001);
+		params.setCarNo("浙A9819Y");
+		params.setStatusId(null);
+		params.setStartTime(null);
+		params.setEndTime(1516955480353L);
+		Map<String, Object> result = cargoDeliverAction.queryOrdersByCarrier(params);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}
@@ -32,10 +32,10 @@ public class CargoDeliverActionTest extends BaseJunit4Test{
 	
 	@Test//测试订单跟踪
 	public void test02(){
-		Param param=new Param();
-		param.setUserId(9007);
-		param.setOrderId(100000001);
-		Map<String, Object> result = cargoDeliverAction.orderTracking(param);
+		Params params=new Params();
+		params.setUserId(9007);
+		params.setOrderId(100000001);
+		Map<String, Object> result = cargoDeliverAction.orderTracking(params);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}

saicLogistics/src/test/java/com/fuzamei/web/CargoTallyActionTest.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.alibaba.fastjson.JSON;
 import com.fuzamei.baseTest.BaseJunit4Test;
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 
 public class CargoTallyActionTest extends BaseJunit4Test{
 	
@@ -16,45 +16,45 @@ public class CargoTallyActionTest extends BaseJunit4Test{
 	
 	@Test//收货员查看订单信息
 	public void test01(){
-		Param param=new Param();
-		param.setUserId(9011);
-		param.setPage(1);
-		param.setOrderId(100000001);
-		param.setCarNo(null);
-		param.setStartTime(null);
-		param.setEndTime(null);
-		Map<String, Object> result = cargoTallyAction.queryOrdersByReceiver(param);
+		Params params=new Params();
+		params.setUserId(9011);
+		params.setPage(1);
+		params.setOrderId(100000001);
+		params.setCarNo(null);
+		params.setStartTime(null);
+		params.setEndTime(null);
+		Map<String, Object> result = cargoTallyAction.queryOrdersByReceiver(params);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}
 	
 	@Test//点击下一步查看订单信息
 	public void test02(){
-		Param param=new Param();
-		param.setUserId(9011);
-		param.setOrderId(100000001);
-		Map<String, Object> result = cargoTallyAction.searchNewOrderByOrderId(param);
+		Params params=new Params();
+		params.setUserId(9011);
+		params.setOrderId(100000001);
+		Map<String, Object> result = cargoTallyAction.searchNewOrderByOrderId(params);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}
 	
 	@Test//查看订单跟踪信息
 	public void test03(){
-		Param param=new Param();
-		param.setUserId(9012);
-		param.setOrderId(100000001);
-		Map<String, Object> result = cargoTallyAction.orderTracking(param);
+		Params params=new Params();
+		params.setUserId(9012);
+		params.setOrderId(100000001);
+		Map<String, Object> result = cargoTallyAction.orderTracking(params);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}
 	
 	@Test//收货员点击收货或者拒收
 	public void test04(){
-		Param param=new Param();
-		param.setUserId(9012);
-		param.setOrderId(100000001);
-		param.setConfirmId(1);
-		Map<String, Object> result = cargoTallyAction.confirmOrReject(param);
+		Params params=new Params();
+		params.setUserId(9012);
+		params.setOrderId(100000001);
+		params.setConfirmId(1);
+		Map<String, Object> result = cargoTallyAction.confirmOrReject(params);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}

saicLogistics/src/test/java/com/fuzamei/web/OperationHistoryActionTest.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.alibaba.fastjson.JSON;
 import com.fuzamei.baseTest.BaseJunit4Test;
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 
 public class OperationHistoryActionTest extends BaseJunit4Test{
 	@Autowired
@@ -15,12 +15,12 @@ public class OperationHistoryActionTest extends BaseJunit4Test{
 	
 	@Test
 	public void test01(){
-		Param param=new Param();
-		param.setUserId(1001);
-		param.setPage(-1);
-		param.setStartTime(null);
-		param.setEndTime(null);
-		Map<String, Object> result = operationHistoryAction.queryOperationHistory(param);
+		Params params=new Params();
+		params.setUserId(1001);
+		params.setPage(-1);
+		params.setStartTime(null);
+		params.setEndTime(null);
+		Map<String, Object> result = operationHistoryAction.queryOperationHistory(params);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}

saicLogistics/src/test/java/com/fuzamei/web/OrdersIssueActionTest.java

@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.alibaba.fastjson.JSON;
 import com.fuzamei.baseTest.BaseJunit4Test;
 import com.fuzamei.constant.Role;
-import com.fuzamei.entity.Param;
+import com.fuzamei.entity.Params;
 import com.fuzamei.entity.UserDetail;
 import com.fuzamei.service.UserAuthoricationService;
 
@@ -22,82 +22,82 @@ public class OrdersIssueActionTest extends BaseJunit4Test{
 	
 	@Test//测试添加订单功能
 	public void test01(){
-		Param param=new Param();
-		param.setUserId(9001);
-		param.setOrderId(100000004);
-		param.setSupplierId(9003);
-		param.setPartNo("partNo1");
-		param.setBoxNo("FCIU4615791");
-		param.setInboxQty(20);
-		Map<String, Object> result = ordersIssueAction.addOrder(param);
+		Params Params=new Params();
+		Params.setUserId(9001);
+		Params.setOrderId(100000004);
+		Params.setSupplierId(9003);
+		Params.setPartNo("partNo1");
+		Params.setBoxNo("FCIU4615791");
+		Params.setInboxQty(20);
+		Map<String, Object> result = ordersIssueAction.addOrder(Params);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}
 	
 	@Test//测试【计划员】查看订单功能
 	public void test02(){
-		Param param=new Param();
-		param.setUserId(9001);
-		param.setPage(-1);
-//		param.setSupplierName("chb供应商");
-		param.setBoxNo(null);
-		param.setStartTime(null);
-		param.setEndTime(null);
-		Map<String, Object> result = ordersIssueAction.queryOrdersByPlanner(param);
+		Params Params=new Params();
+		Params.setUserId(9001);
+		Params.setPage(-1);
+//		Params.setSupplierName("chb供应商");
+		Params.setBoxNo(null);
+		Params.setStartTime(null);
+		Params.setEndTime(null);
+		Map<String, Object> result = ordersIssueAction.queryOrdersByPlanner(Params);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}
 	
 	@Test//测试【供应商】查看订单功能
 	public void test03(){
-		Param param=new Param();
-		param.setUserId(9003);
-		param.setPage(-1);
-		param.setOrderId(null);
-		param.setBoxNo(null);
-		param.setStatusId(null);
-		param.setStartTime(null);
-		param.setEndTime(null);
-		Map<String, Object> result = ordersIssueAction.queryOrdersBySupplier(param);
+		Params Params=new Params();
+		Params.setUserId(9003);
+		Params.setPage(-1);
+		Params.setOrderId(null);
+		Params.setBoxNo(null);
+		Params.setStatusId(null);
+		Params.setStartTime(null);
+		Params.setEndTime(null);
+		Map<String, Object> result = ordersIssueAction.queryOrdersBySupplier(Params);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}
 	
 	@Test//测试显示计划员下的所有供应商
 	public void test04(){
-		Param param=new Param();
-		param.setUserId(9001);
-		Map<String, Object> result = ordersIssueAction.showSuppliersUnderPlanner(param);
+		Params Params=new Params();
+		Params.setUserId(9001);
+		Map<String, Object> result = ordersIssueAction.showSuppliersUnderPlanner(Params);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}
 	
-	@Test//测试显示所有箱号
+	@Test//测试显示所有零件号
 	public void test05(){
-		Param param=new Param();
-		param.setUserId(9001);
-		Map<String, Object> result = ordersIssueAction.showAllBoxNo(param);
+		Params Params=new Params();
+		Params.setUserId(9001);
+		Map<String, Object> result = ordersIssueAction.showAllPartNo(Params);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}
 	
 	@Test//测试订单跟踪信息
 	public void test06(){
-		Param param=new Param();
-		param.setUserId(9001);
-		param.setOrderId(100000002);
-		Map<String, Object> result = ordersIssueAction.orderTracking(param);
+		Params Params=new Params();
+		Params.setUserId(9001);
+		Params.setOrderId(100000002);
+		Map<String, Object> result = ordersIssueAction.orderTracking(Params);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}
 	
 	@Test//测试订单发货
 	public void test07(){
-		Param param=new Param();
-		param.setUserId(9003);
-		param.setOrderId(100000004);
-		param.setCarrierId(9007);
-		Map<String, Object> result = ordersIssueAction.consignment(param);
+		Params Params=new Params();
+		Params.setUserId(9003);
+		Params.setOrderId(100000004);
+		Params.setCarrierId(9007);
+		Map<String, Object> result = ordersIssueAction.consignment(Params);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}