diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java index 8fcf455279..0f4ba3494f 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.form; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; import java.io.Serializable; /** @@ -28,4 +29,16 @@ public class MapAddAreaFormDTO implements Serializable { @NotBlank(message = "coordinates不能为空",groups = MapAddAreaForm.class) private String coordinates; + + /** + * 中心位置经度 经纬度同时填写才更新 + */ + @Pattern(regexp = "^([-+])?\\d+(\\.\\d+)?$", message = "请输入正确的经度值",groups = MapAddAreaForm.class) + private String longitude; + + /** + * 中心位置纬度 + */ + @Pattern(regexp = "^([-+])?\\d+(\\.\\d+)?$", message = "请输入正确的纬度值",groups = MapAddAreaForm.class) + private String latitude; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index a63c7e0ff7..892ef61681 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -273,7 +273,7 @@ public interface CustomerAgencyDao extends BaseDao { * @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 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index 4b11db9a40..ceee6804eb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -711,7 +711,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()); } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 37169a21a4..2b6a9910ff 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -37,7 +37,12 @@ ic_neighbor_hood SET - COORDINATES = #{coordinates}, + + LATITUDE = #{latitude},LONGITUDE = #{longitude}, + + + COORDINATES = #{coordinates}, + UPDATED_TIME = NOW() WHERE ID = #{orgId} AND DEL_FLAG = '0'