Преглед изворни кода

1.修改api增加timeout。

zhengqiang пре 5 година
родитељ
комит
5978f85ae8

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

@@ -122,8 +122,6 @@ public class LapiServiceImpl implements ILapiService {
             map3.put("FaceID", personInfo.getId());
             map3.put("Name", personInfo.getId() + ".jpg");
 
-
-
             map3.put("Size", base64Data.length());
             map3.put("Data", base64Data);
             List listMap3 = new ArrayList();
@@ -133,10 +131,9 @@ public class LapiServiceImpl implements ILapiService {
             listMap1.add(map1);
             map.put("PersonInfoList", listMap1);
 
-
-            String faceDbId = getFaceDbId(deviceInfo, companyInfo.getName());
             try {
                 //获取人员人脸库id
+                String faceDbId = getFaceDbId(deviceInfo, companyInfo.getName());
 
                 JSONObject jsonObject = LApiUtil.PostRequest(deviceInfo.getIpAddress() + ":" + deviceInfo.getPort() + LApiConstant.ADDPERSON + faceDbId + "/People", map);
                 JSONObject dataJson = jsonObject.getJSONObject("Response");
@@ -148,9 +145,7 @@ public class LapiServiceImpl implements ILapiService {
                     lapiMsgResult.setAliasName(deviceInfo.getAliasName());
                     lapiMsgResults.add(lapiMsgResult);
                 }
-
             } catch (Exception e) {
-
                 log.error(e.getMessage());
                 LapiMsgResult lapiMsgResult = new LapiMsgResult();
                 lapiMsgResult.setPersonName(personInfo.getName());
@@ -158,12 +153,9 @@ public class LapiServiceImpl implements ILapiService {
                 lapiMsgResult.setMsg(e.getMessage());
                 lapiMsgResult.setAliasName(deviceInfo.getAliasName());
                 lapiMsgResults.add(lapiMsgResult);
-
             }
-
         }
 
-
         return lapiMsgResults;
     }
 

+ 15 - 0
web/src/main/java/com/jpsoft/smart/modules/base/controller/PersonInfoController.java

@@ -1086,6 +1086,7 @@ public class PersonInfoController {
 
         try {
             List<LapiMsgResult> msgResultList = lapiService.addPerson(personInfo.getId());
+
             for (int i = 0; i < msgResultList.size(); i++) {
                 LapiMsgResult lapiMsgResult = msgResultList.get(i);
 
@@ -1106,6 +1107,20 @@ public class PersonInfoController {
         }catch(Exception ex) {
             logger.error(ex.getMessage(), ex);
             bl = false;
+
+            HSSFRow row = sheet.createRow(sheet.getLastRowNum() + 1);
+
+            HSSFCell cell1 = row.createCell(0);
+            cell1.setCellValue(personInfo.getName());
+
+            HSSFCell cell2 = row.createCell(1);
+            cell2.setCellValue("");
+
+            HSSFCell cell3 = row.createCell(2);
+            cell3.setCellValue("");
+
+            HSSFCell cell4 = row.createCell(3);
+            cell4.setCellValue(ex.getMessage());
         }
 
         return bl;