海康接口修改

zxl

2025-04-27 ccba712602ff6eafe0928d79b6d595c140e924af

海康接口修改

 ycl-server/src/main/java/com/ycl/feign/HKLabelName.java

@@ -7,21 +7,31 @@

@Getter
public enum HKLabelName {
    faceButtStability2023("faceButtStability2023","人脸视图库对接稳定性"),
    faceDelay("faceDelay","设备抓拍人脸数据上传及时性"),
    faceClockAccuracy("faceClockAccuracy","人脸设备抓拍图片时钟准确性"),
    faceOnlineRate("faceOnlineRate","人脸点位在线率"),
    faceCapturedPicturesEligibility("faceCapturedPicturesEligibility","人脸设备抓拍图片合格性"),
    faceBigPictureAccess("faceBigPictureAccess","人脸卡口设备抓拍数据大图可用性"),
    carBigPictureAccess("carBigPictureAccess", "车辆卡口设备抓拍数据大图可用性"),
    carButtStability2023("carButtStability2023", "车辆视图库对接稳定性"),
    carClockAccuracy("carClockAccuracy", "车辆卡口设备时钟准确性"),
    carCorrectRate("carCorrectRate", "车辆卡口设备抓拍数据准确性"),

    carDelay("carDelay","车辆卡口设备抓拍数据上传及时性"),
    carOnlineRate2023("carOnlineRate2023","车辆点位在线率"),
    carButtStability2023("carButtStability2023","车辆视图库对接稳定性"),
    carBigPictureAccess("carBigPictureAccess","车辆卡口设备抓拍数据大图可用性"),
    carCorrectRate("carCorrectRate","车辆卡口设备抓拍数据准确性"),
    carClockAccuracy("carClockAccuracy","车辆卡口设备时钟准确性"),
    carQualifiedRate("carQualifiedRate","车辆卡口设备抓拍数据完整性"),
    carUrlOkRate("carUrlOkRate","车辆卡口设备url可用性");

    carDelay("carDelay", "车辆卡口设备抓拍数据上传及时性"),
    carOnlineRate2023("carOnlineRate2023", "车辆点位在线率"),
    carQualifiedRate("carQualifiedRate", "车辆卡口设备抓拍数据完整性"),
    carUrlOkRate("carUrlOkRate", "车辆卡口设备url可用性"),


    faceBigPictureAccess("faceBigPictureAccess", "人脸卡口设备抓拍数据大图可用性"),


    faceButtStability2023("faceButtStability2023", "人脸视图库对接稳定性"),


    faceCapturedPicturesEligibility("faceCapturedPicturesEligibility", "人脸设备抓拍图片合格性"),
    faceClockAccuracy("faceClockAccuracy", "人脸设备抓拍图片时钟准确性"),

    faceDelay("faceDelay", "设备抓拍人脸数据上传及时性"),

    faceOnlineRate("faceOnlineRate", "人脸点位在线率"),
    ;


    @EnumValue // 标明该字段存入数据库

 ycl-server/src/main/java/com/ycl/feign/HKResultLabel.java

@@ -13,10 +13,10 @@
    //是否是默认标签 1是 0否
    private Integer isDefault;
    //改标签关联的考核指标项
    private List<String> relatedIndex;
    private String relatedIndex;

    //关联指标的大类
    private List<String> relatedIndexCategory;
    private String relatedIndexCategory;

    //是否自动考核 1为自动 0为手动
    private Integer isAuto;

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

@@ -191,18 +191,30 @@

    private List<CheckScore> getCheckScores(Map.Entry<Long, List<CheckScore>> entry) {
        List<CheckScore> tempList = new ArrayList<>(); // 临时存储需要添加的元素
        for (CheckScore listCheckScore : entry.getValue()) {
            if (listCheckScore.getExamineCategory() == 1 && entry.getValue().size() == 1) {
                CheckScore face = new CheckScore();
                face.setExamineCategory((short) 2);
                face.setScore(new BigDecimal("0.0"));
                CheckScore car = new CheckScore();
                car.setExamineCategory((short) 3);
                car.setScore(new BigDecimal("0.0"));
                tempList.add(face);
                tempList.add(car);

        boolean hasFace = false;
        boolean hasCar = false;
        for (int i =0;i <entry.getValue().size();i++) {
            CheckScore checkScore = entry.getValue().get(i);
            if (checkScore.getExamineCategory() == 2){
                hasCar = true;
            }else if (checkScore.getExamineCategory() == 3){
                hasFace = true;
            }
        }
        if (!hasCar){
            CheckScore car = new CheckScore();
            car.setExamineCategory((short) 2);
            car.setScore(new BigDecimal("0.0"));
            tempList.add(car);
        }
        if (!hasFace){
            CheckScore face = new CheckScore();
            face.setExamineCategory((short) 3);
            face.setScore(new BigDecimal("0.0"));
            tempList.add(face);
        }

        return tempList;
    }


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

@@ -78,10 +78,6 @@
    private ICheckIndexFaceService faceService;
    @Autowired
    private CheckIndexFaceMapper faceMapper;
    @Autowired
    private StringHttpMessageConverter stringHttpMessageConverter;
    @Autowired
    private LoadBalancerRequestFactory loadBalancerRequestFactory;

    //车辆设备全检指标监测结果
    public void vehicleDeviceInspectionTask() {
@@ -602,6 +598,7 @@
            String code = labelJson.getString("code");
            if (ApiConstants.HKSuccessCode.equals(code)){
                //获得label考核标签对象
                log.error("labelJson的data:{}",labelJson.get("data"));
                List<HKResultLabel> hkResultLabels = labelJson.getList("data",HKResultLabel.class);
                for (HKResultLabel label : hkResultLabels) {
                    if ("省厅人脸".equals(label.getLabelName())){
@@ -664,6 +661,7 @@
                    //这一层为获得 data -> 中 批次数组中 -> 区域code数组的key
                    for (String areaCodeKey : map.get(id).keySet()) {
                        //存放最新批次的内容到allInfo集合中
                        log.error("打印区信息:{}",map.get(id).get(areaCodeKey));
                        allInfo.addAll(map.get(id).getList(areaCodeKey,HkResultInfo.class));
                    }
                }
@@ -671,8 +669,8 @@
                Map<String, List<HkResultInfo>> groupedByAreaName = allInfo.stream()
                        .collect(Collectors.groupingBy(HkResultInfo::getAreaCode));
                for (Map.Entry<String, List<HkResultInfo>> entry : groupedByAreaName.entrySet()) {
                    log.error("最新批次内数据:{}",groupedByAreaName.get(entry.getKey()).size());
                    log.error("最新批次内size:{}",groupedByAreaName.get(entry.getKey()));
                    log.error("最新批次内size:{}",groupedByAreaName.get(entry.getKey()).size());
                    log.error("最新批次内数据:{}",groupedByAreaName.get(entry.getKey()));
                    CheckIndexCar car = new CheckIndexCar();
                    CheckIndexFace face = new CheckIndexFace();
                    score3Index(groupedByAreaName.get(entry.getKey()), car, face,entry.getKey());
@@ -703,9 +701,10 @@
        List<HkResultInfo> provincialList = new ArrayList<>();
        //获取省厅人脸数据
        if (faceLabelId != null){
            ScoreParam faceParam = new ScoreParam();
            log.error("faceLabelId:{}",faceLabelId);
            param.setLabelId(faceLabelId);
            JSONObject faceJson = hkClient.getScoreNew(param);
            faceParam.setLabelId(faceLabelId);
            JSONObject faceJson = hkClient.getScoreNew(faceParam);
            log.error("省厅人脸数据");
            if (faceJson != null) {
                String code = scoreJson.getString("code");
@@ -744,9 +743,10 @@
        }
        //获取省厅车辆数据v.
        if (carLabelId != null){
            ScoreParam carParam = new ScoreParam();
            log.error("carLabelId:{}",carLabelId);
            param.setLabelId(carLabelId);
            JSONObject carJson = hkClient.getScoreNew(param);
            carParam.setLabelId(carLabelId);
            JSONObject carJson = hkClient.getScoreNew(carParam);
            log.error("省厅车辆数据");
            if (carJson != null) {
                String code = scoreJson.getString("code");

 ycl-server/src/main/java/com/ycl/thread/OnlineCheckThread.java

@@ -65,6 +65,7 @@
        TMonitorResult result = checkPointUtil.check(monitor,times);
        if (result.getPingOnline()){
            result.setPingOnlineStr("1");

        }else {
            result.setPingOnlineStr("-1");
        }