From b5e0ca74aa0ec94aca64841498f7a2351a8fd926 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Tue, 4 Mar 2025 15:19:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=B8=BD=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/safetyhat/mapper/xml/SafetyHatAlarmMapper.xml | 2 +-
 .../modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml  | 2 +-
 .../safetyhat/service/impl/SafetyHatAlarmServiceImpl.java | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatAlarmMapper.xml
index 7e1bfc835..d34dbe920 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatAlarmMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatAlarmMapper.xml
@@ -4,7 +4,7 @@
     <select id="queryList" resultType="com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatAlarm">
         select sha.*, wi.worker_name
         from safety_hat_alarm sha
-        left join safety_hat_dev wi on wi.id = sha.dev_sn
+        left join safety_hat_dev wi on wi.dev_sn = sha.dev_sn
         ${ew.customSqlSegment}
     </select>
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml
index 0954eed63..95fb0a0c5 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml
@@ -4,7 +4,7 @@
     <select id="queryList" resultType="com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatData">
         select shd.*, wi.worker_name
         from safety_hat_data shd
-        left join safety_hat_dev wi on wi.id = shd.dev_sn
+        left join safety_hat_dev wi on wi.dev_sn = shd.dev_sn
         ${ew.customSqlSegment}
     </select>
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java
index 7acdef04f..5c4fc5598 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java
@@ -11,6 +11,8 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
 import com.zhgd.xmgl.base.entity.vo.TrendVo;
 import com.zhgd.xmgl.enums.ParamEnum;
+import com.zhgd.xmgl.modules.basicdata.entity.DictionaryItem;
+import com.zhgd.xmgl.modules.basicdata.service.impl.DictionaryItemServiceImpl;
 import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatAlarm;
 import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev;
 import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatAlarmMapper;
@@ -43,6 +45,8 @@ public class SafetyHatAlarmServiceImpl extends ServiceImpl<SafetyHatAlarmMapper,
     private SafetyHatAlarmMapper safetyHatAlarmMapper;
     @Autowired
     private SafetyHatDevMapper safetyHatDevMapper;
+    @Autowired
+    private DictionaryItemServiceImpl dictionaryItemService;
 
     @Override
     public IPage<SafetyHatAlarm> queryPageList(HashMap<String, Object> paramMap) {
@@ -82,7 +86,9 @@ public class SafetyHatAlarmServiceImpl extends ServiceImpl<SafetyHatAlarmMapper,
         if (dev == null) {
             throw new OpenAlertException("设备编号不正确");
         }
-        String str = ParamEnum.getStr(ParamEnum.SafetyHatAlarmAlarmType.values(), safetyHatAlarm.getAlarmType());
+        List<DictionaryItem> typeList = dictionaryItemService.getDictList("safety_hat_alarm_type", dev.getProjectSn());
+        String str = typeList.stream().filter(o -> o.getData().equals(safetyHatAlarm.getAlarmType() + "")).findFirst().map(o -> o.getName()).orElse(null);
+//        String str = ParamEnum.getStr(ParamEnum.SafetyHatAlarmAlarmType.values(), safetyHatAlarm.getAlarmType());
         safetyHatAlarm.setAlarmInfo(str);
         safetyHatAlarm.setProjectSn(dev.getProjectSn());
         safetyHatAlarm.setId(null);