From 4c245f3092b2c860ab383512a06be048df391ec6 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 28 Dec 2021 17:22:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E7=BD=91=E6=A0=BC=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BD=91=E6=A0=BC=E7=BB=8F=E7=BA=AC=E5=BA=A6?=
 =?UTF-8?q?=E8=BF=94=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dao/CustomerGridDao.java   |  6 +++
 .../service/impl/CustomerGridServiceImpl.java |  7 +--
 .../main/resources/mapper/CustomerGridDao.xml | 49 +++++++++++++++++++
 .../result/UserInfoOnEnterGridResultDTO.java  | 10 ++++
 .../impl/RegisterRelationServiceImpl.java     |  2 +
 5 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
index eca348b6f2..48dacdf82d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
@@ -345,4 +345,10 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
     List<CustomerGridEntity> selectByPid(@Param("pid") String pid);
 
     List<OptionResultDTO> getGridOptionForQuery(String gridPids);
+
+    /**
+     * @Author sun
+     * @Description 网格组织信息
+     **/
+    CustomerGridDTO gridAgencyByGrid(@Param("gridId") String gridId);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index b358c04b81..6ecf0130d6 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -770,15 +770,16 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
             return gridInfo;
         }
 
-        CustomerGridDTO gridInfo = ConvertUtils.sourceToTarget(baseDao.selectById(customerGridFormDTO.getGridId()), CustomerGridDTO.class);
+        CustomerGridDTO gridInfo = baseDao.gridAgencyByGrid(customerGridFormDTO.getGridId());
+        /*CustomerGridDTO gridInfo = ConvertUtils.sourceToTarget(baseDao.selectById(customerGridFormDTO.getGridId()), CustomerGridDTO.class);
         if (null != gridInfo) {
             CustomerAgencyEntity agency = customerAgencyService.selectById(gridInfo.getPid());
             gridInfo.setAgencyName(null != agency ? agency.getOrganizationName() : "");
             gridInfo.setGridNamePath(null != agency ? agency.getOrganizationName().concat("-").concat(gridInfo.getGridName()) : gridInfo.getGridName());
 
             redisUtils.hMSet(redisKey, BeanUtil.beanToMap(gridInfo));
-        }
-
+        }*/
+        redisUtils.hMSet(redisKey, BeanUtil.beanToMap(gridInfo));
         return gridInfo;
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 02e6a67cb2..a08a4f534c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -734,4 +734,53 @@
           and cg.PIDS like concat(#{gridPids},'%')
          order by ca.CREATED_TIME asc,cg.CREATED_TIME asc
     </select>
+
+    <select id="gridAgencyByGrid" resultType="com.epmet.dto.CustomerGridDTO">
+        SELECT
+            CONCAT(
+                ca.organization_name,
+                "-",
+                cg.grid_name
+            ) gridNamePath,
+            ca.all_parent_name allParentName,
+            cg.id,
+            cg.customer_id,
+            cg.grid_name,
+            cg.coordinates,
+            cg.area_code,
+            cg.code,
+            cg.sync_flag,
+            cg.manage_district,
+            cg.total_user,
+            cg.pid,
+            cg.pids,
+            cg.grid_type,
+            cg.contacts,
+            cg.mobile,
+            <!-- 网格没有经纬度时获取客户根组织下的 -->
+            ( CASE WHEN cg.longitude is null THEN
+                ( SELECT longitude FROM customer_agency
+                WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
+                ORDER BY pid ASC LIMIT 1
+                )
+                ELSE cg.longitude
+                END
+            ) longitude,
+                ( CASE WHEN cg.latitude is null THEN
+                ( SELECT latitude FROM customer_agency
+                WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
+                ORDER BY pid ASC LIMIT 1
+                )
+                ELSE cg.latitude
+                END
+            ) latitude
+        FROM
+            customer_grid cg
+        INNER JOIN customer_agency ca ON cg.pid = ca.id
+        WHERE
+            cg.del_flag = '0'
+        AND ca.del_flag = '0'
+        AND cg.id = #{gridId}
+    </select>
+
 </mapper>
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java
index 3561cb4060..e8bff9cd33 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java
@@ -30,6 +30,16 @@ public class UserInfoOnEnterGridResultDTO implements Serializable{
      * */
     private String currentGridId;
 
+    /**
+     * 网格经度【没值则去客户跟组织的值】
+     */
+    private String longitude;
+
+    /**
+     * 网格纬度【没值则去客户跟组织的值】
+     */
+    private String latitude;
+
     /**
      * 当前网格名称
      * */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
index 0e0a8ef246..0ab2d16b99 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
@@ -309,6 +309,8 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
             resultObj.setOrgId(resultObj.getCurrentGridId());
             resultObj.setOrgName(gridDTOResult.getData().getAgencyName()+"-"+gridDTOResult.getData().getGridName());
             resultObj.setOrgType("grid");
+            resultObj.setLongitude(gridDTOResult.getData().getLongitude());
+            resultObj.setLatitude(gridDTOResult.getData().getLatitude());
         }else{
             //查询网格名称失败
             log.warn(String.format("查找网格信息失败，网格Id:【%s】",gridId));