From 54ca64cc7a021c1b254965b1fd609ab7e576d9ff Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 14 Jun 2022 11:09:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=94=BB=E5=8C=BA=E5=9F=9F=E6=97=B6?= =?UTF-8?q?=E4=B9=9F=E5=8F=AF=E4=BB=A5=E5=90=8C=E6=97=B6=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/MapAddAreaFormDTO.java | 10 +++++++++ .../java/com/epmet/dao/CustomerAgencyDao.java | 22 +++++++++++-------- .../epmet/service/impl/AgencyServiceImpl.java | 2 +- .../resources/mapper/CustomerAgencyDao.xml | 7 +++++- 4 files changed, 30 insertions(+), 11 deletions(-) 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..74d985a092 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 @@ -28,4 +28,14 @@ public class MapAddAreaFormDTO implements Serializable { @NotBlank(message = "coordinates不能为空",groups = MapAddAreaForm.class) private String coordinates; + + /** + * 中心位置经度 经纬度同时填写才更新 + */ + private String longitude; + + /** + * 中心位置纬度 + */ + 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 1da4e74a33..5a757875ee 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 @@ -296,35 +296,39 @@ public interface CustomerAgencyDao extends BaseDao { /** * 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 getCommunityList(@Param("customerId")String customerId, @Param("agencyId")String agencyId); + List getCommunityList(@Param("customerId") String customerId, @Param("agencyId") String agencyId); List selectSubOrg(String agencyId); + /** - * @describe: 通过用户所属的行政组织和行政类型，查询下级的组织树 - * @author wangtong - * @date 2022/5/18 17:23 - * @params [formDto] - * @return java.util.List - */ + * @return java.util.List + * @describe: 通过用户所属的行政组织和行政类型，查询下级的组织树 + * @author wangtong + * @date 2022/5/18 17:23 + * @params [formDto] + */ List getOrgTreeByUserAndType(OrgTreeByUserAndTypeFormDTO formDto); } 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 f984f295b4..aaeecb9818 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 @@ -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()); } /** 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 b4f7dc0af3..d296b19ac2 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' From cf60b2ece5856c0786ef7970daae395d1d5ffb4d Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 14 Jun 2022 12:20:37 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=94=BB=E5=8C=BA=E5=9F=9F=E6=97=B6?= =?UTF-8?q?=E4=B9=9F=E5=8F=AF=E4=BB=A5=E5=90=8C=E6=97=B6=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6=20=E6=AD=A3=E5=88=99=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java | 3 +++ 1 file changed, 3 insertions(+) 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 74d985a092..11943c7114 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; /** @@ -32,10 +33,12 @@ public class MapAddAreaFormDTO implements Serializable { /** * 中心位置经度 经纬度同时填写才更新 */ + @Pattern(regexp = "^([-+])?\\d+(\\.\\d+)?$", message = "请输入正确的经度值") private String longitude; /** * 中心位置纬度 */ + @Pattern(regexp = "^([-+])?\\d+(\\.\\d+)?$", message = "请输入正确的纬度值") private String latitude; } From 8ce8a1ab8286bc6db91d7b0c1d14536a7cb83c3b Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 14 Jun 2022 12:39:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=94=BB=E5=8C=BA=E5=9F=9F=E6=97=B6?= =?UTF-8?q?=E4=B9=9F=E5=8F=AF=E4=BB=A5=E5=90=8C=E6=97=B6=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6=20=E6=AD=A3=E5=88=99=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 11943c7114..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 @@ -33,12 +33,12 @@ public class MapAddAreaFormDTO implements Serializable { /** * 中心位置经度 经纬度同时填写才更新 */ - @Pattern(regexp = "^([-+])?\\d+(\\.\\d+)?$", message = "请输入正确的经度值") + @Pattern(regexp = "^([-+])?\\d+(\\.\\d+)?$", message = "请输入正确的经度值",groups = MapAddAreaForm.class) private String longitude; /** * 中心位置纬度 */ - @Pattern(regexp = "^([-+])?\\d+(\\.\\d+)?$", message = "请输入正确的纬度值") + @Pattern(regexp = "^([-+])?\\d+(\\.\\d+)?$", message = "请输入正确的纬度值",groups = MapAddAreaForm.class) private String latitude; } From d330fbb1236bc882ab1fecd08b8de7e435055fdf Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 14 Jun 2022 12:56:24 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E5=AF=BC=E5=85=A5error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...cCommunitySelfOrganizationServiceImpl.java | 27 ++++++++++-------- .../templates/self_org_import_template.xlsx | Bin 8959 -> 8998 bytes 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java index cb063772c0..698045aa65 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java @@ -534,19 +534,19 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl { if (obj.getOrganizationName().equals(org.getOrganizationName())) { - log.warn(String.format("当前客户下的社会自组织名称已存在,社会自组织名称->%s,行号->%s", obj.getOrganizationName(), obj.getRowNum())); - errMsg.append("客户下社会自组织名称已存在;"); + log.warn(String.format("当前客户下的社区自组织名称已存在,社会自组织名称->%s,行号->%s", obj.getOrganizationName(), obj.getRowNum())); + errMsg.append("客户下社区自组织名称已存在;"); bl.set(true); } }); - //手机号不合规 - boolean m = PhoneValidatorUtils.isMobile(obj.getPrincipalPhone()); - boolean t = PhoneValidatorUtils.isTel(obj.getPrincipalPhone()); - if (!m && !t){ - errMsg.append("手机号码不合法;"); - bl.set(true); - log.warn("手机号码不合法,自组织名称{}", obj.getOrganizationName()); - } + // //手机号不合规 + // boolean m = PhoneValidatorUtils.isMobile(obj.getPrincipalPhone()); + // boolean t = PhoneValidatorUtils.isTel(obj.getPrincipalPhone()); + // if (!m && !t){ + // errMsg.append("手机号码不合法;"); + // bl.set(true); + // log.warn("手机号码不合法,自组织名称{}", obj.getOrganizationName()); + // } if(bl.get()){ excel = new CommunitySelfOrgImportExcel(); //excel.setAgencyName(obj.getOrganizationName()); @@ -565,12 +565,15 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl