valhalla / fw-shirasawa

Commit 02a320f94ec69d11083f996e138b0bb1ce105b79

Authored by 张志伟
1 parent a9de532d

:rocket: 优化跟进池

Inline Side-by-side
Showing 4 changed files with 9 additions and 14 deletions
fw-shirasawa-server/src/main/java/cn/fw/shirasawa/server/controller/erp/SettingController.java
  View file @02a320f
... ... @@ -5,6 +5,7 @@ import cn.fw.common.web.auth.LoginAuthBean;
5 5 import cn.fw.common.web.auth.annotation.CurrentUser;
6 6 import cn.fw.data.base.domain.common.Message;
7 7 import cn.fw.security.auth.client.annotation.Authorization;
  8 +import cn.fw.security.auth.client.annotation.IgnoreAuth;
8 9 import cn.fw.security.auth.client.enums.AuthType;
9 10 import cn.fw.shirasawa.domain.dto.SettingDTO;
10 11 import cn.fw.shirasawa.domain.vo.setting.SettingVO;
... ... @@ -63,6 +64,7 @@ public class SettingController {
63 64 * @return
64 65 */
65 66 @PostMapping("/save")
  67 + @IgnoreAuth
66 68 @ControllerMethod("保存配置")
67 69 public Message<Boolean> save(@CurrentUser LoginAuthBean currentUser,
68 70 @RequestBody @NotEmpty(message = "设置项不能为空") @Valid final List<SettingDTO> list) {
... ...
fw-shirasawa-server/src/main/java/cn/fw/shirasawa/server/controller/task/FollowRecordTask.java
  View file @02a320f
... ... @@ -62,7 +62,7 @@ public class FollowRecordTask {
62 62 public void endTaskRecord() {
63 63 List<FollowRecord> list = followRecordService.list(Wrappers.<FollowRecord>lambdaQuery()
64 64 .eq(FollowRecord::getOutTime, Boolean.FALSE)
65   - .le(FollowRecord::getDeadline, DateUtil.localDateTime2Date(LocalDateTime.now()))
  65 + .le(FollowRecord::getDeadline, LocalDateTime.now())
66 66 .isNull(FollowRecord::getFollowTime)
67 67 .last("limit 0, 500")
68 68 );
... ... @@ -85,7 +85,7 @@ public class FollowRecordTask {
85 85 .eq(FollowRecord::getOutTime, Boolean.FALSE)
86 86 .eq(FollowRecord::getAddTodo, Boolean.FALSE)
87 87 .ne(FollowRecord::getType, FollowTypeEnum.AC)
88   - .le(FollowRecord::getPlanTime, DateUtil.localDateTime2Date(LocalDateTime.now()))
  88 + .le(FollowRecord::getPlanTime, LocalDateTime.now())
89 89 .last("limit 0,500")
90 90 );
91 91 execute(list);
... ... @@ -102,7 +102,7 @@ public class FollowRecordTask {
102 102 .eq(FollowRecord::getOutTime, Boolean.FALSE)
103 103 .eq(FollowRecord::getType, FollowTypeEnum.AC)
104 104 .eq(FollowRecord::getAddTodo, Boolean.FALSE)
105   - .le(FollowRecord::getPlanTime, DateUtil.localDateTime2Date(LocalDateTime.now()))
  105 + .le(FollowRecord::getPlanTime, LocalDateTime.now())
106 106 .last("limit 0,50")
107 107 );
108 108 execute(list);
... ...
fw-shirasawa-server/src/main/java/cn/fw/shirasawa/server/controller/task/FollowTaskDealTask.java
  View file @02a320f
1 1 package cn.fw.shirasawa.server.controller.task;
2 2  
3   -import cn.fw.shirasawa.common.utils.DateUtil;
4 3 import cn.fw.shirasawa.domain.db.follow.FollowTask;
5 4 import cn.fw.shirasawa.domain.db.pool.CluePool;
6 5 import cn.fw.shirasawa.domain.enums.ClueStatusEnum;
... ... @@ -21,9 +20,9 @@ import org.springframework.stereotype.Component;
21 20 import org.springframework.transaction.annotation.Transactional;
22 21 import org.springframework.util.CollectionUtils;
23 22  
  23 +import java.time.LocalDate;
24 24 import java.time.LocalDateTime;
25 25 import java.util.ArrayList;
26   -import java.util.Date;
27 26 import java.util.List;
28 27 import java.util.Objects;
29 28 import java.util.concurrent.BlockingQueue;
... ... @@ -72,8 +71,8 @@ public class FollowTaskDealTask {
72 71 public void startClue() {
73 72 List<CluePool> list = cluePoolService.list(Wrappers.<CluePool>lambdaQuery()
74 73 .eq(CluePool::getClueStatus, ClueStatusEnum.WAITING)
75   - .ge(CluePool::getStartTime, DateUtil.startDate(new Date()))
76   - .le(CluePool::getStartTime, DateUtil.localDateTime2Date(LocalDateTime.now()))
  74 + .ge(CluePool::getStartTime, LocalDate.now().atStartOfDay())
  75 + .le(CluePool::getStartTime, LocalDateTime.now())
77 76 .last("limit 0, 500")
78 77 );
79 78 if (CollectionUtils.isEmpty(list)) {
... ... @@ -91,7 +90,7 @@ public class FollowTaskDealTask {
91 90 public void endTask() {
92 91 List<FollowTask> list = followTaskService.list(Wrappers.<FollowTask>lambdaQuery()
93 92 .eq(FollowTask::getState, TaskStateEnum.ONGOING)
94   - .le(FollowTask::getDeadline, DateUtil.localDateTime2Date(LocalDateTime.now()))
  93 + .le(FollowTask::getDeadline, LocalDateTime.now())
95 94 );
96 95 if (CollectionUtils.isEmpty(list)) {
97 96 return;
... ...
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/setting/strategy/AbstractSettingStrategy.java
  View file @02a320f
... ... @@ -138,8 +138,6 @@ public abstract class AbstractSettingStrategy implements SettingStrategy {
138 138 setting = new FollowSetting();
139 139 setting.setCategory(type);
140 140 setting.setGroupId(groupId);
141   - setting.setCreateTime(new Date());
142   - setting.setUpdateTime(new Date());
143 141 settingService.save(setting);
144 142 }
145 143 List<FollowSettingDetail> detailList = new ArrayList<>();
... ... @@ -155,10 +153,6 @@ public abstract class AbstractSettingStrategy implements SettingStrategy {
155 153 detail.setUnit(SettingUnitEnum.ofValue(settingDTO.getUnit()));
156 154 detail.setYn(Boolean.TRUE);
157 155 detail.setGroupId(groupId);
158   - detail.setUpdateTime(new Date());
159   - if (settingDTO.getId() == null) {
160   - detail.setCreateTime(new Date());
161   - }
162 156 detailList.add(detail);
163 157 }
164 158 boolean saved = settingDetailService.saveOrUpdateBatch(detailList);
... ...