Merge remote-tracking branch 'origin/V1' into V1

common/src/main/java/com/jpsoft/smart/modules/lapi/request/LapiRequest.java

@@ -35,7 +35,8 @@ public class LapiRequest {
 
         if (lapiChannel==null){
             log.error(deviceNo + "不在线!");
-            return null;
+            throw new Exception("设备不在线");
+     //       return null;
         }
 
         String msg = "";
@@ -95,7 +96,8 @@ public class LapiRequest {
             return jsonObject;
         }
         else{
-            return null;
+            throw new Exception("设备不在线");
+        //    return null;
         }
     }
 }