From c4f6d4469c294e6bd6c6d1c4477fe17253cee86f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 14 Apr 2021 12:12:09 +0800 Subject: [PATCH] =?UTF-8?q?"editagency"=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/govorg/CustomerAgencyDTO.java | 10 +++--- .../entity/govorg/CustomerAgencyEntity.java | 10 +++--- .../entity/org/CustomerAgencyEntity.java | 10 +++--- .../java/com/epmet/dto/CustomerAgencyDTO.java | 10 +++--- .../epmet/dto/form/AddAgencyV2FormDTO.java | 4 +-- .../epmet/dto/result/AgencysResultDTO.java | 10 +++--- .../epmet/entity/CustomerAgencyEntity.java | 10 +++--- .../epmet/service/impl/AgencyServiceImpl.java | 36 +++++++++++++++---- 8 files changed, 62 insertions(+), 38 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java index cea8221c31..496a2c87cc 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java @@ -114,17 +114,17 @@ public class CustomerAgencyDTO implements Serializable { private Integer totalUser; /** - * 区域编码字典中的【省份】名称 + * 【省份】名称 */ private String province; /** - * 区域编码字典中的【城市】名称 + * 【城市】名称 */ private String city; /** - * 区域编码字典中的【区县】名称 + * 【区县】名称 */ private String district; @@ -134,12 +134,12 @@ public class CustomerAgencyDTO implements Serializable { private String parentAreaCode; /** - * 区域编码字典中的【街道】名称0409 + * 街道 */ private String street; /** - * 区域编码字典中的【社区】名称0409 + * 社区 */ private String community; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java index b12cd2112a..6c6420ffc8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java @@ -80,17 +80,17 @@ public class CustomerAgencyEntity extends BaseEpmetEntity { private Integer totalUser; /** - * 区域编码字典中的【省份】名称 + * 【省份】名称 */ private String province; /** - * 区域编码字典中的【城市】名称 + * 【城市】名称 */ private String city; /** - * 区域编码字典中的【区县】名称 + * 【区县】名称 */ private String district; @@ -100,12 +100,12 @@ public class CustomerAgencyEntity extends BaseEpmetEntity { private String parentAreaCode; /** - * 区域编码字典中的【街道】名称0409 + * 街道 */ private String street; /** - * 区域编码字典中的【社区】名称0409 + * 社区 */ private String community; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java index 4f5f964710..4fbb9bfb83 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java @@ -80,17 +80,17 @@ public class CustomerAgencyEntity extends BaseEpmetEntity { private Integer totalUser; /** - * 区域编码字典中的【省份】名称 + * 【省份】名称 */ private String province; /** - * 区域编码字典中的【城市】名称 + * 【城市】名称 */ private String city; /** - * 区域编码字典中的【区县】名称 + * 【区县】名称 */ private String district; @@ -100,12 +100,12 @@ public class CustomerAgencyEntity extends BaseEpmetEntity { private String parentAreaCode; /** - * 区域编码字典中的【街道】名称0409 + * 街道 */ private String street; /** - * 区域编码字典中的【社区】名称0409 + * 社区 */ private String community; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerAgencyDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerAgencyDTO.java index 5a7ad8fc85..12f5488ac4 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerAgencyDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerAgencyDTO.java @@ -114,17 +114,17 @@ public class CustomerAgencyDTO implements Serializable { private Integer totalUser; /** - * 区域编码字典中的【省份】名称 + * 省 */ private String province; /** - * 区域编码字典中的【城市】名称 + * 市 */ private String city; /** - * 区域编码字典中的【区县】名称 + * 区县 */ private String district; @@ -134,12 +134,12 @@ public class CustomerAgencyDTO implements Serializable { private String parentAreaCode; /** - * 区域编码字典中的【街道】名称0409 + * 街道 */ private String street; /** - * 区域编码字典中的【社区】名称0409 + * 社区 */ private String community; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java index bf29a4aede..c426bc6d41 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java @@ -75,12 +75,12 @@ public class AddAgencyV2FormDTO implements Serializable { private String district; /** - * 区域编码字典中的【街道】名称；来源于【/data/aggregator/org/nextlevelareacodelist】接口里的areaName + * 街道 */ private String street; /** - * 区域编码字典中的【社区】名称；来源于【/data/aggregator/org/nextlevelareacodelist】接口里的areaName + * 社区 */ private String community; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java index a3c7bf0413..175fe56674 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java @@ -58,17 +58,17 @@ public class AgencysResultDTO implements Serializable { private String areaCode = ""; /** - * 区域编码字典中的【省份】名称 + * 【省份】名称 */ private String province = ""; /** - * 区域编码字典中的【城市】名称 + * 【城市】名称 */ private String city = ""; /** - * 区域编码字典中的【区县】名称 + * 【区县】名称 */ private String district = ""; @@ -78,12 +78,12 @@ public class AgencysResultDTO implements Serializable { private List parentList; /** - * 区域编码字典中的【街道】名称0409 + * 街道 */ private String street; /** - * 区域编码字典中的【社区】名称0409 + * 社区 */ private String community; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java index 91852ac516..ee327e421e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java @@ -80,17 +80,17 @@ public class CustomerAgencyEntity extends BaseEpmetEntity { private Integer totalUser; /** - * 区域编码字典中的【省份】名称 + * 省 */ private String province; /** - * 区域编码字典中的【城市】名称 + * 【城市】名称 */ private String city; /** - * 区域编码字典中的【区县】名称 + * 【区县】名称 */ private String district; @@ -100,12 +100,12 @@ public class CustomerAgencyEntity extends BaseEpmetEntity { private String parentAreaCode; /** - * 区域编码字典中的【街道】名称0409 + * 街道 */ private String street; /** - * 区域编码字典中的【社区】名称0409 + * 【社区】名称0409 */ private String community; } 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 2a50885c94..e7dd1a0674 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 @@ -133,9 +133,7 @@ public class AgencyServiceImpl implements AgencyService { @Transactional(rollbackFor = Exception.class) public Result editAgency(EditAgencyFormDTO formDTO) { Result result = new Result(); - CustomerAgencyEntity entity = new CustomerAgencyEntity(); - entity.setId(formDTO.getAgencyId()); - entity.setOrganizationName(formDTO.getAgencyName()); + CustomerAgencyEntity entity = getUpdateEntity(formDTO); //1:更新当前组织信息 if (customerAgencyDao.updateById(entity) < NumConstant.ONE) { log.error(CustomerAgencyConstant.UPDATE_EXCEPTION); @@ -152,7 +150,6 @@ public class AgencyServiceImpl implements AgencyService { List editList = new ArrayList<>(); Date date = new Date(); agencyList.forEach(agency->{ - CustomerAgencyEntity customerAgencyEntity = new CustomerAgencyEntity(); //3-1:查询当前组织的所有上级组织 List listStr = Arrays.asList(agency.getPids().split(":")); List parentList = customerAgencyDao.selectPAgencyById(listStr); @@ -165,10 +162,20 @@ public class AgencyServiceImpl implements AgencyService { allParentName.append("-").append(parents.getName()); } }); - customerAgencyEntity.setId(agency.getId()); + CustomerAgencyEntity customerAgencyEntity = ConvertUtils.sourceToTarget(agency,CustomerAgencyEntity.class); customerAgencyEntity.setAllParentName(allParentName.toString()); customerAgencyEntity.setUpdatedBy(formDTO.getUserId()); - customerAgencyEntity.setUpdatedTime(date); + if (CustomerAgencyConstant.PROVINCE_LEVEL.equals(entity.getLevel())) { + customerAgencyEntity.setProvince(entity.getOrganizationName()); + } else if (CustomerAgencyConstant.CITY_LEVEL.equals(entity.getLevel())) { + customerAgencyEntity.setCity(entity.getOrganizationName()); + } else if (CustomerAgencyConstant.DISTRICT.equals(entity.getLevel())) { + customerAgencyEntity.setDistrict(entity.getOrganizationName()); + } else if (CustomerAgencyConstant.STREET_LEVEL.equals(entity.getLevel())) { + customerAgencyEntity.setStreet(entity.getOrganizationName()); + } else if (CustomerAgencyConstant.COMMUNITY_LEVEL.equals(entity.getLevel())) { + customerAgencyEntity.setCommunity(entity.getOrganizationName()); + } editList.add(customerAgencyEntity); }); //4:批量更新因一个组织名称变动而引起的其他组织字段值的变动 @@ -182,6 +189,23 @@ public class AgencyServiceImpl implements AgencyService { return result; } + private CustomerAgencyEntity getUpdateEntity(EditAgencyFormDTO formDTO) { + CustomerAgencyEntity entity = customerAgencyDao.selectById(formDTO.getAgencyId()); + entity.setOrganizationName(formDTO.getAgencyName()); + if (CustomerAgencyConstant.PROVINCE_LEVEL.equals(entity.getLevel())) { + entity.setProvince(entity.getOrganizationName()); + } else if (CustomerAgencyConstant.CITY_LEVEL.equals(entity.getLevel())) { + entity.setCity(entity.getOrganizationName()); + } else if (CustomerAgencyConstant.DISTRICT.equals(entity.getLevel())) { + entity.setDistrict(entity.getOrganizationName()); + } else if (CustomerAgencyConstant.STREET_LEVEL.equals(entity.getLevel())) { + entity.setStreet(entity.getOrganizationName()); + } else if (CustomerAgencyConstant.COMMUNITY_LEVEL.equals(entity.getLevel())) { + entity.setCommunity(entity.getOrganizationName()); + } + return entity; + } + /** * @param formDTO * @return