人员出入管理修改

securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/AccessMgeDto.java

@@ -41,4 +41,7 @@ public class AccessMgeDto {
 
     @ApiModelProperty(value = "检测名称")
     private String modeName;
+
+    @ApiModelProperty(value = "文件id")
+    private String fileIds;
 }

securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/AccessMgeController.java

@@ -144,6 +144,12 @@ public class AccessMgeController extends BaseController {
         return service.getPerStatisticsPhoto(dto);
     }
 
+    @ApiOperation(value = "今日、当月人员出入场统计图片")
+    @GetMapping("getPhotosById")
+    public AjaxResult getPhotosById(AccessMgeDto dto) {
+        return service.getPhotosById(dto);
+    }
+
     @ApiOperation(value = "今日、当月人员出入场统计列表")
     @GetMapping("getPerStatisticsList")
     @Log(title = "出入管理", menu = "出入管理->今日、当月人员出入场统计列表", grade = OperationType.QUERY_BUSINESS, details = "查询今日、当月人员出入场统计列表", type = "业务日志")

securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/AccessMgeService.java

@@ -53,4 +53,6 @@ public interface AccessMgeService {
      * @return
      */
     List<AccessMgeVo> getPerStatisticsList(AccessMgeDto dto);
+
+    AjaxResult getPhotosById(AccessMgeDto dto);
 }

securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AccessMgeServiceImpl.java

@@ -98,6 +98,7 @@ public class AccessMgeServiceImpl implements AccessMgeService {
                 for (int i = 0; i < list.size(); i++) {
                     AccessMgeVo vo = list.get(i);
                     if (StringUtils.isNotEmpty(vo.getVal())) {
+                        if (i <= 9) {
                             Result<SysFile> result = remoteFileService.getImgBase64(vo.getVal(), SecurityConstants.INNER);
                             if (result != null && result.getCode() == HttpStatus.SUCCESS && result.getData() != null) {
                                 String jsonString = JSON.toJSONString(result.getData());
@@ -105,6 +106,7 @@ public class AccessMgeServiceImpl implements AccessMgeService {
                                 String base64 = item.getString("url");
                                 vo.setBase64(base64);
                             }
+                        }
                         vo.setPersonName(handleData(vo.getSourceData(), "personName"));
                     }
                     if (i == 0 || i == 1) {
@@ -143,8 +145,28 @@ public class AccessMgeServiceImpl implements AccessMgeService {
         return list;
     }
 
+    @Override
+    public AjaxResult getPhotosById(AccessMgeDto dto) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        String[] fileIdArr = dto.getFileIds().split(",");
+        for (String fileId : fileIdArr) {
+            Result<SysFile> result = remoteFileService.getImgBase64(fileId, SecurityConstants.INNER);
+            if (result != null && result.getCode() == HttpStatus.SUCCESS && result.getData() != null) {
+                String jsonString = JSON.toJSONString(result.getData());
+                JSONObject item = JSON.parseObject(jsonString);
+                String base64 = item.getString("url");
+                Map<String, Object> mapData = new HashMap<>();
+                mapData.put("fileId",fileId);
+                mapData.put("base64",base64);
+                list.add(mapData);
+            }
+        }
+        return AjaxResult.success(list);
+    }
+
     /**
      * 人员/车辆 出入场记录
+     *
      * @return List<AccessMgeVo>
      * @description
      * @author cwchen