diff --git a/.classpath b/.classpath
index 33dbb47..64f1662 100644
--- a/.classpath
+++ b/.classpath
@@ -23,9 +23,9 @@
-
+
-
+
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 45a6e0e..6b5aebc 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,13 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index d74c55e..4045d87 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/src/main/java/osc/git/eh3/readlogs/IReadLogs.java b/src/main/java/osc/git/eh3/readlogs/IReadLogs.java
index 1442984..9b19e4f 100644
--- a/src/main/java/osc/git/eh3/readlogs/IReadLogs.java
+++ b/src/main/java/osc/git/eh3/readlogs/IReadLogs.java
@@ -2,7 +2,8 @@ package osc.git.eh3.readlogs;
import java.util.Date;
import java.util.List;
+import java.util.Map;
public interface IReadLogs {
- public String readFile(Date startDate, Date endDate, List mapids);
+ public String readFile(Date startDate, Date endDate, List mapids, String groupid,Map adxs);
}
\ No newline at end of file
diff --git a/src/main/java/osc/git/eh3/test/StatisByHourModel.java b/src/main/java/osc/git/eh3/test/StatisByHourModel.java
new file mode 100644
index 0000000..8967cc8
--- /dev/null
+++ b/src/main/java/osc/git/eh3/test/StatisByHourModel.java
@@ -0,0 +1,106 @@
+package osc.git.eh3.test;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class StatisByHourModel {
+ private Date time;
+
+ private String creativeid;
+
+ private Short category;
+
+ private Integer imprs;
+
+ private Integer clks;
+
+ private BigDecimal cost;
+
+ private Integer downloads;
+
+ private Integer regists;
+
+ private Integer flag;
+
+ private Date createtime;
+
+ public Date getTime() {
+ return time;
+ }
+
+ public void setTime(Date time) {
+ this.time = time;
+ }
+
+ public String getCreativeid() {
+ return creativeid;
+ }
+
+ public void setCreativeid(String creativeid) {
+ this.creativeid = creativeid == null ? null : creativeid.trim();
+ }
+
+ public Short getCategory() {
+ return category;
+ }
+
+ public void setCategory(Short category) {
+ this.category = category;
+ }
+
+ public Integer getImprs() {
+ return imprs;
+ }
+
+ public void setImprs(Integer imprs) {
+ this.imprs = imprs;
+ }
+
+ public Integer getClks() {
+ return clks;
+ }
+
+ public void setClks(Integer clks) {
+ this.clks = clks;
+ }
+
+ public BigDecimal getCost() {
+ return cost;
+ }
+
+ public void setCost(BigDecimal cost) {
+ this.cost = cost;
+ }
+
+ public Integer getDownloads() {
+ return downloads;
+ }
+
+ public void setDownloads(Integer downloads) {
+ this.downloads = downloads;
+ }
+
+ public Integer getRegists() {
+ return regists;
+ }
+
+ public void setRegists(Integer regists) {
+ this.regists = regists;
+ }
+
+ public Integer getFlag() {
+ return flag;
+ }
+
+ public void setFlag(Integer flag) {
+ this.flag = flag;
+ }
+
+ public Date getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Date createtime) {
+ this.createtime = createtime;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/osc/git/eh3/test/TestCode.java b/src/main/java/osc/git/eh3/test/TestCode.java
index d2b32d9..ddfd0aa 100644
--- a/src/main/java/osc/git/eh3/test/TestCode.java
+++ b/src/main/java/osc/git/eh3/test/TestCode.java
@@ -1,5 +1,6 @@
package osc.git.eh3.test;
+import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
import com.caucho.hessian.client.HessianProxyFactory;
import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
import osc.git.eh3.readlogs.IReadLogs;
public class TestCode {
@@ -90,11 +92,26 @@ public class TestCode {
// System.out.println(result);
- JSONArray jonsArr = new JSONArray();
- JSONArray arr = new JSONArray();
- jonsArr = JSONArray.fromObject("[ { 'category': 2, 'clks': 4, 'cost': 13, 'createtime': null, 'creativeid': 'cf0714f4-8b92-41f2-a843-19c94fe3af74', 'downloads': 0, 'flag': 0, 'imprs': 5, 'regists': 0, 'time': null } ]");
- arr.addAll(JSONArray.toCollection(jonsArr));
- System.out.println(arr);
+// JSONArray jonsArr = new JSONArray();
+// JSONArray arr = new JSONArray();
+// jonsArr = JSONArray.fromObject("[ { 'category': 2, 'clks': 4, 'cost': 13, 'createtime': null, 'creativeid': 'cf0714f4-8b92-41f2-a843-19c94fe3af74', 'downloads': 0, 'flag': 0, 'imprs': 5, 'regists': 0, 'time': null } ]");
+// arr.addAll(JSONArray.toCollection(jonsArr));
+// System.out.println(arr);
+
+// String str = "20160222,18:59:50.523,DBG,ip:36.100.240.103,adx:3,bid:08a2d93b-0153-1000-fd75-3f89c5394190,mapid:62367312-d881-426d-81b4-fe635d1db989,deviceid:726e14bf3ba615e5387c256059e9f24a94721f76,deviceidtype:97,mtype:m";
+// for(String dd : str.split(",")){
+//
+// System.out.println(dd);
+// }
+
+// BigDecimal dd = new BigDecimal("1111.10");
+// JSONObject jj = new JSONObject();
+// jj.put("test", dd);
+// System.out.println(jj.optDouble("test"));
+
+ JSONObject jj = new JSONObject();
+ System.out.println(jj.optString("pring"));
+
}
public static Long parseDate(String s) {
diff --git a/src/main/java/osc/git/eh3/test/TestSyncLogData.java b/src/main/java/osc/git/eh3/test/TestSyncLogData.java
new file mode 100644
index 0000000..124d02e
--- /dev/null
+++ b/src/main/java/osc/git/eh3/test/TestSyncLogData.java
@@ -0,0 +1,217 @@
+package osc.git.eh3.test;
+
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import com.caucho.hessian.client.HessianProxyFactory;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import osc.git.eh3.readlogs.IReadLogs;
+
+public class TestSyncLogData {
+
+ public static void main(String[] args) throws Exception {
+ List mapids = new ArrayList();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH");
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMMdd_HH");
+
+ // 测试数据
+ mapids.add("ad2176a7-74f2-4eab-965f-04c509653a93");
+ mapids.add("63cae342-3288-4591-8097-53a9ac8bbe48");
+ mapids.add("b38749f5-d5f9-441f-89de-a97c9b35adb0");
+ mapids.add("3bc9a763-b5ad-4ade-a46c-12ce6f7a9479");
+ mapids.add("cf384c11-0b25-4462-80ae-8a7eaedbf765");
+ mapids.add("e9d823fe-379a-4d86-b9cd-93bb21c085a3");
+ mapids.add("fa3c7262-4538-4192-bbca-ac1114f690c1");
+ mapids.add("441af98d-917a-423a-ad3d-6faa8609e722");
+ mapids.add("60112069-7c05-4135-8430-836ed61576e8");
+ mapids.add("62367312-d881-426d-81b4-fe635d1db989");
+ mapids.add("c41c1d40-1f71-44d2-88ab-478a584cd030");
+ mapids.add("5f9735cf-6036-4902-9cff-5c7a40c76f24");
+
+ Map adxs = new HashMap<>();
+ adxs.put("15", 1.0000);
+ adxs.put("14", 1.0000);
+ adxs.put("2", 1.0000);
+ adxs.put("8", 1.0000);
+ adxs.put("11", 1.0000);
+ adxs.put("1122331", 1.0000);
+ adxs.put("1", 1.0000);
+ adxs.put("4", 1.0000);
+ adxs.put("9", 1.0000);
+ adxs.put("13", 1.0000);
+ adxs.put("10", 1.0000);
+ adxs.put("5", 1.0000);
+ adxs.put("7", 1.0000);
+ adxs.put("112233", 1.0000);
+ adxs.put("3", 0.1569);
+
+ HessianProxyFactory factory = new HessianProxyFactory();
+ IReadLogs readLogs = (IReadLogs) factory.create(IReadLogs.class, "http://localhost:8080/sync-logs/remote/readlogs");
+ String results = readLogs.readFile(sdf.parse("2016-02-24 09"), sdf.parse("2016-02-24 10"), mapids,
+ "6692a223-2ae1-439a-93f4-09fb36e718ef",adxs);
+ System.out.println(results);
+ JSONArray dataArr = new JSONArray();
+ dataArr = JSONArray.fromObject(results);
+ // List dataList = (List)
+ // JSONArray.toCollection(dataArr, StatisByHourModel.class);
+
+ // List