更新接收tokendto

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -243,8 +243,8 @@ public class IcResiUserController implements ResultDataResolver {
      * @date 2022/4/26 10:48
      */
     @PostMapping("rent/updateimage")
-    public Result updateImage(@RequestBody RentTenantFormDTO formDTO) {
-        String resiUserId = icResiUserService.updateImage(formDTO);
+    public Result updateImage(@LoginUser TokenDto tokenDto, @RequestBody RentTenantFormDTO formDTO) {
+        String resiUserId = icResiUserService.updateImage(tokenDto, formDTO);
         //推送MQ事件
         editResiMq(formDTO.getCustomerId(), resiUserId);
         return new Result();

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@@ -273,6 +273,6 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @author zhy
      * @date 2022/4/26 10:48
      */
-    String updateImage(RentTenantFormDTO formDTO);
+    String updateImage(TokenDto tokenDto, RentTenantFormDTO formDTO);
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -252,14 +252,33 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         });
 
         //3.变更记录表和变更记录明细表新增数据
+        saveUserChangeRecord(tokenDto,map,resiUserId,name);
+
+        return resiUserId;
+
+    }
+
+    /**
+     * 3.变更记录表和变更记录明细表新增数据
+     *
+     * @param tokenDto
+     * @param map
+     * @param icUserId
+     * @param icUserName
+     * @return void
+     * @author zhy
+     * @date 2022/4/29 14:49
+     */
+    private void saveUserChangeRecord(TokenDto tokenDto, LinkedHashMap<String, String> map, String icUserId, String icUserName) {
+        //变更记录表和变更记录明细表新增数据
         CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
         //3-1.变更记录表
         IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity();
         changeRecordEntity.setCustomerId(tokenDto.getCustomerId());
         changeRecordEntity.setOperatorId(tokenDto.getUserId());
-        changeRecordEntity.setIcUserId(resiUserId);
+        changeRecordEntity.setIcUserId(icUserId);
         changeRecordEntity.setOperatorName(staffInfoCache.getRealName());
-        changeRecordEntity.setIcUserName(name);
+        changeRecordEntity.setIcUserName(icUserName);
         changeRecordEntity.setType("add");
         changeRecordEntity.setTypeName("新增");
         changeRecordEntity.setBeforeChangeName("-");
@@ -267,11 +286,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         changeRecordEntity.setChangeTime(new java.util.Date());
         icUserChangeRecordService.insert(changeRecordEntity);
         //3-2.变更明细表
-        List<IcUserChangeDetailedEntity> changeDetailedEntityList = saveChangeRecord(tokenDto, map, resiUserId, changeRecordEntity.getId());
+        List<IcUserChangeDetailedEntity> changeDetailedEntityList = saveChangeRecord(tokenDto, map, icUserId, changeRecordEntity.getId());
         icUserChangeDetailedService.insertBatch(changeDetailedEntityList);
-
-        return resiUserId;
-
     }
 
     /**
@@ -1615,7 +1631,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String updateImage(RentTenantFormDTO formDTO) {
+    public String updateImage(TokenDto tokenDto, RentTenantFormDTO formDTO) {
         String resiUserId = "";
         IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(formDTO.getIdCard(), formDTO.getCustomerId());
         if (null != userDTO) {
@@ -1629,7 +1645,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             IcResiUserEntity entity = ConvertUtils.sourceToTarget(formDTO.getUser(), IcResiUserEntity.class);
             insert(entity);
             resiUserId = entity.getId();
-
+            // 变更记录表和变更记录明细表新增数据
+            LinkedHashMap<String, String> map = new LinkedHashMap();
+            map.put("AGENCY_ID",entity.getAgencyId());
+            saveUserChangeRecord(tokenDto,map,resiUserId,entity.getName());
             // 新增用户后保存头像信息
             List<IcResiUserAttachmentDTO> images = formDTO.getImages();
             images.forEach(item -> item.setUserId(entity.getId()));
@@ -1638,4 +1657,5 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
         return resiUserId;
     }
+
 }