123

@@ -46,7 +46,7 @@ class Equipment2 extends Api
             foreach ($list as $k => $v) {
 
                 $startTime = Db::name('reservoir_flow')->where(["number" => $v['deviceId'], "reservoir_id" => $v['reservoir_id']])->order('createtime desc')->value('createtime');
-                $startTime = $startTime ? $startTime + 1 : strtotime("2024-06-05 10:00:00");//数据是从07-14开始才有的，所以默认这个时间点
+                $startTime = $startTime ? $startTime + 1 : strtotime("2024-07-15 10:00:00");//数据是从07-14开始才有的，所以默认这个时间点
                 $time_arr = time_to_today_end($startTime);
                 if (!empty($time_arr)) {
                     foreach ($time_arr as $k2 => $v2) {

@@ -29,7 +29,7 @@ class Index extends Api
      * Depart模型对象
      * @var \app\admin\model\inspection\Depart
      */
-    protected $noNeedLogin = ["index_yqlist","getEquipmentList", "getwerther", "alarm_monitoring", "index_yqlistv2", "index_swlist", "reservoirTypes", "projectlist"];
+    protected $noNeedLogin = ["index_yqlist","selectflow","getEquipmentList", "getwerther", "alarm_monitoring", "index_yqlistv2", "index_swlist", "reservoirTypes", "projectlist"];
     protected $noNeedRight = ['*'];
     protected $model = null;
 
@@ -968,4 +968,29 @@ class Index extends Api
         $data = json_decode($data, true);
         return $data;
     }
+
+    /**
+     * 流量计查询
+     * @return void
+     */
+    public function selectflow(){
+        $res=Db::name("reservoir_equipment")
+            ->where("type",1)
+            ->select();
+        $returndata=[];
+        foreach ($res as $k=>$v){
+            $resflow=Db::name("reservoir_flow")
+                ->where("number",$res[$k]['apiKey'])
+                ->order("id desc")
+                ->find();
+            $returndata[$k]=[
+                "id"=>$res[$k]['id'],
+                "name"=>$res[$k]['name'],
+                "number"=>$res[$k]['apiKey'],
+                "instantaneous_value"=>$resflow['instantaneous_value'],
+                "cumulative_value"=>$resflow['cumulative_value'],
+            ];
+        }
+        print_r($returndata);
+    }
 }