diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/domain/UserFace.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/domain/UserFace.java new file mode 100644 index 00000000..e8f3c95a --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/domain/UserFace.java @@ -0,0 +1,10 @@ +package org.dromara.transferData.domain; + + +import lombok.Data; + +@Data +public class UserFace { + private Long id; + private String pacePhoto; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/mapper/TransferDataMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/mapper/TransferDataMapper.java index 0660d761..fe39508d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/mapper/TransferDataMapper.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/mapper/TransferDataMapper.java @@ -77,13 +77,13 @@ public interface TransferDataMapper { "") List getUserFileList(List goIds); - + @DS("slave1") @Select("") - Map getUserFace(List goIds); + List getUserFace(List goIds); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/service/TransferDataService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/service/TransferDataService.java index e03f913b..eae44dd8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/service/TransferDataService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/service/TransferDataService.java @@ -26,10 +26,7 @@ import org.dromara.system.domain.vo.SysOssVo; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.service.ISysOssService; import org.dromara.system.service.ISysUserService; -import org.dromara.transferData.domain.ConstructionUserNew; -import org.dromara.transferData.domain.OldFile; -import org.dromara.transferData.domain.User; -import org.dromara.transferData.domain.UserFile; +import org.dromara.transferData.domain.*; import org.dromara.transferData.mapper.TransferDataMapper; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.scheduling.annotation.Async; @@ -842,11 +839,13 @@ public class TransferDataService { } // 获取人脸照片路径映射 - Map userFace = transferDataMapper.getUserFace(goIds); + List userFace = transferDataMapper.getUserFace(goIds); + Map facePicMap = userFace.stream() + .collect(Collectors.toMap(UserFace::getId, UserFace::getPacePhoto)); List updateList = new ArrayList<>(); for (SubConstructionUser user : usersWithoutFacePic) { - String facePic = userFace.get(user.getGoId()); + String facePic = facePicMap.get(user.getGoId()); if (facePic != null && !facePic.isEmpty()) { Long facePicId = handleSinglePhotoLimit(facePic); if (facePicId != null) {