1.1.2970下游数据适配调整

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/HistoryDataDealServiceImpl.java

@@ -3,10 +3,13 @@ package com.yeejoin.amos.boot.module.tcm.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.common.api.entity.TzsUserPermission;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StopWatch;
 
 import java.util.ArrayList;
@@ -29,6 +32,7 @@ public class HistoryDataDealServiceImpl {
         this.userPermissionService = userPermissionService;
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public int userPermissionUpdate() {
         log.info("刷存量人员资质开始");
         StopWatch stopWatch = new StopWatch();
@@ -57,16 +61,23 @@ public class HistoryDataDealServiceImpl {
         return allWaitFlushData.size();
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public Integer userPersonTypeUpdate() {
         log.info("刷存量人员类型开始");
         StopWatch stopWatch = new StopWatch();
         stopWatch.start();
-        List<TzsUserInfo> users = userInfoService.list();
-        users.forEach(u->{
+        LambdaQueryWrapper<TzsUserInfo> wrapper = new LambdaQueryWrapper<>();
+        wrapper.select(BaseEntity::getSequenceNbr,TzsUserInfo::getPost);
+        wrapper.isNotNull(TzsUserInfo::getPost);
+        List<TzsUserInfo> users = userInfoService.list(wrapper);
+        users.parallelStream().forEach(u->{
             // 维保人员人员类型去掉，数据规避到作业人员
-            u.setNewPost(u.getPost().replace("6618","6552"));
+            LambdaUpdateWrapper<TzsUserInfo> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.set(TzsUserInfo::getNewPost, u.getPost().replace("6618","6552"));
+            updateWrapper.eq(BaseEntity::getSequenceNbr, u.getSequenceNbr());
+            userInfoService.update(updateWrapper);
         });
-        userInfoService.saveOrUpdateBatch(users);
+
         stopWatch.stop();
         log.info("刷存量人员类型结束，人员数量:{}，耗时：{}秒", users.size(), stopWatch.getTotalTimeSeconds());
         return users.size();