修改自定归档消息逻辑

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

@@ -83,11 +83,10 @@ public interface UserMessageRepository extends JpaRepository<UserMessage, Long>,
      *
      * @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(Date date, Integer status, Boolean isTop);
+    @Query(value = "select um from UserMessage um where um.updateTime < ?1 and um.status =?2 and um.isTop is null")
+    List<UserMessage> selectByTimeAndStatus(Date date, Integer status);
 
     /**
      * 查询满足条件的消息

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

@@ -152,10 +152,9 @@ public interface UserMessageService {
      * 查询满足归档的消息
      * @param date
      * @param status
-     * @param isTop
      * @return
      */
-    List<UserMessage> selectByTimeAndStatus(Date date, Integer status, Boolean isTop);
+    List<UserMessage> selectByTimeAndStatus(Date date, Integer status);
 
     /**
      * 查询满足归档的消息

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

@@ -244,9 +244,8 @@ public class UserMessageServiceImpl implements UserMessageService {
     }
 
     @Override
-    public List<UserMessage> selectByTimeAndStatus(Date date, Integer status, Boolean isTop) {
-        List<UserMessage> userMessages = userMessageRepository.selectByTimeAndStatus(date, status, isTop);
-        return null;
+    public List<UserMessage> selectByTimeAndStatus(Date date, Integer status) {
+        return userMessageRepository.selectByTimeAndStatus(date, status);
     }
 
     @Override

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

@@ -91,7 +91,7 @@ public class SendMessageSync {
     @Scheduled(cron = "0 0 0 1/1 * ?")
     public void automaticFilingMessage() {
         Date date = DateUtil.offsetDay(DateUtil.date(), -7);
-        List<UserMessage> userMessages = userMessageService.selectByTimeAndStatus(date, DefaultNumberConstants.ONE_NUMBER, Boolean.FALSE);
+        List<UserMessage> userMessages = userMessageService.selectByTimeAndStatus(date, DefaultNumberConstants.ONE_NUMBER);
         if (ObjectUtil.isNotNull(userMessages)) {
             userMessages.forEach(x -> x.setStatus(DefaultNumberConstants.MINUS_ONE_NUMBER));
             userMessageService.saveAll(userMessages);
@@ -120,7 +120,7 @@ public class SendMessageSync {
 
     private void saveZip(List<UserMessage> list) {
         try {
-            File file = FileUtil.file(properties.getPath() + "message" + File.separator + DateUtil.now());
+            File file = FileUtil.file(properties.getPath().getPath() + "message" + File.separator + DateUtil.today());
             FileWriter fileWriter = new FileWriter(file);
             for (UserMessage info : list) {
                 fileWriter.write(JSONUtil.toJsonStr(info));