colly_wyx
2018-04-26 40417edce32320cc8f6f558adf9b8ee8b4ff23c2
调整上传接口
3 files added
7 files modified
38 ■■■■ changed files
Library/MyRequest.php 5 ●●●●● patch | view | raw | blame | history
Yfs/Api/Data.php 2 ●●● patch | view | raw | blame | history
Yfs/Domain/Data.php 20 ●●●● patch | view | raw | blame | history
Yfs/Model/.phpintel/0bedd5b0016fa5b46ab8d14a2d2a636e patch | view | raw | blame | history
Yfs/Model/.phpintel/cd550ac684a8053ff9489bafc6a2da05 patch | view | raw | blame | history
Yfs/Model/.phpintel/e9c5c8acc7ec96e3d2bea72829d643ec patch | view | raw | blame | history
Yfs/Model/.phpintel/index patch | view | raw | blame | history
Yfs/Model/Base.php 2 ●●● patch | view | raw | blame | history
Yfs/Model/DataOriginal.php 2 ●●● patch | view | raw | blame | history
Yfs/Model/Task.php 7 ●●●●● patch | view | raw | blame | history
Library/MyRequest.php
@@ -5,8 +5,9 @@
      parent::__construct($data);
      // json处理
      $this->post = file_get_contents('php://input');
      if(!$_POST)
        $this->post = json_decode(file_get_contents('php://input'),true);
      // 普通xml处理
      //$this->post = simplexml_load_string (
      //    file_get_contents('php://input'),
Yfs/Api/Data.php
@@ -48,7 +48,7 @@
        $data_service = new Domain_Data();
        if(!empty($this->data)){
          $data = $this->data;
          $data = json_decode($this->data,true);
        }
        else{
          $data = $this->data_1;
Yfs/Domain/Data.php
@@ -24,6 +24,7 @@
        $arr['lat'] = $data['lat'];
        $arr['address'] = $data['address'];
        foreach ($data['data'] as $value) {
            $arr['value'] = $value['value'];
            $arr['create_time'] = $value['time'];
            $arr['date'] = date('Y-m-d', strtotime($value['time']));
@@ -34,11 +35,24 @@
                }
            }
            elseif($value['type'] == 1){
                $this->hourly_model->add($arr);
                $arr['hour'] = date('H', strtotime($value['time']));
                $hourly = $this->hourly_model->get(array('hour' => $arr['hour'], 'date' => $arr['date'], 'user_id' => $arr['user_id']));
                if($hourly){
                    $_id = $hourly['_id'];
                    //更新原有数据
                    $hourly = $arr;
                    $this->hourly_model->update($hourly, array('_id' => $_id));
                }
                else{
                    $this->hourly_model->add($arr);
                }
                $task_arr = array();
                if(!in_arrar($task_arr)){
                $task_date = $this->hourly_model->get(array('date' => $arr['date']));
                if(!$task_date){
                   $task_arr['date'] = $arr['date'];
                   $this->task_model->add($arr);
                   $this->task_model->add($task_arr);
                }
                
            }
Yfs/Model/.phpintel/0bedd5b0016fa5b46ab8d14a2d2a636e
Binary files differ
Yfs/Model/.phpintel/cd550ac684a8053ff9489bafc6a2da05
Binary files differ
Yfs/Model/.phpintel/e9c5c8acc7ec96e3d2bea72829d643ec
Binary files differ
Yfs/Model/.phpintel/index
Binary files differ
Yfs/Model/Base.php
@@ -53,7 +53,7 @@
        return $this->db->insert($this->table, $data);
    }
    public function update($data, $query){
    public function update($data, $query = null){
        return $this->db->update($this->table, $data, $query);
    }
Yfs/Model/DataOriginal.php
@@ -1,6 +1,6 @@
<?php
class Model_DataOriginal extends System_Model_Base{
class Model_DataOriginal extends Model_Base{
    public $table = "data_original";
    
Yfs/Model/Task.php
New file
@@ -0,0 +1,7 @@
<?php
class Model_Task extends Model_Base{
    public $table = 'user';
}