From c6976365d5bfb39a32db8b541b1fe3ceb30c7826 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 14 二月 2025 10:03:17 +0800 Subject: [PATCH] Merge branch 'dev' --- ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceSamplingResult.java | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 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 ddd81b1..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,9 +1,14 @@ 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; + +import java.math.BigDecimal; +import java.math.RoundingMode; /** * 杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉锛氳溅杈嗭紙杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬э級 @@ -17,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; // 浠ヤ笅涓哄祵濂楀璞$殑瀛楁 @@ -79,6 +79,8 @@ * OSD鏍囨敞寮傚父鏁版嵁閲� */ private Integer osdExpCount; + + } @Data @@ -128,4 +130,14 @@ */ 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