diff --git a/fw-dalaran-domain/src/main/java/cn/fw/dalaran/domain/vo/LiveCheckVo.java b/fw-dalaran-domain/src/main/java/cn/fw/dalaran/domain/vo/LiveCheckVo.java index faff8ec..7b224f1 100644 --- a/fw-dalaran-domain/src/main/java/cn/fw/dalaran/domain/vo/LiveCheckVo.java +++ b/fw-dalaran-domain/src/main/java/cn/fw/dalaran/domain/vo/LiveCheckVo.java @@ -19,13 +19,13 @@ public class LiveCheckVo { /** * 待审核直播列表 */ - private List liveList; + private List liveList; /** * 待审核直播 */ @Data - public static class liveSummary { + public static class LiveSummary { /** * 主键id */ diff --git a/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/controller/app/OtherController.java b/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/controller/app/OtherController.java index 35615a9..38cacc1 100644 --- a/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/controller/app/OtherController.java +++ b/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/controller/app/OtherController.java @@ -74,7 +74,7 @@ public class OtherController { */ @GetMapping("/getLiveCheckDetails") @ControllerMethod("获取某条审计详情") - public Message getLiveCheckDetails(@NotNull(message = "请必须指定数据id") Long id) { + public Message getLiveCheckDetails(@NotNull(message = "请必须指定数据id") Long id) { return success(otherBizService.getLiveCheckDetails(id)); } diff --git a/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/controller/web/TestBizService.java b/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/controller/web/TestBizService.java index 1f7106b..6a5d837 100644 --- a/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/controller/web/TestBizService.java +++ b/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/controller/web/TestBizService.java @@ -1,8 +1,14 @@ package cn.fw.dalaran.server.controller.web; +import cn.fw.attendance.sdk.api.AttendanceApi; +import cn.fw.attendance.sdk.api.StaffStatusApi; +import cn.fw.attendance.sdk.api.dto.UsersScheduleDetailsDto; +import cn.fw.attendance.sdk.api.result.UserStatusVo; +import cn.fw.attendance.sdk.api.result.UsersScheduleDetailsVo; import cn.fw.dalaran.domain.db.Account; import cn.fw.dalaran.domain.enums.PlatformEnum; import cn.fw.dalaran.service.data.AccountService; +import cn.fw.data.base.domain.common.Message; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.aop.framework.AopContext; @@ -10,6 +16,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + /** * @author wmy3969 * @version 1.0 @@ -35,6 +45,8 @@ public class TestBizService { */ private TestBizService testBizService; + private final StaffStatusApi staffStatusApi; + private final AttendanceApi attendanceApi; @Autowired public void inject(TestBizService testBizService) { @@ -45,6 +57,13 @@ public class TestBizService { @Transactional(rollbackFor = Exception.class) public void methodA() { + Message details = staffStatusApi.getUserStatusDetails(Arrays.asList(760L, 1545L, 1486L, 1342L), 1611975222000L, 1675047222937L); + UsersScheduleDetailsDto dto = new UsersScheduleDetailsDto(); + dto.setGroupId(2L); + dto.setUserIds(Arrays.asList(760L, 1545L, 1486L, 1342L)); + dto.setStartTime(new Date(1646818372000L)); + dto.setEndTime(new Date(1678354372000L)); + Message> scheduleDetails = attendanceApi.getUsersScheduleDetails(dto); Account account = new Account(); account.setAccount("methodA"); account.setYn(Boolean.FALSE); diff --git a/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/task/TodoTask.java b/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/task/TodoTask.java index 1015b76..a1a0e68 100644 --- a/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/task/TodoTask.java +++ b/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/task/TodoTask.java @@ -117,17 +117,16 @@ public class TodoTask { return; } for (TodoHistory history : list) { - if (Objects.equals(history.getTodoCode(), Constants.ACCOUNT_INVALID)) {// 账号失效待办 - /*Account account = accountService.getById(history.getDataId()); + /*if (Objects.equals(history.getTodoCode(), Constants.ACCOUNT_INVALID)) {// 账号失效待办 + Account account = accountService.getById(history.getDataId()); if (Objects.isNull(account)) { continue; - }*/ - - BackLogItemDTO dto = new BackLogItemDTO(history.getUserId(), history.getTodoCode(), - history.getDataId().toString(), new Date(), history.getShopId());// 构造待办参数 - if (todoRpcService.complete(dto)) { - history.setTodoDone(Boolean.TRUE); } + }*/ + BackLogItemDTO dto = new BackLogItemDTO(history.getUserId(), history.getTodoCode(), + history.getDataId().toString(), new Date(), history.getShopId());// 构造待办参数 + if (todoRpcService.complete(dto)) { + history.setTodoDone(Boolean.TRUE); } } todoHistoryService.updateBatchById(list); diff --git a/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/biz/CommonBizService.java b/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/biz/CommonBizService.java index d73570f..e075087 100644 --- a/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/biz/CommonBizService.java +++ b/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/biz/CommonBizService.java @@ -782,8 +782,8 @@ public class CommonBizService { public static void main(String[] args) { System.out.println(System.getProperty("java.io.tmpdir")); - String workTitle = "#SL03全电数字轿跑"; - String setTopic = "#深蓝SL03燃油轿车进阶之选,#SL03全电数字轿跑,#SL03长续航低能耗,#SL03感受深蓝爱上电动,#SL03增程版燃油车终结者,#深蓝SL03无惧battle赢翻了,#市区纯电长途混动SL03增程版里程无忧,#都2022年了你还在买燃油车,#回个老家充n次电不如换一台长安深蓝1200km续航真的很绝".replace(",", ""); + String workTitle = "#现车加\\\"免\\\"开新过新年"; + String setTopic = "#温暖回家路提现车过新年,#现车加\\免\\开新过新年,#温暖回家路春节不打烊,#开年有礼大展宏兔,#智电超能体验,#开新年夜FUN,#温暖回家路一路有你,#展厅实车带货UNI-K iDD".replace(",", ""); Set strings1 = processTags(workTitle); Set strings2 = processTags(setTopic); System.out.println(CollectionUtils.containsAny(strings1, strings2)); diff --git a/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/biz/OtherBizService.java b/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/biz/OtherBizService.java index 387bba2..75ba723 100644 --- a/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/biz/OtherBizService.java +++ b/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/biz/OtherBizService.java @@ -105,13 +105,13 @@ public class OtherBizService { } if (!CollectionUtils.isEmpty(waitCheckLives)) { vo.setTheme(ActivityTheme.toVO(Objects.requireNonNull(activityThemeService.getById(themeId)))); - vo.setLiveList(PublicUtil.copyList(waitCheckLives, LiveCheckVo.liveSummary.class).stream() + vo.setLiveList(PublicUtil.copyList(waitCheckLives, LiveCheckVo.LiveSummary.class).stream() .peek(item -> { final LivePool live = livePoolService.getById(item.getLiveId()); item.setTitle(live.getTitle()); item.setPlaybackUrl(live.getPlaybackUrl()); }) - .sorted(Comparator.comparing(LiveCheckVo.liveSummary::getCounterfeit)) + .sorted(Comparator.comparing(LiveCheckVo.LiveSummary::getCounterfeit)) .collect(Collectors.toList()) ); } @@ -174,7 +174,7 @@ public class OtherBizService { liveCheckResult.setValid(Objects.equals(liveCheckResult.getCounterfeit(), 0) && Objects.equals(liveCheckResult.getPay(), 0) ? 1 : 0); return liveCheckResultService.updateById(liveCheckResult); } else if (Objects.equals(type, 1)) {// 完成待办 - final List summaries = this.getLiveCheck(userId, dataId).getLiveList(); + final List summaries = this.getLiveCheck(userId, dataId).getLiveList(); if (summaries.stream().anyMatch(item -> Objects.equals(item.getCounterfeit(), -1))) { throw new BusinessException("还有未完成审核的直播, 请完成所有直播审核后重新提交"); } else { @@ -187,7 +187,7 @@ public class OtherBizService { throw new BusinessException("完成待办失败"); final List invalidLiveIds = summaries.stream() .filter(item -> Objects.equals(item.getValid(), 0)) - .map(LiveCheckVo.liveSummary::getLiveId) + .map(LiveCheckVo.LiveSummary::getLiveId) .collect(Collectors.toList()); if (!CollectionUtils.isEmpty(invalidLiveIds)) { ActivityTheme activityTheme = activityThemeService.getById(param.getDataId()); @@ -214,7 +214,7 @@ public class OtherBizService { .set(LiveCheckResult::getStatus, type) .in(LiveCheckResult::getId, summaries .stream() - .map(LiveCheckVo.liveSummary::getId) + .map(LiveCheckVo.LiveSummary::getId) .collect(Collectors.toList()) ).update(); } @@ -228,9 +228,9 @@ public class OtherBizService { * @param id * @return */ - public LiveCheckVo.liveSummary getLiveCheckDetails(Long id) { + public LiveCheckVo.LiveSummary getLiveCheckDetails(Long id) { final LiveCheckResult checkResult = liveCheckResultService.getById(id); - final LiveCheckVo.liveSummary liveSummary = PublicUtil.copy(checkResult, LiveCheckVo.liveSummary.class); + final LiveCheckVo.LiveSummary liveSummary = PublicUtil.copy(checkResult, LiveCheckVo.LiveSummary.class); final LivePool live = livePoolService.getById(checkResult.getLiveId()); liveSummary.setTitle(live.getTitle()); liveSummary.setPlaybackUrl(live.getPlaybackUrl());