From dc088a4764429cb729026d98e5f1f36458561a4a Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 4 Aug 2018 15:54:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0MyBatis=E7=9A=84Map=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=BC=A0=E9=80=92=E5=92=8C=E8=BF=94=E5=9B=9E=E5=AE=9E?=
 =?UTF-8?q?=E4=BE=8B=EF=BC=8C=E6=94=AF=E6=8C=81=E5=88=86=E9=A1=B5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/interceptor/LogInterceptor.java     |  9 +++++----
 .../com/jeesite/modules/test/dao/TestDataDao.java   |  8 ++++++++
 .../modules/test/service/TestDataService.java       | 10 ++++++++++
 .../resources/mappings/modules/test/TestDataDao.xml | 13 +++++++++++++
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/LogInterceptor.java b/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/LogInterceptor.java
index 5241d226..c97d5bb3 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/LogInterceptor.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/LogInterceptor.java
@@ -12,6 +12,7 @@ import org.springframework.core.NamedThreadLocal;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.jeesite.common.lang.ByteUtils;
 import com.jeesite.common.lang.DateUtils;
 import com.jeesite.common.lang.TimeUtils;
 import com.jeesite.common.service.BaseService;
@@ -61,10 +62,10 @@ public class LogInterceptor extends BaseService implements HandlerInterceptor {
 		
 		// 打印JVM信息。
 		if (logger.isDebugEnabled()){
-	        logger.debug("计时结束: {}  用时: {}  URI: {}  最大内存: {}m  已分配内存: {}m  已分配内存中的剩余空间: {}m  最大可用内存: {}m",
-	        		DateUtils.formatDate(endTime, "hh:mm:ss.SSS"), TimeUtils.formatDateAgo(executeTime),
-					request.getRequestURI(), Runtime.getRuntime().maxMemory()/1024/1024, Runtime.getRuntime().totalMemory()/1024/1024, Runtime.getRuntime().freeMemory()/1024/1024, 
-					(Runtime.getRuntime().maxMemory()-Runtime.getRuntime().totalMemory()+Runtime.getRuntime().freeMemory())/1024/1024); 
+			Runtime runtime = Runtime.getRuntime();
+	        logger.debug("计时结束: {}  用时: {}  URI: {}  总内存: {}  已用内存: {}",
+	        		DateUtils.formatDate(endTime, "hh:mm:ss.SSS"), TimeUtils.formatDateAgo(executeTime), request.getRequestURI(), 
+					ByteUtils.formatByteSize(runtime.totalMemory()), ByteUtils.formatByteSize(runtime.totalMemory()-runtime.freeMemory())); 
 		}
 		
 	}
diff --git a/web/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java b/web/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java
index 0c7ddea4..72ab28db 100644
--- a/web/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java
+++ b/web/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java
@@ -3,6 +3,9 @@
  */
 package com.jeesite.modules.test.dao;
 
+import java.util.List;
+import java.util.Map;
+
 import com.jeesite.common.dao.CrudDao;
 import com.jeesite.common.mybatis.annotation.MyBatisDao;
 import com.jeesite.modules.test.entity.TestData;
@@ -15,4 +18,9 @@ import com.jeesite.modules.test.entity.TestData;
 @MyBatisDao
 public interface TestDataDao extends CrudDao<TestData> {
 	
+	/**
+	 * 演示Map参数和返回值，支持分页
+	 */
+	public List<Map<String, Object>> findListForMap(Map<String, Object> params);
+	
 }
\ No newline at end of file
diff --git a/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java b/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java
index b267825d..ec38c83c 100644
--- a/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java
+++ b/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java
@@ -51,6 +51,16 @@ public class TestDataService extends CrudService<TestDataDao, TestData> {
 	 */
 	@Override
 	public Page<TestData> findPage(Page<TestData> page, TestData testData) {
+		
+//		// 演示Map参数和返回值，支持分页
+//		Page<Map<String, Object>> pageMap = new Page<>();
+//		Map<String, Object> params = MapUtils.newHashMap();
+//		params.put("testInput", "123");
+//		params.put("page", pageMap);
+//		pageMap.setList(dao.findListForMap(params));
+//		System.out.println(pageMap.getList());
+//		System.out.println(pageMap.getCount());
+		
 		return super.findPage(page, testData);
 	}
 	
diff --git a/web/src/main/resources/mappings/modules/test/TestDataDao.xml b/web/src/main/resources/mappings/modules/test/TestDataDao.xml
index b5edba9a..c21f5521 100644
--- a/web/src/main/resources/mappings/modules/test/TestDataDao.xml
+++ b/web/src/main/resources/mappings/modules/test/TestDataDao.xml
@@ -12,4 +12,17 @@
 		ORDER BY ${sqlMap.order.toSql()}
 	</select> -->
 	
+	<!-- 演示Map参数和返回值，支持分页 -->
+	<select id="findListForMap" resultType="map">
+		SELECT * FROM test_data a
+		<where>
+			<if test="testInput != null and testInput != ''">
+				AND a.test_input = #{testInput}
+			</if>
+		</where>
+		<if test="page != null and page.orderBy != null and page.orderBy != ''">
+			ORDER BY ${page.orderBy}
+		</if>
+	</select>
+	
 </mapper>
\ No newline at end of file