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

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

@@ -175,9 +175,7 @@ public class LapiServiceImpl implements ILapiService {
         PersonInfo personInfo = personInfoService.get(id);
         CompanyInfo companyInfo = companyInfoService.get(personInfo.getCompanyId());
         String base64Data = OSSUtil.downloadToBase64(personInfo.getFaceImageUrl());
-        if (base64Data.length() > 512 * 1024 || base64Data.length() < 10 * 1024) {
-            throw new Exception("人员照片大小限定为10k~512k");
-        }
+
         List<String> deviceIdList = Arrays.asList(deviceIds.split(","));
         List<LapiMsgResult> lapiMsgResults = new ArrayList<>();
 
@@ -218,6 +216,9 @@ public class LapiServiceImpl implements ILapiService {
                     listMap1.add(map1);
                     map.put("PersonInfoList", listMap1);
 
+                    if (base64Data.length() > 512 * 1024 || base64Data.length() < 10 * 1024) {
+                        throw new Exception("人员照片大小限定为10k~512k");
+                    }
                     //获取人员人脸库id
                     String faceDbId = getFaceDbId(deviceInfo, companyInfo.getName());
 

web/src/main/java/com/jpsoft/smart/modules/base/controller/PersonDeviceRelationController.java

@@ -313,8 +313,8 @@ public class PersonDeviceRelationController {
                     msgResult.setData(affectCount);
                 }
             } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("有0个人员与设备绑定成功！");
+                msgResult.setResult(true);
+                //msgResult.setMessage("有0个人员与设备绑定成功！");
             }
         }
         catch(Exception ex){