From a88b63c52833433e9270f7641cb39aea9f872172 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 23 Sep 2024 15:35:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
/dev/null | 1053 ------------------------------------
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/bo/CaseAreaBO.java | 17
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseAreaMapper.java | 64 ++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseAreaWebController.java | 171 +++++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml | 8
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseArea.java | 62 ++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAreaMapper.xml | 139 ++++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml | 2
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAreaService.java | 137 ++++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 50
10 files changed, 618 insertions(+), 1,085 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseAreaWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseAreaWebController.java
new file mode 100644
index 0000000..a404147
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseAreaWebController.java
@@ -0,0 +1,171 @@
+package cn.huge.module.cases.controller.web;
+
+import cn.huge.base.common.utils.ReturnFailUtils;
+import cn.huge.base.common.utils.ReturnSucUtils;
+import cn.huge.module.cases.domain.po.CaseArea;
+import cn.huge.module.cases.service.CaseAreaService;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @title: 地区表接口api-web端
+ * @description: 地区表接口api-web端
+ * @company: hugeinfo
+ * @author: zhouxt
+ * @time: 2024-09-23 09:01:17
+ * @version: 1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/api/web/caseArea")
+public class CaseAreaWebController {
+
+ @Autowired(required = false)
+ private HttpServletRequest request;
+
+ @Autowired
+ private CaseAreaService service;
+
+ /**
+ * 获取请求URL参数
+ * @return Map<String, Object>
+ */
+ private Map<String, Object> getParameter(){
+ Map<String, Object> terms = Maps.newHashMap();
+ // 表ID
+ String id = request.getParameter("id");
+ if (StringUtils.isNotBlank(id)){
+ terms.put("id", id);
+ }
+ // 区域名称
+ String areaName = request.getParameter("areaName");
+ if (StringUtils.isNotBlank(areaName)){
+ terms.put("areaName", areaName);
+ }
+ // 区域编码
+ String areaCode = request.getParameter("areaCode");
+ if (StringUtils.isNotBlank(areaCode)){
+ terms.put("areaCode", areaCode);
+ }
+ // 父类编码
+ String parentCode = request.getParameter("parentCode");
+ if (StringUtils.isNotBlank(parentCode)){
+ terms.put("parentCode", parentCode);
+ }
+ // 区域等级，1-省，2-市，3-区，4-街道
+ String areaLevel = request.getParameter("areaLevel");
+ if (StringUtils.isNotBlank(areaLevel)){
+ terms.put("areaLevel", areaLevel);
+ }
+ // 创建时间区间
+ String createStart = request.getParameter("createStart");
+ String createEnd = request.getParameter("createEnd");
+ if(StringUtils.isNotBlank(createStart) && StringUtils.isNotBlank(createEnd)) {
+ terms.put("createStart", createStart);
+ terms.put("createEnd", createEnd);
+ }
+ // 更新时间区间
+ String updateStart = request.getParameter("updateStart");
+ String updateEnd = request.getParameter("updateEnd");
+ if(StringUtils.isNotBlank(updateStart) && StringUtils.isNotBlank(updateEnd)) {
+ terms.put("updateStart", updateStart);
+ terms.put("updateEnd", updateEnd);
+ }
+ return terms;
+ }
+
+ /**
+ * 条件查询多个
+ * @url {ctx}/api/web/caseArea/listQuery
+ * @return Object
+ */
+ @GetMapping("/listQuery")
+ public Object listQuery() {
+ try {
+ Map<String, Object> terms = getParameter();
+ return ReturnSucUtils.getRepInfo(service.listTerms(terms));
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 条件分页查询
+ * @url {ctx}/api/web/caseArea/pageQuery
+ * @param page 页码
+ * @param size 每页数量
+ * @return Object
+ */
+ @GetMapping("/pageQuery")
+ public Object pageQuery(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
+ try {
+ Map<String, Object> terms = getParameter();
+ Sort sort = Sort.by(Sort.Direction.DESC, "create_time");
+ PageRequest pageRequest = PageRequest.of(page-1, size, sort);
+ Page<CaseArea> caseAreaPage = service.pageQuery(pageRequest, terms);
+ return ReturnSucUtils.getRepInfo( "处理成功", caseAreaPage);
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 根据编号查询单个
+ * @url {ctx}/api/web/caseArea/getById
+ * @param id 主键编号
+ * @return Object
+ */
+ @GetMapping("/getById")
+ public Object getById(@RequestParam(value = "id") String id) {
+ try {
+ return ReturnSucUtils.getRepInfo(service.getById(id));
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 根据主键单个
+ * @url {ctx}/api/web/caseArea/deleteById
+ * @param id 主键编号
+ * @return Object
+ */
+ @GetMapping("/deleteById")
+ public Object deleteById(@RequestParam(value = "id") String id) {
+ try {
+ service.removeById(id);
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 新增或更新对象
+ * @url {ctx}/api/web/caseArea/saveCaseArea
+ * @param caseArea 实体对象
+ * @return Object
+ */
+ @PostMapping("/saveCaseArea")
+ public Object saveCaseArea(@RequestBody CaseArea caseArea) {
+ try {
+ service.saveCaseArea(caseArea);
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+
+}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseAreaMapper.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseAreaMapper.java
new file mode 100644
index 0000000..69556fb
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseAreaMapper.java
@@ -0,0 +1,64 @@
+package cn.huge.module.cases.dao.mapper;
+
+import cn.huge.module.cases.domain.po.CaseArea;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @title: 地区表持久层业务处理
+* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
+* @company: hugeinfo
+* @author: zhouxt
+* @time: 2024-09-23 09:01:17
+* @version 1.0.0
+*/
+@Repository
+public interface CaseAreaMapper extends BaseMapper<CaseArea>{
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ void updateCaseArea(@Param("entity") CaseArea entity);
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ void updateCaseAreaTerms(@Param("entity") CaseArea entity, @Param("terms") Map<String, Object> terms);
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ void deleteCaseArea(@Param("id") String id);
+
+ /**
+ * 按条件查询结果集
+ * @param terms 查询条件集合
+ * @return List<CaseArea>
+ */
+ List<CaseArea> listTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体总数
+ * @param terms 查询条件集合
+ * @return long
+ */
+ long countTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体分页结果集
+ * @param page 分页对象
+ * @param terms 查询条件集合
+ * @return List<CaseArea>
+ */
+ List<CaseArea> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+
+}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAreaMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAreaMapper.xml
new file mode 100644
index 0000000..196ef62
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAreaMapper.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+ * @title: 地区表
+ * @description: 自定义sql，请自行实现业务逻辑
+ * @company: hugeinfo
+ * @author: zhouxt
+ * @time:2024-09-23 09:01:17
+ * @version 1.0.0
+-->
+<mapper namespace="cn.huge.module.cases.dao.mapper.CaseAreaMapper">
+ <!-- 结果集 -->
+ <resultMap id="dataResult" type="cn.huge.module.cases.domain.po.CaseArea">
+ <result property="id" column="id"/>
+ <result property="areaName" column="area_name"/>
+ <result property="areaCode" column="area_code"/>
+ <result property="parentCode" column="parent_code"/>
+ <result property="areaLevel" column="area_level"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="createTime" column="create_time"/>
+ </resultMap>
+ <!-- 表 -->
+ <sql id='table-name'>dyh_case_area</sql>
+ <!-- 字段 -->
+ <sql id="column-part">
+ id,
+ area_name,
+ area_code,
+ parent_code,
+ area_level,
+ update_time,
+ create_time
+ </sql>
+ <!-- 更新实体字段 -->
+ <sql id="set-part">
+ <if test="entity.areaName != null">area_name = #{entity.areaName},</if>
+ <if test="entity.areaCode != null">area_code = #{entity.areaCode},</if>
+ <if test="entity.parentCode != null">parent_code = #{entity.parentCode},</if>
+ <if test="entity.areaLevel != null">area_level = #{entity.areaLevel},</if>
+ <if test="entity.updateTime != null">update_time = #{entity.updateTime},</if>
+ <if test="entity.createTime != null">create_time = #{entity.createTime}</if>
+ </sql>
+ <!-- 条件 -->
+ <sql id="where-part">
+ <if test="terms != null">
+ <where>
+ <if test="terms.id != null and terms.id !=''">
+ and id = #{terms.id}
+ </if>
+ <if test="terms.areaName != null and terms.areaName !=''">
+ and area_name = #{terms.areaName}
+ </if>
+ <if test="terms.areaCode != null and terms.areaCode !=''">
+ and area_code = #{terms.areaCode}
+ </if>
+ <if test="terms.parentCode != null and terms.parentCode !=''">
+ and parent_code = #{terms.parentCode}
+ </if>
+ <if test="terms.areaLevel != null and terms.areaLevel !=''">
+ and area_level = #{terms.areaLevel}
+ </if>
+ <if test="terms.updateTime != null and terms.updateTime !=''">
+ and DATE_FORMAT(update_time,'%Y-%m-%d') = #{terms.updateTime}
+ </if>
+ <if test="terms.updateStart != null and terms.updateStart !='' and terms.updateEnd != null and terms.updateEnd !=''">
+ and (DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.updateStart}
+ and DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.updateEnd})
+ </if>
+ <if test="terms.createTime != null and terms.createTime !=''">
+ and DATE_FORMAT(create_time,'%Y-%m-%d') = #{terms.createTime}
+ </if>
+ <if test="terms.createStart != null and terms.createStart !='' and terms.createEnd != null and terms.createEnd !=''">
+ and (DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createStart}
+ and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createEnd})
+ </if>
+ </where>
+ </if>
+ </sql>
+ <!-- 更新对象 -->
+ <update id="updateCaseArea">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <where>
+ id = #{entity.id}
+ </where>
+ </update>
+ <!-- 条件更新对象 -->
+ <update id="updateCaseAreaTerms">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <include refid="where-part"/>
+ </update>
+ <!-- 根据编号物理删除 -->
+ <delete id="deleteCaseArea">
+ delete from
+ <include refid="table-name" />
+ where id = #{id}
+ </delete>
+ <!-- 根据条件查询 -->
+ <select id="listTerms" resultMap="dataResult">
+ select
+ <include refid="column-part"/>
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件统计 -->
+ <select id="countTerms" resultType="java.lang.Long">
+ select
+ COUNT(1)
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件分页查询 -->
+ <select id="pageTerms" resultMap="dataResult">
+ SELECT
+ <include refid="column-part"/>
+ FROM
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ <if test="page.sort != null">
+ <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
+ isnull(${s.property}), ${s.property} ${s.direction}
+ </foreach>
+ </if>
+ <if test="page.sort == null">
+ order by isnull(create_time), create_time desc
+ </if>
+ limit #{page.offset}, #{page.size}
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
index 58419b0..0e5b563 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
@@ -337,7 +337,7 @@
and a.que_road = #{terms.queRoad}
</if>
<if test="terms.isArea != null and terms.isArea !=''">
- and a.que_city is not null
+ and a.que_city is not null and a.que_area is not null and a.que_road is not null
</if>
</where>
</if>
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml
index f9849a3..fe1546f 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml
@@ -747,16 +747,16 @@
and t3.mediator like concat('%', #{terms.mediator}, '%')
</if>
<if test="terms.canal != null and terms.canal !=''">
- and t1.canal = #{terms.canal}
+ and t2.canal = #{terms.canal}
</if>
<if test="terms.mediResult != null and terms.mediResult !=''">
- and t1.medi_result = #{terms.mediResult}
+ and t3.medi_result = #{terms.mediResult}
</if>
<if test="terms.caseLevel != null and terms.caseLevel !=''">
- and t1.case_level = #{terms.caseLevel}
+ and t2.case_level = #{terms.caseLevel}
</if>
<if test="terms.caseType != null and terms.caseType !=''">
- and t1.case_type = #{terms.caseType}
+ and t2.case_type = #{terms.caseType}
</if>
<if test="terms.status != null and terms.status !=''">
and t2.status = #{terms.status}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/bo/CaseAreaBO.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/bo/CaseAreaBO.java
new file mode 100644
index 0000000..8d71a2f
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/bo/CaseAreaBO.java
@@ -0,0 +1,17 @@
+package cn.huge.module.cases.domain.bo;
+
+import cn.huge.module.cases.domain.po.CaseArea;
+
+/**
+ * @title: 地区表业务扩展类
+ * @description: 地区表业务扩展类
+ * @company: hugeinfo
+ * @author: zhouxt
+ * @time: 2024-09-23 09:01:17
+ * @version: 1.0.0
+ * @see cn.huge.module.cases.domain.po.CaseArea
+ */
+public class CaseAreaBO extends CaseArea {
+
+
+}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseArea.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseArea.java
new file mode 100644
index 0000000..c2c86f5
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseArea.java
@@ -0,0 +1,62 @@
+package cn.huge.module.cases.domain.po;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: 地区表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: zhouxt
+ * @time: 2024-09-23 09:01:17
+ * @version 1.0.0
+ */
+@TableName(value = "dyh_case_area")
+@Data
+public class CaseArea {
+
+ /**
+ * 表ID
+ */
+ @TableId(value = "id",type = IdType.ASSIGN_ID)
+ private String id;
+
+ /**
+ * 区域名称
+ */
+ @TableField(value = "area_name")
+ private String areaName;
+
+ /**
+ * 区域编码
+ */
+ @TableField(value = "area_code")
+ private String areaCode;
+
+ /**
+ * 父类编码
+ */
+ @TableField(value = "parent_code")
+ private String parentCode;
+
+ /**
+ * 区域等级，1-省，2-市，3-区，4-街道
+ */
+ @TableField(value = "area_level")
+ private Integer areaLevel;
+
+ /**
+ * 更新时间
+ */
+ @TableField(value = "update_time")
+ private Date updateTime;
+
+ /**
+ * 创建时间
+ */
+ @TableField(value = "create_time")
+ private Date createTime;
+
+}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAreaService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAreaService.java
new file mode 100644
index 0000000..0e7fd48
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAreaService.java
@@ -0,0 +1,137 @@
+package cn.huge.module.cases.service;
+
+import cn.huge.base.common.exception.ServiceException;
+import cn.huge.base.common.utils.DateUtils;
+import cn.huge.base.common.utils.IdUtils;
+import cn.huge.module.cases.domain.dto.CaseAreaDTO;
+import cn.huge.module.client.api.impl.UtilsClientImpl;
+import cn.huge.module.cases.dao.mapper.CaseAreaMapper;
+import cn.huge.module.cases.domain.po.CaseArea;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.PostConstruct;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @title: 地区表业务逻辑处理
+ * @Description 地区表业务逻辑处理
+ * @company hugeinfo
+ * @author zhouxt
+ * @Time 2024-09-23 09:01:17
+ * @version 1.0.0
+ */
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class CaseAreaService extends ServiceImpl<CaseAreaMapper, CaseArea>{
+
+ @Autowired
+ private CaseAreaMapper mapper;
+
+ @Autowired
+ private UtilsClientImpl utilsClient;
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ public void updateCaseArea(CaseArea entity){
+ try{
+ mapper.updateCaseArea(entity);
+ }catch (Exception e){
+ log.error("[CaseAreaService.updateCaseArea]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseAreaService.updateCaseArea", e);
+ }
+ }
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ public void updateCaseAreaTerms(CaseArea entity, Map<String, Object> terms){
+ try{
+ mapper.updateCaseAreaTerms(entity, terms);
+ }catch (Exception e){
+ log.error("[CaseAreaService.updateCaseAreaTerms]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseAreaService.updateCaseAreaTerms", e);
+ }
+ }
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ public void deleteCaseArea(String id){
+ try{
+ mapper.deleteCaseArea(id);
+ }catch (Exception e){
+ log.error("[CaseAreaService.deleteCaseArea]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseAreaService.deleteCaseArea", e);
+ }
+ }
+
+ /**
+ * 按条件查询
+ * @param terms 条件
+ * @return List
+ */
+ public List<CaseArea> listTerms(Map<String, Object> terms){
+ return mapper.listTerms(terms);
+ }
+
+ /**
+ * 按条件统计
+ * @param terms 条件
+ * @return long
+ */
+ public long countTerms(Map<String, Object> terms){
+ return mapper.countTerms(terms);
+ }
+
+ /**
+ * 按条件分页查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<CaseArea> pageQuery(PageRequest page, Map<String, Object> terms){
+ long total = mapper.countTerms(terms);
+ List<CaseArea> content = mapper.pageTerms(page, terms);
+ return new PageImpl<CaseArea>(content, page, total);
+ }
+
+ /**
+ * 新增或更新对象
+ * @param caseArea 实体对象
+ */
+ public void saveCaseArea(CaseArea caseArea){
+ try{
+ Date nowDate = DateUtils.getNowDate();
+ // 判断是否新增
+ if (IdUtils.checkNewId(caseArea.getId())){
+ caseArea.setId(utilsClient.getNewTimeId());
+ caseArea.setCreateTime(nowDate);
+ }
+ caseArea.setUpdateTime(nowDate);
+ this.saveOrUpdate(caseArea);
+ }catch (Exception e){
+ log.error("[CaseAreaService.saveCaseArea]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseAreaService.saveCaseArea", e);
+ }
+ }
+}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
index 4ff5c88..9b5bb46 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
@@ -5,14 +5,11 @@
import cn.huge.module.cases.domain.dto.*;
import cn.huge.module.cases.domain.dto.CaseAreaDTO;
-import cn.huge.module.cases.domain.po.CaseAgent;
-import cn.huge.module.cases.domain.po.CaseInfoUnfold;
-import cn.huge.module.cases.domain.po.CasePerson;
+import cn.huge.module.cases.domain.po.*;
import cn.huge.module.client.api.impl.CustClientImpl;
import cn.huge.module.client.api.impl.SysClientImpl;
import cn.huge.module.client.api.impl.UtilsClientImpl;
import cn.huge.module.cases.dao.mapper.CaseInfoMapper;
-import cn.huge.module.cases.domain.po.CaseInfo;
import cn.huge.module.constant.BaseConsts;
import cn.huge.module.cust.dto.PaUserDTO;
import cn.huge.module.mediate.constant.*;
@@ -40,6 +37,7 @@
import java.io.File;
import java.io.IOException;
+import java.net.URL;
import java.nio.file.Files;
import java.util.*;
import java.util.stream.Collectors;
@@ -86,6 +84,9 @@
@Autowired
private CaseEvaluateService caseEvaluateService;
+
+ @Autowired
+ private CaseAreaService caseAreaService;
/**
@@ -958,9 +959,9 @@
areaCodeList.add(caseStatisticsAreaDTO.getAreaCode());
}
caseStatisticsAreaDTOS.add(allArea);
- List<CaseAreaDTO> queArea = listAreaByType(terms.get("areaType"), terms.get("queArea"));
+ List<CaseArea> queArea = listAreaByType(terms.get("areaType"), terms.get("queArea"));
log.info("listAreaByType {}", JSON.toJSONString(queArea));
- for (CaseAreaDTO caseAreaDTO : queArea) {
+ for (CaseArea caseAreaDTO : queArea) {
if (!areaCodeList.contains(caseAreaDTO.getAreaCode())) {
CaseStatisticsAreaDTO areaChild = new CaseStatisticsAreaDTO();
areaChild.setAreaCode(caseAreaDTO.getAreaCode());
@@ -1008,9 +1009,15 @@
//事项来源
terms.put("canal", CaseBaseConstsEnum.CASE_CANAL_1.getIndex());
CaseStatisticsSourceDTO oneSource = mapper.statisticsSource(terms);
+ if(ObjectUtils.isEmpty(oneSource)){
+ oneSource = new CaseStatisticsSourceDTO();
+ }
oneSource.setCanalName(CaseBaseConstsEnum.CASE_CANAL_1.getDes());
terms.put("canal", CaseBaseConstsEnum.CASE_CANAL_2.getIndex());
CaseStatisticsSourceDTO twoSource = mapper.statisticsSource(terms);
+ if(ObjectUtils.isEmpty(twoSource)){
+ twoSource = new CaseStatisticsSourceDTO();
+ }
twoSource.setCanalName(CaseBaseConstsEnum.CASE_CANAL_2.getDes());
Integer sourceTotalNum = dellNull(oneSource.getCaseNum()) + dellNull(oneSource.getCaseNum());
@@ -1082,37 +1089,26 @@
return number;
}
- /**
- * 根据json文件获取区域信息
- */
- public CaseAreaDTO getArea() throws IOException {
- Class<?> clazz = CaseAreaDTO.class;
- ObjectMapper mapper = new ObjectMapper();
-
- File file = new File("area/Area.json");
- CaseAreaDTO obj = mapper.readValue(file, CaseAreaDTO.class);
- return obj;
- }
-
/**
* 根据不同的等级获取不同区域子集合
*
* @param areaType 1-市级 2-区
*/
- public List<CaseAreaDTO> listAreaByType(Object areaType, Object areaCode) throws IOException {
+ public List<CaseArea> listAreaByType(Object areaType, Object areaCode) throws IOException {
log.info("listAreaByType {},{}", areaType, areaCode);
- CaseAreaDTO area = getArea();
if (ObjectUtils.isEmpty(areaType) || areaType.equals("") || areaType.equals("1")) {
- return area.getChildren();
+ QueryWrapper<CaseArea> caseAreaWrapper = new QueryWrapper<>();
+ caseAreaWrapper.eq("parent_code","1601");
+ List<CaseArea> list = caseAreaService.list(caseAreaWrapper);
+ return list;
}
if (areaType.equals("2")) {
- List<CaseAreaDTO> children = area.getChildren();
- for (CaseAreaDTO child : children) {
- if (child.getAreaCode().equals(areaCode)) {
- return child.getChildren();
- }
- }
+
+ QueryWrapper<CaseArea> caseAreaWrapper = new QueryWrapper<>();
+ caseAreaWrapper.eq("parent_code",areaCode);
+ List<CaseArea> list = caseAreaService.list(caseAreaWrapper);
+ return list;
}
return new ArrayList<>();
}
diff --git a/dyh-service/dyh-mediate/src/main/resources/area/Area.json b/dyh-service/dyh-mediate/src/main/resources/area/Area.json
deleted file mode 100644
index 8483179..0000000
--- a/dyh-service/dyh-mediate/src/main/resources/area/Area.json
+++ /dev/null
@@ -1,1053 +0,0 @@
-{
- "areaName": "广州市",
- "areaCode": "1601",
- "children": [
- {
- "areaName": "白云区",
- "areaCode": "50258",
- "parentId": "1601",
- "children": [
- {
- "areaName": "新市街道",
- "areaCode": "62857",
- "parentId": "50258"
- },
- {
- "areaName": "云城街道",
- "areaCode": "129164",
- "parentId": "50258"
- },
- {
- "areaName": "石门街道",
- "areaCode": "129165",
- "parentId": "50258"
- },
- {
- "areaName": "鹤龙街道",
- "areaCode": "129166",
- "parentId": "50258"
- },
- {
- "areaName": "白云湖街道",
- "areaCode": "129167",
- "parentId": "50258"
- },
- {
- "areaName": "江高镇",
- "areaCode": "50373",
- "parentId": "50258"
- },
- {
- "areaName": "人和镇",
- "areaCode": "50374",
- "parentId": "50258"
- },
- {
- "areaName": "太和镇",
- "areaCode": "50375",
- "parentId": "50258"
- },
- {
- "areaName": "竹料镇",
- "areaCode": "50376",
- "parentId": "50258"
- },
- {
- "areaName": "钟落潭镇",
- "areaCode": "50377",
- "parentId": "50258"
- },
- {
- "areaName": "城区",
- "areaCode": "51885",
- "parentId": "50258"
- },
- {
- "areaName": "三元里街道",
- "areaCode": "62833",
- "parentId": "50258"
- },
- {
- "areaName": "景泰街道",
- "areaCode": "62834",
- "parentId": "50258"
- },
- {
- "areaName": "黄石街道",
- "areaCode": "62835",
- "parentId": "50258"
- },
- {
- "areaName": "棠景街道",
- "areaCode": "62836",
- "parentId": "50258"
- },
- {
- "areaName": "嘉禾街道",
- "areaCode": "62837",
- "parentId": "50258"
- },
- {
- "areaName": "均禾街道",
- "areaCode": "62838",
- "parentId": "50258"
- },
- {
- "areaName": "石井街道",
- "areaCode": "62839",
- "parentId": "50258"
- },
- {
- "areaName": "金沙街道",
- "areaCode": "62840",
- "parentId": "50258"
- },
- {
- "areaName": "松洲街道",
- "areaCode": "62855",
- "parentId": "50258"
- },
- {
- "areaName": "同德街道",
- "areaCode": "62856",
- "parentId": "50258"
- },
- {
- "areaName": "同和街道",
- "areaCode": "62858",
- "parentId": "50258"
- },
- {
- "areaName": "京溪街道",
- "areaCode": "62859",
- "parentId": "50258"
- },
- {
- "areaName": "永平街道",
- "areaCode": "62860",
- "parentId": "50258"
- },
- {
- "areaName": "龙归街道",
- "areaCode": "71879",
- "parentId": "50258"
- },
- {
- "areaName": "大源街道",
- "areaCode": "71880",
- "parentId": "50258"
- }
- ]
- },
- {
- "areaName": "天河区",
- "areaCode": "3633",
- "parentId": "1601",
- "children": [
- {
- "areaName": "员村街道",
- "areaCode": "63243",
- "parentId": "3633"
- },
- {
- "areaName": "车陂街道",
- "areaCode": "63244",
- "parentId": "3633"
- },
- {
- "areaName": "五山街道",
- "areaCode": "63245",
- "parentId": "3633"
- },
- {
- "areaName": "沙河街道",
- "areaCode": "63246",
- "parentId": "3633"
- },
- {
- "areaName": "石牌街道",
- "areaCode": "63247",
- "parentId": "3633"
- },
- {
- "areaName": "沙东街道",
- "areaCode": "63248",
- "parentId": "3633"
- },
- {
- "areaName": "天河南街道",
- "areaCode": "63249",
- "parentId": "3633"
- },
- {
- "areaName": "林和街道",
- "areaCode": "63250",
- "parentId": "3633"
- },
- {
- "areaName": "兴华街道",
- "areaCode": "63251",
- "parentId": "3633"
- },
- {
- "areaName": "棠下街道",
- "areaCode": "63252",
- "parentId": "3633"
- },
- {
- "areaName": "冼村街道",
- "areaCode": "63253",
- "parentId": "3633"
- },
- {
- "areaName": "长兴街道",
- "areaCode": "63254",
- "parentId": "3633"
- },
- {
- "areaName": "前进街道",
- "areaCode": "63255",
- "parentId": "3633"
- },
- {
- "areaName": "珠吉街道",
- "areaCode": "63256",
- "parentId": "3633"
- },
- {
- "areaName": "天园街道",
- "areaCode": "63257",
- "parentId": "3633"
- },
- {
- "areaName": "猎德街道",
- "areaCode": "63258",
- "parentId": "3633"
- },
- {
- "areaName": "元岗街道",
- "areaCode": "63259",
- "parentId": "3633"
- },
- {
- "areaName": "黄村街道",
- "areaCode": "63260",
- "parentId": "3633"
- },
- {
- "areaName": "龙洞街道",
- "areaCode": "63261",
- "parentId": "3633"
- },
- {
- "areaName": "凤凰街道",
- "areaCode": "63262",
- "parentId": "3633"
- },
- {
- "areaName": "新塘街道",
- "areaCode": "63263",
- "parentId": "3633"
- }
- ]
- },
- {
- "areaName": "海珠区",
- "areaCode": "3634",
- "parentId": "1601",
- "children": [
- {
- "areaName": "赤岗街道",
- "areaCode": "63199",
- "parentId": "3634"
- },
- {
- "areaName": "龙凤街道",
- "areaCode": "63200",
- "parentId": "3634"
- },
- {
- "areaName": "华洲街道",
- "areaCode": "63201",
- "parentId": "3634"
- },
- {
- "areaName": "新港街道",
- "areaCode": "63203",
- "parentId": "3634"
- },
- {
- "areaName": "昌岗街道",
- "areaCode": "63204",
- "parentId": "3634"
- },
- {
- "areaName": "江南中街道",
- "areaCode": "63205",
- "parentId": "3634"
- },
- {
- "areaName": "滨江街道",
- "areaCode": "63206",
- "parentId": "3634"
- },
- {
- "areaName": "素社街道",
- "areaCode": "63207",
- "parentId": "3634"
- },
- {
- "areaName": "海幢街道",
- "areaCode": "63208",
- "parentId": "3634"
- },
- {
- "areaName": "南华西街道",
- "areaCode": "63209",
- "parentId": "3634"
- },
- {
- "areaName": "瑞宝街道",
- "areaCode": "63210",
- "parentId": "3634"
- },
- {
- "areaName": "江海街道",
- "areaCode": "63211",
- "parentId": "3634"
- },
- {
- "areaName": "沙园街道",
- "areaCode": "63216",
- "parentId": "3634"
- },
- {
- "areaName": "南石头街道",
- "areaCode": "63217",
- "parentId": "3634"
- },
- {
- "areaName": "凤阳街道",
- "areaCode": "63218",
- "parentId": "3634"
- },
- {
- "areaName": "琶洲街道",
- "areaCode": "63219",
- "parentId": "3634"
- },
- {
- "areaName": "南洲街道",
- "areaCode": "63220",
- "parentId": "3634"
- },
- {
- "areaName": "官洲街道",
- "areaCode": "63221",
- "parentId": "3634"
- }
- ]
- },
- {
- "areaName": "荔湾区",
- "areaCode": "3635",
- "parentId": "1601",
- "children": [
- {
- "areaName": "沙面街道",
- "areaCode": "63101",
- "parentId": "3635"
- },
- {
- "areaName": "岭南街道",
- "areaCode": "63102",
- "parentId": "3635"
- },
- {
- "areaName": "逢源街道",
- "areaCode": "63103",
- "parentId": "3635"
- },
- {
- "areaName": "彩虹街道",
- "areaCode": "63104",
- "parentId": "3635"
- },
- {
- "areaName": "南源街道",
- "areaCode": "63105",
- "parentId": "3635"
- },
- {
- "areaName": "桥中街道",
- "areaCode": "63106",
- "parentId": "3635"
- },
- {
- "areaName": "花地街道",
- "areaCode": "63107",
- "parentId": "3635"
- },
- {
- "areaName": "海龙街道",
- "areaCode": "63108",
- "parentId": "3635"
- },
- {
- "areaName": "中南街道",
- "areaCode": "63109",
- "parentId": "3635"
- },
- {
- "areaName": "华林街道",
- "areaCode": "63126",
- "parentId": "3635"
- },
- {
- "areaName": "多宝街道",
- "areaCode": "63127",
- "parentId": "3635"
- },
- {
- "areaName": "昌华街道",
- "areaCode": "63128",
- "parentId": "3635"
- },
- {
- "areaName": "龙津街道",
- "areaCode": "63129",
- "parentId": "3635"
- },
- {
- "areaName": "金花街道",
- "areaCode": "63130",
- "parentId": "3635"
- },
- {
- "areaName": "西村街道",
- "areaCode": "63131",
- "parentId": "3635"
- },
- {
- "areaName": "站前街道",
- "areaCode": "63132",
- "parentId": "3635"
- },
- {
- "areaName": "白鹤洞街道",
- "areaCode": "63133",
- "parentId": "3635"
- },
- {
- "areaName": "冲口街道",
- "areaCode": "63134",
- "parentId": "3635"
- },
- {
- "areaName": "石围塘街道",
- "areaCode": "63135",
- "parentId": "3635"
- },
- {
- "areaName": "茶滘街道",
- "areaCode": "63136",
- "parentId": "3635"
- },
- {
- "areaName": "东漖街道",
- "areaCode": "63137",
- "parentId": "3635"
- },
- {
- "areaName": "东沙街道",
- "areaCode": "63138",
- "parentId": "3635"
- }
- ]
- },
- {
- "areaName": "越秀区",
- "areaCode": "3637",
- "parentId": "1601",
- "children": [
- {
- "areaName": "洪桥街道",
- "areaCode": "63154",
- "parentId": "3637"
- },
- {
- "areaName": "光塔街道",
- "areaCode": "63155",
- "parentId": "3637"
- },
- {
- "areaName": "人民街道",
- "areaCode": "63156",
- "parentId": "3637"
- },
- {
- "areaName": "农林街道",
- "areaCode": "63157",
- "parentId": "3637"
- },
- {
- "areaName": "黄花岗街道",
- "areaCode": "63158",
- "parentId": "3637"
- },
- {
- "areaName": "建设街道",
- "areaCode": "63159",
- "parentId": "3637"
- },
- {
- "areaName": "矿泉街道",
- "areaCode": "63160",
- "parentId": "3637"
- },
- {
- "areaName": "大东街道",
- "areaCode": "63168",
- "parentId": "3637"
- },
- {
- "areaName": "北京街道",
- "areaCode": "63177",
- "parentId": "3637"
- },
- {
- "areaName": "六榕街道",
- "areaCode": "63178",
- "parentId": "3637"
- },
- {
- "areaName": "流花街道",
- "areaCode": "63179",
- "parentId": "3637"
- },
- {
- "areaName": "东山街道",
- "areaCode": "63180",
- "parentId": "3637"
- },
- {
- "areaName": "梅花村街道",
- "areaCode": "63181",
- "parentId": "3637"
- },
- {
- "areaName": "华乐街道",
- "areaCode": "63182",
- "parentId": "3637"
- },
- {
- "areaName": "大塘街道",
- "areaCode": "63183",
- "parentId": "3637"
- },
- {
- "areaName": "珠光街道",
- "areaCode": "63184",
- "parentId": "3637"
- },
- {
- "areaName": "白云街道",
- "areaCode": "63185",
- "parentId": "3637"
- },
- {
- "areaName": "登峰街道",
- "areaCode": "63187",
- "parentId": "3637"
- }
- ]
- },
- {
- "areaName": "番禺区",
- "areaCode": "36953",
- "parentId": "1601",
- "children": [
- {
- "areaName": "南村镇",
- "areaCode": "50397",
- "parentId": "36953"
- },
- {
- "areaName": "新造镇",
- "areaCode": "50398",
- "parentId": "36953"
- },
- {
- "areaName": "化龙镇",
- "areaCode": "50399",
- "parentId": "36953"
- },
- {
- "areaName": "石楼镇",
- "areaCode": "50400",
- "parentId": "36953"
- },
- {
- "areaName": "沙湾镇",
- "areaCode": "50401",
- "parentId": "36953"
- },
- {
- "areaName": "石碁镇",
- "areaCode": "50402",
- "parentId": "36953"
- },
- {
- "areaName": "城区",
- "areaCode": "51883",
- "parentId": "36953"
- },
- {
- "areaName": "市桥街道",
- "areaCode": "62865",
- "parentId": "36953"
- },
- {
- "areaName": "沙头街道",
- "areaCode": "62866",
- "parentId": "36953"
- },
- {
- "areaName": "东环街道",
- "areaCode": "62867",
- "parentId": "36953"
- },
- {
- "areaName": "小谷围街道",
- "areaCode": "62868",
- "parentId": "36953"
- },
- {
- "areaName": "大石街道",
- "areaCode": "62869",
- "parentId": "36953"
- },
- {
- "areaName": "洛浦街道",
- "areaCode": "62870",
- "parentId": "36953"
- },
- {
- "areaName": "石壁街道",
- "areaCode": "62871",
- "parentId": "36953"
- },
- {
- "areaName": "桥南街道",
- "areaCode": "62891",
- "parentId": "36953"
- },
- {
- "areaName": "钟村街道",
- "areaCode": "62892",
- "parentId": "36953"
- },
- {
- "areaName": "大龙街道",
- "areaCode": "62893",
- "parentId": "36953"
- },
- {
- "areaName": "广州大学城",
- "areaCode": "51091",
- "parentId": "36953"
- }
- ]
- },
- {
- "areaName": "花都区",
- "areaCode": "50256",
- "parentId": "1601",
- "children": [
- {
- "areaName": "狮岭镇",
- "areaCode": "50414",
- "parentId": "50256"
- },
- {
- "areaName": "雅瑶镇",
- "areaCode": "50415",
- "parentId": "50256"
- },
- {
- "areaName": "花山镇",
- "areaCode": "50416",
- "parentId": "50256"
- },
- {
- "areaName": "花东镇",
- "areaCode": "50417",
- "parentId": "50256"
- },
- {
- "areaName": "炭步镇",
- "areaCode": "50418",
- "parentId": "50256"
- },
- {
- "areaName": "梯面镇",
- "areaCode": "50419",
- "parentId": "50256"
- },
- {
- "areaName": "赤坭镇",
- "areaCode": "50420",
- "parentId": "50256"
- },
- {
- "areaName": "白云国际机场",
- "areaCode": "50421",
- "parentId": "50256"
- },
- {
- "areaName": "城区",
- "areaCode": "51884",
- "parentId": "50256"
- },
- {
- "areaName": "花城街道",
- "areaCode": "62876",
- "parentId": "50256"
- },
- {
- "areaName": "新华街道",
- "areaCode": "62894",
- "parentId": "50256"
- },
- {
- "areaName": "秀全街道",
- "areaCode": "62900",
- "parentId": "50256"
- },
- {
- "areaName": "新雅街道",
- "areaCode": "62901",
- "parentId": "50256"
- }
- ]
- },
- {
- "areaName": "南沙区",
- "areaCode": "50259",
- "parentId": "1601",
- "children": [
- {
- "areaName": "黄阁镇",
- "areaCode": "50423",
- "parentId": "50259"
- },
- {
- "areaName": "东涌镇",
- "areaCode": "50424",
- "parentId": "50259"
- },
- {
- "areaName": "大岗镇",
- "areaCode": "50425",
- "parentId": "50259"
- },
- {
- "areaName": "榄核镇",
- "areaCode": "50426",
- "parentId": "50259"
- },
- {
- "areaName": "横沥镇",
- "areaCode": "50427",
- "parentId": "50259"
- },
- {
- "areaName": "万顷沙镇",
- "areaCode": "50430",
- "parentId": "50259"
- },
- {
- "areaName": "城区",
- "areaCode": "51886",
- "parentId": "50259"
- },
- {
- "areaName": "龙穴街道",
- "areaCode": "52680",
- "parentId": "50259"
- },
- {
- "areaName": "南沙街道",
- "areaCode": "62914",
- "parentId": "50259"
- },
- {
- "areaName": "珠江街道",
- "areaCode": "62915",
- "parentId": "50259"
- }
- ]
- },
- {
- "areaName": "黄埔区",
- "areaCode": "50283",
- "parentId": "1601",
- "children": [
- {
- "areaName": "长岭街道",
- "areaCode": "129162",
- "parentId": "50283"
- },
- {
- "areaName": "云埔街道",
- "areaCode": "129163",
- "parentId": "50283"
- },
- {
- "areaName": "长洲街道",
- "areaCode": "50386",
- "parentId": "50283"
- },
- {
- "areaName": "城区",
- "areaCode": "51887",
- "parentId": "50283"
- },
- {
- "areaName": "永和街道",
- "areaCode": "53526",
- "parentId": "50283"
- },
- {
- "areaName": "联和街道",
- "areaCode": "62861",
- "parentId": "50283"
- },
- {
- "areaName": "文冲街道",
- "areaCode": "62862",
- "parentId": "50283"
- },
- {
- "areaName": "南岗街道",
- "areaCode": "62863",
- "parentId": "50283"
- },
- {
- "areaName": "萝岗街道",
- "areaCode": "62864",
- "parentId": "50283"
- },
- {
- "areaName": "黄埔街道",
- "areaCode": "62883",
- "parentId": "50283"
- },
- {
- "areaName": "红山街道",
- "areaCode": "62884",
- "parentId": "50283"
- },
- {
- "areaName": "鱼珠街道",
- "areaCode": "62885",
- "parentId": "50283"
- },
- {
- "areaName": "大沙街道",
- "areaCode": "62886",
- "parentId": "50283"
- },
- {
- "areaName": "穗东街道",
- "areaCode": "62887",
- "parentId": "50283"
- },
- {
- "areaName": "荔联街道",
- "areaCode": "62888",
- "parentId": "50283"
- },
- {
- "areaName": "夏港街道",
- "areaCode": "62889",
- "parentId": "50283"
- },
- {
- "areaName": "东区街道",
- "areaCode": "62890",
- "parentId": "50283"
- },
- {
- "areaName": "九佛街道",
- "areaCode": "71656",
- "parentId": "50283"
- },
- {
- "areaName": "龙湖街道",
- "areaCode": "71661",
- "parentId": "50283"
- },
- {
- "areaName": "新龙镇",
- "areaCode": "71662",
- "parentId": "50283"
- }
- ]
- },
- {
- "areaName": "增城区",
- "areaCode": "50284",
- "parentId": "1601",
- "children": [
- {
- "areaName": "朱村街道",
- "areaCode": "50447",
- "parentId": "50284"
- },
- {
- "areaName": "新塘镇",
- "areaCode": "50448",
- "parentId": "50284"
- },
- {
- "areaName": "小楼镇",
- "areaCode": "50449",
- "parentId": "50284"
- },
- {
- "areaName": "石滩镇",
- "areaCode": "50450",
- "parentId": "50284"
- },
- {
- "areaName": "中新镇",
- "areaCode": "50451",
- "parentId": "50284"
- },
- {
- "areaName": "正果镇",
- "areaCode": "50452",
- "parentId": "50284"
- },
- {
- "areaName": "派潭镇",
- "areaCode": "50453",
- "parentId": "50284"
- },
- {
- "areaName": "宁西街道",
- "areaCode": "51055",
- "parentId": "50284"
- },
- {
- "areaName": "仙村镇",
- "areaCode": "51056",
- "parentId": "50284"
- },
- {
- "areaName": "城区",
- "areaCode": "52086",
- "parentId": "50284"
- },
- {
- "areaName": "增江街道",
- "areaCode": "62875",
- "parentId": "50284"
- },
- {
- "areaName": "荔城街道",
- "areaCode": "62897",
- "parentId": "50284"
- },
- {
- "areaName": "永宁街道",
- "areaCode": "62898",
- "parentId": "50284"
- },
- {
- "areaName": "荔湖街道",
- "areaCode": "62899",
- "parentId": "50284"
- }
- ]
- },
- {
- "areaName": "从化区",
- "areaCode": "50285",
- "parentId": "1601",
- "children": [
- {
- "areaName": "太平镇",
- "areaCode": "50466",
- "parentId": "50285"
- },
- {
- "areaName": "神岗镇",
- "areaCode": "50467",
- "parentId": "50285"
- },
- {
- "areaName": "温泉镇",
- "areaCode": "50468",
- "parentId": "50285"
- },
- {
- "areaName": "良口镇",
- "areaCode": "50469",
- "parentId": "50285"
- },
- {
- "areaName": "吕田镇",
- "areaCode": "50470",
- "parentId": "50285"
- },
- {
- "areaName": "鳌头镇",
- "areaCode": "50471",
- "parentId": "50285"
- },
- {
- "areaName": "龙潭镇",
- "areaCode": "51057",
- "parentId": "50285"
- },
- {
- "areaName": "东明镇",
- "areaCode": "51058",
- "parentId": "50285"
- },
- {
- "areaName": "城区",
- "areaCode": "51382",
- "parentId": "50285"
- },
- {
- "areaName": "街口街道",
- "areaCode": "62872",
- "parentId": "50285"
- },
- {
- "areaName": "流溪河林场",
- "areaCode": "62873",
- "parentId": "50285"
- },
- {
- "areaName": "黄龙带水库管理处",
- "areaCode": "62874",
- "parentId": "50285"
- },
- {
- "areaName": "江埔街道",
- "areaCode": "62895",
- "parentId": "50285"
- },
- {
- "areaName": "城郊街道",
- "areaCode": "62896",
- "parentId": "50285"
- }
- ]
- }
- ]
-}
\ No newline at end of file
--
Gitblit v1.8.0