liux
/
nxdt-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
haozq 2025-02-28 12:11:48 +08:00
parent d36b5b44ef bc4c58a7d3
commit a3b788d1a9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SmartIdentifyServiceImpl.java
View File

@ -57,14 +57,14 @@ public class SmartIdentifyServiceImpl implements SmartIdentifyService {
// 文件ID // 文件ID
String delFileId = null; String delFileId = null;
try { try {
if (StringUtils.isNotBlank(deviceUseVo.getIdCard())) { /* if (StringUtils.isNotBlank(deviceUseVo.getIdCard())) {
/* List<PeopleVioVo> userIds = mapper.getUserByIdCard(Sm4Utils.encode(deviceUseVo.getIdCard())); List<PeopleVioVo> userIds = mapper.getUserByIdCard(Sm4Utils.encode(deviceUseVo.getIdCard()));
if (CollectionUtils.isNotEmpty(userIds)) { if (CollectionUtils.isNotEmpty(userIds)) {
deviceUseVo.setUserId(userIds.get(0).getId()); deviceUseVo.setUserId(userIds.get(0).getId());
deviceUseVo.setPeopleType(userIds.get(0).getPeopleType()); deviceUseVo.setPeopleType(userIds.get(0).getPeopleType());
deviceUseVo.setWarnContent(userIds.get(0).getName() + deviceUseVo.getWarnContent()); deviceUseVo.setWarnContent(userIds.get(0).getName() + deviceUseVo.getWarnContent());
}*/ }
} }*/
// 添加告警信息 // 添加告警信息
mapper.addWarnInfo(deviceUseVo); mapper.addWarnInfo(deviceUseVo);
// 上传智能识别图片 // 上传智能识别图片

2
bonus-modules/bonus-project/src/main/resources/mapper/safetycheck/ConsControlMapper.xml
View File

@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="devId != null">dev_id,</if> <if test="devId != null">dev_id,</if>
<if test="warnContent != null and warnContent!=''">warn_content,</if> <if test="warnContent != null and warnContent!=''">warn_content,</if>
<if test="warnTime != null and warnTime!=''">warn_time,</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="warnType != null">warn_type,</if>
<if test="devType != null">dev_type,</if> <if test="devType != null">dev_type,</if>
create_time, create_time,
@ -20,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="devId != null">#{devId},</if> <if test="devId != null">#{devId},</if>
<if test="warnContent != null and warnContent!=''">#{warnContent},</if> <if test="warnContent != null and warnContent!=''">#{warnContent},</if>
<if test="warnTime != null and warnTime!=''">#{warnTime},</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="warnType != null">#{warnType},</if>
<if test="devType != null">#{devType},</if> <if test="devType != null">#{devType},</if>
now(), now(),