From fb7ddeb184bdb63d341675627ad8d0ddc2d5afa2 Mon Sep 17 00:00:00 2001 From: wujingtao Date: Mon, 7 Mar 2022 09:54:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6=E5=BD=92?= =?UTF-8?q?=E6=A1=A3=E7=9A=84=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/service/impl/ReportServiceImpl.java | 7 ------- .../system/repository/UserMessageRepository.java | 6 ++++-- .../modules/system/service/UserMessageService.java | 7 ++++--- .../system/service/impl/UserMessageServiceImpl.java | 6 ++++-- .../main/java/com/baiye/timed/SendMessageSync.java | 13 +++++-------- 5 files changed, 17 insertions(+), 22 deletions(-) diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/report/service/impl/ReportServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/report/service/impl/ReportServiceImpl.java index cccdc189..f481c6ee 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/report/service/impl/ReportServiceImpl.java +++ b/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; diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/UserMessageRepository.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/UserMessageRepository.java index da20f539..47f52f7d 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/UserMessageRepository.java +++ b/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, /** * 查询满足条件的消息 * - * @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 selectByTimeAndStatus(String time, Integer status, Boolean isTop); + List selectByTimeAndStatus(Date date, Integer status, Boolean isTop); /** * 查询满足条件的消息 diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/UserMessageService.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/UserMessageService.java index e03bfec9..dc7692f8 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/UserMessageService.java +++ b/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 selectByTimeAndStatus(String time, Integer status, Boolean isTop); + List selectByTimeAndStatus(Date date, Integer status, Boolean isTop); /** * 查询满足归档的消息 diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserMessageServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserMessageServiceImpl.java index 9f680d4b..6e15b784 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserMessageServiceImpl.java +++ b/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 selectByTimeAndStatus(String time, Integer status, Boolean isTop) { - return userMessageRepository.selectByTimeAndStatus(time, status, isTop); + public List selectByTimeAndStatus(Date date, Integer status, Boolean isTop) { + List userMessages = userMessageRepository.selectByTimeAndStatus(date, status, isTop); + return null; } @Override diff --git a/manage/ad-platform-management/src/main/java/com/baiye/timed/SendMessageSync.java b/manage/ad-platform-management/src/main/java/com/baiye/timed/SendMessageSync.java index 2e3e77eb..214610a6 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/timed/SendMessageSync.java +++ b/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 userMessages = userMessageService.selectByTimeAndStatus(beginTime, DefaultNumberConstants.ONE_NUMBER, Boolean.FALSE); + Date date = DateUtil.offsetDay(DateUtil.date(), -7); + List 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 list) { @@ -135,6 +133,5 @@ public class SendMessageSync { log.error("定时归档失败"); throw new BadRequestException("定时归档失败"); } - } }