git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@772 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/mobile/service/impl/InquiryItemServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -94,26 +95,6 @@ public class InquiryItemServiceImpl implements InquiryItemService{
 				return inquiryItems;
 			}
 
-			@Override
-			public boolean isLastPage() {
-				return inquiryItemPage.isLast();
-			}
-
-			@Override
-			public boolean isFirstPage() {
-				return inquiryItemPage.isFirst();
-			}
-
-			@Override
-			public boolean hasPreviousPage() {
-				return !inquiryItemPage.isFirst();
-			}
-
-			@Override
-			public boolean hasNextPage() {
-				return !inquiryItemPage.isLast();
-			}
-
 			@Override
 			public int getTotalPages() {
 				return inquiryItemPage.getTotalPages();
@@ -123,6 +104,11 @@ public class InquiryItemServiceImpl implements InquiryItemService{
 			public long getTotalElements() {
 				return inquiryItemPage.getTotalElements();
 			}
+
+			@Override
+			public <S> Page<S> map(Converter<? super InquiryItem, ? extends S> arg0) {
+				return null;
+			}
 		};
 		return page;
 	}

src/main/java/com/uas/platform/b2b/mobile/service/impl/NoticeServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -94,26 +95,6 @@ public class NoticeServiceImpl implements NoticeService{
 				return list;
 			}
 
-			@Override
-			public boolean isLastPage() {
-				return notices.isLast();
-			}
-
-			@Override
-			public boolean isFirstPage() {
-				return notices.isFirst();
-			}
-
-			@Override
-			public boolean hasPreviousPage() {
-				return !notices.isFirst();
-			}
-
-			@Override
-			public boolean hasNextPage() {
-				return !notices.isLast();
-			}
-
 			@Override
 			public int getTotalPages() {
 				return notices.getTotalPages();
@@ -123,6 +104,12 @@ public class NoticeServiceImpl implements NoticeService{
 			public long getTotalElements() {
 				return notices.getTotalElements();
 			}
+
+			@Override
+			public <S> Page<S> map(Converter<? super Notice, ? extends S> arg0) {
+				// TODO Auto-generated method stub
+				return null;
+			}
 		};
 		return page;
 	}

src/main/java/com/uas/platform/b2b/mobile/service/impl/PurchaseChangeServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -93,26 +94,6 @@ public class PurchaseChangeServiceImpl implements PurchaseChangeService {
 				return changes;
 			}
 
-			@Override
-			public boolean isLastPage() {
-				return orderChangePage.isLast();
-			}
-
-			@Override
-			public boolean isFirstPage() {
-				return orderChangePage.isFirst();
-			}
-
-			@Override
-			public boolean hasPreviousPage() {
-				return !orderChangePage.isFirst();
-			}
-
-			@Override
-			public boolean hasNextPage() {
-				return !orderChangePage.isLast();
-			}
-
 			@Override
 			public int getTotalPages() {
 				return orderChangePage.getTotalPages();
@@ -122,6 +103,12 @@ public class PurchaseChangeServiceImpl implements PurchaseChangeService {
 			public long getTotalElements() {
 				return orderChangePage.getTotalElements();
 			}
+
+			@Override
+			public <S> Page<S> map(Converter<? super PurchaseChange, ? extends S> arg0) {
+				// TODO Auto-generated method stub
+				return null;
+			}
 		};
 		return page;
 	}

src/main/java/com/uas/platform/b2b/mobile/service/impl/PurchaseServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.apache.commons.collections.CollectionUtils;
+import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -104,23 +105,9 @@ public class PurchaseServiceImpl implements PurchaseService {
 			}
 
 			@Override
-			public boolean hasNextPage() {
-				return !isLast();
-			}
-
-			@Override
-			public boolean hasPreviousPage() {
-				return !orderPage.isFirst();
-			}
-
-			@Override
-			public boolean isFirstPage() {
-				return orderPage.isFirst();
-			}
-
-			@Override
-			public boolean isLastPage() {
-				return orderPage.isLast();
+			public <S> Page<S> map(Converter<? super Purchase, ? extends S> arg0) {
+				// TODO Auto-generated method stub
+				return null;
 			}
 
 		};

src/main/resources/log4j.properties

@@ -1,6 +1,6 @@
 # For JBoss: Avoid to setup Log4J outside $JBOSS_HOME/server/default/deploy/log4j.xml!
 # For all other servers: Comment out the Log4J listener in web.xml to activate Log4J.
-log4j.rootLogger=INFO, stdout, logfile
+log4j.rootLogger=ERROR, stdout, logfile
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
@@ -16,8 +16,8 @@ log4j.appender.logfile.MaxFileSize=5120KB
 log4j.appender.logfile.layout.ConversionPattern=%d %p [%c]:%m%n
 #log4j.logger.org.springframework.samples.petclinic.aspects=DEBUG
 
-log4j.logger.com.mvc.rest = info
+log4j.logger.com.mvc.rest = error
 #=========================================
 #=   spring framewokr log configuration  =
 #=========================================
-log4j.logger.org.springframework = info
+log4j.logger.org.springframework = error

src/main/webapp/WEB-INF/spring/webmvc.xml

@@ -4,12 +4,23 @@
 	xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
-	<mvc:annotation-driven />
+	<mvc:annotation-driven>
+        <mvc:message-converters register-defaults="true">
+            <!-- 避免IE执行AJAX时,返回JSON出现下载文件 -->
+            <bean id="fastJsonHttpMessageConverter" class="com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter">
+                <property name="supportedMediaTypes">
+                    <list>
+                        <value>application/json;charset=UTF-8</value>
+                    </list>
+                </property>
+            </bean>
+        </mvc:message-converters>
+    </mvc:annotation-driven>
 
 	<mvc:default-servlet-handler />
 
 	<mvc:resources mapping="/static/**" location="/resources/" />
-	
+
 	<context:component-scan base-package="com.uas.platform" />
 
 	<bean