From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceInspectionResult.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceInspectionResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceInspectionResult.java
index b7b4fa0..c68eb8f 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceInspectionResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceInspectionResult.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 lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.data.mongodb.core.index.TextIndexed;
import org.springframework.data.mongodb.core.mapping.Document;
@@ -12,42 +15,37 @@
*/
@Data
@Document(collection = "hk_face_device_inspection")
+@Slf4j
public class FaceDeviceInspectionResult extends BaseResult {
/**
* 璁惧鍚嶇О
*/
- @TextIndexed
private String deviceName;
/**
* 璁惧缂栧彿
*/
- @TextIndexed
private String externalIndexCode;
/**
* 鍗″彛鍐呯爜鎴栭噰闆嗚澶囧唴鐮侊紝dataType涓�1鏃惰〃绀哄崱鍙ｅ唴鐮侊紝dataType涓�2鎴�11鏃惰〃绀洪噰闆嗚澶囧唴鐮�
*/
- @TextIndexed
private String indexCode;
/**
* IP鍦板潃
*/
- @TextIndexed
private String networkAddr;
/**
* 缁勭粐缂栧彿
*/
- @TextIndexed
private String orgCode;
/**
* 缁勭粐鍚嶇О
*/
- @TextIndexed
private String orgName;
/**
@@ -308,4 +306,37 @@
*/
private Integer nouniqueCount;
}
+
+ public static SnapClockVO getVO(FaceDeviceInspectionResult result){
+ SnapClockVO snapClockVO = new SnapClockVO();
+ BeanUtils.copyProperties(result,snapClockVO);
+ SnapClock snapClock = result.getSnapClock();
+ if (snapClock != null) {
+ snapClockVO.setClockPercent(snapClock.getClockPercent());
+ snapClockVO.setTodayClockCount(snapClock.getTodayClockCount());
+ snapClockVO.setTodayClockResult(snapClock.getTodayClockResult());
+ snapClockVO.setAllClockCount(snapClock.getAllClockCount());
+ snapClockVO.setAllClockResult(snapClock.getAllClockResult());
+ snapClockVO.setAllClockResultText(snapClock.getAllClockResultText());
+ snapClockVO.setTodayClockResultText(snapClock.getTodayClockResultText());
+ } else {
+ log.info("鍑虹幇绌烘暟鎹��:{}",result);
+ // 绌哄�煎厹搴曪細缁� VO 瀛楁璧嬮粯璁ゅ�硷紝闃叉鍓嶇鎺ユ敹 null 鎶ラ敊
+ snapClockVO.setClockPercent(0.0f); // 鏁板�煎瀷榛樿 0.0
+ snapClockVO.setTodayClockCount(0); // 璁℃暟鍨嬮粯璁� 0
+ snapClockVO.setTodayClockResult(0); // 缁撴灉鐘舵�侀粯璁� 0锛堝彲鏍规嵁涓氬姟璋冩暣锛�
+ snapClockVO.setAllClockCount(0);
+ snapClockVO.setAllClockResult(0);
+ snapClockVO.setAllClockResultText(""); // 鏂囨湰鍨嬮粯璁ょ┖瀛楃涓�
+ snapClockVO.setTodayClockResultText("");
+ }
+// 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