（部级录像可用率，重点录像可用率，录像可用率）计算可用率bug修复，hk接口bug修复，

zxl

2025-05-13 7758b9a294a4f35c2d2c56beca0ad4dcdd610169

（部级录像可用率，重点录像可用率，录像可用率）计算可用率bug修复，hk接口bug修复，

 ycl-pojo/src/main/java/com/ycl/platform/domain/query/DataCenterQuery.java

@@ -55,4 +55,13 @@
        }
    }

    /**
     * 查询动态列数据id
     */
    private Integer DyId;
    /**
     * 查询动态列数据value 用于匹配值
     */
    private String DyValue;

}

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DynamicColumnVO.java

@@ -33,6 +33,10 @@

    /** value表的id */
    private Integer valueId;

    /** 字段的id*/
    private Integer labelId;

    public static DynamicColumnVO getVoByEntity(@NonNull DynamicColumn entity, DynamicColumnVO vo) {
        if(vo == null) {
            vo = new DynamicColumnVO();

 ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java

@@ -193,6 +193,12 @@
    }


    /**
     * 录像可用率导出
     * @param response
     * @param query
     * @throws IOException
     */
    @PostMapping("/recordingAvailability/export")
    public void recordingAvailabilityExport(HttpServletResponse response,DataCenterQuery query) throws IOException {
        query.setTime();

 ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java

@@ -77,14 +77,35 @@

    private static DecimalFormat DF = new DecimalFormat("#.####");



    public Map<String,List<DynamicColumnVO>> getDynamicByConditions(DataCenterQuery params,List<DynamicColumnVO> list){
        //获得到对应id，且包含传入字符串 动态列集合
        List<DynamicColumnVO> likeFieldDynamicColumnVOList = list.stream()
                .filter(dynamicColumnVO ->
                    dynamicColumnVO.getLabelId().equals(params.getDyId()) &&
                            dynamicColumnVO.getColumnValue().contains(params.getDyValue())
        ).collect(Collectors.toList());
        //获得满足条件的id集合
        List<String> ids = likeFieldDynamicColumnVOList.stream().map(DynamicColumnVO::getRefStringId).toList();
        Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = list.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId));
        Set<String> removeSet = new HashSet<>(ids);
        //移除掉不符合条件的key
        groupByRefStringIdMap.keySet().retainAll(removeSet);

        return groupByRefStringIdMap;
    }

    @Override
    public void recordingAvailabilityExport(HttpServletResponse response,DataCenterQuery params) throws IOException {

        List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
        Query query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
        //下拉框录像情况查询条件
        if (params.getOption() != null) {
            query.addCriteria(Criteria.where("recordStatus").is(params.getOption()));
        }
        MongoUtil.setNoPage(query, params, TIME_FIELD);
        List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
        //翻译行政区域
        resultList.forEach(item -> {
@@ -92,8 +113,19 @@
            AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(areaCode);
            if (areaDeptEnum != null) item.setArealayername(areaDeptEnum.getName());
        });
        //获得动态列数据
        List<DynamicColumnVO> dynamicColumnVOList = dynamicColumnMapper.getDynamicColumnByTableName(TableNameConstants.COLUMN_NAME_VIDEO);
        Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId));

        //判断是否有查询条件
        boolean conditions = false;
        Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = new HashMap<>();
        if (params.getDyId() != null && StringUtils.isNotEmpty(params.getDyValue())){
            conditions = true;
            //获得动态列集合中包含了的字符串值的集合 区分大小写
            groupByRefStringIdMap = getDynamicByConditions(params,dynamicColumnVOList);
        }else{
            groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId));
        }
        //固定表头
        LinkedHashSet<String> headers = new LinkedHashSet<>();
        headers.add(RecordingAvailabilityHeaders.arealayername);
@@ -115,21 +147,28 @@
            headersList.addAll(dynamicsHeaders);
            headers.addAll(headersList);
        }
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
        SimpleDateFormat dateFormat2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

//        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
        //查询到有动态列查询条件
        //获得对应动态列中ref的对象id 与 查询结果id过滤
        if (conditions){
            Map<String, List<DynamicColumnVO>> finalGroupByRefStringIdMap = groupByRefStringIdMap;
            resultList = resultList.stream()
                    .filter(obj -> finalGroupByRefStringIdMap.containsKey(obj.getId()))
                    .collect(Collectors.toList());
        }
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        List<List<Object>> data = new ArrayList<>();
        for (RecordMetaDSumResult result : resultList){
            List<Object> row = new ArrayList<>();
            row.add(result.getArealayername());
            row.add(result.getArealayerno());
            row.add(dateFormat2.format(result.getCreateTime()));
            row.add(dateFormat.format(result.getCreateTime()));
            row.add(result.getDeviceId());
            row.add(result.getMissDuration());
            row.add(result.getPlatId());
            row.add(result.getRecordDuration());
            row.add(result.getRecordStatusText());
            row.add(dateFormat2.format(result.getCreateTime()));
            row.add(dateFormat.format(result.getCreateTime()));
            //添加动态列数据
            for (String header : headersList){
                boolean flag = false;
@@ -201,8 +240,23 @@
                item.setOffLineTimeStr(offLineTime);
            }
        });



        List<DynamicColumnVO> dynamicColumnVOList = dynamicColumnMapper.getDynamicColumnByTableName(TableNameConstants.COLUMN_NAME_FACE_POINT);
        Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId));


        //判断是否有查询条件
        boolean conditions = false;
        Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = new HashMap<>();
        if (params.getDyId() != null && StringUtils.isNotEmpty(params.getDyValue())){
            conditions = true;
            //获得动态列集合中包含了的字符串值的集合 区分大小写
            groupByRefStringIdMap = getDynamicByConditions(params,dynamicColumnVOList);
        }else{
            groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId));
        }

        //固定表头
        LinkedHashSet<String> headers = new LinkedHashSet<>();
        headers.add(PointOnlineHeaders.no);
@@ -223,6 +277,13 @@
            //使用链表保证后续补充数据时获取数据顺序一致
            headersList.addAll(dynamicsHeaders);
            headers.addAll(headersList);
        }

        if (conditions){
            Map<String, List<DynamicColumnVO>> finalGroupByRefStringIdMap = groupByRefStringIdMap;
            resultList = resultList.stream()
                    .filter(obj -> finalGroupByRefStringIdMap.containsKey(obj.getNo()))
                    .collect(Collectors.toList());
        }

        List<List<Object>> data = new ArrayList<>();
@@ -313,7 +374,16 @@
            }
        });
        List<DynamicColumnVO> dynamicColumnVOList = dynamicColumnMapper.getDynamicColumnByTableName(TableNameConstants.COLUMN_NAME_VIDEO_POINT);
        Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId));
        //判断是否有查询条件
        boolean conditions = false;
        Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = new HashMap<>();
        if (params.getDyId() != null && StringUtils.isNotEmpty(params.getDyValue())){
            conditions = true;
            //获得动态列集合中包含了的字符串值的集合 区分大小写
            groupByRefStringIdMap = getDynamicByConditions(params,dynamicColumnVOList);
        }else{
            groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId));
        }
        //固定表头
        LinkedHashSet<String> headers = new LinkedHashSet<>();
        headers.add(PointOnlineHeaders.no);
@@ -334,6 +404,14 @@
            //使用链表保证后续补充数据时获取数据顺序一致
            headersList.addAll(dynamicsHeaders);
            headers.addAll(headersList);
        }


        if (conditions){
            Map<String, List<DynamicColumnVO>> finalGroupByRefStringIdMap = groupByRefStringIdMap;
            resultList = resultList.stream()
                    .filter(obj -> finalGroupByRefStringIdMap.containsKey(obj.getNo()))
                    .collect(Collectors.toList());
        }

        List<List<Object>> data = new ArrayList<>();
@@ -428,7 +506,16 @@
            }
        });
        List<DynamicColumnVO> dynamicColumnVOList = dynamicColumnMapper.getDynamicColumnByTableName(TableNameConstants.COLUMN_NAME_CAR_POINT);
        Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId));
        //判断是否有查询条件
        boolean conditions = false;
        Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = new HashMap<>();
        if (params.getDyId() != null && StringUtils.isNotEmpty(params.getDyValue())){
            conditions = true;
            //获得动态列集合中包含了的字符串值的集合 区分大小写
            groupByRefStringIdMap = getDynamicByConditions(params,dynamicColumnVOList);
        }else{
            groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId));
        }
        //固定表头
        LinkedHashSet<String> headers = new LinkedHashSet<>();
        headers.add(PointOnlineHeaders.no);
@@ -449,6 +536,14 @@
            //使用链表保证后续补充数据时获取数据顺序一致
            headersList.addAll(dynamicsHeaders);
            headers.addAll(headersList);
        }


        if (conditions){
            Map<String, List<DynamicColumnVO>> finalGroupByRefStringIdMap = groupByRefStringIdMap;
            resultList = resultList.stream()
                    .filter(obj -> finalGroupByRefStringIdMap.containsKey(obj.getNo()))
                    .collect(Collectors.toList());
        }

        List<List<Object>> data = new ArrayList<>();
@@ -1284,9 +1379,6 @@
     */
    @Override
    public Result videoAvailabilityRate(DataCenterQuery params) {




        List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
        Query query = MongoUtil.getQuery(params, "createTime", likeFileds, null);

 ycl-server/src/main/java/com/ycl/task/HKTask.java

@@ -592,6 +592,7 @@
        JSONObject labelJson = hkClient.getGetLabel();
        Integer faceLabelId = null;
        Integer carLabelId = null;
        Integer allLabelId = null;
        if (labelJson != null) {
            String code = labelJson.getString("code");
            if (ApiConstants.HKSuccessCode.equals(code)){
@@ -603,6 +604,8 @@
                        faceLabelId = label.getId();
                    }else if ("省厅车辆".equals(label.getLabelName())){
                        carLabelId = label.getId();
                    }else if ("全量".equals(label.getLabelName())){
                        allLabelId = label.getId();
                    }
                }
                log.error("打印hkResultLabels：{}",hkResultLabels);
@@ -632,6 +635,10 @@
//        param.setLabelId();

        //------------默认参数为null请求全量数据
        if (allLabelId == null){
            allLabelId = -1;
        }
        param.setLabelId(allLabelId);
        JSONObject scoreJson = hkClient.getScoreNew(param);
        log.error("全量数据");
        if (scoreJson != null) {
@@ -687,7 +694,6 @@
                    cars.add(car);
                    faces.add(face);
                }
                //请求省厅数据
            }else {
                log.error("调用海康全量数据api失败");
            }

 ycl-server/src/main/resources/mapper/zgyw/DynamicColumnMapper.xml

@@ -98,6 +98,7 @@
        <result column="column_value" property="columnValue"/>
        <result column="ref_string_id" property="refStringId"/>
        <result column="value_id" property="valueId"/>
        <result column="label_id" property="labelId"/>
    </resultMap>

    <select id="getDynamicColumnByTable" resultMap="dynamicColumnMap">
@@ -111,7 +112,12 @@
    </select>

    <select id="getDynamicColumnByTableName" resultMap="dynamicColumnMap">
        select *,dcv.id as value_id
        select *,
               dc.prop_name,
               dc.label_value,
               dcv.column_value,
               dcv.ref_string_id,
               dcv.dynamic_column_id as label_id
        from  t_dynamic_column_value dcv
        left join t_dynamic_column dc
        on dc.id = dcv.dynamic_column_id