From eb0e29e72049bc65f943cc864929c332b07f25d0 Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期一, 03 三月 2025 20:56:46 +0800 Subject: [PATCH] 导出osd问题 以及缺少小时改分钟 --- ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceSamplingResult.java | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceSamplingResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceSamplingResult.java index b564d6d..ff11462 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceSamplingResult.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceSamplingResult.java @@ -1,7 +1,9 @@ package com.ycl.platform.domain.result.HK; import com.ycl.platform.domain.result.BaseResult; +import com.ycl.platform.domain.vo.DataCenter.BigPicUsefulVO; import lombok.Data; +import org.springframework.beans.BeanUtils; import org.springframework.data.mongodb.core.index.TextIndexed; import org.springframework.data.mongodb.core.mapping.Document; @@ -20,31 +22,26 @@ /** * 鍗″彛鍐呯爜鎴栭噰闆嗚澶囧唴鐮侊紝dataType涓�1鏃惰〃绀哄崱鍙e唴鐮侊紝dataType涓�11鏃惰〃绀洪噰闆嗚澶囧唴鐮� */ - @TextIndexed private String indexCode; /** * 璁惧鎴栧崱鍙e浗鏍囩紪鐮� */ - @TextIndexed private String externalIndexCode; /** * 璁惧鎴栧崱鍙e悕绉� */ - @TextIndexed private String deviceName; /** * 缁勭粐缂栧彿 */ - @TextIndexed private String orgCode; /** * 缁勭粐鍚嶇О */ - @TextIndexed private String orgName; // 浠ヤ笅涓哄祵濂楀璞$殑瀛楁 @@ -83,17 +80,7 @@ */ private Integer osdExpCount; - public static BigDecimal calUrl(BigUsefulness bigUseful) { - BigDecimal url = BigDecimal.ZERO; - if (bigUseful.getSampleCount() != 0) { - //鍥剧墖璁块棶姝e父閲� = 鎶芥閲�-寮傚父閲� - BigDecimal picNormalCount = new BigDecimal(bigUseful.getSampleCount() - bigUseful.getBigPicExpCount()); - //鍥剧墖鎶芥閲� - BigDecimal sampleCount = new BigDecimal(bigUseful.getSampleCount()); - url = picNormalCount.divide(sampleCount, 4, RoundingMode.HALF_UP); - } - return url; - } + } @Data @@ -144,5 +131,13 @@ private Float importantConPercent; } - + public static BigPicUsefulVO getPicVO(VehicleDeviceSamplingResult result){ + BigPicUsefulVO vo = new BigPicUsefulVO(); + BeanUtils.copyProperties(result,vo); + vo.setBigPicExpCount(result.getBigUseful().getBigPicExpCount()); + vo.setBigUsefulPercent(result.getBigUseful().getBigUsefulPercent()); + vo.setSampleCount(result.getBigUseful().getSampleCount()); + vo.setOsdExpCount(result.getBigUseful().getOsdExpCount()); + return vo; + } } -- Gitblit v1.8.0