Merge remote-tracking branch 'origin/dev' into test

张志伟
2 parents 54a49929 8c89bf6a
Showing 9 changed files with 54 additions and 42 deletions
fw-valhalla-dao/src/main/resources/mapper/SecretReportHistoryMapper.xml
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/vo/follow/FollowDetailVO.java
fw-valhalla-rpc/src/main/java/cn/fw/valhalla/rpc/erp/TodoRpcService.java
fw-valhalla-rpc/src/main/java/cn/fw/valhalla/rpc/erp/dto/BackLogItemDTO.java
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/app/FollowController.java
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/FollowRecordTask.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AccidentPoolBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/ACFollowStrategy.java
@@ -52,6 +52,9 @@
             <if test="condition.taskType !=null">
                 and t1.task_type = #{condition.taskType}
             </if>
+            <if test="condition.callType !=null">
+                and t1.call_type = #{condition.callType}
+            </if>
             <if test="condition.startTime1 !=null">
                 and t1.call_time >= #{condition.startTime1}
             </if>
@@ -101,6 +104,9 @@
             <if test="condition.taskType !=null">
                 and t1.task_type = #{condition.taskType}
             </if>
+            <if test="condition.callType !=null">
+                and t1.call_type = #{condition.callType}
+            </if>
             <if test="condition.startTime1 !=null">
                 and t1.call_time >= #{condition.startTime1}
             </if>
@@ -23,6 +23,7 @@ public class FollowDetailVO {
      * 档案id
      */
     private Long customerId;
+    private Integer type;
     /**
      * 名称
      */
@@ -17,10 +17,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
  
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
  
 /**
@@ -163,28 +160,27 @@ public class TodoRpcService {
             }
             return Optional.of(dto);
         } catch (Exception e) {
-            log.error("缓存设置信息失败 key[{}]", key, e);
+            log.error("缓存信息获取失败 key[{}]", key, e);
             return Optional.empty();
         }
     }
  
-    public List<BackLogItemDTO> getAllFromCache(final String key) {
+    public Collection<BackLogItemDTO> getAllFromCache(final String key) {
         try {
             Boolean hasKey = redisTemplate.hasKey(key);
             if (!Boolean.TRUE.equals(hasKey)) {
-                return new ArrayList<>();
+                return new HashSet<>();
             }
             BoundListOperations<String, String> ops = redisTemplate.boundListOps(key);
             List<String> stringList = ops.range(0, -1);
+            redisTemplate.delete(key);
             if (CollectionUtils.isEmpty(stringList)) {
-                return new ArrayList<>();
+                return new HashSet<>();
             }
-            List<BackLogItemDTO> dtos = stringList.stream().map(str -> JSONObject.parseObject(str, BackLogItemDTO.class)).collect(Collectors.toList());
-            redisTemplate.delete(key);
-            return dtos;
+            return stringList.stream().map(str -> JSONObject.parseObject(str, BackLogItemDTO.class)).collect(Collectors.toSet());
         } catch (Exception e) {
-            log.error("缓存设置信息失败 key[{}]", key, e);
-            return new ArrayList<>();
+            log.error("缓存信息获取失败 key[{}]", key, e);
+            return new HashSet<>();
         }
     }
  
 package cn.fw.valhalla.rpc.erp.dto;
  
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.ToString;
  
 import java.util.Date;
@@ -14,6 +15,7 @@ import java.util.Objects;
  */
 @Data
 @ToString
+@EqualsAndHashCode
 public class BackLogItemDTO {
     /**
      * 发送次数
@@ -82,14 +82,11 @@ public class FollowController {
  
     @GetMapping("/approve/detail")
     @IgnoreAuth
-    public Message<FollowDetailVO> approveDetail(@NotNull(message = "跟进记录id不能为空") final Long recordId,
-                                                 @NotNull(message = "跟进类型不能为空") final Integer type) {
+    public Message<FollowDetailVO> approveDetail(@NotNull(message = "跟进记录id不能为空") final Long recordId, final Integer type) {
         final String msg = "查询跟进战败审批详情[follow/approve/detail]";
         try {
             log.info("{}: param[{}  {}]", msg, recordId, type);
-            FollowTypeEnum typeEnum = FollowTypeEnum.ofValue(type);
-            BV.notNull(typeEnum, "跟进类型不正确");
-            FollowDetailVO detailVO = followBizService.approveDetail(recordId, typeEnum);
+            FollowDetailVO detailVO = followBizService.approveDetail(recordId, type);
             return success(detailVO, data -> log.info("{}", data));
         } catch (Exception ex) {
             handleException(ex, e -> log.error("{}失败：param[{}  {}]", msg, recordId, type, e));
@@ -99,14 +96,11 @@ public class FollowController {
  
     @GetMapping("/todo/record")
     @IgnoreAuth
-    public Message<List<FollowRecordVO>> todoRecord(@NotNull(message = "跟进任务id不能为空") final Long taskId,
-                                                    @NotNull(message = "跟进类型不能为空") final Integer type) {
+    public Message<List<FollowRecordVO>> todoRecord(@NotNull(message = "跟进任务id不能为空") final Long taskId, final Integer type) {
         final String msg = "查询跟进历史记录[follow/todo/record]";
         try {
             log.info("{}: param[{}  {}]", msg, taskId, type);
-            FollowTypeEnum typeEnum = FollowTypeEnum.ofValue(type);
-            BV.notNull(typeEnum, "跟进类型不正确");
-            return success(followBizService.todoRecord(taskId, typeEnum), data -> log.info("{}", data));
+            return success(followBizService.todoRecord(taskId, type), data -> log.info("{}", data));
         } catch (Exception ex) {
             handleException(ex, e -> log.error("{}失败：param[{}  {}]", msg, taskId, type, e));
             return failureWithMessage(QUERY_FAILURE);
@@ -22,9 +22,9 @@ import org.springframework.util.CollectionUtils;
  
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
  
 /**
  * @author : kurisu
@@ -125,21 +125,21 @@ public class FollowRecordTask {
     /**
      * 完成待办的重试
      */
-    @Scheduled(initialDelay = 1500, fixedRate = 1000)
+    @Scheduled(initialDelay = 1500, fixedRate = 15 * 1000)
     public void retryCompleteTodoItem() {
         String key = todoRpcService.generateKey(TodoRpcService.TodoOperationEnum.COMPLETE);
-        Optional<BackLogItemDTO> fromCache = todoRpcService.getOneFromCache(key);
-        fromCache.ifPresent(todoRpcService::complete);
+        Collection<BackLogItemDTO> all = todoRpcService.getAllFromCache(key);
+        all.forEach(todoRpcService::complete);
     }
  
     /**
      * 取消待办的重试
      */
-    @Scheduled(initialDelay = 1000, fixedRate = 1000)
+    @Scheduled(initialDelay = 1000, fixedRate = 10 * 1000)
     public void retryCancelTodoItem() {
         String key = todoRpcService.generateKey(TodoRpcService.TodoOperationEnum.CANCEL);
-        Optional<BackLogItemDTO> fromCache = todoRpcService.getOneFromCache(key);
-        fromCache.ifPresent(todoRpcService::cancel);
+        Collection<BackLogItemDTO> all = todoRpcService.getAllFromCache(key);
+        all.forEach(todoRpcService::cancel);
     }
  
  
@@ -4,6 +4,7 @@ import cn.fw.common.cache.locker.DistributedLocker;
 import cn.fw.common.web.auth.LoginAuthBean;
 import cn.fw.valhalla.common.constant.RoleCode;
 import cn.fw.valhalla.common.utils.DateUtil;
+import cn.fw.valhalla.common.utils.StringUtils;
 import cn.fw.valhalla.domain.db.customer.AccidentPool;
 import cn.fw.valhalla.domain.db.customer.Customer;
 import cn.fw.valhalla.domain.db.follow.FollowRecord;
@@ -80,6 +81,9 @@ public class AccidentPoolBizService {
             BV.isTrue(Boolean.TRUE.equals(pair.getKey()), () -> "请勿重复提交");
             boolean repetition = isRepetition(currentUser.getGroupId(), poolDTO.getPlateNo());
             BV.isFalse(repetition, () -> "该记录已存在，请勿重复添加");
+            if (StringUtils.isEmpty(poolDTO.getMobile())) {
+                poolDTO.setMobile(poolDTO.getReportMobile());
+            }
             AccidentPool pool = conversion2db(poolDTO, currentUser);
             pool.setShopId(poolDTO.getShopId());
             pool.setShopName(poolDTO.getShopName());
@@ -276,11 +280,7 @@ public class AccidentPoolBizService {
         record.setAddTodo(Boolean.FALSE);
         record.setGroupId(task.getGroupId());
         record.setShopId(task.getFollowShop());
-        settingBizService.querySettingByType(FollowTypeEnum.AC, SettingTypeEnum.LIMITATION, task.getGroupId())
-                .ifPresent(r -> {
-                    Timestamp expired = DateUtil.getExpired(task.getBeginTime(), r.getDetailValue(), getCalendarType(Objects.requireNonNull(SettingUnitEnum.ofValue(r.getUnit()))));
-                    record.setLimitTime(expired);
-                });
+        record.setLimitTime(record.getDeadline());
         followRecordService.queryAndSave(record);
     }
 }
@@ -139,9 +139,15 @@ public class FollowBizService {
      * @param type
      * @return
      */
-    public List<FollowRecordVO> todoRecord(Long taskId, FollowTypeEnum type) {
-        FollowStrategy strategy = followMap.get(type);
-        Assert.notNull(strategy, "strategy cannot be null");
+    public List<FollowRecordVO> todoRecord(Long taskId, Integer type) {
+        FollowTypeEnum typeEnum = FollowTypeEnum.ofValue(type);
+        if (Objects.isNull(typeEnum)) {
+            FollowTask task = followTaskService.getById(taskId);
+            BV.notNull(task, () -> "跟进任务不存在");
+            typeEnum = task.getType();
+        }
+        FollowStrategy strategy = followMap.get(typeEnum);
+        BV.notNull(strategy, () -> "跟进类型不正确");
         return strategy.getRecordList(taskId);
     }
  
@@ -216,10 +222,17 @@ public class FollowBizService {
      * @param type
      * @return
      */
-    public FollowDetailVO approveDetail(Long id, FollowTypeEnum type) {
-        FollowStrategy strategy = followMap.get(type);
-        Assert.notNull(strategy, "strategy cannot be null");
+    public FollowDetailVO approveDetail(Long id, Integer type) {
+        FollowTypeEnum typeEnum = FollowTypeEnum.ofValue(type);
+        if (Objects.isNull(typeEnum)) {
+            FollowRecord record = followRecordService.getById(id);
+            BV.notNull(record, () -> "跟进记录不存在");
+            typeEnum = record.getType();
+        }
+        FollowStrategy strategy = followMap.get(typeEnum);
+        BV.notNull(strategy, () -> "跟进类型不正确");
         FollowDetailVO detail = strategy.getDetail(id);
+        detail.setType(typeEnum.getValue());
         ApproveRecord approveRecord = approveRecordService.getOne(Wrappers.<ApproveRecord>lambdaQuery()
                 .eq(ApproveRecord::getDataId, detail.getTaskId())
                 .last("limit 1")
@@ -95,7 +95,7 @@ public class ACFollowStrategy extends AbstractFollowStrategy {
         vo.setId(followRecord.getId());
         vo.setTaskId(followRecord.getTaskId());
         vo.setHadCall(count > 0 || !ValidationUtils.checkMobile(vo.getReportMobile()));
-        vo.setDeadline(Objects.isNull(followRecord.getLimitTime()) ? followRecord.getDeadline() : followRecord.getLimitTime());
+        vo.setDeadline(followRecord.getDeadline());
         return vo;
     }