From ee03b526152d335dd1e42bc01a1f717d1205204c Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 26 五月 2025 15:27:04 +0800
Subject: [PATCH] （部级录像可用率，重点录像可用率，录像可用率）计算可用率bug修复，hk接口bug修复，
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 114 insertions(+), 2 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java
index 5b8233f..6a6b806 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java
@@ -1,7 +1,10 @@
package com.ycl.platform.domain.result.HK;
import com.ycl.platform.domain.result.BaseResult;
+import com.ycl.platform.domain.vo.DataCenter.SnapClockVO;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
+import org.springframework.data.mongodb.core.index.TextIndexed;
import org.springframework.data.mongodb.core.mapping.Document;
/**
@@ -64,6 +67,11 @@
*/
private Integer snapResult;
+ /**
+ * 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋滐紝1:姝ｅ父 2:鏃犳暟鎹� 4:鏁版嵁閲忓皯
+ */
+ private String snapResultText;
+
// 浠ヤ笅涓哄祵濂楀璞＄殑瀛楁
/**
@@ -91,12 +99,25 @@
*/
private Integrity integrity;
+ public String getSnapResultText() {
+ if (snapResult == 1) {
+ snapResultText = "姝ｅ父";
+ }
+ if (snapResult == 2) {
+ snapResultText = "鏃犳暟鎹�";
+ }
+ if (snapResult == 4) {
+ snapResultText = "鏁版嵁閲忓皯";
+ }
+ return snapResultText;
+ }
+
// 鍐呭祵瀵硅薄瀹氫箟
@Data
public static class SnapClock {
/**
- * 鏃堕挓鍑嗙‘鐜�
+ * 鏃堕挓鍑嗙‘鐜囷細1 == 100%
*/
private Float clockPercent;
@@ -111,6 +132,11 @@
private Integer todayClockResult;
/**
+ * 褰撴棩鎺ユ敹鐨勫綋鏃ユ姄鎷嶆暟鎹椂閽熷噯纭�у垽瀹氱粨鏋滐細1鏄悎鏍硷紝0鏄笉鍚堟牸
+ */
+ private String todayClockResultText;
+
+ /**
* 褰撴棩鎺ユ敹鐨勫叏閮ㄦ姄鎷嶆暟鎹椂閽熷噯纭暟鎹噺
*/
private Integer allClockCount;
@@ -119,12 +145,37 @@
* 褰撴棩鎺ユ敹鐨勫叏閮ㄦ姄鎷嶆暟鎹椂閽熷噯纭�у垽瀹氱粨鏋滐細1鏄悎鏍硷紝0鏄笉鍚堟牸
*/
private Integer allClockResult;
+
+ /**
+ * 褰撴棩鎺ユ敹鐨勫叏閮ㄦ姄鎷嶆暟鎹椂閽熷噯纭�у垽瀹氱粨鏋滐細1鏄悎鏍硷紝0鏄笉鍚堟牸
+ */
+ private String allClockResultText;
+
+ public String getTodayClockResultText() {
+ if (todayClockResult == 1) {
+ todayClockResultText = "鍚堟牸";
+ }
+ if (todayClockResult == 0) {
+ todayClockResultText = "涓嶅悎鏍�";
+ }
+ return todayClockResultText;
+ }
+
+ public String getAllClockResultText() {
+ if (allClockResult == 1) {
+ allClockResultText = "鍚堟牸";
+ }
+ if (allClockResult == 0) {
+ allClockResultText = "涓嶅悎鏍�";
+ }
+ return allClockResultText;
+ }
}
@Data
public static class SnapTimely {
/**
- * 鍙婃椂鐜�
+ * 鍙婃椂鐜� 1 == 100%
*/
private Float timelyPercent;
@@ -154,6 +205,11 @@
private Integer todayTimelyResult;
/**
+ * 褰撴棩鎺ユ敹鐨勫綋鏃ユ姄鎷嶆暟鎹暟鎹強鏃舵�у垽瀹氱粨鏋滐細1鏄悎鏍硷紝0鏄笉鍚堟牸
+ */
+ private String todayTimelyResultText;
+
+ /**
* 褰撴棩鎺ユ敹鐨勫叏閮ㄦ暟鎹欢杩熼噺
*/
private Integer allDelayCount;
@@ -177,6 +233,31 @@
* 褰撴棩鎺ユ敹鐨勫叏閮ㄦ暟鎹強鏃舵�у垽瀹氱粨鏋滐細1鏄悎鏍硷紝0鏄笉鍚堟牸
*/
private Integer allTimelyResult;
+
+ /**
+ * 褰撴棩鎺ユ敹鐨勫叏閮ㄦ暟鎹強鏃舵�у垽瀹氱粨鏋滐細1鏄悎鏍硷紝0鏄笉鍚堟牸
+ */
+ private String allTimelyResultText;
+
+ public String getTodayTimelyResultText() {
+ if (todayTimelyResult == 1) {
+ todayTimelyResultText = "鍚堟牸";
+ }
+ if (todayTimelyResult == 0) {
+ todayTimelyResultText = "涓嶅悎鏍�";
+ }
+ return todayTimelyResultText;
+ }
+
+ public String getAllTimelyResultText() {
+ if (allTimelyResult == 1) {
+ allTimelyResultText = "鍚堟牸";
+ }
+ if (allTimelyResult == 0) {
+ allTimelyResultText = "涓嶅悎鏍�";
+ }
+ return allTimelyResultText;
+ }
}
@Data
@@ -208,6 +289,24 @@
* 杞︾墝璇嗗埆寮傚父锛氱粨鏋滅被鍨� 1:姝ｅ父 2:璇嗗埆鐜囦綆 3:鏄煎璇嗗埆鐜囩獊鍙�
*/
private Integer recgResult;
+
+ /**
+ * 杞︾墝璇嗗埆寮傚父锛氱粨鏋滅被鍨� 1:姝ｅ父 2:璇嗗埆鐜囦綆 3:鏄煎璇嗗埆鐜囩獊鍙�
+ */
+ private String recgResultText;
+
+ public String getRecgResultText() {
+ if (recgResult == 1) {
+ recgResultText = "姝ｅ父";
+ }
+ if (recgResult == 2) {
+ recgResultText = "璇嗗埆鐜囦綆";
+ }
+ if (recgResult == 3) {
+ recgResultText = "鏄煎璇嗗埆鐜囩獊鍙�";
+ }
+ return recgResultText;
+ }
}
@Data
@@ -252,4 +351,17 @@
*/
private Integer noIntegrityCount;
}
+
+ public static SnapClockVO getVO(VehicleDeviceInspectionResult result){
+ SnapClockVO snapClockVO = new SnapClockVO();
+ BeanUtils.copyProperties(result,snapClockVO);
+ snapClockVO.setClockPercent(result.getSnapClock().getClockPercent());
+ snapClockVO.setTodayClockCount(result.getSnapClock().getTodayClockCount());
+ snapClockVO.setTodayClockResult(result.getSnapClock().getTodayClockResult());
+ snapClockVO.setAllClockCount(result.getSnapClock().getAllClockCount());
+ snapClockVO.setAllClockResult(result.getSnapClock().getAllClockResult());
+ snapClockVO.setAllClockResultText(result.getSnapClock().getAllClockResultText());
+ snapClockVO.setTodayClockResultText(result.getSnapClock().getTodayClockResultText());
+ return snapClockVO;
+ }
}
--
Gitblit v1.8.0