no message

api/application/controllers/Lampcontrol.php

@@ -1528,7 +1528,7 @@ class Lampcontrol extends Base_Controller {
             $res["updatetime"] = date_change($res["updatetime"],0,DEF_TIMEZONE);
             exit(json_result('0000', $this->response['0000'], $res));
         }elseif ($datatype == 'battery_info_log') {
-            $fields = "battstatus,batteryvoltage as battvoltage,chargecurrent,discharcurrent,chargepower,dischargepower,batttemper,electrictotal,electricSOC,voltagedaymin,voltagedaymax,daychargemaxpow,daydischarmaxpow,daychargemincurrent,daycharmaxcurrent,daydischargemincurrent,daydischarmaxcurrent,daybattmintemper,daybattmaxtemper,updatetime";
+            $fields = "battstatus,batteryvoltage as battvoltage,chargecurrent,lampcurrent as discharcurrent,chargepower,lamppower as dischargepower,batttemper,electrictotal,electricSOC,voltagedaymin,voltagedaymax,daychargemaxpow,daydischarmaxpow,daychargemincurrent,daycharmaxcurrent,daydischargemincurrent,daydischarmaxcurrent,daybattmintemper,daybattmaxtemper,updatetime";
             // $fields = "*";
 
             $res = $this->Lamp_model->get_one(['id'=>$lamp_id],$fields);
@@ -2070,9 +2070,11 @@ class Lampcontrol extends Base_Controller {
             }
             $list = $temp;
         }elseif ($type == 1) { // 蓄电池
-            $sql = 'select batvoltage as battvoltage,batcurrent as chargecurrent,chgtemper as batttemper,batpower as chargepower,updatetime from realtime_info_log where lampid = '.$lampId.' and updatetime >= "'.$beginDate.'" and updatetime <= "'.$endDate.'"';
+            $sql = 'select batvoltage as battvoltage,batcurrent as chargecurrent,chgtemper as batttemper,batpower as chargepower,updatetime,battstatus from realtime_info_log where lampid = '.$lampId.' and updatetime >= "'.$beginDate.'" and updatetime <= "'.$endDate.'"';
             $list = $this->db->query($sql)->result_array();
             $temp = [];
+            $data['maxcurrent'] = 0;
+            $data['mincurrent'] = 0;
             foreach ($list as $value) {
                 $temp['battvoltage'][] = $value['battvoltage'];
                 $temp['updatetime'][] = date_change($value['updatetime'],0,$timezone);
@@ -2082,16 +2084,23 @@ class Lampcontrol extends Base_Controller {
                 
                 $batterypower = $value['chargepower'];
                 $temp['batterypower'][] = $batterypower;
-                if (!isset($data['maxcurrent'])) {
-                    $data['maxcurrent'] = $batterycurrent;
-                }else{
-                    $data['maxcurrent'] = $batterycurrent > $data['maxcurrent'] ? $batterycurrent : $data['maxcurrent'];
-                }
-                if (!isset($data['mincurrent'])) {
-                    $data['mincurrent'] = $batterycurrent;
+                if ($value['battstatus'] == 2) {
+                    if (!isset($data['maxcurrent'])) {
+                        $data['maxcurrent'] = $batterycurrent;
+                    }else{
+                        $data['maxcurrent'] = $batterycurrent > $data['maxcurrent'] ? $batterycurrent : $data['maxcurrent'];
+                    }
+                }elseif ($value['battstatus'] == 1) {
+                    if (!isset($data['mincurrent'])) {
+                        $data['mincurrent'] = $batterycurrent;
+                    }else{
+                        $data['mincurrent'] = $batterycurrent > $data['mincurrent'] ? $batterycurrent : $data['mincurrent'];
+                    }
                 }else{
-                    $data['mincurrent'] = $batterycurrent < $data['mincurrent'] ? $batterycurrent : $data['mincurrent'];
+
                 }
+                
+                
                 if (!isset($data['maxvoltage'])) {
                     $data['maxvoltage'] = $value['battvoltage'];
                 }else{