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 userIds = mapper.getUserByIdCard(Sm4Utils.encode(deviceUseVo.getIdCard())); + /* if (StringUtils.isNotBlank(deviceUseVo.getIdCard())) { + List 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" dev_id, warn_content, warn_time, + id_card, warn_type, dev_type, create_time, @@ -20,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{devId}, #{warnContent}, #{warnTime}, + #{idCard}, #{warnType}, #{devType}, now(),