Merge branch 'LD'

app/Http/Controllers/api/thirdPart/haiq/StorageController.php

@@ -243,17 +243,20 @@ class StorageController
         return $this->light($request,$this->lightOff);
     }
     public function taskUpdate(ForeignHaiRobotic_taskUpdateRequest $request){
-        $this->service->taskUpdate(
-            $request['groupCode'],
-            $request['taskCode'],
-            $request['updateEventType'],
-            $request['status'],
-            $request['binCode'],
-            $request['kubotId'],
-            $request['description']
-        );
-        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->all()));
-        return ['code'=>200,'errMsg'=>'','data'=>$request->all()];
+        try{
+            $this->service->taskUpdate(
+                $request['groupCode'],
+                $request['taskCode'],
+                $request['updateEventType'],
+                $request['status'],
+                $request['binCode'],
+                $request['kubotId'],
+                $request['description']
+            );
+            return ['code'=>200,'errMsg'=>'','data'=>$request->all()];
+        }catch (\Exception $e){
+            return ['code'=>$e->getCode(),'errMsg'=>$e->getMessage(),'data'=>$request->all()];
+        }
     }
     public function exception(Request $request){
         $this->service->throwException();

app/Services/ForeignHaiRoboticsService.php

@@ -110,8 +110,10 @@ class ForeignHaiRoboticsService
         $binCode,
         $robotId,
         $description
-    ){
-
+    ):bool{
+        if(false){
+            throw new \Exception('错误描述', '1111');
+        }
 
     }
     public function throwException(){