xiangpei
2024-08-12 68e4f49cf09a133defc646f10654bbb3fe6ab487
海康接口调整
4个文件已修改
72 ■■■■ 已修改文件
ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/DataCenterService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/task/HKTask.java 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
@@ -47,7 +47,7 @@
     */
    @GetMapping("/videoPointOnlineRate")
    public Result videoPointOnlineRate(DataCenterQuery query) {
        return Result.ok().data(dataCenterService.videoPointOnlineRate(query));
        return dataCenterService.videoPointOnlineRate(query);
    }
    /**
@@ -58,7 +58,7 @@
     */
    @GetMapping("/videoOneMachineDocumentRegister")
    public Result videoOneMachineDocumentRegister(DataCenterQuery query) {
        return Result.ok().data(dataCenterService.videoOneMachineDocumentRegister(query));
        return dataCenterService.videoOneMachineDocumentRegister(query);
    }
    /**
ycl-server/src/main/java/com/ycl/platform/service/DataCenterService.java
@@ -4,6 +4,7 @@
import com.ycl.platform.domain.result.HK.*;
import com.ycl.platform.domain.result.UY.OneMachineFileResult;
import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
import com.ycl.system.Result;
import java.util.List;
@@ -22,7 +23,7 @@
     * @return
     */
    // TODO 返回数据对象更换
    List<OneMachineFileResult> videoPointOnlineRate(DataCenterQuery query);
    Result videoPointOnlineRate(DataCenterQuery query);
    /**
     * 视频:一机一档注册率
@@ -30,7 +31,7 @@
     * @param query
     * @return
     */
    List<OneMachineFileResult> videoOneMachineDocumentRegister(DataCenterQuery query);
    Result videoOneMachineDocumentRegister(DataCenterQuery query);
    /**
     * 视频:一机一档合格率
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
@@ -4,14 +4,15 @@
import com.ycl.platform.domain.result.HK.*;
import com.ycl.platform.domain.result.UY.OneMachineFileResult;
import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
import com.ycl.platform.domain.result.UY.VideoOnlineResult;
import com.ycl.platform.service.DataCenterService;
import com.ycl.system.Result;
import com.ycl.utils.MongoUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.TextCriteria;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -38,7 +39,7 @@
     * @return
     */
    @Override
    public List<OneMachineFileResult> videoPointOnlineRate(DataCenterQuery params) {
    public Result videoPointOnlineRate(DataCenterQuery params) {
        Query query = new Query();
        // 全文索引查询
        MongoUtil.fullText(query, params.getKeyword());
@@ -51,8 +52,9 @@
        }
        query.addCriteria(criteria);
        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
        List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
        return resultList;
        List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
        long total = mongoTemplate.count(query, VideoOnlineResult.class);
        return Result.ok().data(resultList).total(total);
    }
    /**
@@ -62,7 +64,7 @@
     * @return
     */
    @Override
    public List<OneMachineFileResult> videoOneMachineDocumentRegister(DataCenterQuery params) {
    public Result videoOneMachineDocumentRegister(DataCenterQuery params) {
        Query query = new Query();
        // 全文索引查询
        MongoUtil.fullText(query, params.getKeyword());
@@ -76,7 +78,8 @@
        query.addCriteria(criteria);
        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
        List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
        return resultList;
        long total = mongoTemplate.count(query, OneMachineFileResult.class);
        return Result.ok().data(resultList).total(total);
    }
    /**
ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -291,4 +291,52 @@
        log.info("结束人脸设备抽检指标监测结果数据同步");
    }
    //测试
    public void test() {
        log.info("测试海康接口");
        HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/faceDetect/query", new FaceDeviceSamplingParam(), Object.class);
        log.info("结束->{},调用成功");
    }
    //测试
    public void test1() {
        log.info("测试海康接口");
        HkApiUtil.sendAPI("/api/dqd/service/rs/v1/device/coordinateExpInfo/query", new FaceDeviceSamplingParam(), Object.class);
        log.info("结束->{},调用成功");
    }
    //测试
    public void test2() {
        log.info("测试海康接口");
        HkApiUtil.sendAPI("/api/dqd/service/rs/v1/device/gbCodeExpInfo/query", new FaceDeviceSamplingParam(), Object.class);
        log.info("结束->{},调用成功");
    }
    //测试
    public void test3() {
        log.info("测试海康接口");
        HkApiUtil.sendAPI("/dqd/service/rs/v2/data/passDetect/query", new FaceDeviceSamplingParam(), Object.class);
        log.info("结束->{},调用成功");
    }
    //解析数据
    private <T> List<T> getDataList(JSONObject jsonObject, Class<T> resultClass, String message) {
        if (jsonObject != null && ApiConstants.HKSuccessCode.equals(jsonObject.getString("code"))) {
            log.info("数据格式"+jsonObject);
            JSONObject data = jsonObject.getJSONObject("data");
            if (data == null) {
                log.error(message, jsonObject);
                return null;
            }
            List<T> list = data.getList("list", resultClass);
            if (CollectionUtils.isEmpty(list)) {
                log.error(message, data);
                return null;
            }
            return list;
        } else {
            log.error(message);
        }
        return null;
    }
}