Commit 6481fce1 authored by 王亮's avatar 王亮

fixed an issues.

parent d0211fed
...@@ -4,8 +4,12 @@ import cn.quantgroup.xyqb.entity.UserTag; ...@@ -4,8 +4,12 @@ import cn.quantgroup.xyqb.entity.UserTag;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import java.util.List;
public interface IUserTagRepository extends JpaRepository<UserTag, Long>, JpaSpecificationExecutor<UserTag> { public interface IUserTagRepository extends JpaRepository<UserTag, Long>, JpaSpecificationExecutor<UserTag> {
UserTag findByUserIdAndTenantIdAndRegisteredFrom(Long userId,Integer tenantId,Long registeredFrom); UserTag findByUserIdAndTenantIdAndRegisteredFrom(Long userId, Integer tenantId, Long registeredFrom);
List<UserTag> findByUserIdInAndTenantId(List<Long> userIds, Integer tenantId);
void deleteByUserIdAndTenantId(Long userId,Integer tenantId); void deleteByUserIdAndTenantId(Long userId, Integer tenantId);
} }
...@@ -13,9 +13,6 @@ import org.springframework.data.domain.PageRequest; ...@@ -13,9 +13,6 @@ import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
import java.util.stream.Collectors;
/** /**
* 第一次上线对历史数据清理程序 * 第一次上线对历史数据清理程序
*/ */
...@@ -31,17 +28,21 @@ public class UserTagCleanJobHandler { ...@@ -31,17 +28,21 @@ public class UserTagCleanJobHandler {
public ReturnT<String> execute(String param) throws Exception { public ReturnT<String> execute(String param) throws Exception {
Pageable pageable = new PageRequest(0, 500); Pageable pageable = new PageRequest(0, 500);
Page<User> userPage = userRepository.findAll(pageable); Page<User> userPage = userRepository.findAll(pageable);
while (CollectionUtils.isNotEmpty(userPage.getContent())) { while (CollectionUtils.isNotEmpty(userPage.getContent())) {
List<UserTag> userTagList = userPage.getContent().stream().map(user -> { userPage.getContent().forEach(user -> {
UserTag userTag = UserTag.builder() UserTag userTag = UserTag.builder()
.userId(user.getId()).registeredFrom(user.getRegisteredFrom()).tenantId(user.getTenantId()) .userId(user.getId()).registeredFrom(user.getRegisteredFrom()).tenantId(user.getTenantId())
.build(); .build();
userTag.setCreatedAt(user.getCreatedAt()); userTag.setCreatedAt(user.getCreatedAt());
userTag.setUpdatedAt(user.getUpdatedAt()); userTag.setUpdatedAt(user.getUpdatedAt());
return userTag; try {
}).collect(Collectors.toList()); userTagRepository.save(userTag);
} catch (Exception ignored) {
}
userTagRepository.save(userTagList); });
pageable = new PageRequest(pageable.getPageNumber() + 1, pageable.getPageSize()); pageable = new PageRequest(pageable.getPageNumber() + 1, pageable.getPageSize());
userPage = userRepository.findAll(pageable); userPage = userRepository.findAll(pageable);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment