画区域时也可以同时更新经纬度

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

@@ -28,4 +28,14 @@ public class MapAddAreaFormDTO implements Serializable {
 
     @NotBlank(message = "coordinates不能为空",groups = MapAddAreaForm.class)
     private String coordinates;
+
+    /**
+     * 中心位置经度 经纬度同时填写才更新
+     */
+    private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    private String latitude;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@@ -273,7 +273,7 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @author zxc
      * @date 2021/10/25 9:59 上午
      */
-    void addMapArea(@Param("orgId") String orgId, @Param("level") String level, @Param("coordinates") String coordinates);
+    void addMapArea(@Param("orgId") String orgId, @Param("level") String level, @Param("coordinates") String coordinates, @Param("latitude") String latitude, @Param("longitude") String longitude);
 
     /**
      * @param pid
@@ -296,34 +296,38 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
 
     /**
      * desc:获取组织和网格的数据 树形sql
+     *
      * @param agencyId
      * @return
      */
     ExtStaffPermissionResultDTO selectAgencyAndGridById(@Param("agencyId") String agencyId);
+
     /**
      * @Description 【事件】社区服务热线
      * @author sun
      **/
     OrgMobileResultDTO getAgencyMobile(@Param("gridId") String gridId);
 
-    int updateSubAgencyAreaCodeById(@Param("customerId")String customerId, @Param("agencyId")String agencyId, @Param("operateUserId") String operateUserId);
+    int updateSubAgencyAreaCodeById(@Param("customerId") String customerId, @Param("agencyId") String agencyId, @Param("operateUserId") String operateUserId);
 
     /**
      * Desc: 查询组织下的社区
+     *
      * @param customerId
      * @param agencyId
      * @author zxc
      * @date 2022/3/21 15:23
      */
-    List<CommunityListResultDTO> getCommunityList(@Param("customerId")String customerId, @Param("agencyId")String agencyId);
+    List<CommunityListResultDTO> getCommunityList(@Param("customerId") String customerId, @Param("agencyId") String agencyId);
 
     List<SubOrgResDTO> selectSubOrg(String agencyId);
+
     /**
+     * @return java.util.List<com.epmet.dto.result.PartyOrgTreeResultDTO>
      * @describe: 通过用户所属的行政组织和行政类型，查询下级的组织树
      * @author wangtong
      * @date 2022/5/18 17:23
      * @params [formDto]
-    * @return java.util.List<com.epmet.dto.result.PartyOrgTreeResultDTO>
      */
     List<PartyOrgTreeResultDTO> getOrgTreeByUserAndType(OrgTreeByUserAndTypeFormDTO formDto);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@@ -709,7 +709,7 @@ public class AgencyServiceImpl implements AgencyService {
      */
     @Override
     public void mapAddArea(MapAddAreaFormDTO formDTO) {
-        customerAgencyDao.addMapArea(formDTO.getOrgId(), formDTO.getLevel(), formDTO.getCoordinates());
+        customerAgencyDao.addMapArea(formDTO.getOrgId(), formDTO.getLevel(), formDTO.getCoordinates(), formDTO.getLatitude(), formDTO.getLongitude());
     }
 
     /**

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

@@ -37,7 +37,12 @@
             ic_neighbor_hood
         </if>
         SET
+        <if test="latitude != null and latitude.trim() != '' and longitude != null and longitude.trim() != ''">
+            LATITUDE = #{latitude},LONGITUDE = #{longitude},
+        </if>
+        <if test="coordinates != null and coordinates.trim() != ''">
             COORDINATES = #{coordinates},
+        </if>
         UPDATED_TIME = NOW()
         WHERE ID = #{orgId}
         AND DEL_FLAG = '0'