人体检测-完善查询接口

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinApiCameraDevicesVo.java

 package com.liquidnet.service.kylin.dto.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.entity.KylinCamera;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -35,9 +37,11 @@ public class KylinApiCameraDevicesVo implements Serializable {
     private String status;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime createdAt;
 
     @ApiModelProperty(value = "修改时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime updatedAt;
 
     @ApiModelProperty(value = "检测到的人数")

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinCameraServiceImpl.java

@@ -3,9 +3,11 @@ package com.liquidnet.service.kylin.service.impl;
 import com.liquidnet.service.kylin.dto.vo.KylinApiCameraDevicesVo;
 import com.liquidnet.service.kylin.service.IKylinCameraService;
 import com.liquidnet.service.kylin.utils.DataUtils;
+import com.liquidnet.service.kylin.utils.ObjectUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -25,6 +27,17 @@ public class KylinCameraServiceImpl implements IKylinCameraService {
     @Override
     public List<KylinApiCameraDevicesVo> cameraList(String fieldId, Integer siteType) {
         List<KylinApiCameraDevicesVo> list = dataUtils.getCameraDevices(fieldId);
+        ArrayList<KylinApiCameraDevicesVo> devicesVoArrayList = ObjectUtil.getKylinApiCameraDevicesVoArrayList();
+        for (KylinApiCameraDevicesVo devicesVo : list) {
+            devicesVo.setPersonNum(dataUtils.getCameraDevicePersonNum(devicesVo.getCameraId()));
+            if (siteType > 0 && devicesVo.getSiteType() == siteType) {
+                devicesVoArrayList.add(devicesVo);
+            }
+        }
+        if (siteType > 0) {
+            return devicesVoArrayList;
+        } else {
             return list;
         }
+    }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java

@@ -861,4 +861,14 @@ public class DataUtils {
             return (List<KylinApiCameraDevicesVo>) obj;
         }
     }
+
+    public Integer getCameraDevicePersonNum(String cameraId) {
+        String redisKey = KylinRedisConst.CAMERA_DEVICES_PERSON_NUM.concat(cameraId);
+        Object obj = redisUtil.get(redisKey);
+        if (null == obj) {
+            return 0;
+        } else {
+            return (int) obj;
+        }
+    }
 }