Merge remote-tracking branch 'origin/master'

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/repository/TaskImeiRepository.java

@@ -29,9 +29,11 @@ public interface TaskImeiRepository extends JpaRepository<TaskImei, Long>, JpaSp
      * 状态查找
      *
      * @param num
+     * @param beginOfDay
      * @return
      */
-    List<TaskImei> findByStatus(Integer num);
+    @Query("from TaskImei t where t.status = ?1 and t.createTime > ?2")
+    List<TaskImei> findByStatusAndCreateTime(Integer num, DateTime beginOfDay);
 
     /**
      * 修改兑换数量

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/TaskImeiService.java

@@ -18,10 +18,12 @@ public interface TaskImeiService {
 
     /**
      * 状态查找集合
+     *
      * @param num
+     * @param beginOfDay
      * @return
      */
-    List<TaskImei> findByStatus(Integer num);
+    List<TaskImei> findByStatusAndTime(Integer num, DateTime beginOfDay);
 
     /**
      * 接收消息

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskImeiServiceImpl.java

@@ -57,8 +57,8 @@ public class TaskImeiServiceImpl implements TaskImeiService {
 
 
     @Override
-    public List<TaskImei> findByStatus(Integer num) {
+    public List<TaskImei> findByStatusAndTime(Integer num, DateTime beginOfDay) {
-        return taskImeiRepository.findByStatus(num);
+        return taskImeiRepository.findByStatusAndCreateTime(num, beginOfDay);
     }
 
     /**

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java

@@ -77,8 +77,9 @@ public class DeliveryBalanceTask {
     @Scheduled(cron = "0 0/15 * * * ? ")
     @Transactional(rollbackFor = Exception.class)
     public void cashResources() {
+        DateTime beginOfDay = DateUtil.beginOfDay(DateUtil.date());
         // 查询所有未兑换的
-        List<TaskImei> imeiList = taskImeiService.findByStatus(DefaultNumberConstants.ZERO_NUMBER);
+        List<TaskImei> imeiList = taskImeiService.findByStatusAndTime(DefaultNumberConstants.ZERO_NUMBER, beginOfDay);
         if (CollUtil.isNotEmpty(imeiList)) {
             // 根据任务id分组
             Map<Long, List<TaskImei>> listMap = imeiList.stream().collect(Collectors.groupingBy(TaskImei::getTaskId));

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/UpdateImeiTask.java

@@ -35,7 +35,7 @@ public class UpdateImeiTask {
     public void updateImeiByDate() {
 
         log.info("================= the update imei time as {} =================", DateUtil.date());
-        DateTime dateTime = DateUtil.offsetDay(DateUtil.date(), -DefaultNumberConstants.TWO_NUMBER);
+        DateTime dateTime = DateUtil.offsetDay(DateUtil.date(), -DefaultNumberConstants.ONE_NUMBER);
         Boolean result = taskImeiService.updateImeiByDate(DefaultNumberConstants.ONE_NUMBER, DefaultNumberConstants.ZERO_NUMBER, dateTime);
         log.info("================= the update imei time as {} the result as {} =================", DateUtil.date(), result);
     }
@@ -56,7 +56,7 @@ public class UpdateImeiTask {
         long totalDeleted = 0L;
         String deleteStr = "DELETE FROM tb_task_imei WHERE  create_time  <:DATE ";
         // 时间偏移六个月
-        DateTime date = DateUtil.offsetMonth(DateUtil.date(), -DefaultNumberConstants.SIX_NUMBER);
+        DateTime date = DateUtil.offsetMonth(DateUtil.date(), -DefaultNumberConstants.ONE_NUMBER);
         do {
             Query deleteTagByQuery = entityManager.createNativeQuery(deleteStr.concat(" limit 50000"));
             deleteTagByQuery.setParameter("DATE", date.toDateStr());

ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueRepository.java

@@ -32,14 +32,15 @@ public interface ClueRepository extends JpaRepository<Clue, Long>, 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")
+    @Query(value = "UPDATE Clue set gender = ?1 where gender = ?2 and id >= ?3 and id <= ?4")
-    Integer updateGenderById(Integer number, Long firstId, Long lastId);
+    Integer updateGenderById(Integer setNumber, Integer initialNumber, Long firstId, Long lastId);
 
 
     /**

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);
 
 
     /**

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) {
+    public Boolean updateGenderById(Integer number, Integer initialNumber, Long firstId, Long lastId) {
-        return clueRepository.updateGenderById(number, firstId, lastId) > DefaultNumberConstants.ZERO_NUMBER;
+        return clueRepository.updateGenderById(number, initialNumber, firstId, lastId) > DefaultNumberConstants.ZERO_NUMBER;
     }
 
     @Override

ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java

@@ -55,7 +55,7 @@ public class GenderConversionTask {
     private final GenderRecordService genderRecordService;
 
 
-    @Scheduled(cron = "0 0/30 0-6 * * ? ")
+    @Scheduled(cron = "0 0/20 0-6 * * ? ")
     @Transactional(rollbackFor = Exception.class)
     public void exchangeResource() {
         String fileUrl = deliveryProperties.getFileUrl();
@@ -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);
         }