|
@@ -29,7 +29,10 @@ import javax.annotation.Resource;
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
import java.time.format.DateTimeFormatter;
|
|
|
import java.time.temporal.ChronoUnit;
|
|
import java.time.temporal.ChronoUnit;
|
|
|
-import java.util.*;
|
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
|
|
+import java.util.Date;
|
|
|
|
|
+import java.util.List;
|
|
|
|
|
+import java.util.UUID;
|
|
|
|
|
|
|
|
|
|
|
|
|
@Component
|
|
@Component
|
|
@@ -62,9 +65,9 @@ public class ReleaseUserTask {
|
|
|
* 客户释放
|
|
* 客户释放
|
|
|
*
|
|
*
|
|
|
*/
|
|
*/
|
|
|
-// @Scheduled(cron = "0 22 11 * * ?")
|
|
|
|
|
|
|
+ @Scheduled(cron = "0 22 14 * * ?")
|
|
|
// @RequestMapping("/open/test")
|
|
// @RequestMapping("/open/test")
|
|
|
- @Scheduled(cron = "0 0 1 * * ?")
|
|
|
|
|
|
|
+// @Scheduled(cron = "0 0 1 * * ?")
|
|
|
public void startTask() {
|
|
public void startTask() {
|
|
|
try {
|
|
try {
|
|
|
List<User> userList = userService.selectUserByRoleName("营销员", "营销经理");
|
|
List<User> userList = userService.selectUserByRoleName("营销员", "营销经理");
|
|
@@ -244,8 +247,6 @@ public class ReleaseUserTask {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
List<LockingReleaseBo> newList = new ArrayList<LockingReleaseBo>();
|
|
List<LockingReleaseBo> newList = new ArrayList<LockingReleaseBo>();
|
|
|
- Timer timer=new Timer();
|
|
|
|
|
-
|
|
|
|
|
if (lockUserList != null && !lockUserList.isEmpty()) {
|
|
if (lockUserList != null && !lockUserList.isEmpty()) {
|
|
|
for (int i = 0; i < lockUserList.size(); i++) {
|
|
for (int i = 0; i < lockUserList.size(); i++) {
|
|
|
newList.add(lockUserList.get(i));
|
|
newList.add(lockUserList.get(i));
|
|
@@ -292,9 +293,6 @@ public class ReleaseUserTask {
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 处理外联
|
|
* 处理外联
|
|
|
- * @param releaseTime
|
|
|
|
|
- * @param userList
|
|
|
|
|
- * @throws InterruptedException
|
|
|
|
|
*/
|
|
*/
|
|
|
private void pushChannel(Date releaseTime, List<User> userList) throws InterruptedException {
|
|
private void pushChannel(Date releaseTime, List<User> userList) throws InterruptedException {
|
|
|
// 获取超过90天客户,判断是否回收过,未回收则回收,已回收则释放为公共客户
|
|
// 获取超过90天客户,判断是否回收过,未回收则回收,已回收则释放为公共客户
|
|
@@ -310,7 +308,7 @@ public class ReleaseUserTask {
|
|
|
}
|
|
}
|
|
|
List<userDaysBo> hsList=new ArrayList<>();
|
|
List<userDaysBo> hsList=new ArrayList<>();
|
|
|
List<userDaysBo> sfList=new ArrayList<>();
|
|
List<userDaysBo> sfList=new ArrayList<>();
|
|
|
- if (count != null && count.size() > 0) {
|
|
|
|
|
|
|
+ if (count != null && !count.isEmpty()) {
|
|
|
for (int i = 0; i < count.size(); i++) {
|
|
for (int i = 0; i < count.size(); i++) {
|
|
|
//回收
|
|
//回收
|
|
|
if (count.get(i).getRecovery()==0) {
|
|
if (count.get(i).getRecovery()==0) {
|
|
@@ -329,7 +327,7 @@ public class ReleaseUserTask {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
List<LockingReleaseBo> lockList = customerService.selectPendinglockUserList();
|
|
List<LockingReleaseBo> lockList = customerService.selectPendinglockUserList();
|
|
|
- if (lockList.size() > 0)
|
|
|
|
|
|
|
+ if (!lockList.isEmpty())
|
|
|
customerService.updateReleaseLock(releaseTime);
|
|
customerService.updateReleaseLock(releaseTime);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -340,12 +338,12 @@ public class ReleaseUserTask {
|
|
|
|
|
|
|
|
public void addNoticeBatch(List<Notice> ln) {
|
|
public void addNoticeBatch(List<Notice> ln) {
|
|
|
List<Notice> newList=new ArrayList<Notice>();
|
|
List<Notice> newList=new ArrayList<Notice>();
|
|
|
- if (ln != null && ln.size() > 0) {
|
|
|
|
|
|
|
+ if (ln != null && !ln.isEmpty()) {
|
|
|
for (int i = 0; i < ln.size(); i++) {
|
|
for (int i = 0; i < ln.size(); i++) {
|
|
|
ln.get(i).setType(NoticeTypes.getType(ln.get(i).getNoticeType()));
|
|
ln.get(i).setType(NoticeTypes.getType(ln.get(i).getNoticeType()));
|
|
|
newList.add(ln.get(i));
|
|
newList.add(ln.get(i));
|
|
|
if (50 == newList.size() || i == ln.size() - 1) {
|
|
if (50 == newList.size() || i == ln.size() - 1) {
|
|
|
- if (newList.size() > 0) {
|
|
|
|
|
|
|
+ if (!newList.isEmpty()) {
|
|
|
//发送站内信
|
|
//发送站内信
|
|
|
noticeMapper.insertBatch(newList);
|
|
noticeMapper.insertBatch(newList);
|
|
|
}
|
|
}
|