速率表

airport-blocked/src/main/java/com/sundot/airport/blocked/service/impl/BlockedRateServiceImpl.java

@@ -9,10 +9,12 @@ import cn.hutool.core.util.ObjUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysDictData;
 import com.sundot.airport.common.enums.ShiftEnum;
 import com.sundot.airport.common.exception.ServiceException;
 import com.sundot.airport.common.utils.DateUtils;
 import com.sundot.airport.system.service.ISysDeptService;
+import com.sundot.airport.system.service.ISysDictDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.sundot.airport.blocked.mapper.BlockedRateMapper;
@@ -32,6 +34,8 @@ public class BlockedRateServiceImpl extends ServiceImpl<BlockedRateMapper, Block
     private BlockedRateMapper blockedRateMapper;
     @Autowired
     private ISysDeptService sysDeptService;
+    @Autowired
+    private ISysDictDataService sysDictDataService;
 
     /**
      * 查询速率
@@ -128,6 +132,11 @@ public class BlockedRateServiceImpl extends ServiceImpl<BlockedRateMapper, Block
         List<SysDept> deptListAll = sysDeptService.selectDeptInfoAll(new SysDept());
         Map<String, Long> deptMap = deptListAll.stream().collect(Collectors.toMap(SysDept::getDeptName, SysDept::getDeptId, (oldValue, newValue) -> newValue));
 
+        SysDictData query = new SysDictData();
+        query.setDictType("shift");
+        List<SysDictData> shiftList = sysDictDataService.selectDictDataList(query);
+        Map<String, String> shiftMap = shiftList.stream().collect(Collectors.toMap(SysDictData::getDictLabel, SysDictData::getDictValue));
+
         int successNum = 0;
         int failureNum = 0;
         StringBuilder successMsg = new StringBuilder();
@@ -135,7 +144,7 @@ public class BlockedRateServiceImpl extends ServiceImpl<BlockedRateMapper, Block
 
         for (BlockedRate data : list) {
             // 根据名称填充ID字段
-            fillIdsByName(data, deptMap);
+            fillIdsByName(data, deptMap, shiftMap);
             try {
                 if (ObjUtil.isNull(data.getStatDate())) {
                     failureNum++;
@@ -199,16 +208,15 @@ public class BlockedRateServiceImpl extends ServiceImpl<BlockedRateMapper, Block
      *
      * @param data 速率数据
      */
-    private void fillIdsByName(BlockedRate data, Map<String, Long> deptMap) {
+    private void fillIdsByName(BlockedRate data, Map<String, Long> deptMap, Map<String, String> shiftMap) {
         // 当班大队
         if (ObjUtil.isNotNull(data.getDutyBrigadeName())) {
             data.setDutyBrigadeId(deptMap.get(data.getDutyBrigadeName()));
         }
 
         // 班次
-        ShiftEnum shiftEnum = ShiftEnum.getByDesc(data.getShiftDesc());
-        if (ObjUtil.isNotNull(shiftEnum)) {
-            data.setShift(shiftEnum.getCode());
+        if (ObjUtil.isNotNull(data.getShiftDesc())) {
+            data.setShift(shiftMap.get(data.getShiftDesc()));
         }
     }
 }