Merge pull request '数据接口' (#56) from wpd_api into master

Reviewed-on: #56

control/weibo.php

@@ -88,12 +88,13 @@ class weibo extends publicBase {
     public function ajax_get_spider_list() {
         $date = trim($this->post('date'));
         $uid = trim($this->post('uid'));
+        $wid = trim($this->post('wid'));
         $cur_page = $this->post('currentPage') ? $this->post('currentPage') : 1;
         $page_size = $this->post('pageSize') ? $this->post('pageSize') : 20;
 
         $obj = new mWeiboBehavior();
-        $list = $obj->getSpiderBehavior($date, $uid, $cur_page, $page_size);
+        $list = $obj->getSpiderBehavior($date, $uid, $wid, $cur_page, $page_size);
-        $total = $obj->getSpiderBehaviorTotal($date, $uid);
+        $total = $obj->getSpiderBehaviorTotal($date, $wid, $uid);
 
         $rdata = array(
             'total' => $total,

model/mWeiboBehavior.php

@@ -36,23 +36,42 @@ class mWeiboBehavior extends mBase {
         return $this->obj->delete($this->tbl_delta, array('sql' => "`date`<?", 'vals' => array($date)));
     }
 
-    public function getSpiderBehavior($date, $uid, $page_num, $page_size) {
+    public function getSpiderBehavior($date, $uid, $wid, $page_num, $page_size) {
-        $where = array('sql' => "`date`=?", 'vals' => array($date));
+        $where = array('sql' => " 1=1 ", 'vals' => array());
+        if ($date) {
+            $where['sql'] .= " AND `date`=?";
+            $where['vals'][] = $date;
+        }
         if ($uid > 0) {
             $where['sql'] .= " AND `uid`=?";
             $where['vals'][] = $uid;
         }
+        if ($wid > 0) {
+            $where['sql'] .= " AND `wid`=?";
+            $where['vals'][] = $wid;
+        }
         $offset = ($page_num - 1) * $page_size;
 
-        return $this->obj->selectAll($this->tbl_data, $where, 'created_at desc', array($offset, $page_size));
+        $orderby = "created_at desc";
+        if(!$date) $orderby = "wid desc";
+
+        return $this->obj->selectAll($this->tbl_data, $where, $orderby, array($offset, $page_size));
     }
 
-    public function getSpiderBehaviorTotal($date, $uid) {
+    public function getSpiderBehaviorTotal($date, $uid, $wid) {
-        $where = array('sql' => "`date`=?", 'vals' => array($date));
+        $where = array('sql' => " 1=1 ", 'vals' => array());
+        if ($date) {
+            $where['sql'] .= " AND `date`=?";
+            $where['vals'][] = $date;
+        }
         if ($uid > 0) {
             $where['sql'] .= " AND `uid`=?";
             $where['vals'][] = $uid;
         }
+        if ($wid > 0) {
+            $where['sql'] .= " AND `wid`=?";
+            $where['vals'][] = $wid;
+        }
         return $this->obj->count($this->tbl_data, $where);
     }