فهرست منبع

大屏:修改告警类型

lilt085163@126.com 3 سال پیش
والد
کامیت
c499eb5312

+ 9 - 1
src/main/java/com/care/bigscreen/service/impl/BigScreenServiceImpl.java

@@ -1,6 +1,7 @@
 package com.care.bigscreen.service.impl;
 
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.care.bigscreen.entity.StOrganization;
 import com.care.bigscreen.entity.StStation;
@@ -11,6 +12,7 @@ import com.care.bigscreen.service.BigScreenService;
 import com.care.bigscreen.vo.*;
 import com.care.bms.websocket.StationWebSocketEndpoint;
 import com.care.bms.websocket.WebSocketEndpoint;
+import com.care.common.enums.OrderTypeEnum;
 import com.care.common.service.CareStationService;
 import com.care.common.util.DomainEquals;
 import com.care.common.vo.PageResVO;
@@ -151,7 +153,13 @@ public class BigScreenServiceImpl implements BigScreenService {
      */
     @Override
     public List<BigScreenEventVO> selectBigScreenRtEventList(Long orgId ,Long stationId) {
-        return bigSreenMapper.selectBigScreenRtEventList(orgId, stationId);
+        List<BigScreenEventVO> list = bigSreenMapper.selectBigScreenRtEventList(orgId, stationId);
+        if (CollUtil.isNotEmpty(list)){
+            list.forEach(item ->{
+                item.setEventType(OrderTypeEnum.getCodeToName(item.getEventType()));
+            });
+        }
+        return list;
     }
 
     /**

+ 1 - 1
src/main/resources/mybatis/BigSreenMapper.xml

@@ -306,7 +306,7 @@
         a.title,
         a.create_time createTime,
         (select sdc.name from sys_dim_code sdc where sdc.dim_code = a.status and sdc.type_code='event_order_status') status,
-        '告警' eventType
+        order_type eventType
         FROM care_event_order a
         where a.status in ('0','1')
         <if test="orgId != null and orgId != ''">