Merge branch 'develos'

app/Http/Controllers/Auth/ZehongTcpController.php

@@ -42,9 +42,12 @@ class  ZehongTcpController extends Controller
                 if($totcp['nd'] < 999 ){
                     $totcp['nd'] = '0' . $totcp['nd'];
                 }
+                if($totcp['nd'] < 99 ){
+                    $totcp['nd'] = '0' . $totcp['nd'];
+                }
                 $totcpdata = $totcp['devicenum'] .$totcp['devicepolice'] .$totcp['nd']  . $totcp['shutoff_status'] . $devicechongqi . $devicezijian;
                 $crcdata = $this->getPrc($totcpdata);
-                return $totcpdata . $crcdata;
+                return $totcpdata .$crcdata ;
             }
         } else {
             return "数据格式错误";
@@ -97,7 +100,7 @@ class  ZehongTcpController extends Controller
             if ($todata){
                 return json_encode($todata);
             }else{
-                return "暂无设备";
+                return json_encode("暂无设备");
             }
 
         }