Commit 2fcb0c4dfccea6ead51a3c930a548c708f2e7ba6
1 parent
5b2e2efe
fix: 修改接口传参，可不更新人脸图片
Showing
2 changed files
with
19 additions
and
10 deletions
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
| ... | ... | @@ -459,20 +459,26 @@ public class DriverServiceImpl implements IDriverService { |
| 459 | 459 | List<Driver> updateDrivers = getDriversByJobCode(vo, date, existsSet, true); |
| 460 | 460 | List<Driver> insertDrivers = getDriversByJobCode(vo, date, existsSet, false); |
| 461 | 461 | List<List<Driver>> lists = ListUtils.splitList(updateDrivers, 400); |
| 462 | - log.info("开始人脸数据更新"); | |
| 462 | + log.info("开始人员数据更新"); | |
| 463 | 463 | // 数据更新 更新人脸注册标识 更新基本数据 |
| 464 | 464 | for (List<Driver> list : lists) { |
| 465 | 465 | driverMapper.updateSignStatusDriversByJobCodes(list); |
| 466 | 466 | } |
| 467 | 467 | if (insertDrivers.size() > 0) driverMapper.saveDrivers(insertDrivers); |
| 468 | 468 | |
| 469 | - log.info("人脸数据更新完成"); | |
| 469 | + log.info("完成人员数据更新"); | |
| 470 | 470 | log.info("开始删除注册表中对应工号的数据"); |
| 471 | - if (jobCodes.size() > 0) | |
| 472 | - driverMapper.deleteDeviceIdAssociatedJobCode(jobCodes); | |
| 471 | + List<String> updateImageJobCodes = new ArrayList<>(); | |
| 472 | + for (Driver driver : updateDrivers) { | |
| 473 | + if (StringUtil.isNotEmpty(driver.getImage())){ | |
| 474 | + updateImageJobCodes.add(driver.getJobCode()); | |
| 475 | + } | |
| 476 | + } | |
| 477 | + if (updateImageJobCodes.size() > 0){ | |
| 478 | + driverMapper.deleteDeviceIdAssociatedJobCode(updateImageJobCodes); | |
| 479 | + } | |
| 473 | 480 | log.info("删除注册表中对应工号的数据结束"); |
| 474 | - | |
| 475 | - return Result.OK(); | |
| 481 | + return Result.OK("共更新:" + updateDrivers.size() + "条数据," + "共存入:" + insertDrivers.size() + "条数据。"); | |
| 476 | 482 | } |
| 477 | 483 | |
| 478 | 484 | private ArrayList<Driver> getDriversByJobCode(FaceUpdateReqVo vo, Date date, Map<String, String> existsSet, Boolean updateFlag) { |
| ... | ... | @@ -484,7 +490,9 @@ public class DriverServiceImpl implements IDriverService { |
| 484 | 490 | driver.setFleetName(item.getFleetName()); |
| 485 | 491 | driver.setLineName(item.getLineName()); |
| 486 | 492 | try { |
| 487 | - driver.setImage(getNewImageUrl(item.getJobCode(), item.getImageUrl())); | |
| 493 | + if (StringUtil.isNotEmpty(item.getImageUrl())){ | |
| 494 | + driver.setImage(getNewImageUrl(item.getJobCode(), item.getImageUrl())); | |
| 495 | + } | |
| 488 | 496 | } catch (IOException e) { |
| 489 | 497 | log.error(e.getMessage()); |
| 490 | 498 | throw new RuntimeException(e); |
| ... | ... | @@ -502,7 +510,9 @@ public class DriverServiceImpl implements IDriverService { |
| 502 | 510 | driver.setLineName(item.getLineName()); |
| 503 | 511 | driver.setFaceSignIn(SIGN_FACE_ACTIVE); |
| 504 | 512 | try { |
| 505 | - driver.setImage(getNewImageUrl(item.getJobCode(), item.getImageUrl())); | |
| 513 | + if (StringUtil.isNotEmpty(item.getImageUrl())){ | |
| 514 | + driver.setImage(getNewImageUrl(item.getJobCode(), item.getImageUrl())); | |
| 515 | + } | |
| 506 | 516 | } catch (IOException e) { |
| 507 | 517 | log.error(e.getMessage()); |
| 508 | 518 | throw new RuntimeException(e); | ... | ... |
Bsth-admin/src/main/java/com/ruoyi/pojo/request/FaceUpdateReqVo.java