From bc4c58a7d32b2d66d273407f26fd62ac6ddfb2a9 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Thu, 27 Feb 2025 10:48:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=99=BA=E8=83=BD=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=E8=BF=9D=E7=AB=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/service/impl/SmartIdentifyServiceImpl.java    | 8 ++++----
 .../resources/mapper/safetycheck/ConsControlMapper.xml    | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SmartIdentifyServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SmartIdentifyServiceImpl.java
index 6ac2099..3f84edb 100644
--- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SmartIdentifyServiceImpl.java
+++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SmartIdentifyServiceImpl.java
@@ -57,14 +57,14 @@ public class SmartIdentifyServiceImpl implements SmartIdentifyService {
         // 文件ID
         String delFileId = null;
         try {
-            if (StringUtils.isNotBlank(deviceUseVo.getIdCard())) {
-               /* List<PeopleVioVo> userIds = mapper.getUserByIdCard(Sm4Utils.encode(deviceUseVo.getIdCard()));
+     /*       if (StringUtils.isNotBlank(deviceUseVo.getIdCard())) {
+                List<PeopleVioVo> userIds = mapper.getUserByIdCard(Sm4Utils.encode(deviceUseVo.getIdCard()));
                 if (CollectionUtils.isNotEmpty(userIds)) {
                     deviceUseVo.setUserId(userIds.get(0).getId());
                     deviceUseVo.setPeopleType(userIds.get(0).getPeopleType());
                     deviceUseVo.setWarnContent(userIds.get(0).getName() + deviceUseVo.getWarnContent());
-                }*/
-            }
+                }
+            }*/
             // 添加告警信息
             mapper.addWarnInfo(deviceUseVo);
             // 上传智能识别图片
diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/safetycheck/ConsControlMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/safetycheck/ConsControlMapper.xml
index 006b95b..d7c97a6 100644
--- a/bonus-modules/bonus-project/src/main/resources/mapper/safetycheck/ConsControlMapper.xml
+++ b/bonus-modules/bonus-project/src/main/resources/mapper/safetycheck/ConsControlMapper.xml
@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="devId != null">dev_id,</if>
             <if test="warnContent != null and warnContent!=''">warn_content,</if>
             <if test="warnTime != null and warnTime!=''">warn_time,</if>
+            <if test="idCard != null and idCard!=''">id_card,</if>
             <if test="warnType != null">warn_type,</if>
             <if test="devType != null">dev_type,</if>
             create_time,
@@ -20,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="devId != null">#{devId},</if>
             <if test="warnContent != null and warnContent!=''">#{warnContent},</if>
             <if test="warnTime != null and warnTime!=''">#{warnTime},</if>
+            <if test="idCard != null and idCard!=''">#{idCard},</if>
             <if test="warnType != null">#{warnType},</if>
             <if test="devType != null">#{devType},</if>
             now(),