Merge remote-tracking branch 'origin/dev'

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListCustomerGridFormDTO.java

@@ -35,4 +35,6 @@ public class ListCustomerGridFormDTO implements Serializable{
      * 每页显示数量
      * */
     private Integer pageSize = 20;
+
+    private String customerId;
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -59,6 +59,9 @@
            grid.del_flag = 0
        AND
            grid.area_code LIKE CONCAT(#{areaCode},'%')
+           <if test='null != customerId and "" != customerId'>
+               AND grid.customer_id = #{customerId}
+           </if>
        ORDER BY
            grid.customer_id,
            CONVERT ( gridName USING gbk ) ASC
@@ -73,6 +76,7 @@
         FROM
 
 
+        (
         (
                 SELECT
                     a.id AS grid_id,
@@ -80,12 +84,10 @@
                     concat( agency.fullname, '-', a.grid_name ) AS gridName
                 FROM
                     CUSTOMER_GRID a
-
                 LEFT JOIN (
                     SELECT
                         a1.id,
                         CASE
-
                         WHEN a2.ORGANIZATION_NAME IS NULL THEN
                         a1.ORGANIZATION_NAME ELSE concat( a2.ORGANIZATION_NAME, '-', a1.ORGANIZATION_NAME )
                         END AS fullname
@@ -95,15 +97,52 @@
                         AND a1.del_flag = '0'
                     WHERE
                         a1.del_flag = '0'
+                    AND a1.customer_id = #{customerId}
                 ) agency ON a.PID = agency.ID
-
-
                 WHERE
                     a.del_flag = 0
-        AND
-        a.area_code = #{areaCode}
+                AND a.area_code = #{areaCode}
+                <if test='null != customerId and "" != customerId'>
+                    AND a.customer_id = #{customerId}
+                </if>
                 ORDER BY
                   CONVERT ( gridName USING gbk ) ASC
+                LIMIT 0,999999999999
+            )
+            UNION
+            (
+                SELECT
+                b.id AS grid_id,
+                b.customer_id,
+                concat(agency.fullname , '-' ,b.grid_name) as gridName
+                FROM
+                CUSTOMER_GRID b
+                LEFT JOIN (
+                    SELECT
+                        a1.id,
+                        CASE
+                        WHEN a2.ORGANIZATION_NAME IS NULL THEN
+                        a1.ORGANIZATION_NAME ELSE concat( a2.ORGANIZATION_NAME, '-', a1.ORGANIZATION_NAME )
+                        END AS fullname
+                    FROM
+                        customer_agency a1
+                    LEFT JOIN customer_agency a2 ON a1.PID = a2.ID
+                        AND a1.del_flag = '0'
+                    WHERE
+                        a1.del_flag = '0'
+                    AND a1.customer_id = #{customerId}
+                ) agency ON b.PID = agency.ID
+                WHERE
+                    b.del_flag = 0
+                <if test='null != customerId and "" != customerId'>
+                    AND b.customer_id = #{customerId}
+                </if>
+                AND b.area_code LIKE CONCAT(#{cityCode},'%')
+                AND  <![CDATA[ b.area_code <> #{areaCode}]]>
+                ORDER BY
+                    b.area_code DESC ,CONVERT ( gridName USING gbk ) ASC
+                LIMIT 0,999999999999
+            )
 
         ) c
 

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java

@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.exception.ValidateException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -30,6 +31,7 @@ import com.epmet.dto.result.MarketContactInfoResultDTO;
 import com.epmet.dto.result.PublicCustomerGridForStrangerResultDTO;
 import com.epmet.service.StrangerAccessRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -87,9 +89,10 @@ public class StrangerResiGuideController {
 	 * @date 2021.01.18 16:39
 	 */
 	@PostMapping("sso/publiclocationgridlist")
-	Result<List<CustomerGridForStrangerResultDTO>> locationGridList(@RequestBody CustomerGridListFormDTO customerGridListFormDTO){
+	Result<List<PublicCustomerGridForStrangerResultDTO>> locationGridList(@LoginUser TokenDto dto,@RequestBody CustomerGridListFormDTO customerGridListFormDTO){
 		ValidatorUtils.validateEntity(customerGridListFormDTO);
-		return strangerAccessRecordService.listCustomerGridH5(customerGridListFormDTO);
+		if(null == dto || StringUtils.isEmpty(dto.getCustomerId())) throw new ValidateException("无法获取客户Id");
+		return strangerAccessRecordService.listCustomerGridH5(customerGridListFormDTO,dto.getCustomerId());
 	}
 
 	/**

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

@@ -128,6 +128,6 @@ public interface StrangerAccessRecordService extends BaseService<StrangerAccessR
      * @author wangc
      * @date 2021.01.18 16:39
     */
-    Result<List<CustomerGridForStrangerResultDTO>> listCustomerGridH5(CustomerGridListFormDTO customerGridListFormDTO);
+    Result<List<PublicCustomerGridForStrangerResultDTO>> listCustomerGridH5(CustomerGridListFormDTO customerGridListFormDTO,String customerId);
 
 }

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

@@ -312,26 +312,24 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
      * @date 2021.01.18 16:39
      */
     @Override
-    public Result<List<CustomerGridForStrangerResultDTO>> listCustomerGridH5(CustomerGridListFormDTO customerGridListFormDTO) {
-
-        ListCustomerGridFormDTO listCustomerGridFormDTO = new ListCustomerGridFormDTO();
-        listCustomerGridFormDTO.setAreaCode(StringUtils.isBlank(customerGridListFormDTO.getSelectedAreaCode()) ?
+    public Result<List<PublicCustomerGridForStrangerResultDTO>> listCustomerGridH5(CustomerGridListFormDTO customerGridListFormDTO,String customerId) {
+		ThirdCustomerGridListFormDTO gridParam = new ThirdCustomerGridListFormDTO();
+		gridParam.setAreaCode(StringUtils.isBlank(customerGridListFormDTO.getSelectedAreaCode()) ?
 				customerGridListFormDTO.getAreaCode() : customerGridListFormDTO.getSelectedAreaCode());
 
-        listCustomerGridFormDTO.setPageNo(null == customerGridListFormDTO.getPageNo() ? ModuleConstant.MIN_CURRENT_PAGE_NO : customerGridListFormDTO.getPageNo());
-        listCustomerGridFormDTO.setPageSize(customerGridListFormDTO.getPageSize());
-
-
-        Result<List<CustomerGridForStrangerResultDTO>> queryResult =
+		gridParam.setPageNo(null == customerGridListFormDTO.getPageNo() ? ModuleConstant.MIN_CURRENT_PAGE_NO : customerGridListFormDTO.getPageNo());
+		gridParam.setPageSize(customerGridListFormDTO.getPageSize());
+		gridParam.setCustomerId(customerId);
+        Result<List<PublicCustomerGridForStrangerResultDTO>> queryResult =
                 govOrgFeignClient
-                        .queryGridListByAreaCode(listCustomerGridFormDTO);
+                        .queryCustomerGridList(gridParam);
 
         //Feign调用成功
         if (queryResult.success()) {
-            List<CustomerGridForStrangerResultDTO> queryList = queryResult.getData();
+            List<PublicCustomerGridForStrangerResultDTO> queryList = queryResult.getData();
             if (null != queryResult && queryList.size() > 0) {
                 StrangerAccessRecordEntity strangerTrance = new StrangerAccessRecordEntity();
-                strangerTrance.setLocationAreaCode(listCustomerGridFormDTO.getAreaCode());
+                strangerTrance.setLocationAreaCode(gridParam.getAreaCode());
                 strangerTrance.setIsAuthorized(customerGridListFormDTO.getIsAuthorized());
                 strangerTrance.setGridNumber(queryList.size());
                 strangerTrance.setVisitTime(new Date());