liu 1 年間 前
コミット
663539c742

+ 13 - 7
src/main/java/com/template/controller/HouseLockController.java

@@ -151,15 +151,21 @@ public class HouseLockController implements HouseLockControllerAPI {
         if (ObjectUtils.isEmpty(equipmentType)) {
             return CommonResult.fail("未绑定门锁设备");
         }
-        JSONObject particular = passwordIssController.particular(equipmentType);
-//        设备连接状态
-        String state = particular.getString("state");
+        try {
+            JSONObject particular = passwordIssController.particular(equipmentType);
+            //        设备连接状态
+            String state = particular.getString("state");
 //        电量
-        String battery = particular.getString("battery");
+            String battery = particular.getString("battery");
+
+            houseLock.setElectricQuantity(battery);
+            houseLock.setNetworkState(state);
+            houseLock.setEquipmentState(state);
+        }catch (Exception e){
+            return CommonResult.fail(e.getMessage());
+        }
+
 
-        houseLock.setElectricQuantity(battery);
-        houseLock.setNetworkState(state);
-        houseLock.setEquipmentState(state);
 
         houseLockService.updateById(houseLock);
 

+ 5 - 2
src/main/java/com/template/controller/PasswordIssController.java

@@ -166,12 +166,15 @@ public class PasswordIssController {
 
         try {
             JSONObject jsonObject = queryData(jsonContent, PasswordUrlEnum.Device_Info.getUrl());
+            String result = jsonObject.getString("result");
+            if (!"1".equals(result)) {
+                throw new RuntimeException(jsonObject.getString("message"));
+            }
             JSONObject data = jsonObject.getJSONObject("data");
             return data;
         } catch (Exception e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
         }
-        return null;
     }
 
     /**