From d62253bdd110d28a562f28ab69534c4bbd806ea7 Mon Sep 17 00:00:00 2001 From: haidong Date: Mon, 9 Oct 2023 14:52:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=A7=E5=8D=8E=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: haidong --- src/main/java/com/yzx/impl/DaHua.java | 23 +++++++++++++++++++ .../java/com/yzx/pojo/FaceRecrodInfo.java | 4 ++++ 2 files changed, 27 insertions(+) diff --git a/src/main/java/com/yzx/impl/DaHua.java b/src/main/java/com/yzx/impl/DaHua.java index 942ea9c..de842e0 100644 --- a/src/main/java/com/yzx/impl/DaHua.java +++ b/src/main/java/com/yzx/impl/DaHua.java @@ -122,6 +122,29 @@ public class DaHua implements IHardwareEquipment { faceRecrodInfo.setEmployeeName(new String(pstRecord[i].szCardName, "GBK").trim()); faceRecrodInfo.setTime(pstRecord[i].stuTime.toStringTimeEx()); faceRecrodInfo.setSnapUrl(new String(pstRecord[i].szSnapFtpUrl).trim()); + faceRecrodInfo.setMethod(pstRecord[i].emMethod); + faceRecrodInfo.setMethodName(Res.string().getOpenMethods(pstRecord[i].emMethod)); + faceRecrodInfo.setStatus(pstRecord[i].bStatus); + + int emTemperatureUnit = pstRecord[i].stuManTemperatureInfo.emTemperatureUnit; + float fCurrentTemperature = pstRecord[i].stuManTemperatureInfo.fCurrentTemperature; + String unit = ""; + switch (emTemperatureUnit) { + case -1: + unit = ""; + break; + case 1: + unit = "°C"; + break; + case 2: + unit = "°F"; + break; + case 3: + unit = "开尔文"; + break; + } + + faceRecrodInfo.setTemperature(fCurrentTemperature + unit); faceRecrodInfoList.add(faceRecrodInfo); } catch (UnsupportedEncodingException e) { e.printStackTrace(); diff --git a/src/main/java/com/yzx/pojo/FaceRecrodInfo.java b/src/main/java/com/yzx/pojo/FaceRecrodInfo.java index 1f19390..08abb64 100644 --- a/src/main/java/com/yzx/pojo/FaceRecrodInfo.java +++ b/src/main/java/com/yzx/pojo/FaceRecrodInfo.java @@ -12,4 +12,8 @@ public class FaceRecrodInfo { private String employeeName;//用户名称 -> user_name private String time;//刷脸时间 private String snapUrl;//人脸图片地址 + private String temperature;//温度 + private int method;//开门方式 + private String methodName;//开门方式名称 + private int status;//开门状态 1 成功 0 失败 }