Merge remote-tracking branch 'origin/master'

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

@@ -7,20 +7,15 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baiye.constant.DefaultNumberConstants;
-import com.baiye.exception.BadRequestException;
 import com.baiye.feign.SourceClueClient;
 import com.baiye.http.CommonResponse;
-import com.baiye.http.DoubleCallResponse;
-import com.baiye.model.enums.ResponseCode;
 import com.baiye.model.vo.ResSourceLabel;
 import com.baiye.modules.report.entity.dto.StatisticalReportDTO;
 import com.baiye.modules.report.entity.dto.UploadTaskDTO;
 import com.baiye.modules.report.entity.vo.MemberInfoVO;
 import com.baiye.modules.report.service.ReportService;
-import com.baiye.modules.system.domain.Company;
 import com.baiye.modules.system.domain.Organize;
 import com.baiye.modules.system.domain.Task;
 import com.baiye.modules.system.domain.User;
@@ -32,12 +27,10 @@ import com.baiye.modules.telemarkting.dao.AllCallInfoRepository;
 import com.baiye.modules.telemarkting.dao.CallClueRepository;
 import com.baiye.modules.telemarkting.entity.AllCallInfo;
 import com.baiye.modules.telemarkting.entity.CallClueInfo;
-import com.baiye.modules.telemarkting.entity.DoubleCallInfo;
 import com.baiye.util.DateTimeUtil;
 import com.baiye.util.ExportExcelUtil;
 import com.baiye.util.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 

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

@@ -23,6 +23,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -80,12 +81,13 @@ public interface UserMessageRepository extends JpaRepository<UserMessage, Long>,
     /**
      * 查询满足条件的消息
      *
-     * @param time
+     * @param date
      * @param status
+     * @param isTop
      * @return
      */
     @Query(value = "select um from UserMessage um where um.updateTime < ?1 and um.status =?2 and um.isTop = ?3")
-    List<UserMessage> selectByTimeAndStatus(String time, Integer status, Boolean isTop);
+    List<UserMessage> selectByTimeAndStatus(Date date, Integer status, Boolean isTop);
 
     /**
      * 查询满足条件的消息

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

@@ -24,6 +24,7 @@ import org.springframework.data.domain.Pageable;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -149,12 +150,12 @@ public interface UserMessageService {
 
     /**
      * 查询满足归档的消息
-     *
-     * @param time
+     * @param date
      * @param status
+     * @param isTop
      * @return
      */
-    List<UserMessage> selectByTimeAndStatus(String time, Integer status, Boolean isTop);
+    List<UserMessage> selectByTimeAndStatus(Date date, Integer status, Boolean isTop);
 
     /**
      * 查询满足归档的消息

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

@@ -33,6 +33,7 @@ import com.baiye.util.FileUtil;
 import com.baiye.util.PageUtil;
 import com.baiye.util.QueryHelp;
 import com.baiye.util.ValidationUtil;
+import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -243,8 +244,9 @@ public class UserMessageServiceImpl implements UserMessageService {
     }
 
     @Override
-    public List<UserMessage> selectByTimeAndStatus(String time, Integer status, Boolean isTop) {
-        return userMessageRepository.selectByTimeAndStatus(time, status, isTop);
+    public List<UserMessage> selectByTimeAndStatus(Date date, Integer status, Boolean isTop) {
+        List<UserMessage> userMessages = userMessageRepository.selectByTimeAndStatus(date, status, isTop);
+        return null;
     }
 
     @Override

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

@@ -26,10 +26,7 @@ import org.springframework.stereotype.Component;
 
 import java.io.File;
 import java.io.FileWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -93,13 +90,13 @@ public class SendMessageSync {
      */
     @Scheduled(cron = "0 0 0 1/1 * ?")
     public void automaticFilingMessage() {
-        String beginTime = DateUtil.format(DateUtil.offsetDay(DateUtil.date(), -7), "yyyy-MM-dd HH:mm:ss");
-        List<UserMessage> userMessages = userMessageService.selectByTimeAndStatus(beginTime, DefaultNumberConstants.ONE_NUMBER, Boolean.FALSE);
+        Date date = DateUtil.offsetDay(DateUtil.date(), -7);
+        List<UserMessage> userMessages = userMessageService.selectByTimeAndStatus(date, DefaultNumberConstants.ONE_NUMBER, Boolean.FALSE);
         if (ObjectUtil.isNotNull(userMessages)) {
             userMessages.forEach(x -> x.setStatus(DefaultNumberConstants.MINUS_ONE_NUMBER));
             userMessageService.saveAll(userMessages);
         }
-
+        log.info("========================= sync automaticFiling  as {} =========================", DateTime.now());
     }
 
     /**
@@ -118,6 +115,7 @@ public class SendMessageSync {
                 throw new BadRequestException("删除归档消息失败");
             }
         }
+        log.info("========================= sync saveMessagesZip  as {} =========================", DateTime.now());
     }
 
     private void saveZip(List<UserMessage> list) {
@@ -135,6 +133,5 @@ public class SendMessageSync {
             log.error("定时归档失败");
             throw new BadRequestException("定时归档失败");
         }
-
     }
 }