diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueRepository.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueRepository.java index 21ae2bfb..388fc95c 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueRepository.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueRepository.java @@ -32,14 +32,15 @@ public interface ClueRepository extends JpaRepository, JpaSpecificat /** * 修改性别 * - * @param number + * @param setNumber + * @param initialNumber * @param firstId * @param lastId * @return */ @Modifying - @Query(value = "UPDATE Clue set gender = ?1 where id >= ?2 and id <= ?3") - Integer updateGenderById(Integer number, Long firstId, Long lastId); + @Query(value = "UPDATE Clue set gender = ?1 where gender = ?2 and id >= ?3 and id <= ?4") + Integer updateGenderById(Integer setNumber, Integer initialNumber, Long firstId, Long lastId); /** diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/ClueService.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/ClueService.java index c1abbc8c..a352c39b 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/ClueService.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/ClueService.java @@ -213,11 +213,12 @@ public interface ClueService { * 根据id修改状态 * * @param number + * @param setNumber * @param firstId * @param lastId * @return */ - Boolean updateGenderById(Integer number, Long firstId, Long lastId); + Boolean updateGenderById(Integer number, Integer setNumber, Long firstId, Long lastId); /** diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java index cf9993fd..fa9e702e 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java @@ -1170,8 +1170,8 @@ public class ClueServiceImpl implements ClueService { @Override @Transactional(rollbackFor = Exception.class) - public Boolean updateGenderById(Integer number, Long firstId, Long lastId) { - return clueRepository.updateGenderById(number, firstId, lastId) > DefaultNumberConstants.ZERO_NUMBER; + public Boolean updateGenderById(Integer number, Integer initialNumber, Long firstId, Long lastId) { + return clueRepository.updateGenderById(number, initialNumber, firstId, lastId) > DefaultNumberConstants.ZERO_NUMBER; } @Override diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java index 01162064..48f766b0 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java @@ -61,7 +61,7 @@ public class GenderConversionTask { String fileUrl = deliveryProperties.getFileUrl(); // 单次查询10000 List> resourceList = clueService.queryUnconvertedResource - (DefaultNumberConstants.ZERO_NUMBER, DefaultNumberConstants.TEN_THOUSAND); + (DefaultNumberConstants.ZERO_NUMBER, DefaultNumberConstants.FIFTY_THOUSAND); if (resourceList.size() > DefaultNumberConstants.ONE_THOUSAND && CollUtil.isNotEmpty(resourceList)) { // 对应转换 List list = Convert.toList(QueryClueDTO.class, resourceList); @@ -81,7 +81,7 @@ public class GenderConversionTask { String file = fileUrl.concat(StrPool.SLASH).concat(taskImeiName); // 压缩文件并发送 FileAndGenderUtil.zipFileAndSendGenderMail(stringList, file, taskImeiName, deliveryProperties); - clueService.updateGenderById(DefaultNumberConstants.FOUR_NUMBER, firstId, lastId); + clueService.updateGenderById(DefaultNumberConstants.FOUR_NUMBER, DefaultNumberConstants.ZERO_NUMBER, firstId, lastId); genderRecordService.saveDeliveryRecord(taskImeiName, list.size(), DefaultNumberConstants.ONE_NUMBER); log.info("============== the save num as {} first id {} last id {} ================", stringList.size(), firstId, lastId); }