每日各时段查堵行李表

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

@@ -4,10 +4,14 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
+import com.sundot.airport.common.core.domain.entity.SysDictData;
+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;
@@ -33,6 +37,9 @@ public class BlockedLuggagePieceDailyServiceImpl implements IBlockedLuggagePiece
     @Autowired
     private ISysDeptService sysDeptService;
 
+    @Autowired
+    private ISysDictDataService sysDictDataService;
+
     /**
      * 查询每日各时段查堵行李
      *
@@ -134,17 +141,17 @@ public class BlockedLuggagePieceDailyServiceImpl implements IBlockedLuggagePiece
                 // 数据校验
                 if (ObjUtil.isNull(data.getStatDate())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、统计日期不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、统计日期【" + data.getStatDate() + "】、大队【" + data.getBrigadeName() + "】、时间段【" + data.getTimePeriod() + "】统计日期不能为空");
                     continue;
                 }
-                if (ObjUtil.isNull(data.getBrigadeId())) {
+                if (ObjUtil.isNull(data.getBrigadeId()) || ObjUtil.isNull(data.getBrigadeName())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、大队ID不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、统计日期【" + data.getStatDate() + "】、大队【" + data.getBrigadeName() + "】、时间段【" + data.getTimePeriod() + "】大队不能为空");
                     continue;
                 }
                 if (StrUtil.isBlank(data.getTimePeriod())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、时间段不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、统计日期【" + data.getStatDate() + "】、大队【" + data.getBrigadeName() + "】、时间段【" + data.getTimePeriod() + "】时间段不能为空");
                     continue;
                 }
 
@@ -177,7 +184,7 @@ public class BlockedLuggagePieceDailyServiceImpl implements IBlockedLuggagePiece
                 }
             } catch (Exception e) {
                 failureNum++;
-                String msg = "<br/>" + failureNum + "、统计日期【" + data.getStatDate() + "】导入失败：";
+                String msg = "<br/>" + failureNum + "、统计日期【" + data.getStatDate() + "】、大队【" + data.getBrigadeName() + "】、时间段【" + data.getTimePeriod() + "】导入失败：";
                 failureMsg.append(msg + e.getMessage());
             }
         }
@@ -321,5 +328,14 @@ public class BlockedLuggagePieceDailyServiceImpl implements IBlockedLuggagePiece
                 data.setBrigadeId(deptList.get(0).getDeptId());
             }
         }
+
+        // 时间段 - 通过查堵时间段字典查询
+        if (StrUtil.isNotBlank(data.getTimePeriod())) {
+            SysDictData query = new SysDictData();
+            query.setDictType("blocked_time_period");
+            List<SysDictData> sysDictDataList = sysDictDataService.selectDictDataList(query);
+            Map<String, String> sysDictDataMap = sysDictDataList.stream().collect(Collectors.toMap(SysDictData::getDictLabel, SysDictData::getDictValue));
+            data.setTimePeriod(sysDictDataMap.get(data.getTimePeriod()));
+        }
     }
 }