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

src/main/java/com/uas/platform/b2b/controller/UsageLogController.java

@@ -59,7 +59,7 @@ public class UsageLogController {
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("data", usageLogSerice.findAllByPageInfo(pageInfo).getContent());
-		return new ModelAndView(new JxlsExcelView("classpath:jxls-tpl/UsageLog", "平台使用日志"), map);
+		return new ModelAndView(new JxlsExcelView("classpath:jxls-tpl/account/log/UsageLog$List", "平台使用日志"), map);
 	}
 
 }

src/main/java/com/uas/platform/b2b/dao/CommonDao.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
 
@@ -29,4 +30,20 @@ public class CommonDao {
 		return this.jdbcTemplate.queryForList(sql, args, elementType);
 	}
 
+	public <T> List<T> queryForList(String sql, Class<T> elementType, Object... args) {
+		return this.jdbcTemplate.queryForList(sql, elementType, args);
+	}
+
+	public <T> List<T> query(String sql, Object[] args, Class<T> elementType) {
+		return this.jdbcTemplate.query(sql, args, new BeanPropertyRowMapper<T>(elementType));
+	}
+
+	public <T> List<T> query(String sql, Class<T> elementType) {
+		return this.jdbcTemplate.query(sql, new BeanPropertyRowMapper<T>(elementType));
+	}
+
+	public <T> List<T> query(String sql, Class<T> elementType, Object... args) {
+		return this.jdbcTemplate.query(sql, new BeanPropertyRowMapper<T>(elementType), args);
+	}
+
 }

src/main/java/com/uas/platform/b2b/erp/controller/ErpLogController.java

@@ -53,6 +53,14 @@ public class ErpLogController {
 	public ModelAndView exportErpLogs() {
 		return new ModelAndView(new XmlGridExcelView("classpath:xml-tpl/account/log/ErpLog", "数据传输日志",
 				erpLogService.findAll(), ContextUtils.getApplicationContext()));
+//		final PageInfo pageInfo = new PageInfo(1, 50000, 0);
+//		pageInfo.sorting("time", Direction.DESC);
+//		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+//		Map<String, Object> map = new HashMap<String, Object>();
+//		long t1 = System.currentTimeMillis();
+//		map.put("data", erpLogService.findAllByPageInfo(pageInfo).getContent());
+//		System.out.println(System.currentTimeMillis() - t1);
+//		return new ModelAndView(new JxlsExcelView("classpath:jxls-tpl/account/log/ErpLog$List", "数据传输日志"), map);
 	}
 
 }

src/main/java/com/uas/platform/b2b/erp/service/impl/ErpLogServiceImpl.java

@@ -60,10 +60,11 @@ public class ErpLogServiceImpl implements ErpLogService {
 
 			@Override
 			public List<Map<String, Object>> getContent() {
-				return commonDao
+				List<Map<String, Object>> list = commonDao
 						.queryForList(
-								"SELECT tt.* FROM (SELECT to_char(to_date('1970-01-01','yyyy-MM-dd')+log_time/86400000,'yyyy-mm-dd hh24:mi:ss') timeString,log_ip ip,user_name userName,log_title title,log_message message,log_total total FROM log$erp left join sec$users on log_useruu=user_uu WHERE log_enuu=? ORDER BY log_time DESC) tt WHERE ROWNUM <= ?",
+								"SELECT to_char(to_date('1970-01-01','yyyy-MM-dd')+log_time/86400000,'yyyy-mm-dd hh24:mi:ss') timeString,log_ip ip,user_name userName,log_title title,log_message message,log_total total FROM log$erp t left join sec$users on log_useruu=user_uu,(SELECT rd,rownum rn FROM (SELECT ROWID rd FROM log$erp WHERE log_enuu=? ORDER BY log_time DESC) WHERE ROWNUM<=?) where t.rowid=rd ORDER BY rn",
 								SystemSession.getUser().getEnterprise().getUu(), XmlExcelView.BUFFER_SIZE);
+				return list;
 			}
 
 			@Override

src/main/java/com/uas/platform/b2b/support/JxlsExcelView.java

@@ -32,7 +32,7 @@ public class JxlsExcelView extends AbstractExcelView {
 	/**
 	 * 最大导出行
 	 */
-	public final static int MAX_SIZE = 5000;
+	public final static int MAX_SIZE = 50000;
 
 	private String fileName;