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

common/src/main/java/com/jpsoft/smart/modules/common/utils/POIUtils.java

@@ -408,11 +408,11 @@ public class POIUtils {
                 if (cell != null && StringUtils.isNotEmpty(cell.getStringCellValue())) {
                     Row dataRow2 = destSheet.createRow(destRowIndex);
 
-                    for (int i = 0; i < dataRow1.getLastCellNum(); i++) {
+                    int lastCellNum = Math.min(dataRow1.getLastCellNum(),100);
+
+                    for (int i = 0; i < lastCellNum; i++) {
                         if (dataRow1.getCell(i) != null) {
                             dataRow2.createCell(i).setCellValue((String) getCellValue(0, srcRowIndex, i));
-                        } else {
-                            break;
                         }
                     }
 

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

@@ -169,6 +169,7 @@ public class PersonInfoController {
         try {
             personInfo.setUpdateBy(subject);
             personInfo.setUpdateTime(new Date());
+            personInfo.setFaceBound(false);
 
             int affectCount = personInfoService.update(personInfo);
 
@@ -355,7 +356,7 @@ public class PersonInfoController {
             @ApiImplicitParam(name = "position3",value = "三级位置", required = false, paramType = "form",dataType = "String"),
             @ApiImplicitParam(name = "position4",value = "四级位置", required = false, paramType = "form",dataType = "String"),
             @ApiImplicitParam(name = "position5",value = "五级位置", required = false, paramType = "form",dataType = "String"),
-            @ApiImplicitParam(name = "faceBound",value = "五级位置", required = false, paramType = "form",dataType = "String")
+            @ApiImplicitParam(name = "faceBound",value = "是否同步", required = false, paramType = "form",dataType = "String")
     })
     public MessageResult<Map> pageList(
             @RequestParam(value="name",defaultValue="") String name,
@@ -369,7 +370,7 @@ public class PersonInfoController {
             @RequestParam(value="position5",defaultValue="") String position5,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            @RequestParam(value="faceBound",defaultValue="=") String faceBound,
+            @RequestParam(value="faceBound",defaultValue="") String faceBound,
             @RequestAttribute String subject){
 
         //当前用户ID
@@ -960,6 +961,7 @@ public class PersonInfoController {
     @PostMapping("dataSync")
     public MessageResult<String> dataSync(@RequestBody List<String> ids){
         MessageResult<String> msgResult = new MessageResult<>();
+        msgResult.setResult(true);
 
         try {
             for(String id : ids){
@@ -977,10 +979,11 @@ public class PersonInfoController {
                     LapiMsgResult lapiMsgResult = msgResultList.get(i);
 
                     if (lapiMsgResult.isSuccess()){
-                        sb.append("【" + personInfo.getName() + "】" + lapiMsgResult.getAliasName() + "绑定人脸信息成功!");
+//                        sb.append("【" + personInfo.getName() + "】" + lapiMsgResult.getAliasName() + "绑定人脸信息成功!");
                     }
                     else{
                         sb.append("【" + personInfo.getName() + "】" + lapiMsgResult.getAliasName() + "绑定人脸信息失败!" + lapiMsgResult.getMsg());
+                        msgResult.setResult(false);
                     }
 
                     if (i!=msgResultList.size()-1){
@@ -998,7 +1001,7 @@ public class PersonInfoController {
                 personInfo.setUpdateTime(new Date());
                 personInfoService.update(personInfo);
 
-                msgResult.setResult(true);
+                msgResult.setMessage(sb.toString());
             }
         }
         catch(Exception ex){
@@ -1012,7 +1015,8 @@ public class PersonInfoController {
     }
 
     @ApiOperation(value="删除设备人员图片")
-    private Boolean deleteDevicePerson(Long  personId){
+    private MessageResult deleteDevicePerson(Long  personId){
+        MessageResult msgResult = new MessageResult();
         boolean success = true;
 
         try {
@@ -1036,11 +1040,16 @@ public class PersonInfoController {
                 }
 
                 success &= lapiMsgResult.isSuccess();
+
+                msgResult.setResult(true);
+                msgResult.setMessage(sb.toString());
             }
         }catch(Exception ex) {
             logger.error(ex.getMessage(), ex);
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
         }
 
-        return success;
+        return msgResult;
     }
 }