Commit d95eb56aee5993c7904e8bdafc28e9ed19425992
1 parent
473d9be8
feat: 增加排班日志
Showing
2 changed files
with
5 additions
and
1 deletions
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
| ... | ... | @@ -322,6 +322,7 @@ public class DriverJob implements InitializingBean { |
| 322 | 322 | null, |
| 323 | 323 | new ParameterizedTypeReference<List<ResponseSchedulingDto>>() { |
| 324 | 324 | }).getBody(); |
| 325 | + log.info("通过:{},获取到:{}条数据",getSchedulingInfoUrl, originSchedulingList.size()); | |
| 325 | 326 | Map<String, List<ResponseSchedulingDto>> driverSchedulingMap = new HashMap<>(200); |
| 326 | 327 | // 以员工号为key存入排班集合 |
| 327 | 328 | originSchedulingList.stream().forEach(item -> { | ... | ... |
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
| ... | ... | @@ -46,6 +46,7 @@ import sun.misc.BASE64Decoder; |
| 46 | 46 | import javax.annotation.Resource; |
| 47 | 47 | import java.io.*; |
| 48 | 48 | import java.math.BigDecimal; |
| 49 | +import java.text.SimpleDateFormat; | |
| 49 | 50 | import java.time.LocalDate; |
| 50 | 51 | import java.util.*; |
| 51 | 52 | import java.util.stream.Collectors; |
| ... | ... | @@ -379,15 +380,17 @@ public class ThreadJobService { |
| 379 | 380 | LocalDate date = LocalDate.now(); |
| 380 | 381 | Date date2 = ConstDateUtil.dateAddition(date.toString(), timeOut); |
| 381 | 382 | Date date1 = new Date(); |
| 383 | + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); | |
| 382 | 384 | // 如果当前日期小于设定时间就不获取固定排班 |
| 383 | 385 | if (date1.compareTo(date2) < 0) { |
| 386 | + log.info("当前日期小于设定时间就不获取排班,当前时间:{},设定时间:{}", format.format(date1), format.format(date2)); | |
| 384 | 387 | return; |
| 385 | 388 | } |
| 386 | 389 | } |
| 387 | 390 | //查询当天是否保存过考情表 如果不存在则保存 |
| 388 | 391 | Map<String, List<DriverScheduling>> dto = nowSchedulingCache.getCacheScheduling(ConstDateUtil.formatDate(new Date())); |
| 389 | 392 | if (!CollectionUtil.isEmpty(dto) || originSchedulingMap.size() == 0) { |
| 390 | - log.info("当天排班数据长度:{}", originSchedulingMap.size()); | |
| 393 | + log.info("已有数据,当天排班数据长度:{}", originSchedulingMap.size()); | |
| 391 | 394 | return; |
| 392 | 395 | } |
| 393 | 396 | List<DriverScheduling> bcList = getBcList(originSchedulingMap); | ... | ... |