fix: 修复异常打卡通知空指针异常，完善获取排班日志。

guzijian
1 parent afe58e25
Showing 4 changed files with 13 additions and 6 deletions
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/resources/mapper/driver/DriverMapper.xml
Bsth-admin/src/main/resources/mapper/equipment/EquipmentMapper.xml
@@ -595,6 +595,9 @@ public class DriverServiceImpl implements IDriverService {
     public void computedExceptionScheduling() {
         // 从当前缓存种读取所有的签到数据 遍历每个工号的打卡集合
         Map<String, List<DriverScheduling>> map = nowSchedulingCache.getCacheScheduling(ConstDateUtil.formatDate(new Date()));
+        if (CollectionUtil.isEmpty(map)) {
+            return;
+        }
         List<DriverSignInRecommendation> nowTimerList = new ArrayList<>();
         Long now = System.currentTimeMillis();
         for (Map.Entry<String, List<DriverScheduling>> entry : map.entrySet()) {
@@ -406,14 +406,17 @@ public class ThreadJobService {
             }
         }
         //查询当天是否保存过考情表  如果不存在则保存
+        List<DriverScheduling> bcList = schedulingMapper.queryToDay(ConstDateUtil.formatDate("yyyy-MM-dd"), null, null, null);
         Map<String, List<DriverScheduling>> dto = nowSchedulingCache.getCacheScheduling(ConstDateUtil.formatDate(new Date()));
-        if (!CollectionUtil.isEmpty(dto) || originSchedulingMap.size() == 0) {
-            log.info("已有数据,当天排班数据长度：{}", originSchedulingMap.size());
+        // 当天已有记录则不在保存  或者 调度记录为空则不在保存
+        if ((CollectionUtil.isNotEmpty(dto) && CollectionUtil.isNotEmpty(bcList)) || originSchedulingMap.size() == 0) {
+            log.info("调度最新数据：{}", originSchedulingMap.size());
+            log.info("当天获取数据：{}", bcList.size());
             return;
         }
         // TODO maybe delete
         TempCache.resetMapStatus();
-        List<DriverScheduling> bcList = getBcList(originSchedulingMap);
+        bcList = getBcList(originSchedulingMap);
         // 处理非司售人员的排班明细
         bcList.addAll(handleOtherPostsScheduling());
@@ -433,6 +436,7 @@ public class ThreadJobService {
             // 插入错误排班
             errorJobcodeService.insertBatchErrorJobcode(errorScheduling);
         }
+        log.info("当天排班数据获取完毕,共：{}条", bcList.size());
     }
     private List<DriverScheduling> handleOtherPostsScheduling() {
@@ -531,7 +535,7 @@ public class ThreadJobService {
                     log.error("特殊处理失败:{}", e.getMessage());
                 }
                 // 处理青蒸线区间 区间删除注意特殊情况放到最后可能没有全部都是区间倒是nowScheduling 为0 然后get报错
-                if (nowScheduling.get(0).getLineName().startsWith("青蒸线")) {
+                if (CollectionUtil.isNotEmpty(nowScheduling) && nowScheduling.get(0).getLineName().startsWith("青蒸线")) {
                     nowScheduling = handleQinZhengLine(nowScheduling);
                 }
                 //  ------|结束处理|------
@@ -211,7 +211,8 @@
         ) d1
     </select>
     <select id="selectDriverListAll" resultType="com.ruoyi.driver.domain.Driver">
-        select job_code, line_name, personnel_name, posts, fleet_name from driver
+        select job_code, line_name, personnel_name, posts, fleet_name
+        from driver
     </select>
     <insert id="insertDriver" parameterType="Driver" useGeneratedKeys="true" keyProperty="id">
@@ -165,7 +165,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="status != null">status = #{status},</if>
             <if test="promise != null and promise != ''">promise = #{promise},</if>
             <if test="image != null">image = #{image},</if>
-            <if test="deviceId != null">device_id = #{deviceId},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>