工单只下发考核的、阈值bug

fuliqi

2024-11-01 b91945ea32378a71d1e57356af6e16703a1ceaa7

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

@@ -14,10 +14,7 @@
import com.ycl.platform.domain.query.DataCenterQuery;
import com.ycl.platform.domain.query.HomeQuery;
import com.ycl.platform.domain.result.BaseResult;
import com.ycl.platform.domain.result.HK.FaceDeviceInspectionResult;
import com.ycl.platform.domain.result.HK.FaceDeviceSamplingResult;
import com.ycl.platform.domain.result.HK.VehicleDeviceInspectionResult;
import com.ycl.platform.domain.result.HK.VehicleDeviceSamplingResult;
import com.ycl.platform.domain.result.HK.*;
import com.ycl.platform.domain.result.SYS.TMonitorResult;
import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
import com.ycl.platform.domain.result.UY.OsdCheckResult;
@@ -189,21 +186,30 @@
        }
        // 车辆监控设备
        if (Objects.equals(tMonitor.getCameraFunType(), "2")) {
            //属性一致率、大图、url
            //属性一致率、大图
            List<VehicleDeviceSamplingResult> sampleResults = mongoTemplate.find(query, VehicleDeviceSamplingResult.class);
            List<PicAccessResult> picAccessResults = mongoTemplate.find(query, PicAccessResult.class);
            //抓拍量、时钟、上传
            List<VehicleDeviceInspectionResult> inspectResults = mongoTemplate.find(query, VehicleDeviceInspectionResult.class);
            for (TMonitorVO monitor : monitors) {
                monitor.setMongoCreateTime(now);
                //一机一档
                setOneFile(monitorQualifyResults, monitor);
                //属性一致率、大图、url
                //url
                if (!CollectionUtils.isEmpty(sampleResults)) {
                    for (PicAccessResult picAccessResult : picAccessResults) {
                        if (monitor.getSerialNumber().equals(picAccessResult.getNo())) {
                            BigDecimal bigDecimal = PicAccessResult.calUrl(picAccessResult);
                            monitor.setUrlPercent(bigDecimal);
                        }
                    }
                }
                //属性一致率、大图
                if (!CollectionUtils.isEmpty(sampleResults)) {
                    for (VehicleDeviceSamplingResult sampleResult : sampleResults) {
                        if (monitor.getSerialNumber().equals(sampleResult.getNo())) {
                            if (sampleResult.getBigUseful() != null) {
                                monitor.setBigUsefulPercent(sampleResult.getBigUseful().getBigUsefulPercent());
                                monitor.setUrlPercent(VehicleDeviceSamplingResult.BigUsefulness.calUrl(sampleResult.getBigUseful()));
                            }
                            if (sampleResult.getVehDiff() != null) {
                                monitor.setImportantConPercent(sampleResult.getVehDiff().getImportantConPercent());
@@ -237,13 +243,12 @@
                monitor.setMongoCreateTime(now);
                //一机一档
                setOneFile(monitorQualifyResults, monitor);
                //人脸合格、大图、url访问异常
                //人脸合格、大图
                if (!CollectionUtils.isEmpty(sampleResults)) {
                    for (FaceDeviceSamplingResult sampleResult : sampleResults) {
                        if (monitor.getSerialNumber().equals(sampleResult.getNo())) {
                            if (sampleResult.getBigUseful() != null) {
                                monitor.setBigUsefulPercent(sampleResult.getBigUseful().getBigUsefulPercent());
                                monitor.setUrlPercent(FaceDeviceSamplingResult.BigUsefulness.calUrl(sampleResult.getBigUseful()));
                            }
                            if (sampleResult.getFaceEligibility() != null)
                                monitor.setFacePercent(sampleResult.getFaceEligibility().getFaceEligPercent());
@@ -456,9 +461,10 @@
                List<TMonitorResult> onlines = onlineList.stream().filter(tMonitorResult -> tMonitorResult.getMongoCreateTime().minusDays(1).equals(parseTime)).collect(Collectors.toList());
                if (!CollectionUtils.isEmpty(onlines)) {
                    videoExp.setTotal(onlines.size());
                    videoExp.setOnline(Integer.valueOf(onlines.stream()
                            .filter(TMonitorResult::getPingOnline)
                            .count() + ""));
                    long count = onlines.stream()
                            .filter(item -> ApiConstants.UY_OnlineSite_Online.equals(item.getOnline()))
                            .count();
                    videoExp.setOnline(Integer.valueOf(count+""));
                    videoExp.setOffline(videoExp.getTotal() - videoExp.getOnline());
                }
                //设置存储情况
@@ -809,7 +815,7 @@
                new Document("$group", new Document("_id", "$mongoCreateTime")
                        .append("onlineCount", new Document("$sum",
                                new Document("$cond", Arrays.asList(
                                        new Document("$eq", Arrays.asList("$online", Boolean.TRUE)),
                                        new Document("$eq", Arrays.asList("$online",ApiConstants.UY_OnlineSite_Online)),
                                        1,
                                        0
                                ))
@@ -911,7 +917,7 @@
                new Document("$group", new Document("_id", "$mongoCreateTime")
                        .append("onlineCount", new Document("$sum",
                                new Document("$cond", Arrays.asList(
                                        new Document("$eq", Arrays.asList("$online", Boolean.TRUE)),
                                        new Document("$eq", Arrays.asList("$online",ApiConstants.UY_OnlineSite_Online)),
                                        1,
                                        0
                                ))
@@ -1022,7 +1028,7 @@
                new Document("$group", new Document("_id", "$mongoCreateTime")
                        .append("onlineCount", new Document("$sum",
                                new Document("$cond", Arrays.asList(
                                        new Document("$eq", Arrays.asList("$online", Boolean.TRUE)),
                                        new Document("$eq", Arrays.asList("$online", ApiConstants.UY_OnlineSite_Online)),
                                        1,
                                        0
                                ))