From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
src/main/java/com/ots/project/monitor/job/task/RecoverTask.java | 38 ++++++--------------------------------
1 files changed, 6 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/ots/project/monitor/job/task/RecoverTask.java b/src/main/java/com/ots/project/monitor/job/task/RecoverTask.java
index 4fcc10b..5c484f0 100644
--- a/src/main/java/com/ots/project/monitor/job/task/RecoverTask.java
+++ b/src/main/java/com/ots/project/monitor/job/task/RecoverTask.java
@@ -1,5 +1,4 @@
package com.ots.project.monitor.job.task;
-
import com.ots.common.enums.TestMemberStatusEnum;
import com.ots.common.enums.TestPackageStatusEnum;
import com.ots.project.exam.domain.EntTestMember;
@@ -9,46 +8,33 @@
import com.ots.project.exam.service.impl.EntOperLogServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.*;
import java.util.stream.Collectors;
-
import static com.ots.common.enums.OpertypeEnum.DIS_USER;
-/**
- * 鎺у埗娴嬭瘯鍖呯姸鎬�
- * 鍒版湡鍚庨渶瑕佸洖鏀舵鏁扮殑鐙珛绋嬪簭
- */
@Component("recoverTask")
public class RecoverTask {
-
@Autowired
IEntTestPackageService entTestPackageService;
@Autowired
IEntTestMemberService entTestMemberService;
@Autowired
private EntOperLogServiceImpl entOperLogService;
-
- /**
- * 杩囨湡鍥炴敹璇勬祴璧勬牸锛屽彉鏇�
- */
+
public void expiredRecyclingTestEligibility() {
Map paramMap = testPackageParams();
- //杩囨湡娴嬭瘯鍖�
+
List<EntTestPackage> entTestPackages = entTestPackageService.selectEntTestPackageListByIdAndStatusIn(paramMap);
-
- //闇�瑕佹牴鎹紒涓氱敤鎴峰垎缁�,瑕佺櫥璁版棩蹇楀拰缁熻
+
Map<Long, List<EntTestPackage>> collect = entTestPackages.stream().collect(Collectors.groupingBy(EntTestPackage::getUserId));
-
collect.forEach((userId, value) -> {
List<Long> testIds = entTestPackages.stream().map(p -> p.getId()).collect(Collectors.toList());
Map map = testMemberParams(testIds);
List<EntTestMember> entTestMembers = entTestMemberService.selectEntTestMemberList(map);
-
entTestMembers.stream().forEach(it -> {
it.setStatus(TestMemberStatusEnum.expiryRecovery.getCode());
entTestMemberService.updateEntTestMember(it);
- //璁板綍鏃ュ織
+
entOperLogService.saveLog(userId, "", DIS_USER, Long.valueOf(entTestMembers.size()));
});
entTestPackages.stream().forEach(it -> {
@@ -56,15 +42,8 @@
entTestPackageService.updateEntTestPackage(it);
});
});
-
}
-
- /**
- * 璇勬祴浜哄憳鏌ヨ鍙傛暟
- *
- * @param testIds
- * @return
- */
+
private Map testMemberParams(List<Long> testIds) {
Map map = new HashMap();
map.put("testIds", testIds);
@@ -72,12 +51,7 @@
map.put("status", recyclingStatus);
return map;
}
-
- /**
- * 娴嬭瘯鍖呮煡璇㈠弬鏁�
- *
- * @return
- */
+
private Map testPackageParams() {
Map paramMap = new HashMap();
List<String> status = Arrays.asList(TestPackageStatusEnum.enable.getCode(), TestPackageStatusEnum.pause.getCode());
--
Gitblit v1.9.1