From 6239edadfa526987f42a54803c97b904df6e395a Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Mon, 17 Jun 2024 11:00:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=87=BA=E5=85=A5=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/service/impl/AccessMgeServiceImpl.java      |  9 +++++----
 .../src/main/resources/mapper/AccessMgeMapper.xml      | 10 ++++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AccessMgeServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AccessMgeServiceImpl.java
index 84376bf..56574c0 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AccessMgeServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AccessMgeServiceImpl.java
@@ -100,7 +100,8 @@ public class AccessMgeServiceImpl implements AccessMgeService {
                             String base64 = item.getString("url");
                             vo.setBase64(base64);
                         }
-                        vo.setPersonName(handleData(vo.getSourceData()));
+                        vo.setPersonName(handleData(vo.getSourceData(),"personName"));
+                        vo.setAccesssTime(handleData(vo.getSourceData(),"dataTime"));
                     }
                     if(i == 0 || i == 1){
                         noWarnList.add(vo);
@@ -116,14 +117,14 @@ public class AccessMgeServiceImpl implements AccessMgeService {
         return AjaxResult.success(map);
     }
 
-    public static String handleData(String jsonStr){
+    public static String handleData(String jsonStr,String fieldName){
         try {
             if(StringUtils.isEmpty(jsonStr)){
                 return null;
             }else{
                 JSONObject jsonObject = JSONObject.parseObject(jsonStr);
-                String personName = jsonObject.getString("personName");
-                return personName;
+                String value = jsonObject.getString(fieldName);
+                return value;
             }
         } catch (Exception e) {
             log.error("人员出入数据解析异常",e);
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AccessMgeMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AccessMgeMapper.xml
index d55eb2f..a13fb53 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AccessMgeMapper.xml
+++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AccessMgeMapper.xml
@@ -67,13 +67,19 @@
 
     <!--人员出入照片-->
     <select id="getPerStatisticsPhoto" resultType="com.securitycontrol.entity.screen.vo.AccessMgeVo">
-        SELECT trf.file_id AS val,thdv.create_time AS createTime,thdv.is_warn AS isWarn,thdv.source_data AS sourceData
+        SELECT trf.file_id AS val,thdv.create_time AS createTime,thdv.is_warn AS isWarn,thdv.source_data AS sourceData,a.val AS accesssTime
         FROM tb_his_device_value thdv
+        INNER JOIN (
+            SELECT thdv.val,thdv.source_type
+            FROM tb_his_device_value thdv
+            INNER JOIN tb_device_detail tdd ON thdv.attribute_id = tdd.id AND tdd.del_flag = 0 AND tdd.device_code = 'dataTime'
+            WHERE thdv.bid_code = #{bidCode}
+        ) a ON a.source_type = thdv.source_type
         INNER JOIN tb_resource_file trf ON thdv.val = trf.source_id AND trf.del_flag = 0 AND trf.source_type = '人员出入'
         INNER JOIN tb_device_detail tdd ON thdv.attribute_id = tdd.id AND tdd.del_flag = 0 AND tdd.device_code = #{modeName}
         INNER JOIN tb_bd_device tbd ON tdd.device_id = tbd.device_id AND tbd.del_flag = 0 AND tbd.devic_type = #{typeCode}
         WHERE bid_code = #{bidCode}
-        ORDER BY thdv.create_time DESC
+        ORDER BY a.val DESC
     </select>
 
     <!--人员出入场记录-->