new

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace = "com.fuzamei.mapperInterface.CargoConsignMapper">
 	
-	<select id="queryOrdersBySupplier" parameterType="Param" resultType="SendOrder">
+	<select id="queryOrdersBySupplier" parameterType="Params" resultType="SendOrder">
 		select 
 			o.order_id,
 			u.person_name as carrier_name,
@@ -41,7 +41,7 @@
 		limit #{startPage},#{rowNum}
 	</select>
 	
-	<select id="findQueryCountBySupplier" parameterType="Param" resultType="int">
+	<select id="findQueryCountBySupplier" parameterType="Params" resultType="int">
 		select 
 			count(*)
 		from 
@@ -63,7 +63,7 @@
 		</where>
 	</select>
 	
-	<select id="queryOrdersByCarrier" parameterType="Param" resultType="SendOrder">
+	<select id="queryOrdersByCarrier" parameterType="Params" resultType="SendOrder">
 		select 
 			o.order_id,
 			o.part_no,
@@ -97,7 +97,7 @@
 		limit #{startPage},#{rowNum}
 	</select>
 	
-	<select id="findQueryCountByCarrier" parameterType="Param" resultType="int">
+	<select id="findQueryCountByCarrier" parameterType="Params" resultType="int">
 		select 
 			count(*)
 		from 

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace = "com.fuzamei.mapperInterface.CargoDeliverMapper">
 	
-	<select id="queryOrdersByCarrier" parameterType="Param" resultType="DeliverOrder">
+	<select id="queryOrdersByCarrier" parameterType="Params" resultType="DeliverOrder">
 		select 
 			o.order_id,
 			o.box_no,
@@ -37,7 +37,7 @@
 	</select>
 	
 	
-	<select id="findQueryCountByCarrier" parameterType="Param" resultType="int">
+	<select id="findQueryCountByCarrier" parameterType="Params" resultType="int">
 		select 
 			count(*)
 		from 

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace = "com.fuzamei.mapperInterface.CargoTallyMapper">
 	
-	<select id="queryOrdersByReceiver" parameterType="Param" resultType="TallyOrder">
+	<select id="queryOrdersByReceiver" parameterType="Params" resultType="TallyOrder">
 		select 
 			o.order_id,
 			o.part_no,
@@ -37,7 +37,7 @@
 		limit #{startPage},#{rowNum}
 	</select>
 	
-	<select id="findQueryCountByReceiver" parameterType="Param" resultType="int">
+	<select id="findQueryCountByReceiver" parameterType="Params" resultType="int">
 		select 
 			count(*)
 		from 

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

@@ -15,7 +15,7 @@
 				   #{operationTime}) 
 	</insert>
 	
-	<select id="queryOperationHistory" parameterType="Param" resultType="OperationHistory">
+	<select id="queryOperationHistory" parameterType="Params" resultType="OperationHistory">
 		select
 			oh.order_id,
 			ot.operation_type_name,
@@ -40,7 +40,7 @@
 		limit #{startPage},#{rowNum}
 	</select>
 	
-	<select id="findQueryCount" parameterType="Param" resultType="int">
+	<select id="findQueryCount" parameterType="Params" resultType="int">
 		select
 			count(*)
 		from 

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace = "com.fuzamei.mapperInterface.OrdersIssueMapper">
 	
-	<select id="queryOrdersByPlanner" parameterType="Param" resultType="IssueOrder">
+	<select id="queryOrdersByPlanner" parameterType="Params" resultType="IssueOrder">
 		select 
 			o.order_id,
 			u.person_name as supplier_name,
@@ -38,7 +38,7 @@
 		limit #{startPage},#{rowNum}
 	</select>
 	
-	<select id="findQueryCountByPlanner" parameterType="Param" resultType="int">
+	<select id="findQueryCountByPlanner" parameterType="Params" resultType="int">
 		select 
 			count(*) 
 		from
@@ -70,7 +70,7 @@
 			</where>) temp
 	</select>
 	
-	<select id="queryOrdersBySupplier" parameterType="Param" resultType="IssueOrder">
+	<select id="queryOrdersBySupplier" parameterType="Params" resultType="IssueOrder">
 		select 
 			o.order_id,
 			o.part_no,
@@ -104,7 +104,7 @@
 		limit #{startPage},#{rowNum}
 	</select>
 	
-	<select id="findQueryCountBySupplier" parameterType="Param" resultType="int">
+	<select id="findQueryCountBySupplier" parameterType="Params" resultType="int">
 		select 
 			count(*)
 		from 

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

@@ -19,13 +19,12 @@ import com.fuzamei.service.LoginService;
 import com.fuzamei.util.JSONUtil;
 
 @RestController
-@RequestMapping(path="/login")
 public class LoginAction {
 
 	@Autowired
 	private LoginService loginService;
 	
-	@RequestMapping(path="/loginUserName")
+	@RequestMapping(path="/login")
 	public Map<String,Object> loginUserName(@Validated(GroupA.class) @RequestBody User user,BindingResult result){
 		Map<String,Object> resultMap = new LinkedHashMap<String,Object>();	//存放最终返回结果
 		try {

saicLogistics/src/main/resources/spring-mvc.xml

@@ -12,27 +12,35 @@
                         http://www.springframework.org/schema/context  
                         http://www.springframework.org/schema/context/spring-context.xsd">
 
-	<mvc:annotation-driven validator="validator"/>
+	<mvc:annotation-driven validator="validator" />
 	<!-- hibernate validator参数校验 -->
 	<bean id="validator"
 		class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean">
 		<property name="providerClass" value="org.hibernate.validator.HibernateValidator" />
 	</bean>
 	<!-- 方法级别的校验 要校验的方法所在类必须添加@Validated注解 -->
-	<bean class="org.springframework.validation.beanvalidation.MethodValidationPostProcessor">
+	<bean
+		class="org.springframework.validation.beanvalidation.MethodValidationPostProcessor">
 		<!-- 可以引用自己的 validator 配置，在本文中（下面）可以找到 validator 的参考配置，如果不指定则系统使用默认的 -->
 		<property name="validator" ref="validator" />
 	</bean>
 	<context:component-scan base-package="com.fuzamei" />
 	<!-- 配置事务 -->
-	<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+	<bean id="transactionManager"
+		class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
 		<!-- 加载数据源 -->
 		<property name="dataSource" ref="dataSource"></property>
 	</bean>
 	<!-- 开启事务扫描 -->
-	<tx:annotation-driven transaction-manager="transactionManager" proxy-target-class="true" />
+	<tx:annotation-driven transaction-manager="transactionManager"
+		proxy-target-class="true" />
 	<!-- 对token拦截验证 (为方便测试,测试环境给注释掉) -->
-	<!-- <mvc:interceptors> <mvc:interceptor> <mvc:mapping path="/*/api/*" /> 
-		<bean class="com.fuzamei.interceptor.TokenInterceptor" /> </mvc:interceptor> 
-		</mvc:interceptors> -->
+	<mvc:interceptors>
+		<mvc:interceptor>
+			<!-- 拦截路径 -->
+			<mvc:mapping path="/**" />
+			<mvc:exclude-mapping path="/login"/>
+			<bean class="com.fuzamei.interceptor.TokenInterceptor" />
+		</mvc:interceptor>
+	</mvc:interceptors>
 </beans>