报警记录 gengdidi

gassafety-admin/src/main/java/com/zehong/web/controller/dataMonitoring/TDeviceAlarmController.java

@@ -2,7 +2,10 @@ package com.zehong.web.controller.dataMonitoring;
 
 import java.util.List;
 
+import com.zehong.common.core.domain.entity.SysDictData;
+import com.zehong.common.utils.StringUtils;
 import com.zehong.system.domain.vo.DeviceAlarmVo;
+import com.zehong.system.service.ISysDictTypeService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -35,6 +38,9 @@ public class TDeviceAlarmController extends BaseController
     @Autowired
     private ITDeviceAlarmService tDeviceAlarmService;
 
+    @Autowired
+    private ISysDictTypeService iSysDictTypeService;
+
     /**
      * 查询报警信息列表
      */
@@ -46,6 +52,18 @@ public class TDeviceAlarmController extends BaseController
         List<DeviceAlarmVo> list = null;
         try {
             list = tDeviceAlarmService.selectTDeviceAlarmList(tDeviceAlarm);
+            List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("t_alarm_type");
+            for(DeviceAlarmVo deviceAlarmVo : list){
+                for(SysDictData sysDictData : sysDictDataList){
+                    if(StringUtils.isNotEmpty(deviceAlarmVo.getAlarmType())){
+                        if(deviceAlarmVo.getAlarmType().equals(sysDictData.getDictValue())){
+                            deviceAlarmVo.setAlarmType(sysDictData.getDictLabel());
+                        }
+                    }
+
+                }
+            }
+
         } catch (Exception e) {
             e.printStackTrace();
             throw new Exception("查询报警信息列表出错");