18.从数据字典获取类型名称

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/vo/UnsafeTypeVO.java

@@ -23,5 +23,5 @@ public class UnsafeTypeVO implements Serializable {
     /**
      * 该类型不安全事件数量（饼图数值，统计条数）
      */
-    private Integer typeNum;
+    private Integer eventTypeNum;
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/LedgerUnsafeEventServiceImpl.java

@@ -1,9 +1,18 @@
 package com.sundot.airport.ledger.service.impl;
 
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.sundot.airport.common.core.domain.entity.SysDictData;
 import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.common.utils.DictUtils;
 import com.sundot.airport.ledger.domain.LedgerUnsafeEvent;
 import com.sundot.airport.ledger.domain.vo.CountQueryReqVO;
 import com.sundot.airport.ledger.domain.vo.UnsafeItemVO;
@@ -11,6 +20,7 @@ import com.sundot.airport.ledger.domain.vo.UnsafePositionVO;
 import com.sundot.airport.ledger.domain.vo.UnsafeTypeVO;
 import com.sundot.airport.ledger.mapper.LedgerUnsafeEventMapper;
 import com.sundot.airport.ledger.service.ILedgerUnsafeEventService;
+import com.sundot.airport.system.service.ISysDictDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,11 +29,12 @@ import org.springframework.transaction.annotation.Transactional;
  * 不安全事件记录Service实现
  */
 @Service
-public class LedgerUnsafeEventServiceImpl extends ServiceImpl<LedgerUnsafeEventMapper, LedgerUnsafeEvent>
-        implements ILedgerUnsafeEventService {
+public class LedgerUnsafeEventServiceImpl extends ServiceImpl<LedgerUnsafeEventMapper, LedgerUnsafeEvent> implements ILedgerUnsafeEventService {
 
     @Autowired
     private LedgerUnsafeEventMapper mapper;
+    @Autowired
+    private ISysDictDataService dictDataService;
 
     @Override
     public List<LedgerUnsafeEvent> selectList(LedgerUnsafeEvent query) {
@@ -64,7 +75,25 @@ public class LedgerUnsafeEventServiceImpl extends ServiceImpl<LedgerUnsafeEventM
      */
     @Override
     public List<UnsafeTypeVO> countSeizureStatsType(CountQueryReqVO countQueryReq) {
-        return this.baseMapper.countSeizureStatsType(countQueryReq);
+        List<UnsafeTypeVO> unsafeTypeList = this.baseMapper.countSeizureStatsType(countQueryReq);
+        if (CollUtil.isEmpty(unsafeTypeList)){
+            return Lists.newArrayList();
+        }
+
+        SysDictData dictData = new SysDictData();
+        dictData.setDictType("sys_unsafe_type");
+        dictData.setStatus("0");
+        List<SysDictData> sysDictData = dictDataService.selectDictDataList(dictData);
+        Map<String, SysDictData> trendDataMap = CollUtil.emptyIfNull(sysDictData).stream().collect(Collectors.toMap(SysDictData::getDictValue, dto -> dto));
+
+        unsafeTypeList.forEach(unsafeType -> {
+            SysDictData dict = trendDataMap.get(unsafeType.getEventType());
+            if (Objects.nonNull(dict)) {
+                unsafeType.setEventTypeName(dict.getDictLabel());
+            }
+        });
+
+        return unsafeTypeList;
     }
 
     /**

airport-ledger/src/main/resources/mapper/ledger/LedgerUnsafeEventMapper.xml

@@ -73,9 +73,7 @@
     </select>
 
     <select id="countSeizureStatsType" parameterType="com.sundot.airport.ledger.domain.vo.CountQueryReqVO" resultType="com.sundot.airport.ledger.domain.vo.UnsafeTypeVO">
-        SELECT
-            event_type AS eventType,
-            COUNT(*) AS typeNum
+        SELECT event_type AS eventType, COUNT(*) AS eventTypeNum
         FROM ledger_unsafe_event
         WHERE
             del_flag = '0'