pathCode

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;
+}

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;
+}

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<String>().ok(areaCodeService.addAreaCode(formDTO));
     }
+
+    /**
+     * 行政地区编码逐级查询
+     * @param formDTO
+     * @return
+     */
+    @PostMapping(value = "nextarea")
+    public Result<List<AreaCodeResultDTO>> nextArea(@RequestBody AreaCodeFormDTO formDTO){
+        return new Result<List<AreaCodeResultDTO>>().ok(areaCodeService.nextArea(formDTO));
+    }
 }

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<AreaCodeEntity> {
     AreaCodeDTO selectByCityCode(String cityCode);
 
     AreaCodeDTO selectMaxCounty(String cityCode);
+
+    List<AreaCodeResultDTO> selectProvince();
+
+    List<AreaCodeResultDTO> selectCity(String pCode);
+
+    List<AreaCodeResultDTO> selectDistrict(String pCode);
+
+    List<AreaCodeResultDTO> selectStreet(String pCode);
+
+    List<AreaCodeResultDTO> selectCommunity(String pCode);
 }

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<AreaCodeEntity> {
      * @Date 2021/4/13 14:40
      **/
     String addAreaCode(AddAreaCodeFormDTO formDTO);
+
+    List<AreaCodeResultDTO> nextArea(AreaCodeFormDTO formDTO);
 }

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<AreaCodeDao, AreaCodeEn
         return areaCode;
     }
 
+    @Override
+    public List<AreaCodeResultDTO> nextArea(AreaCodeFormDTO formDTO) {
+        if(StringUtils.isBlank(formDTO.getParentAreaCode())&&StringUtils.isBlank(formDTO.getParentLevel())){
+            return baseDao.selectProvince();
+        }
+        List<AreaCodeResultDTO> 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);

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
     </select>
+
+    <select id="selectProvince" resultType="com.epmet.dto.result.AreaCodeResultDTO">
+        SELECT DISTINCT
+            ac.province_code AS areaCode,
+            ac.province_name AS areaName,
+            '' AS parentCode,
+            'province' AS LEVEL
+        FROM
+            area_code ac
+        WHERE
+            ac.DEL_FLAG = '0'
+        ORDER BY
+            ac.province_code ASC
+    </select>
+
+    <select id="selectCity" parameterType="java.lang.String" resultType="com.epmet.dto.result.AreaCodeResultDTO">
+        SELECT DISTINCT
+            ac.city_code AS areaCode,
+            ac.city_name AS areaName,
+            ac.province_code AS parentCode,
+            'city' AS LEVEL
+        FROM
+            area_code ac
+        WHERE
+            ac.DEL_FLAG = '0'
+        <if test='null != pCode and "" != pCode'>
+            and ac.province_code=#{pCode}
+        </if>
+        ORDER BY
+            ac.city_code ASC
+    </select>
+    <select id="selectDistrict" parameterType="java.lang.String" resultType="com.epmet.dto.result.AreaCodeResultDTO">
+            SELECT DISTINCT
+                ac.county_code AS areaCode,
+                ac.county_name AS areaName,
+                ac.city_code AS parentCode,
+                'district' AS LEVEL
+            FROM
+                area_code ac
+            WHERE
+                ac.DEL_FLAG = '0'
+                <if test='null != pCode and "" != pCode'>
+                    and ac.city_code=#{pCode}
+                </if>
+            ORDER BY
+                ac.county_code ASC
+    </select>
+    <select id="selectStreet" parameterType="java.lang.String" resultType="com.epmet.dto.result.AreaCodeResultDTO">
+        SELECT
+            ac.`code` AS areaCode,
+            ac.`name` AS areaName,
+            ac.p_code AS parentCode,
+            'street' AS LEVEL
+        FROM
+            area_code_child ac
+        WHERE
+            ac.DEL_FLAG = '0'
+            AND ac.USER_DEFINED = '0'
+            <if test='null != pCode and "" != pCode'>
+                AND ac.p_code=#{pCode}
+            </if>
+        ORDER BY
+            ac.`code` ASC
+    </select>
+    <select id="selectCommunity" parameterType="java.lang.String" resultType="com.epmet.dto.result.AreaCodeResultDTO">
+        SELECT
+            ac.`code` AS areaCode,
+            ac.`name` AS areaName,
+            ac.p_code AS parentCode,
+            'community' AS LEVEL
+        FROM
+            area_code_child ac
+        WHERE
+            ac.DEL_FLAG = '0'
+            AND ac.USER_DEFINED = '0'
+            <if test='null != pCode and "" != pCode'>
+                AND ac.p_code=#{pCode}
+            </if>
+        ORDER BY
+            ac.`code` ASC
+    </select>
 </mapper>

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;
+
     /**
      * 来源地区地址
      */

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;
+
     /**
      * 来源地区地址
      */

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;
+
     /**
      * 来源地区地址
      */

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;