对接新待办

张志伟
1 parent dbd3caa4
Showing 4 changed files with 56 additions and 26 deletions
fw-valhalla-rpc/src/main/java/cn/fw/valhalla/rpc/backlog/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/follow/FollowBizService.java
@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import java.util.Date;
+import java.util.Map;
 import java.util.Objects;
 /**
@@ -43,6 +44,7 @@ public class BackLogItemDTO {
     private Date dataTime;
     private Date expireTime;
     private Long shopId;
+    private Map<String, String> dynamicMap;
     public BackLogItemDTO(Long userId, String itemCode, String dataId, Date dataTime, Long shopId) {
         this.userId = userId;
@@ -15,9 +15,7 @@ import cn.fw.valhalla.domain.vo.follow.CustomerClueHistoryVO;
 import cn.fw.valhalla.domain.vo.follow.FollowDetailVO;
 import cn.fw.valhalla.domain.vo.follow.FollowRecordVO;
 import cn.fw.valhalla.domain.vo.follow.FollowTodoListVO;
-import cn.fw.valhalla.rpc.sms.SmsRpcService;
 import cn.fw.valhalla.service.bus.follow.FollowBizService;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -29,10 +27,7 @@ import java.util.List;
 import java.util.Objects;
 import static cn.fw.common.businessvalidator.Validator.BV;
-import static cn.fw.common.web.util.ExceptionHandler.handleException;
-import static cn.fw.common.web.util.ResultBuilder.failureWithMessage;
 import static cn.fw.common.web.util.ResultBuilder.success;
-import static cn.fw.valhalla.common.constant.MessageStr.QUERY_FAILURE;
 /**
  * @author : kurisu
@@ -56,6 +51,7 @@ public class FollowController {
     @GetMapping("/todo/list")
     @ControllerMethod("分页查询跟进待办列表")
+    @Deprecated
     public Message<AppPage<FollowTodoListVO>> todoList(@CurrentUser LoginAuthBean currentUser, final FollowQueryVO queryVO) {
         BV.notNull(queryVO.getType(), "跟进类型不正确");
         AppPage<FollowTodoListVO> page = followBizService.todoList(queryVO, currentUser);
@@ -64,11 +60,8 @@ public class FollowController {
     @GetMapping("/todo/detail")
     @ControllerMethod("查询跟进待办详情")
-    public Message<FollowDetailVO> todoDetail(@NotNull(message = "跟进记录id不能为空") final Long id,
-                                              @NotNull(message = "跟进类型不能为空") final Integer type) {
-        FollowTypeEnum typeEnum = FollowTypeEnum.ofValue(type);
-        BV.notNull(typeEnum, "跟进类型不正确");
-        FollowDetailVO detailVO = followBizService.todoDetail(id, typeEnum);
+    public Message<FollowDetailVO> todoDetail(@NotNull(message = "跟进记录id不能为空") final Long id) {
+        FollowDetailVO detailVO = followBizService.todoDetail(id);
         return success(detailVO);
     }
@@ -83,8 +76,8 @@ public class FollowController {
     @GetMapping("/todo/record")
     @IgnoreAuth
     @ControllerMethod("查询跟进历史记录")
-    public Message<List<FollowRecordVO>> todoRecord(@NotNull(message = "跟进任务id不能为空") final Long taskId, final Integer type) {
-        return success(followBizService.todoRecord(taskId, type));
+    public Message<List<FollowRecordVO>> todoRecord(@NotNull(message = "跟进任务id不能为空") final Long taskId) {
+        return success(followBizService.todoRecord(taskId));
     }
     @GetMapping("/sms/template")
 package cn.fw.valhalla.controller.task;
 import cn.fw.valhalla.common.utils.DateUtil;
+import cn.fw.valhalla.common.utils.StringUtils;
 import cn.fw.valhalla.domain.db.follow.FollowRecord;
 import cn.fw.valhalla.domain.db.follow.FollowTask;
 import cn.fw.valhalla.domain.enums.FollowTypeEnum;
 import cn.fw.valhalla.domain.enums.TaskStateEnum;
+import cn.fw.valhalla.domain.vo.follow.*;
 import cn.fw.valhalla.rpc.backlog.TodoRpcService;
 import cn.fw.valhalla.rpc.backlog.dto.BackLogItemDTO;
 import cn.fw.valhalla.service.bus.follow.FollowBizService;
@@ -21,10 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 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.*;
 /**
  * @author : kurisu
@@ -154,6 +153,7 @@ public class FollowRecordTask {
             if (Objects.nonNull(task) && TaskStateEnum.ONGOING.equals(task.getState())) {
                 BackLogItemDTO dto = new BackLogItemDTO(record.getUserId(), getItemCode(record.getType()), String.valueOf(record.getId()), record.getPlanTime(), record.getShopId());
                 dto.setExpireTime(record.getDeadline());
+                dto.setDynamicMap(create(record));
                 todoRpcService.push(dto);
                 idList.add(record.getId());
             } else {
@@ -166,6 +166,32 @@ public class FollowRecordTask {
         }
     }
+    private Map<String, String> create(FollowRecord record) {
+        FollowDetailVO vo = followBizService.todoDetail(record.getId(), record.getType());
+        Map<String, String> dynamicMap = new HashMap<>();
+        dynamicMap.put("type", record.getType().getValue().toString());
+        dynamicMap.put("taskId", record.getTaskId().toString());
+        dynamicMap.put("id", record.getId().toString());
+        if (Objects.nonNull(vo)) {
+            dynamicMap.put("state", "1");
+            dynamicMap.put("plateNo", StringUtils.isValid(vo.getPlateNo()) ? vo.getPlateNo() : "");
+            dynamicMap.put("name", StringUtils.isValid(vo.getName()) ? vo.getPlateNo() : "");
+            if (vo instanceof FMDetailVO) {
+                dynamicMap.put("buyDate", DateUtil.getFullDateString(((FMDetailVO) vo).getBuyDate()));
+                dynamicMap.put("expirTime", DateUtil.getFullDateString(((FMDetailVO) vo).getFMExpiration()));
+            } else if (vo instanceof RMDetailVO) {
+                dynamicMap.put("currentMileage", Optional.ofNullable(((RMDetailVO) vo).getLastMileage()).map(String::valueOf).orElse(""));
+                dynamicMap.put("arrivalTime", DateUtil.getFullDateString(((RMDetailVO) vo).getDeliveryTime()));
+            } else if (vo instanceof IRDetailVO) {
+                dynamicMap.put("expirTime", DateUtil.getFullDateString(((IRDetailVO) vo).getTclInsExpiration()));
+                dynamicMap.put("insComName", StringUtils.isValid(((IRDetailVO) vo).getTclInsComName()) ? vo.getPlateNo() : "");
+            } else if (vo instanceof ACDetailVO) {
+                dynamicMap.put("insComName", StringUtils.isValid(((ACDetailVO) vo).getInsComName()) ? vo.getPlateNo() : "");
+            }
+        }
+        return dynamicMap;
+    }
+
     private String getItemCode(FollowTypeEnum type) {
         switch (type) {
             case AC:
@@ -118,6 +118,7 @@ public class FollowBizService {
      * @param currentUser
      * @return
      */
+    @Deprecated
     public AppPage<FollowTodoListVO> todoList(FollowQueryVO queryVO, LoginAuthBean currentUser) {
         Integer pageSize = queryVO.getPageSize();
         Integer current = queryVO.getCurrent();
@@ -156,7 +157,20 @@ public class FollowBizService {
      * 查询待办详情
      *
      * @param id
-     * @param type
+     * @return
+     */
+    public FollowDetailVO todoDetail(Long id) {
+        FollowTask followTask = followTaskService.getById(id);
+        BV.notNull(followTask, () -> "跟进不能为空");
+        FollowStrategy strategy = followMap.get(followTask.getType());
+        Assert.notNull(strategy, "strategy cannot be null");
+        return strategy.getDetail(id);
+    }
+
+    /**
+     * 查询待办详情
+     *
+     * @param id
      * @return
      */
     public FollowDetailVO todoDetail(Long id, FollowTypeEnum type) {
@@ -169,17 +183,12 @@ public class FollowBizService {
      * 查询跟进历史
      *
      * @param taskId
-     * @param type
      * @return
      */
-    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);
+    public List<FollowRecordVO> todoRecord(Long taskId) {
+        FollowTask task = followTaskService.getById(taskId);
+        BV.notNull(task, () -> "跟进任务不存在");
+        FollowStrategy strategy = followMap.get(task.getType());
         BV.notNull(strategy, () -> "跟进类型不正确");
         return strategy.getRecordList(taskId);
     }