From 16eb18ddc6cc8934f4facb466b2bdb822edd387b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 30 Mar 2022 18:10:17 +0800 Subject: [PATCH 1/5] pathCode --- .../com/epmet/dto/form/AreaCodeFormDTO.java | 9 +++ .../epmet/dto/result/AreaCodeResultDTO.java | 11 +++ .../epmet/controller/AreaCodeController.java | 12 +++ .../main/java/com/epmet/dao/AreaCodeDao.java | 11 +++ .../com/epmet/service/AreaCodeService.java | 4 + .../service/impl/AreaCodeServiceImpl.java | 30 +++++++ .../src/main/resources/mapper/AreaCodeDao.xml | 81 +++++++++++++++++++ .../com/epmet/dto/IcTripReportRecordDTO.java | 12 +++ .../epmet/dto/form/IcTripReportFormDTO.java | 12 +++ .../entity/IcTripReportRecordEntity.java | 10 +++ .../V0.0.33__modify_trip_reportv3.sql | 2 + 11 files changed, 194 insertions(+) create mode 100644 epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AreaCodeFormDTO.java create mode 100644 epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/AreaCodeResultDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.33__modify_trip_reportv3.sql diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AreaCodeFormDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AreaCodeFormDTO.java new file mode 100644 index 0000000000..bc88cf3a28 --- /dev/null +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AreaCodeFormDTO.java @@ -0,0 +1,9 @@ +package com.epmet.dto.form; + +import lombok.Data; + +@Data +public class AreaCodeFormDTO { + private String parentAreaCode; + private String parentLevel; +} diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/AreaCodeResultDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/AreaCodeResultDTO.java new file mode 100644 index 0000000000..7b09f4f020 --- /dev/null +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/AreaCodeResultDTO.java @@ -0,0 +1,11 @@ +package com.epmet.dto.result; + +import lombok.Data; + +@Data +public class AreaCodeResultDTO { + private String areaCode; + private String parentCode; + private String areaName; + private String level; +} diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java index df821f7410..7bf4e537f8 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java @@ -28,7 +28,9 @@ import com.epmet.dto.AreaCodeDTO; import com.epmet.dto.form.AddAreaCodeDictFormDTO; import com.epmet.dto.form.AddAreaCodeFormDTO; import com.epmet.dto.form.AreaCodeDictFormDTO; +import com.epmet.dto.form.AreaCodeFormDTO; import com.epmet.dto.result.AreaCodeDictResultDTO; +import com.epmet.dto.result.AreaCodeResultDTO; import com.epmet.service.AreaCodeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -121,4 +123,14 @@ public class AreaCodeController { ValidatorUtils.validateEntity(formDTO); return new Result().ok(areaCodeService.addAreaCode(formDTO)); } + + /** + * 行政地区编码逐级查询 + * @param formDTO + * @return + */ + @PostMapping(value = "nextarea") + public Result> nextArea(@RequestBody AreaCodeFormDTO formDTO){ + return new Result>().ok(areaCodeService.nextArea(formDTO)); + } } \ No newline at end of file diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeDao.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeDao.java index 54b89ee82f..730689599c 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeDao.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeDao.java @@ -19,6 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.AreaCodeDTO; +import com.epmet.dto.result.AreaCodeResultDTO; import com.epmet.entity.AreaCodeEntity; import org.apache.ibatis.annotations.Mapper; @@ -40,4 +41,14 @@ public interface AreaCodeDao extends BaseDao { AreaCodeDTO selectByCityCode(String cityCode); AreaCodeDTO selectMaxCounty(String cityCode); + + List selectProvince(); + + List selectCity(String pCode); + + List selectDistrict(String pCode); + + List selectStreet(String pCode); + + List selectCommunity(String pCode); } \ No newline at end of file diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java index 99c25ab2f2..e452332fea 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java @@ -23,7 +23,9 @@ import com.epmet.dto.AreaCodeDTO; import com.epmet.dto.form.AddAreaCodeDictFormDTO; import com.epmet.dto.form.AddAreaCodeFormDTO; import com.epmet.dto.form.AreaCodeDictFormDTO; +import com.epmet.dto.form.AreaCodeFormDTO; import com.epmet.dto.result.AreaCodeDictResultDTO; +import com.epmet.dto.result.AreaCodeResultDTO; import com.epmet.entity.AreaCodeEntity; import java.util.List; @@ -123,4 +125,6 @@ public interface AreaCodeService extends BaseService { * @Date 2021/4/13 14:40 **/ String addAreaCode(AddAreaCodeFormDTO formDTO); + + List nextArea(AreaCodeFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java index 0de5ddac2b..0f2c1861a7 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java @@ -38,7 +38,9 @@ import com.epmet.dto.AreaCodeDTO; import com.epmet.dto.form.AddAreaCodeDictFormDTO; import com.epmet.dto.form.AddAreaCodeFormDTO; import com.epmet.dto.form.AreaCodeDictFormDTO; +import com.epmet.dto.form.AreaCodeFormDTO; import com.epmet.dto.result.AreaCodeDictResultDTO; +import com.epmet.dto.result.AreaCodeResultDTO; import com.epmet.entity.AreaCodeEntity; import com.epmet.redis.AreaCodeRedis; import com.epmet.service.AreaCodeChildService; @@ -688,6 +690,34 @@ public class AreaCodeServiceImpl extends BaseServiceImpl nextArea(AreaCodeFormDTO formDTO) { + if(StringUtils.isBlank(formDTO.getParentAreaCode())&&StringUtils.isBlank(formDTO.getParentLevel())){ + return baseDao.selectProvince(); + } + List list=new ArrayList<>(); + switch (formDTO.getParentLevel()) { + case AreaCodeConstant.PROVINCE: + list = baseDao.selectCity(formDTO.getParentAreaCode()); + break; + case AreaCodeConstant.CITY: + list = baseDao.selectDistrict(formDTO.getParentAreaCode()); + break; + case AreaCodeConstant.DISTRICT: + list = baseDao.selectStreet(formDTO.getParentAreaCode()); + break; + case AreaCodeConstant.STREET: + list = baseDao.selectCommunity(formDTO.getParentAreaCode()); + break; + case AreaCodeConstant.COMMUNITY: + log.info("社区无下级"); + break; + default: + log.warn("parentLevel错误："+formDTO.getParentLevel()); + } + return list; + } + private String addDistrictAreaCode(String cityCode, String countyName) { AreaCodeDTO city = baseDao.selectByCityCode(cityCode); diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml index 9eaffba75a..a40099f378 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml +++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml @@ -27,4 +27,85 @@ order by ac.COUNTY_CODE desc limit 1 + + + + + + + \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 0bf1d81e58..47d23549da 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -93,6 +93,12 @@ public class IcTripReportRecordDTO implements Serializable { @ExcelIgnore private String presentAddressCode; + /** + * 现居地编码路径："presentAddressPathCode":"37,3702,370203,370203026,370203026002" + */ + @ExcelIgnore + private String presentAddressPathCode; + /** * 现居地名称eg:山东省青岛市黄岛区玫瑰山路社区 */ @@ -113,6 +119,12 @@ public class IcTripReportRecordDTO implements Serializable { @ExcelIgnore private String sourceAddressCode; + /** + * 来源地编码路径： "sourceAddressPathCode": "37,3702,370203,370203026,370203026002" + */ + @ExcelIgnore + private String sourceAddressPathCode; + /** * 来源地区地址 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index 9c085f2e07..3de314d424 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -71,6 +71,12 @@ public class IcTripReportFormDTO implements Serializable { @NotBlank(message = "现居地编码不能为空", groups = {ResiUserRequired.class}) private String presentAddressCode; + /** + * 现居地编码路径："presentAddressPathCode":"37,3702,370203,370203026,370203026002" + */ + @NotBlank(message = "现居地编码不能为空", groups = {ResiUserRequired.class}) + private String presentAddressPathCode; + /** * 现居地名称eg:山东省青岛市黄岛区玫瑰山路社区 */ @@ -89,6 +95,12 @@ public class IcTripReportFormDTO implements Serializable { @NotBlank(message = "来自地区编码不能为空", groups = {ResiUserRequired.class}) private String sourceAddressCode; + /** + * 来源地编码路径： "sourceAddressPathCode": "37,3702,370203,370203026,370203026002" + */ + @NotBlank(message = "来自地区编码不能为空", groups = {ResiUserRequired.class}) + private String sourceAddressPathCode; + /** * 来源地区地址 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index 0b7d4fd4fd..f14eb97013 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -71,6 +71,11 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { */ private String presentAddressCode; + /** + * 现居地编码路径："presentAddressPathCode":"37,3702,370203,370203026,370203026002" + */ + private String presentAddressPathCode; + /** * 现居地名称eg:山东省青岛市黄岛区玫瑰山路社区 */ @@ -86,6 +91,11 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { */ private String sourceAddressCode; + /** + * 来源地编码路径： "sourceAddressPathCode": "37,3702,370203,370203026,370203026002" + */ + private String sourceAddressPathCode; + /** * 来源地区地址 */ diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.33__modify_trip_reportv3.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.33__modify_trip_reportv3.sql new file mode 100644 index 0000000000..927c2f9a35 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.33__modify_trip_reportv3.sql @@ -0,0 +1,2 @@ +alter table ic_trip_report_record add column PRESENT_ADDRESS_PATH_CODE VARCHAR(255) COMMENT '现居地编码全路径' AFTER PRESENT_ADDRESS_CODE; +alter table ic_trip_report_record add column SOURCE_ADDRESS_PATH_CODE VARCHAR(255) COMMENT '来源地区编码全路径' AFTER SOURCE_ADDRESS_CODE; \ No newline at end of file From 0b6330bec5e1fbf6dd344380bee0bb4453074a05 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 31 Mar 2022 09:15:21 +0800 Subject: [PATCH 2/5] nextarea --- .../src/main/java/com/epmet/dao/AreaCodeDao.java | 9 +++++---- .../java/com/epmet/service/impl/AreaCodeServiceImpl.java | 1 + .../src/main/resources/mapper/AreaCodeDao.xml | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeDao.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeDao.java index 730689599c..bfe5c8139e 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeDao.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeDao.java @@ -22,6 +22,7 @@ import com.epmet.dto.AreaCodeDTO; import com.epmet.dto.result.AreaCodeResultDTO; import com.epmet.entity.AreaCodeEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -44,11 +45,11 @@ public interface AreaCodeDao extends BaseDao { List selectProvince(); - List selectCity(String pCode); + List selectCity(@Param("pCode")String pCode); - List selectDistrict(String pCode); + List selectDistrict(@Param("pCode")String pCode); - List selectStreet(String pCode); + List selectStreet(@Param("pCode")String pCode); - List selectCommunity(String pCode); + List selectCommunity(@Param("pCode")String pCode); } \ No newline at end of file diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java index 0f2c1861a7..f300c4bb4e 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java @@ -711,6 +711,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl - SELECT DISTINCT ac.city_code AS areaCode, ac.city_name AS areaName, @@ -58,7 +58,7 @@ ORDER BY ac.city_code ASC - SELECT DISTINCT ac.county_code AS areaCode, ac.county_name AS areaName, @@ -74,7 +74,7 @@ ORDER BY ac.county_code ASC - SELECT ac.`code` AS areaCode, ac.`name` AS areaName, @@ -91,7 +91,7 @@ ORDER BY ac.`code` ASC - SELECT ac.`code` AS areaCode, ac.`name` AS areaName, From 10e22e375685aa6f7aae48cda9aed1f0f62a0b85 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 31 Mar 2022 09:29:50 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/trip_report_import_template.xlsx | Bin 9319 -> 9304 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/trip_report_import_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/trip_report_import_template.xlsx index f13d7ec77d97db25035a97f95e3d4ec74c12d1c0..587ecda2e01dbc2cdc40e208af3d235f159e129e 100644 GIT binary patch delta 4665 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 YO9ci10000H01*HO1ONa^AOHXW097x Date: Thu, 31 Mar 2022 09:53:59 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=85=B3=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/IcEpidemicSpecialAttentionDao.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index f2757d0b9f..1510da99b8 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -7,7 +7,8 @@ UPDATE ic_epidemic_special_attention SET UPDATED_TIME = NOW(), - IS_ATTENTION = 0 + IS_ATTENTION = 0, + del_flag = 1 WHERE del_flag = 0 AND attention_type = #{attentionType} AND id_card IN ( From b527890173471190f62da3ae294557449afbe425 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 31 Mar 2022 09:55:19 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=A0=B7=E4=BE=8B?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/excel/ic_nat.xlsx | Bin 9114 -> 9157 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx index 4d7df5944a91e416a31a21891975ba1778567252..d74d726f950651308593eff7a73765535b44aff8 100644 GIT binary patch delta 4467 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 F000K7Qs)2w delta 4440 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