Commit c56b5be42b8ce8f3908847495a66eb628a629fc9
1 parent
52f31683
2022年12月24日15:25:19
Showing
4 changed files
with
31 additions
and
21 deletions
fw-dalaran-server/src/main/java/cn/fw/dalaran/server/controller/app/OtherController.java
| ... | ... | @@ -5,8 +5,6 @@ import cn.fw.common.web.auth.LoginAuthBean; |
| 5 | 5 | import cn.fw.common.web.auth.annotation.CurrentUser; |
| 6 | 6 | import cn.fw.dalaran.domain.param.LiveCheckParams; |
| 7 | 7 | import cn.fw.dalaran.domain.vo.LiveCheckVo; |
| 8 | -import cn.fw.dalaran.rpc.erp.UserRoleRpcService; | |
| 9 | -import cn.fw.dalaran.server.task.TodoTask; | |
| 10 | 8 | import cn.fw.dalaran.service.Common; |
| 11 | 9 | import cn.fw.dalaran.service.biz.OtherBizService; |
| 12 | 10 | import cn.fw.data.base.domain.common.Message; |
| ... | ... | @@ -43,8 +41,7 @@ public class OtherController { |
| 43 | 41 | |
| 44 | 42 | private final OtherBizService otherBizService; |
| 45 | 43 | private final Common common; |
| 46 | - private final UserRoleRpcService userRoleRpcService; | |
| 47 | - private final TodoTask todoTask;// 定时任务 | |
| 44 | + //private final TodoTask todoTask;// 定时任务 | |
| 48 | 45 | |
| 49 | 46 | /** |
| 50 | 47 | * 获取直播审计页面 |
| ... | ... | @@ -114,10 +111,10 @@ public class OtherController { |
| 114 | 111 | * @param timestamp 时间戳 |
| 115 | 112 | * @return |
| 116 | 113 | */ |
| 117 | - @GetMapping("/resendLiveCheckBacklog") | |
| 114 | + /*@GetMapping("/resendLiveCheckBacklog") | |
| 118 | 115 | public Message<Void> test(@NotNull(message = "请必须指定时间戳") Long timestamp) { |
| 119 | 116 | todoTask.sendLiveCheckBacklog(timestamp); |
| 120 | 117 | return Message.success(); |
| 121 | - } | |
| 118 | + }*/ | |
| 122 | 119 | |
| 123 | 120 | } | ... | ... |
fw-dalaran-server/src/main/java/cn/fw/dalaran/server/task/TodoTask.java
| ... | ... | @@ -164,7 +164,8 @@ public class TodoTask { |
| 164 | 164 | .eq(LivePool::getValidLive, 11) |
| 165 | 165 | .list();// 找到主题对应的所有人的最佳直播 |
| 166 | 166 | final List<Long> waitCheckThemeIds = bestLives.stream() |
| 167 | - .map(LivePool::getThemeId).distinct() | |
| 167 | + .map(LivePool::getThemeId) | |
| 168 | + .distinct() | |
| 168 | 169 | .collect(Collectors.toList());// 根据最佳直播分布, 找到(真正)需要审核的主题id集合 |
| 169 | 170 | if (CollectionUtils.isEmpty(waitCheckThemeIds)) |
| 170 | 171 | return; | ... | ... |
fw-dalaran-service/src/main/java/cn/fw/dalaran/service/biz/CommonBizService.java
| ... | ... | @@ -781,8 +781,9 @@ public class CommonBizService { |
| 781 | 781 | } |
| 782 | 782 | |
| 783 | 783 | public static void main(String[] args) { |
| 784 | - String workTitle = "#长安汽车618闪购 #长安univ #自有引力"; | |
| 785 | - String setTopic = "#618厂店联动团购会#长安汽车618闪购#嗨购618团购会"; | |
| 784 | + System.out.println(System.getProperty("java.io.tmpdir")); | |
| 785 | + String workTitle = "#SL03全电数字轿跑"; | |
| 786 | + String setTopic = "#深蓝SL03燃油轿车进阶之选,#SL03全电数字轿跑,#SL03长续航低能耗,#SL03感受深蓝爱上电动,#SL03增程版燃油车终结者,#深蓝SL03无惧battle赢翻了,#市区纯电长途混动SL03增程版里程无忧,#都2022年了你还在买燃油车,#回个老家充n次电不如换一台长安深蓝1200km续航真的很绝".replace(",", ""); | |
| 786 | 787 | Set<String> strings1 = processTags(workTitle); |
| 787 | 788 | Set<String> strings2 = processTags(setTopic); |
| 788 | 789 | System.out.println(CollectionUtils.containsAny(strings1, strings2)); |
| ... | ... | @@ -841,7 +842,7 @@ public class CommonBizService { |
| 841 | 842 | resultSet.retainAll(configTags);// 交集 |
| 842 | 843 | //resultSet.removeAll(configTags);// 差集 |
| 843 | 844 | //resultSet.addAll(configTags);// 并集 |
| 844 | - containsTag = resultSet.size() > 0; | |
| 845 | + containsTag = !resultSet.isEmpty(); | |
| 845 | 846 | } else {// LCS计算话题匹配度 |
| 846 | 847 | for (String configTag : configTags) { |
| 847 | 848 | for (String tag : tags) { | ... | ... |
fw-dalaran-service/src/main/java/cn/fw/dalaran/service/data/impl/ActivityThemeServiceImpl.java
| ... | ... | @@ -379,18 +379,29 @@ public class ActivityThemeServiceImpl extends ServiceImpl<ActivityThemeDao, Acti |
| 379 | 379 | * 活动主题数据封面图处理 |
| 380 | 380 | */ |
| 381 | 381 | public static void main(String[] args) { |
| 382 | - int themeId = 81; | |
| 382 | + int themeId = 85; | |
| 383 | 383 | String tempDir = System.getProperty("java.io.tmpdir");// 获取当前环境临时文件夹路径 |
| 384 | - Arrays.asList("137c401527774851b8f941eef128ea31", | |
| 385 | - "1c3612176f1143a292d8ee2115b44644", | |
| 386 | - "3d09e66cf4ec4d6e9abec9d67cc61b6f", | |
| 387 | - "54ab375a3f1d48c6a872613add1ccbb4", | |
| 388 | - "8dec2c73874344b08ef45cc71b6796ff", | |
| 389 | - "b3e80f1c5ca74c118e99f74254f1dc2b", | |
| 390 | - "b5463674fe9e4bf6ac864a693a5e53b6", | |
| 391 | - "bac0533d6f664fab9668d2fce2aafe3c", | |
| 392 | - "d9440d5dc08c4b1189f4eac9a64dfce8", | |
| 393 | - "f42e23fd3ed24dc8a7dfa54d0f9acff6") | |
| 384 | + Arrays.asList("26b284da426c41cda324f3a11568991f", | |
| 385 | + "417ac7dc65a641aea4153721742bcc71", | |
| 386 | + "57610873d190488baa29449d094f31db", | |
| 387 | + "5c3dc2e118ed436485185d9e4ee55bff", | |
| 388 | + "5e33ad337aa04b44988df9498c5ddd43", | |
| 389 | + "5f2caa0b050d4d63b6288ddb64c1748a", | |
| 390 | + "5f3650d43fba461588396db5d07ef5c6", | |
| 391 | + "71ff5e4eb1e8487c82b2f0f1e45fba3e", | |
| 392 | + "721292bc2515482cb49f841a2ec40b1a", | |
| 393 | + "78fe2f5e566047c7b6b41d227b77858c", | |
| 394 | + "81316e2bb88648119194dfabf986439e", | |
| 395 | + "924d99014f7a4223b86a67e669d34b61", | |
| 396 | + "a0af2e55e03a4c1c852a6c0e081bc49f", | |
| 397 | + "a804bee84e6d4084a123d729abe789fb", | |
| 398 | + "b0c6f5ba7e7d4300aea5b1312afb7f55", | |
| 399 | + "d478442fe3ee431b916d0f74ce72cf66", | |
| 400 | + "d4e2df114e0a42ec8eb3ff3b36a6e168", | |
| 401 | + "dd7f88410d124f8b8d15d2f142005ba0", | |
| 402 | + "e73c04b8011a45ff8162cfb0750a4aef", | |
| 403 | + "ea8d6dcad8d94be4b7234c076fe2363d", | |
| 404 | + "ee484477b9fd44ca8c096360312ca212") | |
| 394 | 405 | .forEach(item -> { |
| 395 | 406 | try { |
| 396 | 407 | File downloadFile = ImageUtils.convertFileByUrl("https://gate.feewee.cn/file/show?fid=" + item, item); | ... | ... |