commit

DataFusion/src/com/zskk/control/ViewController.java

@@ -53,14 +53,15 @@ public class ViewController extends Controller {
 		List<Record> count = Db.use("local").find("select * from study where status =4");
 		//同时下载的队列
 		Integer flag = count.size();
-		renderText(flag.toString());
-//		if (flag >= max) {
-//			return;
-//		}
-//		List<Record> studyidfinds = Db.use("local").find("select * from study where status =1 or status =2 order by createAt asc limit 6");
-//		if (studyidfinds == null) {
-//			return;
-//		}
+		if (flag >= max) {
+			return;
+		}
+		List<Record> studyidfinds = Db.use("local").find("select * from study where status =1 or status =2 order by createAt asc limit 6");
+		if (studyidfinds == null) {
+			return;
+		}
+	    renderJson(studyidfinds);
+
 //		for (Record studyidfind : studyidfinds) {
 //			//延时3min获取
 //			Date dateNow = new Date();