Commit de52410aa2051640ab5ecf77d4dc2181235c6714
1 parent
04c09f7b
新增人员信息接口
Showing
3 changed files
with
11 additions
and
25 deletions
Bsth-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
| @@ -149,8 +149,8 @@ public class DriverController extends BaseController { | @@ -149,8 +149,8 @@ public class DriverController extends BaseController { | ||
| 149 | * @param request 请求头 | 149 | * @param request 请求头 |
| 150 | * @param vo 更新实际数据 | 150 | * @param vo 更新实际数据 |
| 151 | */ | 151 | */ |
| 152 | - // @PostMapping("/update/face") | ||
| 153 | - // @ApiOperation("人脸数据更新接口") | 152 | + @PostMapping("/update/face") |
| 153 | + @ApiOperation("人脸数据更新接口") | ||
| 154 | public Result<?> updateFaceByJob(HttpServletRequest request, @ApiParam @Validated @RequestBody FaceUpdateReqVo vo) { | 154 | public Result<?> updateFaceByJob(HttpServletRequest request, @ApiParam @Validated @RequestBody FaceUpdateReqVo vo) { |
| 155 | try { | 155 | try { |
| 156 | return driverService.updateFaceByJob(request, vo); | 156 | return driverService.updateFaceByJob(request, vo); |
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
| @@ -494,30 +494,16 @@ public class DriverServiceImpl implements IDriverService { | @@ -494,30 +494,16 @@ public class DriverServiceImpl implements IDriverService { | ||
| 494 | List<String> jobCodes = vo.getFaceDataList().stream().map(FaceUpdateReqVo.FaceData::getJobCode).collect(Collectors.toList()); | 494 | List<String> jobCodes = vo.getFaceDataList().stream().map(FaceUpdateReqVo.FaceData::getJobCode).collect(Collectors.toList()); |
| 495 | Map<String, String> existsSet = driverMapper.queryJobCodesIsExists(jobCodes).stream().collect(Collectors.toMap(item -> item, s -> s)); | 495 | Map<String, String> existsSet = driverMapper.queryJobCodesIsExists(jobCodes).stream().collect(Collectors.toMap(item -> item, s -> s)); |
| 496 | jobCodes = new ArrayList<>(existsSet.values()); | 496 | jobCodes = new ArrayList<>(existsSet.values()); |
| 497 | - List<Driver> updateDrivers = getDriversByJobCode(vo, date, existsSet, true); | 497 | + // 只处理新增数据，不再处理更新操作 |
| 498 | List<Driver> insertDrivers = getDriversByJobCode(vo, date, existsSet, false); | 498 | List<Driver> insertDrivers = getDriversByJobCode(vo, date, existsSet, false); |
| 499 | - List<List<Driver>> lists = ListUtils.splitList(updateDrivers, 400); | ||
| 500 | - log.info("开始人员数据更新"); | ||
| 501 | - // 数据更新 更新人脸注册标识 更新基本数据 | ||
| 502 | - for (List<Driver> list : lists) { | ||
| 503 | - driverMapper.updateDriverBaseInfoByJobCodes(list, 0); | ||
| 504 | - attendanceMainService.updateAttendanceMainByJobCode(list); | ||
| 505 | - } | ||
| 506 | - if (insertDrivers.size() > 0) driverMapper.saveDrivers(insertDrivers); | ||
| 507 | - | ||
| 508 | - log.info("完成人员数据更新"); | ||
| 509 | - log.info("开始删除注册表中对应工号的数据"); | ||
| 510 | - List<String> updateImageJobCodes = new ArrayList<>(); | ||
| 511 | - for (Driver driver : updateDrivers) { | ||
| 512 | - if (StringUtil.isNotEmpty(driver.getImage())) { | ||
| 513 | - updateImageJobCodes.add(driver.getJobCode()); | ||
| 514 | - } | ||
| 515 | - } | ||
| 516 | - if (updateImageJobCodes.size() > 0) { | ||
| 517 | - driverMapper.deleteDeviceIdAssociatedJobCode(updateImageJobCodes); | 499 | + if (insertDrivers.size() > 0) { |
| 500 | + driverMapper.saveDrivers(insertDrivers); | ||
| 501 | + log.info("完成人员数据新增，共新增:{}条数据", insertDrivers.size()); | ||
| 502 | + } else { | ||
| 503 | + log.info("没有需要新增的数据"); | ||
| 518 | } | 504 | } |
| 519 | - log.info("删除注册表中对应工号的数据结束"); | ||
| 520 | - return Result.OK("共更新:" + updateDrivers.size() + "条数据," + "共存入:" + insertDrivers.size() + "条数据。"); | 505 | + |
| 506 | + return Result.OK("共新增:" + insertDrivers.size() + "条数据。"); | ||
| 521 | } | 507 | } |
| 522 | 508 | ||
| 523 | private ArrayList<Driver> getDriversByJobCode(FaceUpdateReqVo vo, Date date, Map<String, String> existsSet, Boolean updateFlag) { | 509 | private ArrayList<Driver> getDriversByJobCode(FaceUpdateReqVo vo, Date date, Map<String, String> existsSet, Boolean updateFlag) { |
Bsth-admin/src/main/resources/application.yml