new

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

@@ -42,8 +42,6 @@ public class CargoConsignAction {
 	@Autowired
 	private HttpServletRequest req;
 	
-	private static final Integer ROWNUM=Integer.parseInt(ReadConfUtil.getProperty("rowNum"));
-	
 	private static final String CARNO_PATTERN =RegexConstant.CAR_NO;
 	/**
 	 * 
@@ -70,13 +68,14 @@ public class CargoConsignAction {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.SUPPLIER);
 			int page = ValidationUtil.checkMinAndAssignInt(params.getPage(), 1);
+			int rowNum=ValidationUtil.checkMinAndAssignInt(params.getRowNum(), 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);
+			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) {
@@ -109,13 +108,14 @@ public class CargoConsignAction {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.CARRIER);
 			int page = ValidationUtil.checkMinAndAssignInt(params.getPage(), 1);
+			int rowNum=ValidationUtil.checkMinAndAssignInt(params.getRowNum(), 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);
+			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) {

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

@@ -38,8 +38,6 @@ public class CargoDeliverAction {
 	@Autowired
 	private OrderService orderService;
 	
-	private static final Integer ROWNUM=Integer.parseInt(ReadConfUtil.getProperty("rowNum"));
-	
 	/**
 	 * 
 	* @Title: queryOrdersByCarrier
@@ -65,13 +63,14 @@ public class CargoDeliverAction {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.CARRIER);
 			int page = ValidationUtil.checkMinAndAssignInt(params.getPage(), 1);
+			int rowNum = ValidationUtil.checkMinAndAssignInt(params.getRowNum(), 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);
+			params.setStartPage((page - 1) * rowNum);
+			params.setRowNum(rowNum);
 			PageDTO pageDto = cargoDeliverService.queryOrdersByCarrier(params);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, pageDto);
 		} catch (Exception e) {

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

@@ -40,8 +40,6 @@ public class CargoTallyAction {
 	@Autowired
 	private OrderService orderService;
 	
-	private static final Integer ROWNUM=Integer.parseInt(ReadConfUtil.getProperty("rowNum"));
-	
 	/**
 	 * 
 	* @Title: queryOrdersByReceiver
@@ -66,13 +64,14 @@ public class CargoTallyAction {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.STOCKER);
 			int page = ValidationUtil.checkMinAndAssignInt(params.getPage(), 1);
+			int rowNum = ValidationUtil.checkMinAndAssignInt(params.getRowNum(), 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);
+			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) {

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

@@ -31,8 +31,6 @@ public class OperationHistoryAction {
 	@Autowired
 	private UserAuthoricationService userAuthoricationService;
 	
-	private static final Integer ROWNUM=Integer.parseInt(ReadConfUtil.getProperty("rowNum"));
-	
 	@Autowired
 	private HttpServletRequest req;
 	/**
@@ -57,13 +55,14 @@ public class OperationHistoryAction {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.ADMIN);
 			int page = ValidationUtil.checkMinAndAssignInt(params.getPage(), 1);
+			int rowNum=ValidationUtil.checkMinAndAssignInt(params.getRowNum(), 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);
+			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) {

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

@@ -50,8 +50,6 @@ public class OrdersIssueAction {
 	@Autowired
 	private PartService partService;
 	
-	private static final Integer ROWNUM=Integer.parseInt(ReadConfUtil.getProperty("rowNum"));
-	
 	private static final String ORDER_ID_PATTERN=RegexConstant.ORDER_ID;
 	
 	@Autowired
@@ -80,13 +78,14 @@ public class OrdersIssueAction {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.PLANNER);
 			int page = ValidationUtil.checkMinAndAssignInt(params.getPage(), 1);
+			int rowNum = ValidationUtil.checkMinAndAssignInt(params.getRowNum(), 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);
+			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) {
@@ -119,13 +118,14 @@ public class OrdersIssueAction {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.SUPPLIER);
 			int page = ValidationUtil.checkMinAndAssignInt(params.getPage(), 1);
+			int rowNum = ValidationUtil.checkMinAndAssignInt(params.getRowNum(), 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);
+			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) {