fix: 修改接口传参，可不更新人脸图片

guzijian
1 parent 5b2e2efe
Showing 2 changed files with 19 additions and 10 deletions
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/pojo/request/FaceUpdateReqVo.java
@@ -459,20 +459,26 @@ public class DriverServiceImpl implements IDriverService {
         List<Driver> updateDrivers = getDriversByJobCode(vo, date, existsSet, true);
         List<Driver> insertDrivers = getDriversByJobCode(vo, date, existsSet, false);
         List<List<Driver>> lists = ListUtils.splitList(updateDrivers, 400);
-        log.info("开始人脸数据更新");
+        log.info("开始人员数据更新");
         // 数据更新 更新人脸注册标识 更新基本数据
         for (List<Driver> list : lists) {
             driverMapper.updateSignStatusDriversByJobCodes(list);
         }
         if (insertDrivers.size() > 0) driverMapper.saveDrivers(insertDrivers);
-        log.info("人脸数据更新完成");
+        log.info("完成人员数据更新");
         log.info("开始删除注册表中对应工号的数据");
-        if (jobCodes.size() > 0)
-            driverMapper.deleteDeviceIdAssociatedJobCode(jobCodes);
+        List<String> updateImageJobCodes = new ArrayList<>();
+        for (Driver driver : updateDrivers) {
+            if (StringUtil.isNotEmpty(driver.getImage())){
+                updateImageJobCodes.add(driver.getJobCode());
+            }
+        }
+        if (updateImageJobCodes.size() > 0){
+            driverMapper.deleteDeviceIdAssociatedJobCode(updateImageJobCodes);
+        }
         log.info("删除注册表中对应工号的数据结束");
-
-        return Result.OK();
+        return Result.OK("共更新:" + updateDrivers.size() + "条数据," + "共存入:" + insertDrivers.size() + "条数据。");
     }
     private ArrayList<Driver> getDriversByJobCode(FaceUpdateReqVo vo, Date date, Map<String, String> existsSet, Boolean updateFlag) {
@@ -484,7 +490,9 @@ public class DriverServiceImpl implements IDriverService {
                 driver.setFleetName(item.getFleetName());
                 driver.setLineName(item.getLineName());
                 try {
-                    driver.setImage(getNewImageUrl(item.getJobCode(), item.getImageUrl()));
+                    if (StringUtil.isNotEmpty(item.getImageUrl())){
+                        driver.setImage(getNewImageUrl(item.getJobCode(), item.getImageUrl()));
+                    }
                 } catch (IOException e) {
                     log.error(e.getMessage());
                     throw new RuntimeException(e);
@@ -502,7 +510,9 @@ public class DriverServiceImpl implements IDriverService {
                 driver.setLineName(item.getLineName());
                 driver.setFaceSignIn(SIGN_FACE_ACTIVE);
                 try {
-                    driver.setImage(getNewImageUrl(item.getJobCode(), item.getImageUrl()));
+                    if (StringUtil.isNotEmpty(item.getImageUrl())){
+                        driver.setImage(getNewImageUrl(item.getJobCode(), item.getImageUrl()));
+                    }
                 } catch (IOException e) {
                     log.error(e.getMessage());
                     throw new RuntimeException(e);
@@ -34,8 +34,7 @@ public class FaceUpdateReqVo {
         /**
          * 图片url不能为空
          */
-        @ApiModelProperty(value = "图片url",required = true)
-        @NotBlank(message = "图片url不能为空")
+        @ApiModelProperty(value = "图片url")
         String imageUrl;
         /**
          * 姓名