Merge remote-tracking branch 'origin/master'

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

@@ -13,14 +13,10 @@ import java.io.Serializable;
 @Data
 public class UnsafeTypeVO implements Serializable {
     /**
-     * 事件类型值（数据字典）
+     * 事件类型值（存储的是中文）
      */
     private String eventType;
     /**
-     * 事件类型名称（数据字典）
-     */
-    private String eventTypeName;
-    /**
      * 该类型不安全事件数量（饼图数值，统计条数）
      */
     private Integer eventTypeNum;

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

@@ -76,24 +76,7 @@ public class LedgerUnsafeEventServiceImpl extends ServiceImpl<LedgerUnsafeEventM
     @Override
     public List<UnsafeTypeVO> countSeizureStatsType(CountQueryReqVO 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;
+        return CollUtil.emptyIfNull(unsafeTypeList);
     }
 
     /**

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

@@ -85,7 +85,7 @@
             AND event_type IS NOT NULL AND event_type != ''
         </where>
         GROUP BY event_type
-        ORDER BY typeNum DESC
+        ORDER BY eventTypeNum DESC
     </select>
 
     <select id="countSeizureStatsPost" parameterType="com.sundot.airport.ledger.domain.vo.CountQueryReqVO" resultType="com.sundot.airport.ledger.domain.vo.UnsafePositionVO">