一机一档OSD优化

fuliqi

2024-12-12 040fe24077c6a57fd0b337fd41cec00d9125eb0e

一机一档OSD优化

 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java

@@ -58,6 +58,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date setTime;


    /**
     * osd通道名
     */
@@ -91,7 +92,7 @@
    /**
     * osdTimeCorrect时间是否正确
     */
    private String osdTimeCorrectText;
    private Boolean osdTimeError;

    /**
     * osd通道名是否正确   1正确  0未知  -1错
@@ -99,9 +100,9 @@
    private Integer osdNameCorrect;

    /**
     * osd通道名是否正确   1正确  0未知  -1错
     * osd通道名是否正确
     */
    private String osdNameCorrectText;
    private Boolean osdNameError;

    /**
     * osd省是否正确
@@ -111,7 +112,7 @@
    /**
     * osd省是否正确
     */
    private String osdProvinceCorrectText;
    private Boolean osdProvinceError;

    /**
     * osd市是否正确
@@ -121,7 +122,7 @@
    /**
     * osd市是否正确
     */
    private String osdCityCorrectText;
    private Boolean osdCityError;

    /**
     * osd区是否正确
@@ -131,7 +132,7 @@
    /**
     * osd区是否正确
     */
    private String osdPartCorrectText;
    private Boolean osdPartError;
    /**
     * osd左下角是否正确
     */
@@ -150,26 +151,21 @@
        return ApiConstants.OSD_Correct.equals(result.getOsdTimeCorrect());
    }

    public static void getText(OsdCheckResult result) {
        if(ApiConstants.OSD_Correct.equals(result.getOsdTimeCorrect())) result.setOsdTimeCorrectText("正确");
        else if(ApiConstants.OSD_Error.equals(result.getOsdTimeCorrect())) result.setOsdTimeCorrectText("错误");
        else { result.setOsdTimeCorrectText("未知"); }
    public static void getError(OsdCheckResult result) {
        if(ApiConstants.OSD_Correct.equals(result.getOsdTimeCorrect())) result.setOsdTimeError(Boolean.FALSE);
        else {result.setOsdTimeError(Boolean.TRUE); }

        if(ApiConstants.OSD_Correct.equals(result.getOsdNameCorrect())) result.setOsdNameCorrectText("正确");
        else if(ApiConstants.OSD_Error.equals(result.getOsdNameCorrect())) result.setOsdNameCorrectText("错误");
        else { result.setOsdNameCorrectText("未知"); }
        if(ApiConstants.OSD_Correct.equals(result.getOsdNameCorrect())) result.setOsdNameError(Boolean.FALSE);
        else { result.setOsdNameError(Boolean.TRUE); }

        if(ApiConstants.OSD_Correct.equals(result.getOsdProvinceCorrect())) result.setOsdProvinceCorrectText("正确");
        else if(ApiConstants.OSD_Error.equals(result.getOsdProvinceCorrect())) result.setOsdProvinceCorrectText("错误");
        else { result.setOsdProvinceCorrectText("未知"); }
        if(ApiConstants.OSD_Correct.equals(result.getOsdProvinceCorrect())) result.setOsdProvinceError(Boolean.FALSE);
        else { result.setOsdProvinceError(Boolean.TRUE); }

        if(ApiConstants.OSD_Correct.equals(result.getOsdCityCorrect())) result.setOsdCityCorrectText("正确");
        else if(ApiConstants.OSD_Error.equals(result.getOsdCityCorrect())) result.setOsdCityCorrectText("错误");
        else { result.setOsdCityCorrectText("未知"); }
        if(ApiConstants.OSD_Correct.equals(result.getOsdCityCorrect())) result.setOsdCityError(Boolean.FALSE);
        else { result.setOsdCityError(Boolean.TRUE); }

        if(ApiConstants.OSD_Correct.equals(result.getOsdPartCorrect())) result.setOsdPartCorrectText("正确");
        else if(ApiConstants.OSD_Error.equals(result.getOsdPartCorrect())) result.setOsdPartCorrectText("错误");
        else { result.setOsdPartCorrectText("未知"); }
        if(ApiConstants.OSD_Correct.equals(result.getOsdPartCorrect())) result.setOsdPartError(Boolean.FALSE);
        else { result.setOsdPartError(Boolean.TRUE); }

        if(DeviceType.DH.getType().equals(result.getDeviceBrand())) result.setDeviceBrandStr(DeviceType.DH.getDesc());
        else if(DeviceType.HK.getType().equals(result.getDeviceBrand())) result.setDeviceBrandStr(DeviceType.HK.getDesc());

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

@@ -162,7 +162,7 @@
    }

    /**
     * 视频：校时正确率
     * 视频：校时正确率 （新规则已经弃用）
     *
     * @param query
     * @return

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

@@ -1061,7 +1061,7 @@
        MongoUtil.setPage(query, params, "checkTime");
        List<OsdCheckResult> resultList = mongoTemplate.find(query, OsdCheckResult.class);
        for (OsdCheckResult osdCheckResult : resultList) {
            OsdCheckResult.getText(osdCheckResult);
            OsdCheckResult.getError(osdCheckResult);
        }
        // 统计数量
        MongoDatabase database = mongoTemplate.getDb();
@@ -1183,7 +1183,7 @@
    @Override
    public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
        List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
        Query query = MongoUtil.getQuery(params, "checkTime", likeFileds, 3);
        Query query = MongoUtil.getQuery(params, "checkTime", likeFileds, null);
        //下拉框标注正确查询条件
        if (params.getOption() != null) {
            if(params.getOption()==1) {
@@ -1200,14 +1200,14 @@
        List<OsdCheckResult> resultList = mongoTemplate.find(query, OsdCheckResult.class);

        for (OsdCheckResult osdCheckResult : resultList) {
            OsdCheckResult.getText(osdCheckResult);
            OsdCheckResult.getError(osdCheckResult);
        }
        // 统计数量
        MongoDatabase database = mongoTemplate.getDb();
        MongoCollection<Document> collection = database.getCollection("osd_check_result");
        //总数
        List<Document> dList = new ArrayList<>(2);
        dList.add(new Document("importantTag", Boolean.TRUE));
//        dList.add(new Document("importantTag", Boolean.TRUE));
        setTag(params, dList);
        Document osdFilter = new Document("$and", dList);
        //正常数