feature(*): 新增进行中的事故车跟进人员查询

- 新增事故车跟进人员查询 - 升级sdk

feature(*): 新增进行中的事故车跟进人员查询
- 新增事故车跟进人员查询 - 升级sdk
张志伟
1 parent 67c4c5d6
Showing 7 changed files with 107 additions and 8 deletions
fw-valhalla-sdk/pom.xml
fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/api/ValhallaGeneralApiService.java
fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/result/AccidentFollowerResult.java
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/api/ValhallaGeneralApiServiceImpl.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/FollowApiBizService.java
pom.xml
@@ -10,7 +10,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>fw-valhalla-sdk</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3</version>
     <packaging>jar</packaging>
     <name>fw-valhalla-sdk</name>
  
@@ -3,10 +3,13 @@ package cn.fw.valhalla.sdk.api;
 import cn.fw.data.base.domain.common.Message;
 import cn.fw.valhalla.sdk.param.CustomerQueryReq;
 import cn.fw.valhalla.sdk.param.ReachLogReq;
+import cn.fw.valhalla.sdk.result.AccidentFollowerResult;
 import cn.fw.valhalla.sdk.result.CustomerSimpleInfoDto;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
  
 import javax.validation.Valid;
 import java.util.List;
@@ -36,4 +39,13 @@ public interface ValhallaGeneralApiService {
      */
     @PostMapping("/query/customer/list")
     Message<List<CustomerSimpleInfoDto>> queryCustomList(@RequestBody CustomerQueryReq customerQueryReq);
+
+    /**
+     * 根据车牌号查询事故车跟进人员
+     * @param plateNo 车牌号
+     * @param groupId 集团id
+     * @return
+     */
+    @GetMapping("/query/accident/follower")
+    Message<AccidentFollowerResult> queryByPlate(@RequestParam("plateNo") String plateNo, @RequestParam("groupId") Long groupId);
 }
+package cn.fw.valhalla.sdk.result;
+
+import lombok.Data;
+
+/**
+ * 事故车跟进人员
+ *
+ * @author : kurisu
+ * @version : 1.0
+ * @className : AccidentFollowerResult
+ * @description : 事故车跟进人员
+ * @date : 2022-12-03 10:21
+ */
+@Data
+public class AccidentFollowerResult {
+    /**
+     * 跟进人员id
+     */
+    private Long userId;
+    /**
+     * 跟进人员名称
+     */
+    private String userName;
+    /**
+     * 门店id
+     */
+    private Long shopId;
+}
@@ -2,24 +2,25 @@ package cn.fw.valhalla.controller.api;
  
 import cn.fw.common.web.annotation.ControllerMethod;
 import cn.fw.data.base.domain.common.Message;
+import cn.fw.valhalla.domain.db.follow.ClueTask;
 import cn.fw.valhalla.domain.dto.CustomerDetailDto;
 import cn.fw.valhalla.sdk.api.ValhallaGeneralApiService;
 import cn.fw.valhalla.sdk.param.CustomerQueryReq;
 import cn.fw.valhalla.sdk.param.ReachLogReq;
+import cn.fw.valhalla.sdk.result.AccidentFollowerResult;
 import cn.fw.valhalla.sdk.result.CustomerSimpleInfoDto;
 import cn.fw.valhalla.service.bus.ReachLogBizService;
 import cn.fw.valhalla.service.bus.cust.CustomerBizService;
+import cn.fw.valhalla.service.bus.follow.FollowApiBizService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
  
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
  
 import static cn.fw.common.web.util.ResultBuilder.success;
  
@@ -39,12 +40,15 @@ public class ValhallaGeneralApiServiceImpl implements ValhallaGeneralApiService 
      * 保有客数据服务
      */
     private final CustomerBizService customerBiz;
+    private final FollowApiBizService followApiBizService;
  
     @Autowired
     public ValhallaGeneralApiServiceImpl(final ReachLogBizService reachLogBizService,
-                                         final CustomerBizService customerBiz) {
+                                         final CustomerBizService customerBiz,
+                                         final FollowApiBizService followApiBizService) {
         this.reachLogBizService = reachLogBizService;
         this.customerBiz = customerBiz;
+        this.followApiBizService = followApiBizService;
     }
  
     @PostMapping("/reach/save")
@@ -68,4 +72,19 @@ public class ValhallaGeneralApiServiceImpl implements ValhallaGeneralApiService 
         }
         return success(dtoList);
     }
+
+    @Override
+    @GetMapping("/query/accident/follower")
+    @ControllerMethod("查询进行中的事故车跟进人员")
+    public Message<AccidentFollowerResult> queryByPlate(@RequestParam("plateNo") String plateNo, @RequestParam("groupId") Long groupId) {
+        ClueTask clueTask = followApiBizService.queryAccidentFollowerByPlate(plateNo, groupId);
+        if (Objects.isNull(clueTask)) {
+            return success();
+        }
+        AccidentFollowerResult result = new AccidentFollowerResult();
+        result.setUserId(clueTask.getFollowUser());
+        result.setUserName(clueTask.getFollowUserName());
+        result.setShopId(clueTask.getFollowShop());
+        return success(result);
+    }
 }
@@ -172,6 +172,7 @@ public class AccidentPoolBizService {
                 .eq(FollowClue::getPlateNo, plateNo)
                 .eq(FollowClue::getClueType, FollowTypeEnum.AC)
                 .eq(FollowClue::getClueState, ClueStatusEnum.ONGOING)
+                .eq(FollowClue::getGroupId, groupId)
                 .last(" limit 1 ")
         );
  
 package cn.fw.valhalla.service.bus.follow;
  
+import cn.fw.valhalla.domain.db.customer.AccidentPool;
+import cn.fw.valhalla.domain.db.follow.ClueTask;
+import cn.fw.valhalla.domain.db.follow.FollowClue;
 import cn.fw.valhalla.domain.dto.ShouldBeCompletedDTO;
+import cn.fw.valhalla.domain.enums.ClueStatusEnum;
 import cn.fw.valhalla.domain.enums.FollowTypeEnum;
 import cn.fw.valhalla.domain.query.BeCompletedQuery;
 import cn.fw.valhalla.sdk.param.ShouldBeCompletedQuery;
 import cn.fw.valhalla.sdk.result.ShouldBeCompletedResult;
+import cn.fw.valhalla.service.data.AccidentPoolService;
 import cn.fw.valhalla.service.data.ClueTaskService;
+import cn.fw.valhalla.service.data.FollowClueService;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
  
 /**
  * 跟进api接口业务实现
@@ -24,10 +32,16 @@ import java.util.List;
 @Service
 public class FollowApiBizService {
     private final ClueTaskService clueTaskService;
+    private final AccidentPoolService accidentPoolService;
+    private final FollowClueService followClueService;
  
     @Autowired
-    public FollowApiBizService(final ClueTaskService clueTaskService) {
+    public FollowApiBizService(final ClueTaskService clueTaskService,
+                               final AccidentPoolService accidentPoolService,
+                               final FollowClueService followClueService) {
         this.clueTaskService = clueTaskService;
+        this.accidentPoolService = accidentPoolService;
+        this.followClueService = followClueService;
     }
  
     /**
@@ -56,4 +70,29 @@ public class FollowApiBizService {
         }
         return results;
     }
+
+    public ClueTask queryAccidentFollowerByPlate(String plateNo, Long groupId) {
+        AccidentPool lastOne = accidentPoolService.getOne(Wrappers.<AccidentPool>lambdaQuery()
+                .eq(AccidentPool::getPlateNo, plateNo)
+                .eq(AccidentPool::getGroupId, groupId)
+                .orderByDesc(AccidentPool::getCreateTime)
+                .last(" limit 1 ")
+        );
+
+        if (Objects.isNull(lastOne)) {
+            return null;
+        }
+        FollowClue lastOngoingClue = followClueService.getOne(Wrappers.<FollowClue>lambdaQuery()
+                .eq(FollowClue::getPlateNo, plateNo)
+                .eq(FollowClue::getClueType, FollowTypeEnum.AC)
+                .eq(FollowClue::getClueState, ClueStatusEnum.ONGOING)
+                .eq(FollowClue::getGroupId, groupId)
+                .last(" limit 1 ")
+        );
+
+        if (Objects.isNull(lastOngoingClue)) {
+            return null;
+        }
+        return clueTaskService.queryOngoingTaskByClueId(lastOngoingClue.getId());
+    }
 }
@@ -118,7 +118,7 @@
             <dependency>
                 <groupId>cn.fw</groupId>
                 <artifactId>fw-valhalla-sdk</artifactId>
-                <version>1.2.2</version>
+                <version>1.2.3</version>
             </dependency>
             <dependency>
                 <groupId>cn.fw</groupId>