陌生人搜网格接口调整customerId->appid

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/PublicCustomerResultDTO.java

@@ -0,0 +1,22 @@
+package com.epmet.dto.result;
+
+import com.epmet.dto.PaCustomerDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 根据appid查询公众号注册的客户信息
+ * @Author sun
+ */
+@Data
+public class PublicCustomerResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 4642988014737245076L;
+
+    /**
+     * 客户信息
+     */
+    private PaCustomerDTO customer;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java

@@ -7,6 +7,7 @@ import com.epmet.dto.form.SaveUserVisitedFormDTO;
 import com.epmet.dto.form.WxLoginFormDTO;
 import com.epmet.dto.result.CustomerUserResultDTO;
 import com.epmet.dto.result.InitCustomerResultDTO;
+import com.epmet.dto.result.PublicCustomerResultDTO;
 import com.epmet.dto.result.SaveUserResultDTO;
 import com.epmet.feign.fallback.EpmetThirdFeignClientFallback;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
@@ -94,5 +95,14 @@ public interface EpmetThirdFeignClient {
      * @Description 校验appId是否有效以及是否授权,校验通过的调用微信API获取用户基本信息
      **/
     @PostMapping(value = "third/customermp/resiandworklogin")
-    Result<UserWechatDTO> resiAndWorkLogin(WxLoginFormDTO formDTO);
+    Result<UserWechatDTO> resiAndWorkLogin(@RequestBody WxLoginFormDTO formDTO);
+
+    /**
+     * @param appId
+     * @return
+     * @Author sun
+     * @Description 根据appId查询公众号注册的客户信息
+     **/
+    @PostMapping(value = "third/customermp/getcustomermsg")
+    Result<PublicCustomerResultDTO> getCustomerMsg(@PathVariable("appId") String appId);
 }

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java

@@ -8,6 +8,7 @@ import com.epmet.dto.form.SaveUserVisitedFormDTO;
 import com.epmet.dto.form.WxLoginFormDTO;
 import com.epmet.dto.result.CustomerUserResultDTO;
 import com.epmet.dto.result.InitCustomerResultDTO;
+import com.epmet.dto.result.PublicCustomerResultDTO;
 import com.epmet.dto.result.SaveUserResultDTO;
 import com.epmet.feign.EpmetThirdFeignClient;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
@@ -59,4 +60,9 @@ public class EpmetThirdFeignClientFallback implements EpmetThirdFeignClient {
     public Result<UserWechatDTO> resiAndWorkLogin(WxLoginFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "resiAndWorkLogin", formDTO);
     }
+
+    @Override
+    public Result<PublicCustomerResultDTO> getCustomerMsg(String appId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "getCustomerMsg", appId);
+    }
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java

@@ -62,4 +62,8 @@ public interface PaConstant {
      * 获取缓存中token信息失败
      */
     String TOKEN_EXCEPTION = "token已过期";
+    /**
+     * 获取客户信息失败
+     */
+    String SELECT_CUSTOMER_EXCEPTION = "获取客户信息失败";
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CustomerMpController.java

@@ -28,6 +28,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerMpDTO;
 import com.epmet.dto.UserWechatDTO;
 import com.epmet.dto.form.WxLoginFormDTO;
+import com.epmet.dto.result.PublicCustomerResultDTO;
 import com.epmet.excel.CustomerMpExcel;
 import com.epmet.service.CustomerMpService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -104,4 +105,15 @@ public class CustomerMpController {
         return new Result<UserWechatDTO>().ok(customerMpService.resiAndWorkLogin(formDTO));
     }
 
+    /**
+     * @param appId
+     * @return
+     * @Author sun
+     * @Description 根据appId查询公众号注册的客户信息
+     **/
+    @PostMapping("getcustomermsg")
+    public Result<PublicCustomerResultDTO> getCustomerMsg(@PathVariable("appId") String appId) {
+        return new Result<PublicCustomerResultDTO>().ok(customerMpService.getCustomerMsg(appId));
+    }
+
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java

@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.CustomerMpDTO;
+import com.epmet.dto.PaCustomerDTO;
 import com.epmet.dto.form.AuthCodeFormDTO;
 import com.epmet.entity.CustomerMpEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -98,4 +99,12 @@ public interface CustomerMpDao extends BaseDao<CustomerMpEntity> {
      * @Description 根据appId查询小程序信息
      **/
     CustomerMpDTO selectByAppId(@Param("appId") String appId);
+
+    /**
+     * @param appId
+     * @return
+     * @Author sun
+     * @Description 根据appId查询客户信息
+     **/
+    PaCustomerDTO selectCustomerByAppId(@Param("appId") String appId);
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CustomerMpService.java

@@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.CustomerMpDTO;
 import com.epmet.dto.UserWechatDTO;
 import com.epmet.dto.form.WxLoginFormDTO;
+import com.epmet.dto.result.PublicCustomerResultDTO;
 import com.epmet.entity.CustomerMpEntity;
 
 import java.util.List;
@@ -112,4 +113,12 @@ public interface CustomerMpService extends BaseService<CustomerMpEntity> {
      * @Description 校验appId是否有效以及是否授权,校验通过的调用微信API获取用户基本信息
      **/
     UserWechatDTO resiAndWorkLogin(WxLoginFormDTO formDTO);
+
+    /**
+     * @param appId
+     * @return
+     * @Author sun
+     * @Description 根据appId查询公众号注册的客户信息
+     **/
+    PublicCustomerResultDTO getCustomerMsg(String appId);
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CustomerMpServiceImpl.java

@@ -26,10 +26,13 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.constant.PaConstant;
 import com.epmet.dao.CustomerMpDao;
 import com.epmet.dto.CustomerMpDTO;
+import com.epmet.dto.PaCustomerDTO;
 import com.epmet.dto.UserWechatDTO;
 import com.epmet.dto.form.WxLoginFormDTO;
+import com.epmet.dto.result.PublicCustomerResultDTO;
 import com.epmet.entity.CustomerMpEntity;
 import com.epmet.redis.CustomerMpRedis;
 import com.epmet.service.CustomerMpService;
@@ -142,4 +145,23 @@ public class CustomerMpServiceImpl extends BaseServiceImpl<CustomerMpDao, Custom
         return resultMap;
     }
 
+    /**
+     * @param appId
+     * @return
+     * @Author sun
+     * @Description 根据appId查询公众号注册的客户信息
+     **/
+    @Override
+    public PublicCustomerResultDTO getCustomerMsg(String appId) {
+        PublicCustomerResultDTO resultDTO = new PublicCustomerResultDTO();
+        //1.根据appid查询客户信息
+        PaCustomerDTO paCustomerDTO = baseDao.selectCustomerByAppId(appId);
+        if(null==paCustomerDTO){
+            throw new RenException(PaConstant.SELECT_CUSTOMER_EXCEPTION);
+        }
+        resultDTO.setCustomer(paCustomerDTO);
+
+        return resultDTO;
+    }
+
 }

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml

@@ -99,4 +99,18 @@
         AND app_id = #{appId}
     </select>
 
+    <select id="selectCustomerByAppId" resultType="com.epmet.dto.PaCustomerDTO">
+        SELECT
+            pc.id,
+            pc.customer_name,
+            pc.is_initialize
+        FROM
+            customer_mp cm
+        INNER JOIN pa_customer pc ON cm.customer_id = pc.id
+        WHERE
+            cm.del_flag = '0'
+        AND pc.del_flag = '0'
+        AND cm.app_id = #{appId}
+    </select>
+
 </mapper>

epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/form/PublicCustomerGridListFormDTO.java

@@ -22,10 +22,10 @@ public class PublicCustomerGridListFormDTO implements Serializable {
     }
 
     /**
-     * 客户Id
+     * 小程序appId
      * */
-    @NotBlank(message = "客户Id不能为空", groups = {AddUserShowGroup.class})
-    private String customerId;
+    @NotBlank(message = "小程序appId不能为空", groups = {AddUserShowGroup.class})
+    private String appId;
     /**
      * 当前页
      * */

epmet-module/resi-guide/resi-guide-server/pom.xml

@@ -81,6 +81,12 @@
             <artifactId>snakeyaml</artifactId>
             <version>${snakeyaml.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-third-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java

@@ -14,12 +14,15 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.StrangerResiGuideConstant;
 import com.epmet.dao.StrangerAccessRecordDao;
+import com.epmet.dto.PaCustomerDTO;
 import com.epmet.dto.StrangerAccessRecordDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
 import com.epmet.dto.result.HomeDesignByCustomerResultDTO;
 import com.epmet.dto.result.PublicCustomerGridForStrangerResultDTO;
+import com.epmet.dto.result.PublicCustomerResultDTO;
 import com.epmet.entity.StrangerAccessRecordEntity;
+import com.epmet.feign.EpmetThirdFeignClient;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.feign.OperCustomizeFeignClient;
@@ -52,6 +55,8 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
     private EpmetUserFeignClient epmetUserFeignClient;
     @Autowired
     private OperCustomizeFeignClient operCustomizeFeignClient;
+    @Autowired
+    private EpmetThirdFeignClient epmetThirdFeignClient;
 
     /**
      * 查询陌生人访问记录
@@ -249,8 +254,16 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
     @Override
     public Result<List<PublicCustomerGridForStrangerResultDTO>> thirdCustomerGridList(PublicCustomerGridListFormDTO formDTO) {
 
+        //0.调用epmet-third服务，根据appId查询客户信息
+        Result<PublicCustomerResultDTO> result = epmetThirdFeignClient.getCustomerMsg(formDTO.getAppId());
+        if(!result.success()){
+            throw new RenException(result.getCode());
+        }
+        PublicCustomerResultDTO resultDTO = result.getData();
+        PaCustomerDTO customer = resultDTO.getCustomer();
+
         ThirdCustomerGridListFormDTO third = new ThirdCustomerGridListFormDTO();
-        third.setCustomerId(formDTO.getCustomerId());
+        third.setCustomerId(customer.getId());
         //1.参数设置
         //根据是自动定位还是手动定位获取地区编码值
         third.setAreaCode(ModuleConstant.NOT_POSITION_AUTHORIZED == formDTO.getIsAuthorized() ?