feat(api): 新增关键字全匹配查询api接口

- 新增关键字查询档案 - 关键之只包含用户名称、车牌号、车架号后6位且全匹配查询 BREAKING CHANGE: nothing

feat(api): 新增关键字全匹配查询api接口
- 新增关键字查询档案 - 关键之只包含用户名称、车牌号、车架号后6位且全匹配查询 BREAKING CHANGE: nothing
张志伟
1 parent 3c9f0339
Showing 10 changed files with 148 additions and 11 deletions
fw-valhalla-dao/src/main/java/cn/fw/valhalla/dao/mapper/CustomerMapper.java
fw-valhalla-dao/src/main/resources/mapper/CustomerMapper.xml
fw-valhalla-sdk/pom.xml
fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/api/CustomerApiService.java
fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/result/BasicsCustomerDTO.java
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/api/CustomerApiServiceImpl.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/data/CustomerService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/data/impl/CustomerServiceImpl.java
pom.xml
@@ -7,6 +7,7 @@ import cn.fw.valhalla.domain.query.CustomCustomerQuery;
 import cn.fw.valhalla.domain.query.CustomerQueryVO;
 import cn.fw.valhalla.domain.query.StammkundeAnalyseQueryVO;
 import cn.fw.valhalla.domain.vo.customer.CustomerListVO;
+import cn.fw.valhalla.sdk.result.BasicsCustomerDTO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -46,6 +47,7 @@ public interface CustomerMapper extends BaseMapper&lt;Customer&gt; {
      * @return
      */
     List<CustomerDetailDto> queryCustomList(@Param("condition") CustomCustomerQuery query);
+
     /**
      * 查询自定义参数的档案数量
      *
@@ -53,4 +55,13 @@ public interface CustomerMapper extends BaseMapper&lt;Customer&gt; {
      * @return
      */
     Long queryCustomCount(@Param("condition") CustomCustomerQuery query);
+
+    /**
+     * 关键字全匹配查询
+     *
+     * @param keyword
+     * @param groupId
+     * @return
+     */
+    List<BasicsCustomerDTO> queryByKeyword(@Param("keyword") String keyword, @Param("groupId") Long groupId);
 }
@@ -317,4 +317,28 @@
             )
         </if>
     </select>
+
+    <select
+            id="queryByKeyword"
+            resultType="cn.fw.valhalla.sdk.result.BasicsCustomerDTO"
+    >
+        select t1.id                                                       customer_id,
+               t2.name                                                     customer_name,
+               t2.member_id                                                member_id,
+               t2.cus_type                                                 cus_type,
+               t1.plate_no                                                 plate_no,
+               t1.frame_no                                                 frame_no,
+               concat_ws(' ', t1.brand_name, t1.series_name, t1.spec_name) car_name,
+               t1.shop_id,
+               t1.adviser_id
+        from customer t1
+                 inner join customer_base_info t2 on t1.base_id = t2.id
+        where t1.yn = 1
+          and (
+                    t1.plate_no = #{keyword}
+                or right(t1.frame_no, 6) = #{keyword}
+                or t2.name = #{keyword}
+            )
+          and t1.group_id = #{groupId}
+    </select>
 </mapper>
@@ -10,7 +10,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>fw-valhalla-sdk</artifactId>
-    <version>1.1.6</version>
+    <version>1.2.0</version>
     <packaging>jar</packaging>
     <name>fw-valhalla-sdk</name>
  
@@ -5,10 +5,7 @@ import cn.fw.valhalla.sdk.param.ChangeAdviserReq;
 import cn.fw.valhalla.sdk.param.ChangePlateNoReq;
 import cn.fw.valhalla.sdk.param.ChangeSpecCodeReq;
 import cn.fw.valhalla.sdk.param.CustomerParams;
-import cn.fw.valhalla.sdk.result.CarArchiveDTO;
-import cn.fw.valhalla.sdk.result.CustomerContactDto;
-import cn.fw.valhalla.sdk.result.CustomerInfoDto;
-import cn.fw.valhalla.sdk.result.ReceptionResultDto;
+import cn.fw.valhalla.sdk.result.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -184,4 +181,14 @@ public interface CustomerApiService {
      */
     @GetMapping("/query/by/engineNo")
     Message<CustomerInfoDto> queryByEngineNo(@RequestParam("engineNo") String engineNo, @RequestParam("groupId") Long groupId);
+
+    /**
+     * 通过关键字查询档案列表
+     *
+     * @param keyword 关键字 【车主名称、车牌号、车架号后6位】精确查找
+     * @param groupId 集团id
+     * @return
+     */
+    @GetMapping("/query/by/keyword")
+    Message<List<BasicsCustomerDTO>> queryByKeyword(@RequestParam("keyword") String keyword, @RequestParam("groupId") Long groupId);
 }
+package cn.fw.valhalla.sdk.result;
+
+import lombok.Data;
+
+/**
+ * @author : kurisu
+ * @version : 1.0
+ * @className : BasicsCustomerDTO
+ * @description : 基础档案信息
+ * @date : 2022-04-12 14:04
+ */
+@Data
+public class BasicsCustomerDTO {
+    private Long customerId;
+    /**
+     * 姓名
+     */
+    private String customerName;
+    /**
+     * 客户类型
+     *
+     * @see cn.fw.valhalla.sdk.enums.CusTypeEnum
+     */
+    private Integer cusType;
+    /**
+     * 会员id
+     */
+    private Long memberId;
+    /**
+     * 车牌号
+     */
+    private String plateNo;
+    /**
+     * 车架号
+     */
+    private String frameNo;
+    /**
+     * 车辆品牌信息
+     */
+    private String carName;
+    /**
+     * 专属服务顾问id
+     */
+    private Long adviserId;
+    /**
+     * 专属服务顾问
+     */
+    private String adviserName;
+    /**
+     * 所属服务站id
+     */
+    private Long shopId;
+    /**
+     * 所属服务站
+     */
+    private String shopName;
+}
@@ -9,10 +9,7 @@ import cn.fw.valhalla.sdk.param.ChangeAdviserReq;
 import cn.fw.valhalla.sdk.param.ChangePlateNoReq;
 import cn.fw.valhalla.sdk.param.ChangeSpecCodeReq;
 import cn.fw.valhalla.sdk.param.CustomerParams;
-import cn.fw.valhalla.sdk.result.CarArchiveDTO;
-import cn.fw.valhalla.sdk.result.CustomerContactDto;
-import cn.fw.valhalla.sdk.result.CustomerInfoDto;
-import cn.fw.valhalla.sdk.result.ReceptionResultDto;
+import cn.fw.valhalla.sdk.result.*;
 import cn.fw.valhalla.service.bus.cust.ContactBizService;
 import cn.fw.valhalla.service.bus.cust.CustomerBizService;
 import cn.fw.valhalla.service.bus.cust.CustomerChangeBizService;
@@ -225,4 +222,11 @@ public class CustomerApiServiceImpl implements CustomerApiService {
         }
         return success();
     }
+
+    @GetMapping("/query/by/keyword")
+    @Override
+    @ControllerMethod("通过关键字查询档案列表")
+    public Message<List<BasicsCustomerDTO>> queryByKeyword(@RequestParam("keyword") String keyword, @RequestParam("groupId") Long groupId) {
+        return success(customerBiz.queryByKeyword(keyword, groupId));
+    }
 }
@@ -34,6 +34,7 @@ import cn.fw.valhalla.rpc.oop.dto.SpecDTO;
 import cn.fw.valhalla.sdk.param.ChangeSpecCodeReq;
 import cn.fw.valhalla.sdk.param.CustomerParams;
 import cn.fw.valhalla.sdk.param.CustomerQueryReq;
+import cn.fw.valhalla.sdk.result.BasicsCustomerDTO;
 import cn.fw.valhalla.sdk.result.CustomerInfoDto;
 import cn.fw.valhalla.sdk.result.ReceptionResultDto;
 import cn.fw.valhalla.service.bus.StammkundeBizService;
@@ -778,6 +779,22 @@ public class CustomerBizService extends AbstractCustomerService {
                 .in(Customer::getId, customerIdList));
     }
  
+    public List<BasicsCustomerDTO> queryByKeyword(String keyword, Long groupId) {
+        List<BasicsCustomerDTO> list = customerService.queryByKeyword(keyword, groupId);
+        for (BasicsCustomerDTO dto : list) {
+            UserInfoDTO user = userService.user(dto.getAdviserId());
+            if (Objects.nonNull(user)) {
+                dto.setAdviserName(user.getUserName());
+            }
+            ShopDTO shop = oopService.shop(dto.getShopId());
+            if (Objects.nonNull(shop)) {
+                dto.setShopName(shop.getShortName());
+            }
+        }
+        return list;
+    }
+
+
     private AffiliationRecord createEntity(CustomerDetailDto customer) {
         AffiliationRecord record = new AffiliationRecord();
         record.setCustomerId(customer.getId());
@@ -7,6 +7,7 @@ import cn.fw.valhalla.domain.query.CustomCustomerQuery;
 import cn.fw.valhalla.domain.query.CustomerQueryVO;
 import cn.fw.valhalla.domain.query.StammkundeAnalyseQueryVO;
 import cn.fw.valhalla.domain.vo.customer.CustomerListVO;
+import cn.fw.valhalla.sdk.result.BasicsCustomerDTO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
@@ -123,8 +124,18 @@ public interface CustomerService extends IService&lt;Customer&gt; {
  
     /**
      * 查询自定义参数的档案数量
+     *
      * @param query
      * @return
      */
     Long queryCustomListCount(CustomCustomerQuery query);
+
+    /**
+     * 关键字全匹配查询
+     *
+     * @param keyword
+     * @param groupId
+     * @return
+     */
+    List<BasicsCustomerDTO> queryByKeyword(String keyword, Long groupId);
 }
@@ -8,6 +8,7 @@ import cn.fw.valhalla.domain.query.CustomCustomerQuery;
 import cn.fw.valhalla.domain.query.CustomerQueryVO;
 import cn.fw.valhalla.domain.query.StammkundeAnalyseQueryVO;
 import cn.fw.valhalla.domain.vo.customer.CustomerListVO;
+import cn.fw.valhalla.sdk.result.BasicsCustomerDTO;
 import cn.fw.valhalla.service.data.CustomerService;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -130,4 +131,9 @@ public class CustomerServiceImpl extends ServiceImpl&lt;CustomerMapper, Customer&gt; i
     public Long queryCustomListCount(CustomCustomerQuery query) {
         return Optional.ofNullable(getBaseMapper().queryCustomCount(query)).orElse(0L);
     }
+
+    @Override
+    public List<BasicsCustomerDTO> queryByKeyword(String keyword, Long groupId) {
+        return Optional.ofNullable(this.getBaseMapper().queryByKeyword(keyword, groupId)).orElse(new ArrayList<>());
+    }
 }
@@ -12,7 +12,7 @@
     <parent>
         <groupId>cn.fw</groupId>
         <artifactId>fw-common-dependencies</artifactId>
-        <version>3.2.5</version>
+        <version>3.3.0</version>
     </parent>
  
     <modules>
@@ -117,7 +117,7 @@
             <dependency>
                 <groupId>cn.fw</groupId>
                 <artifactId>fw-valhalla-sdk</artifactId>
-                <version>1.1.6</version>
+                <version>1.2.0</version>
             </dependency>
             <dependency>
                 <groupId>cn.fw</groupId>