new

saicLogistics/pom.xml

@@ -1,13 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.fuzamei</groupId>
-  <artifactId>sqLogistics</artifactId>
-  <packaging>war</packaging>
-  <version>0.0.1-SNAPSHOT</version>
-  <name>sqLogistics Maven Webapp</name>
-  <url>http://maven.apache.org</url>
-  <properties>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.fuzamei</groupId>
+	<artifactId>sqLogistics</artifactId>
+	<packaging>war</packaging>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>sqLogistics Maven Webapp</name>
+	<url>http://maven.apache.org</url>
+	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring.version>4.3.2.RELEASE</spring.version>
 		<jackson.version>2.9.0</jackson.version>
@@ -24,14 +24,14 @@
 			<version>4.9</version>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
-   	 		<groupId>javax.servlet</groupId>
-    		<artifactId>javax.servlet-api</artifactId>
-    		<version>3.1.0</version>
-    		<scope>provided</scope>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
+			<scope>provided</scope>
 		</dependency>
-		
+
 
 		<dependency>
 			<groupId>org.mockito</groupId>
@@ -224,33 +224,54 @@
 		<!-- excel jar end…… -->
 		<!-- https://mvnrepository.com/artifact/org.quartz-scheduler/quartz -->
 		<dependency>
-		    <groupId>org.quartz-scheduler</groupId>
-		    <artifactId>quartz</artifactId>
-		    <version>2.3.0</version>
+			<groupId>org.quartz-scheduler</groupId>
+			<artifactId>quartz</artifactId>
+			<version>2.3.0</version>
 		</dependency>
-		<dependency>    
-            <groupId>org.quartz-scheduler</groupId>    
-            <artifactId>quartz</artifactId>    
-            <version>2.2.1</version>    
-	    </dependency>
-	    <!-- hibernate validator 参数校验 -->
-	    <dependency>
-		   <groupId>org.hibernate</groupId>
-		   <artifactId>hibernate-validator</artifactId>
-		   <version>5.3.4.Final</version>
+		<dependency>
+			<groupId>org.quartz-scheduler</groupId>
+			<artifactId>quartz</artifactId>
+			<version>2.2.1</version>
+		</dependency>
+		<!-- hibernate validator 参数校验 -->
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>5.3.4.Final</version>
 		</dependency>
 		<dependency>
-		   <groupId>javax.el</groupId>
-		   <artifactId>javax.el-api</artifactId>
-		   <version>2.2.4</version>
+			<groupId>javax.el</groupId>
+			<artifactId>javax.el-api</artifactId>
+			<version>2.2.4</version>
 		</dependency>
 		<dependency>
-		   <groupId>org.glassfish.web</groupId>
-		   <artifactId>javax.el</artifactId>
-		   <version>2.2.4</version>
+			<groupId>org.glassfish.web</groupId>
+			<artifactId>javax.el</artifactId>
+			<version>2.2.4</version>
 		</dependency>
 	</dependencies>
-  <build>
-    <finalName>sqLogistics</finalName>
-  </build>
+	<build>
+		<finalName>sqLogistics</finalName>
+		<plugins>
+			<!-- skip test -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+			<!-- customerize your compiler -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.1</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+					<encoding>${project.build.sourceEncoding}</encoding>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>

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

@@ -44,6 +44,10 @@ public class OrdersIssueAction {
 	
 	private static final Integer ROWNUM=Integer.parseInt(ReadConfUtil.getProperty("rowNum"));
 	
+	public static final String ORDER_ID_PATTERN="\\d{8}";
+	public static void main(String[] args) {
+		System.out.println("\\d{8}");
+	}
 	/**
 	 * 
 	* @Title: queryOrdersByPlanner
@@ -170,7 +174,7 @@ public class OrdersIssueAction {
 	@RequestMapping(value="/addOrder",method=RequestMethod.POST)
 	public Map<String, Object> addOrder(@RequestBody Param param){
 		try {
-			orderService.checkIfHasTheSameId(ValidationUtil.checkAndAssignInt(param.getOrderId()));
+			orderService.checkIfHasTheSameId(ValidationUtil.checkAndAssignInt(param.getOrderId(),ORDER_ID_PATTERN));
 			UserDetail userDetail = userAuthoricationService.queryUserDetail(ValidationUtil.checkAndAssignInt(param.getUserId()), Role.PLANNER);//检测当前操作用户权限
 			List<UserDetail> users = userDetail.getUsers();
 			int supplierId = ValidationUtil.checkAndAssignInt(param.getSupplierId());

saicLogistics/src/main/resources/conf.properties

@@ -5,4 +5,6 @@ block_port=46657
 privateKey=90b289fda1fb0439158f837bbe60cc1ec99616dd0bc6335d6fd0bf3d22888e20
 publicKey=b15a4f6c5c1163b5f80715c9bd87d5118ec4b5668cb29f148eeceec61ddeadc2
 #分页每页显示条数
-rowNum=10
+rowNum=10
+#订单号正则表达式
+orderIdPattern=\\d{8}

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

@@ -39,7 +39,7 @@ public class OrdersIssueActionTest extends BaseJunit4Test{
 		Param param=new Param();
 		param.setUserId(9001);
 		param.setPage(1);
-		param.setSupplierName("chb供应商");
+//		param.setSupplierName("chb供应商");
 		param.setBoxNo(null);
 		param.setStartTime(null);
 		param.setEndTime(null);
@@ -102,4 +102,9 @@ public class OrdersIssueActionTest extends BaseJunit4Test{
 		System.out.println(jsonString);
 	}
 	
+	@Test//测试正则
+	public void test08(){
+		System.out.println(OrdersIssueAction.ORDER_ID_PATTERN);
+	}
+	
 }