From 7941bd4d0f7b9eac2025808940417a1dd2f6b5d0 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Fri, 4 Aug 2023 18:28:39 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/FrontierProtectionDevAlarmMapper.xml        | 7 +++++--
 .../poisonous/mapper/xml/PoisonousGasDevAlarmMapper.xml    | 7 +++++--
 .../xmgl/modules/smoke/mapper/xml/SmokeDevAlarmMapper.xml  | 3 ++-
 .../smoke/service/impl/SmokeDevAlarmServiceImpl.java       | 5 +++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/frontier/mapper/xml/FrontierProtectionDevAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/frontier/mapper/xml/FrontierProtectionDevAlarmMapper.xml
index 4e802c0fa..5d3df5d25 100644
--- a/src/main/java/com/zhgd/xmgl/modules/frontier/mapper/xml/FrontierProtectionDevAlarmMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/frontier/mapper/xml/FrontierProtectionDevAlarmMapper.xml
@@ -2,8 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.frontier.mapper.FrontierProtectionDevAlarmMapper">
     <select id="queryPageList" resultType="com.zhgd.xmgl.modules.frontier.entity.FrontierProtectionDevAlarm">
-        select fpda.*,fpd.dev_name,fpd.location from frontier_protection_dev_alarm fpda join frontier_protection_dev fpd
-        on fpd.dev_sn=fpda.dev_sn
+        select fpda.*, fpd.dev_name, fpd.location,su.account operateName
+        from frontier_protection_dev_alarm fpda
+        join frontier_protection_dev fpd
+        on fpd.dev_sn = fpda.dev_sn
+        join system_user su on su.user_id = fpda.operate_id
         ${ew.customSqlSegment}
     </select>
 </mapper>
diff --git a/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/xml/PoisonousGasDevAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/xml/PoisonousGasDevAlarmMapper.xml
index 9f63b8839..d5887ec48 100644
--- a/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/xml/PoisonousGasDevAlarmMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/xml/PoisonousGasDevAlarmMapper.xml
@@ -2,8 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.poisonous.mapper.PoisonousGasDevAlarmMapper">
     <select id="queryPageList" resultType="com.zhgd.xmgl.modules.poisonous.entity.PoisonousGasDevAlarm">
-        select pgda.*,pgd.dev_name,pgd.location from poisonous_gas_dev_alarm pgda join poisonous_gas_dev pgd on
-        pgd.dev_sn=pgda.dev_sn
+        select pgda.*, pgd.dev_name, pgd.location,su.account operateName
+        from poisonous_gas_dev_alarm pgda
+        join poisonous_gas_dev pgd on
+        pgd.dev_sn = pgda.dev_sn
+        join system_user su on su.user_id=pgda.operate_id
         ${ew.customSqlSegment}
     </select>
 </mapper>
diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/xml/SmokeDevAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/xml/SmokeDevAlarmMapper.xml
index 299f67434..cc6197659 100644
--- a/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/xml/SmokeDevAlarmMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/xml/SmokeDevAlarmMapper.xml
@@ -2,9 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.smoke.mapper.SmokeDevAlarmMapper">
     <select id="queryPageList" resultType="com.zhgd.xmgl.modules.smoke.entity.SmokeDevAlarm">
-        select sda.*, sd.location,sd.dev_name
+        select sda.*, sd.location,sd.dev_name,su.account operateName
         from smoke_dev_alarm sda
         join smoke_dev sd on sda.dev_sn = sd.dev_sn
+        join system_user su on su.user_id=sda.operate_id
         ${ew.customSqlSegment}
     </select>
 </mapper>
diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevAlarmServiceImpl.java
index dbb98be1d..39a6c5b07 100644
--- a/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevAlarmServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevAlarmServiceImpl.java
@@ -43,7 +43,8 @@ public class SmokeDevAlarmServiceImpl extends ServiceImpl<SmokeDevAlarmMapper, S
         String deviceid = dto.getDeviceid();
         SmokeDev smokeDev = smokeDevMapper.selectOne(new LambdaQueryWrapper<SmokeDev>().eq(SmokeDev::getDevSn, deviceid));
         if (smokeDev == null) {
-            throw new OpenAlertException("设备不存在");
+            log.error("设备不存在");
+            return "1";
         }
         smokeDev.setUploadDate(new Date());
         smokeDevMapper.updateById(smokeDev);
@@ -54,7 +55,7 @@ public class SmokeDevAlarmServiceImpl extends ServiceImpl<SmokeDevAlarmMapper, S
         smokeDevAlarm.setProjectSn(smokeDev.getProjectSn());
         smokeDevAlarm.setAlarmDetailStatus(dto.getState());
         smokeDevAlarmMapper.insert(smokeDevAlarm);
-        return "1";
+        return "0";
     }
 
     @Override