优化管理员代领钥匙逻辑

2c
1 parent 4fa8a048
Showing 2 changed files with 26 additions and 8 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/BigViewServiceImpl.java
@@ -336,18 +336,36 @@ public class KeyBoxController extends BaseController {
             String date = DateFormatUtils.format(DateUtils.getNowDate(),"yyyy-MM-dd");
             LambdaQueryWrapper<LinggangScheduling> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(LinggangScheduling::getNbbm,dto.getKeyItem().get(0).getPlate()).and(i -> i.and(j -> j.apply("DATE_FORMAT(schedule_date, '%Y-%m-%d') LIKE {0}", date+"%")))
-                    .and(i -> i.eq(LinggangScheduling::getBcType,"out")).and(i -> i.eq(LinggangScheduling::getPosts,"驾驶员"))
-                    .last("ORDER BY ABS(fcsj_t - UNIX_TIMESTAMP() * 1000) LIMIT 1");
+                    .and(i -> i.eq(LinggangScheduling::getBcType,"out")).and(i -> i.eq(LinggangScheduling::getPosts,"驾驶员"));
             //sql 语句：
             // SELECT * FROM `linggang_scheduling`
             // WHERE nbbm = 'A01' AND DATE_FORMAT(schedule_date, '%Y-%m-%d') LIKE '2023-07-08%' AND bc_type = 'out' AND posts = '驾驶员'
-            // ORDER BY ABS(fcsj_t - UNIX_TIMESTAMP() * 100)
-            // LIMIT 1
+
+            // 查询符合条件的调度信息列表
             List<LinggangScheduling> scheduling = schedulingService.list(wrapper);
+            // 初始化调度信息索引
+            int schedulingIndex = 0;
+            // 检查调度信息列表是否不为空
             if(!scheduling.isEmpty()){
-                scheduling.get(0).setExType(4);
-                scheduling.get(0).setRemark("管理员代领钥匙");
-                schedulingService.updateById(scheduling.get(0));
+                // 初始化一个数组，用于存储每个调度信息与当前时间的毫秒差
+                long[] timing = new long[scheduling.size()];
+                // 获取当前系统时间的毫秒值
+                long time = System.currentTimeMillis();
+                // 遍历调度信息列表，计算每个调度信息的时间与当前时间的差值
+                for(int i=0;i<scheduling.size();i++){
+                    timing[i] = Math.abs(time - scheduling.get(i).getFcsjT());
+                }
+                // 遍历时间差数组，找到与当前时间最接近的调度信息索引
+                for (int i = 0; i < timing.length; i++){
+                    if (timing[i] < timing[schedulingIndex]) {
+                        schedulingIndex = i;
+                    }
+                }
+                // 更新与当前时间最接近的调度信息，设置其事件类型为4，并备注管理员代领钥匙
+                scheduling.get(schedulingIndex).setExType(4);
+                scheduling.get(schedulingIndex).setRemark("管理员代领钥匙");
+                // 调用服务方法更新数据库中的相应调度信息
+                schedulingService.updateById(scheduling.get(schedulingIndex));
             }
         }
@@ -472,7 +472,7 @@ public class BigViewServiceImpl implements BigViewService {
                     return;
                 }
                 //   如有多异常覆盖策略 异常等级排 未签 -》 迟到 -》 酒驾
-                if (driverInfoVo.getSignStatus().compareTo(personInfoVo.getSignStatus()) > 0) {
+                if (driverInfoVo.getSignStatus().compareTo(personInfoVo.getSignStatus()) > 0 && personInfoVo.getSignStatus()!=4) {
                     return;
                 }
             }