人脸数据和设备同步逻辑修改

common/src/main/java/com/jpsoft/smart/modules/lapi/service/ILapiService.java

@@ -35,7 +35,7 @@ public interface ILapiService {
      * @return
      * @throws Exception
      */
-     List<LapiMsgResult> addPerson(Long id) throws Exception;
+     List<LapiResult> addPerson(Long id) throws Exception;
 
 
     /**

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

@@ -70,7 +70,7 @@ public class LapiServiceImpl implements ILapiService {
     }
 
     @Override
-    public List<LapiMsgResult> addPerson(Long id) throws Exception {
+    public List<LapiResult> addPerson(Long id) throws Exception {
 
         PersonInfo personInfo = personInfoService.get(id);
         if (personInfo == null) {
@@ -95,7 +95,7 @@ public class LapiServiceImpl implements ILapiService {
         if (base64Data.length() > 512 * 1024 || base64Data.length() < 10 * 1024) {
             throw new Exception("人员照片大小限定为10k~512k");
         }
-        List<LapiMsgResult> lapiMsgResults = new ArrayList<>();
+        List<LapiResult> lapiResultList = new ArrayList<>();
         for (DeviceInfo deviceInfo : deviceList) {
             HashMap<String, Object> map = new HashMap<>();
             map.put("Num", 1L);
@@ -139,24 +139,26 @@ public class LapiServiceImpl implements ILapiService {
                 JSONObject dataJson = jsonObject.getJSONObject("Response");
                 JSONObject response = LApiUtil.getResponse(dataJson);
                 if (dataJson.getInteger("ResponseCode") == 0 && dataJson.getInteger("StatusCode") == 0) {
-                    LapiMsgResult lapiMsgResult = new LapiMsgResult();
-                    lapiMsgResult.setPersonName(personInfo.getName());
-                    lapiMsgResult.setSuccess(true);
-                    lapiMsgResult.setAliasName(deviceInfo.getAliasName());
-                    lapiMsgResults.add(lapiMsgResult);
+                    HashMap<String,Object> dataMap = new HashMap<>();
+                    dataMap.put("deviceId",deviceInfo.getId());
+                    dataMap.put("deviceAliasName",deviceInfo.getAliasName());
+                    LapiResult lapiResult = new LapiResult();
+                    lapiResult.setMsg("绑定成功");
+                    lapiResult.setSuccess(true);
+                    lapiResult.setData(dataMap);
+                    lapiResultList.add(lapiResult);
                 }
             } catch (Exception e) {
                 log.error(e.getMessage());
-                LapiMsgResult lapiMsgResult = new LapiMsgResult();
-                lapiMsgResult.setPersonName(personInfo.getName());
-                lapiMsgResult.setSuccess(false);
-                lapiMsgResult.setMsg(e.getMessage());
-                lapiMsgResult.setAliasName(deviceInfo.getAliasName());
-                lapiMsgResults.add(lapiMsgResult);
+                LapiResult lapiResult = new LapiResult();
+                lapiResult.setSuccess(false);
+                lapiResult.setMsg(e.getMessage());
+                lapiResult.setData("");
+                lapiResultList.add(lapiResult);
             }
         }
 
-        return lapiMsgResults;
+        return lapiResultList;
     }
 
     @Override