M墨鱼—_mo %!s(int64=5) %!d(string=hai) anos
pai
achega
8bb0e1a228

+ 6 - 6
common/src/main/java/com/jpsoft/smart/modules/lapi/service/impl/LapiServiceImpl.java

@@ -148,7 +148,7 @@ public class LapiServiceImpl implements ILapiService {
                     HashMap<String,Object> dataMap = new HashMap<>();
                     dataMap.put("deviceId",deviceInfo.getId());
                     dataMap.put("deviceAliasName",deviceInfo.getAliasName());
-                    dataMap.put("persoName",personInfo.getName());
+                    dataMap.put("personName",personInfo.getName());
                     LapiResult lapiResult = new LapiResult();
                     if (success){
                         lapiResult.setMsg("绑定成功");
@@ -168,10 +168,10 @@ public class LapiServiceImpl implements ILapiService {
                 HashMap<String,Object> dataMap = new HashMap<>();
                 dataMap.put("deviceId",deviceInfo.getId());
                 dataMap.put("deviceAliasName",deviceInfo.getAliasName());
-                dataMap.put("persoName",personInfo.getName());
+                dataMap.put("personName",personInfo.getName());
                 LapiResult lapiResult = new LapiResult();
                 lapiResult.setSuccess(false);
-                lapiResult.setMsg(e.getMessage().contains("time out")?"设备连接超时":e.getMessage());
+                lapiResult.setMsg(e.getMessage().contains("timed out")?"设备连接超时":e.getMessage());
                 lapiResult.setData(dataMap);
                 lapiResultList.add(lapiResult);
             }
@@ -248,7 +248,7 @@ public class LapiServiceImpl implements ILapiService {
                         HashMap<String,Object> dataMap = new HashMap<>();
                         dataMap.put("deviceId",deviceInfo.getId());
                         dataMap.put("deviceAliasName",deviceInfo.getAliasName());
-                        dataMap.put("persoName",personInfo.getName());
+                        dataMap.put("personName",personInfo.getName());
                         LapiResult lapiResult = new LapiResult();
                         if (success){
                             lapiResult.setMsg("绑定成功");
@@ -271,10 +271,10 @@ public class LapiServiceImpl implements ILapiService {
                     HashMap<String,Object> dataMap = new HashMap<>();
                     dataMap.put("deviceId",deviceInfo.getId());
                     dataMap.put("deviceAliasName",deviceInfo.getAliasName());
-                    dataMap.put("persoName",personInfo.getName());
+                    dataMap.put("personName",personInfo.getName());
                     LapiResult lapiResult = new LapiResult();
                     lapiResult.setSuccess(false);
-                    lapiResult.setMsg(e.getMessage().contains("time out")?"设备连接超时":e.getMessage());
+                    lapiResult.setMsg(e.getMessage().contains("timed out")?"设备连接超时":e.getMessage());
                     lapiResult.setData(dataMap);
                     lapiResultList.add(lapiResult);
                 }