From 0bee241c9ba22c66e52f687dd6d10970dac8a297 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Thu, 20 Jul 2023 17:28:46 +0800 Subject: [PATCH] fix poi --- .../controller/sys/SysGaodeController.java | 2 +- .../db/migration/V2023072000001_poi.sql | 396 +++++++++++++++++- .../com/iformall/domain/po/TtMerchantPoi.java | 7 + .../com/iformall/domain/vo/GaodeCityTree.java | 20 + .../com/iformall/service/SysGaoDeService.java | 3 +- .../service/impl/SysGaoDeServiceImpl.java | 40 +- .../resources/mapper/TtMerchantPoiMapper.xml | 14 + 7 files changed, 477 insertions(+), 5 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/GaodeCityTree.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysGaodeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysGaodeController.java index 51c4d82cd..14e559a6d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysGaodeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysGaodeController.java @@ -22,7 +22,7 @@ public class SysGaodeController extends BaseController { @GetMapping("getAll") public ResultData getAll() { - return new ResultData(sysGaoDeService.getAll()); + return new ResultData(sysGaoDeService.getTreeAll()); } } diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023072000001_poi.sql b/mallinkAdmin/src/main/resources/db/migration/V2023072000001_poi.sql index d95e1bf29..9c1decf1b 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V2023072000001_poi.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V2023072000001_poi.sql @@ -1,7 +1,401 @@ alter table sys_gaode_city add column type int(1) NOT NULL COMMENT '类型EnumGaodeCityType' ; alter table sys_gaode_city add column parent_id bigint(11) COMMENT '父级' ; -###重新导出数据#### +delete from sys_gaode_city; + +INSERT INTO `sys_gaode_city` (`id`, `label`, `create_date`, `update_date`, `is_hide`, `status`, `name`, `type`, `parent_id`) +VALUES + (3683,'B','2023-07-02 19:41:10','2023-07-02 19:41:10',0,0,'北京市',2,4043), + (3684,'T','2023-07-02 19:41:10','2023-07-02 19:41:10',0,0,'天津市',2,4044), + (3685,'S','2023-07-02 19:41:10','2023-07-02 19:41:10',0,0,'石家庄市',2,4045), + (3686,'T','2023-07-02 19:41:10','2023-07-02 19:41:10',0,0,'唐山市',2,4045), + (3687,'Q','2023-07-02 19:41:10','2023-07-02 19:41:10',0,0,'秦皇岛市',2,4045), + (3688,'H','2023-07-02 19:41:10','2023-07-02 19:41:10',0,0,'邯郸市',2,4045), + (3689,'X','2023-07-02 19:41:10','2023-07-02 19:41:10',0,0,'邢台市',2,4045), + (3690,'B','2023-07-02 19:41:10','2023-07-02 19:41:10',0,0,'保定市',2,4045), + (3691,'Z','2023-07-02 19:41:10','2023-07-02 19:41:10',0,0,'张家口市',2,4045), + (3692,'C','2023-07-02 19:41:10','2023-07-02 19:41:10',0,0,'承德市',2,4045), + (3693,'C','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'沧州市',2,4045), + (3694,'L','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'廊坊市',2,4045), + (3695,'H','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'衡水市',2,4045), + (3696,'T','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'太原市',2,4046), + (3697,'D','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'大同市',2,4046), + (3698,'Y','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'阳泉市',2,4046), + (3699,'C','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'长治市',2,4046), + (3700,'J','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'晋城市',2,4046), + (3701,'S','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'朔州市',2,4046), + (3702,'J','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'晋中市',2,4046), + (3703,'Y','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'运城市',2,4046), + (3704,'L','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'忻州市',2,4046), + (3705,'L','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'临汾市',2,4046), + (3706,'L','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'吕梁市',2,4046), + (3707,'H','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'呼和浩特市',2,4047), + (3708,'B','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'包头市',2,4047), + (3709,'W','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'乌海市',2,4047), + (3710,'C','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'赤峰市',2,4047), + (3711,'T','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'通辽市',2,4047), + (3712,'E','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'鄂尔多斯市',2,4047), + (3713,'H','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'呼伦贝尔市',2,4047), + (3714,'B','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'巴彦淖尔市',2,4047), + (3715,'W','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'乌兰察布市',2,4047), + (3716,'X','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'兴安盟',2,4047), + (3717,'X','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'锡林郭勒盟',2,4047), + (3718,'A','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'阿拉善盟',2,4047), + (3719,'S','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'沈阳市',2,4048), + (3720,'D','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'大连市',2,4048), + (3721,'A','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'鞍山市',2,4048), + (3722,'F','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'抚顺市',2,4048), + (3723,'B','2023-07-02 19:41:11','2023-07-02 19:41:11',0,0,'本溪市',2,4048), + (3724,'D','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'丹东市',2,4048), + (3725,'J','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'锦州市',2,4048), + (3726,'Y','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'营口市',2,4048), + (3727,'F','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'阜新市',2,4048), + (3728,'L','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'辽阳市',2,4048), + (3729,'P','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'盘锦市',2,4048), + (3730,'T','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'铁岭市',2,4048), + (3731,'C','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'朝阳市',2,4048), + (3732,'H','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'葫芦岛市',2,4048), + (3733,'C','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'长春市',2,4049), + (3734,'J','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'吉林市',2,4049), + (3735,'S','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'四平市',2,4049), + (3736,'L','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'辽源市',2,4049), + (3737,'T','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'通化市',2,4049), + (3738,'B','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'白山市',2,4049), + (3739,'S','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'松原市',2,4049), + (3740,'B','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'白城市',2,4049), + (3741,'Y','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'延边朝鲜族自治州',2,4049), + (3742,'H','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'哈尔滨市',2,4050), + (3743,'Q','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'齐齐哈尔市',2,4050), + (3744,'J','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'鸡西市',2,4050), + (3745,'H','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'鹤岗市',2,4050), + (3746,'S','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'双鸭山市',2,4050), + (3747,'D','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'大庆市',2,4050), + (3748,'Y','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'伊春市',2,4050), + (3749,'J','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'佳木斯市',2,4050), + (3750,'Q','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'七台河市',2,4050), + (3751,'M','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'牡丹江市',2,4050), + (3752,'H','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'黑河市',2,4050), + (3753,'S','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'绥化市',2,4050), + (3754,'D','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'大兴安岭地区',2,4050), + (3755,'S','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'上海市',2,4051), + (3756,'N','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'南京市',2,4052), + (3757,'W','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'无锡市',2,4052), + (3758,'X','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'徐州市',2,4052), + (3759,'C','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'常州市',2,4052), + (3760,'S','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'苏州市',2,4052), + (3761,'N','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'南通市',2,4052), + (3762,'L','2023-07-02 19:41:12','2023-07-02 19:41:12',0,0,'连云港市',2,4052), + (3763,'H','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'淮安市',2,4052), + (3764,'Y','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'盐城市',2,4052), + (3765,'Y','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'扬州市',2,4052), + (3766,'Z','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'镇江市',2,4052), + (3767,'T','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'泰州市',2,4052), + (3768,'S','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'宿迁市',2,4052), + (3769,'H','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'杭州市',2,4053), + (3770,'N','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'宁波市',2,4053), + (3771,'W','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'温州市',2,4053), + (3772,'J','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'嘉兴市',2,4053), + (3773,'H','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'湖州市',2,4053), + (3774,'S','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'绍兴市',2,4053), + (3775,'J','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'金华市',2,4053), + (3776,'Q','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'衢州市',2,4053), + (3777,'Z','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'舟山市',2,4053), + (3778,'T','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'台州市',2,4053), + (3779,'L','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'丽水市',2,4053), + (3780,'H','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'合肥市',2,4054), + (3781,'W','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'芜湖市',2,4054), + (3782,'B','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'蚌埠市',2,4054), + (3783,'H','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'淮南市',2,4054), + (3784,'M','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'马鞍山市',2,4054), + (3785,'H','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'淮北市',2,4054), + (3786,'T','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'铜陵市',2,4054), + (3787,'A','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'安庆市',2,4054), + (3788,'H','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'黄山市',2,4054), + (3789,'C','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'滁州市',2,4054), + (3790,'F','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'阜阳市',2,4054), + (3791,'S','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'宿州市',2,4054), + (3792,'L','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'六安市',2,4054), + (3793,'H','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'亳州市',2,4054), + (3794,'C','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'池州市',2,4054), + (3795,'X','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'宣城市',2,4054), + (3796,'F','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'福州市',2,4055), + (3797,'X','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'厦门市',2,4055), + (3798,'P','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'莆田市',2,4055), + (3799,'S','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'三明市',2,4055), + (3800,'Q','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'泉州市',2,4055), + (3801,'Z','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'漳州市',2,4055), + (3802,'N','2023-07-02 19:41:13','2023-07-02 19:41:13',0,0,'南平市',2,4055), + (3803,'L','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'龙岩市',2,4055), + (3804,'N','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'宁德市',2,4055), + (3805,'N','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'南昌市',2,4056), + (3806,'J','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'景德镇市',2,4056), + (3807,'P','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'萍乡市',2,4056), + (3808,'J','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'九江市',2,4056), + (3809,'X','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'新余市',2,4056), + (3810,'Y','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'鹰潭市',2,4056), + (3811,'G','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'赣州市',2,4056), + (3812,'J','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'吉安市',2,4056), + (3813,'Y','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'宜春市',2,4056), + (3814,'F','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'抚州市',2,4056), + (3815,'S','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'上饶市',2,4056), + (3816,'J','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'济南市',2,4057), + (3817,'Q','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'青岛市',2,4057), + (3818,'Z','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'淄博市',2,4057), + (3819,'Z','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'枣庄市',2,4057), + (3820,'D','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'东营市',2,4057), + (3821,'Y','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'烟台市',2,4057), + (3822,'W','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'潍坊市',2,4057), + (3823,'J','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'济宁市',2,4057), + (3824,'T','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'泰安市',2,4057), + (3825,'W','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'威海市',2,4057), + (3826,'R','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'日照市',2,4057), + (3827,'L','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'临沂市',2,4057), + (3828,'D','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'德州市',2,4057), + (3829,'L','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'聊城市',2,4057), + (3830,'B','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'滨州市',2,4057), + (3831,'H','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'菏泽市',2,4057), + (3832,'Z','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'郑州市',2,4058), + (3833,'K','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'开封市',2,4058), + (3834,'L','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'洛阳市',2,4058), + (3835,'P','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'平顶山市',2,4058), + (3836,'A','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'安阳市',2,4058), + (3837,'H','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'鹤壁市',2,4058), + (3838,'X','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'新乡市',2,4058), + (3839,'J','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'焦作市',2,4058), + (3840,'P','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'濮阳市',2,4058), + (3841,'X','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'许昌市',2,4058), + (3842,'L','2023-07-02 19:41:14','2023-07-02 19:41:14',0,0,'漯河市',2,4058), + (3843,'S','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'三门峡市',2,4058), + (3844,'N','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'南阳市',2,4058), + (3845,'S','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'商丘市',2,4058), + (3846,'X','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'信阳市',2,4058), + (3847,'Z','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'周口市',2,4058), + (3848,'Z','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'驻马店市',2,4058), + (3849,'J','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'济源市',2,4058), + (3850,'W','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'武汉市',2,4059), + (3851,'H','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'黄石市',2,4059), + (3852,'S','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'十堰市',2,4059), + (3853,'Y','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'宜昌市',2,4059), + (3854,'X','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'襄阳市',2,4059), + (3855,'E','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'鄂州市',2,4059), + (3856,'J','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'荆门市',2,4059), + (3857,'X','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'孝感市',2,4059), + (3858,'J','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'荆州市',2,4059), + (3859,'H','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'黄冈市',2,4059), + (3860,'X','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'咸宁市',2,4059), + (3861,'S','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'随州市',2,4059), + (3862,'E','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'恩施土家族苗族自治州',2,4059), + (3863,'X','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'仙桃市',2,4059), + (3864,'Q','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'潜江市',2,4059), + (3865,'T','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'天门市',2,4059), + (3866,'S','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'神农架林区',2,4059), + (3867,'C','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'长沙市',2,4060), + (3868,'Z','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'株洲市',2,4060), + (3869,'X','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'湘潭市',2,4060), + (3870,'H','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'衡阳市',2,4060), + (3871,'S','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'邵阳市',2,4060), + (3872,'Y','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'岳阳市',2,4060), + (3873,'C','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'常德市',2,4060), + (3874,'Z','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'张家界市',2,4060), + (3875,'Y','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'益阳市',2,4060), + (3876,'C','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'郴州市',2,4060), + (3877,'Y','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'永州市',2,4060), + (3878,'H','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'怀化市',2,4060), + (3879,'L','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'娄底市',2,4060), + (3880,'X','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'湘西土家族苗族自治州',2,4060), + (3881,'G','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'广州市',2,4061), + (3882,'S','2023-07-02 19:41:15','2023-07-02 19:41:15',0,0,'韶关市',2,4061), + (3883,'S','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'深圳市',2,4061), + (3884,'Z','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'珠海市',2,4061), + (3885,'S','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'汕头市',2,4061), + (3886,'F','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'佛山市',2,4061), + (3887,'J','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'江门市',2,4061), + (3888,'Z','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'湛江市',2,4061), + (3889,'M','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'茂名市',2,4061), + (3890,'Z','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'肇庆市',2,4061), + (3891,'H','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'惠州市',2,4061), + (3892,'M','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'梅州市',2,4061), + (3893,'S','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'汕尾市',2,4061), + (3894,'H','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'河源市',2,4061), + (3895,'Y','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'阳江市',2,4061), + (3896,'Q','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'清远市',2,4061), + (3897,'D','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'东莞市',2,4061), + (3898,'Z','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'中山市',2,4061), + (3899,'C','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'潮州市',2,4061), + (3900,'Y','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'揭阳市',2,4061), + (3901,'Y','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'云浮市',2,4061), + (3902,'N','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'南宁市',2,4062), + (3903,'L','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'柳州市',2,4062), + (3904,'G','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'桂林市',2,4062), + (3905,'W','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'梧州市',2,4062), + (3906,'B','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'北海市',2,4062), + (3907,'F','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'防城港市',2,4062), + (3908,'Q','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'钦州市',2,4062), + (3909,'G','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'贵港市',2,4062), + (3910,'Y','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'玉林市',2,4062), + (3911,'B','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'百色市',2,4062), + (3912,'H','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'贺州市',2,4062), + (3913,'C','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'河池市',2,4062), + (3914,'L','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'来宾市',2,4062), + (3915,'C','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'崇左市',2,4062), + (3916,'H','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'海口市',2,4063), + (3917,'S','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'三亚市',2,4063), + (3918,'S','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'三沙市',2,4063), + (3919,'S','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'儋州市',2,4063), + (3920,'W','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'五指山市',2,4063), + (3921,'Q','2023-07-02 19:41:16','2023-07-02 19:41:16',0,0,'琼海市',2,4063), + (3922,'W','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'文昌市',2,4063), + (3923,'W','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'万宁市',2,4063), + (3924,'D','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'东方市',2,4063), + (3925,'C','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'重庆市',2,4064), + (3926,'C','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'成都市',2,4065), + (3927,'Z','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'自贡市',2,4065), + (3928,'P','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'攀枝花市',2,4065), + (3929,'L','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'泸州市',2,4065), + (3930,'D','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'德阳市',2,4065), + (3931,'M','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'绵阳市',2,4065), + (3932,'G','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'广元市',2,4065), + (3933,'S','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'遂宁市',2,4065), + (3934,'N','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'内江市',2,4065), + (3935,'L','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'乐山市',2,4065), + (3936,'N','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'南充市',2,4065), + (3937,'M','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'眉山市',2,4065), + (3938,'Y','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'宜宾市',2,4065), + (3939,'G','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'广安市',2,4065), + (3940,'D','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'达州市',2,4065), + (3941,'Y','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'雅安市',2,4065), + (3942,'B','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'巴中市',2,4065), + (3943,'Z','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'资阳市',2,4065), + (3944,'A','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'阿坝藏族羌族自治州',2,4065), + (3945,'G','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'甘孜藏族自治州',2,4065), + (3946,'L','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'凉山彝族自治州',2,4065), + (3947,'G','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'贵阳市',2,4066), + (3948,'L','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'六盘水市',2,4066), + (3949,'Z','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'遵义市',2,4066), + (3950,'A','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'安顺市',2,4066), + (3951,'B','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'毕节市',2,4066), + (3952,'T','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'铜仁市',2,4066), + (3953,'Q','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'黔西南布依族苗族自治州',2,4066), + (3954,'Q','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'黔东南苗族侗族自治州',2,4066), + (3955,'Q','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'黔南布依族苗族自治州',2,4066), + (3956,'K','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'昆明市',2,4067), + (3957,'Q','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'曲靖市',2,4067), + (3958,'Y','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'玉溪市',2,4067), + (3959,'B','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'保山市',2,4067), + (3960,'Z','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'昭通市',2,4067), + (3961,'L','2023-07-02 19:41:17','2023-07-02 19:41:17',0,0,'丽江市',2,4067), + (3962,'P','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'普洱市',2,4067), + (3963,'L','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'临沧市',2,4067), + (3964,'C','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'楚雄彝族自治州',2,4067), + (3965,'H','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'红河哈尼族彝族自治州',2,4067), + (3966,'W','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'文山壮族苗族自治州',2,4067), + (3967,'X','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'西双版纳傣族自治州',2,4067), + (3968,'D','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'大理白族自治州',2,4067), + (3969,'D','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'德宏傣族景颇族自治州',2,4067), + (3970,'N','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'怒江傈僳族自治州',2,4067), + (3971,'D','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'迪庆藏族自治州',2,4067), + (3972,'L','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'拉萨市',2,4068), + (3973,'R','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'日喀则市',2,4068), + (3974,'C','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'昌都市',2,4068), + (3975,'L','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'林芝市',2,4068), + (3976,'S','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'山南市',2,4068), + (3977,'N','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'那曲市',2,4068), + (3978,'A','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'阿里地区',2,4068), + (3979,'X','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'西安市',2,4069), + (3980,'T','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'铜川市',2,4069), + (3981,'B','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'宝鸡市',2,4069), + (3982,'X','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'咸阳市',2,4069), + (3983,'W','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'渭南市',2,4069), + (3984,'Y','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'延安市',2,4069), + (3985,'H','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'汉中市',2,4069), + (3986,'Y','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'榆林市',2,4069), + (3987,'A','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'安康市',2,4069), + (3988,'S','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'商洛市',2,4069), + (3989,'L','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'兰州市',2,4070), + (3990,'J','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'嘉峪关市',2,4070), + (3991,'J','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'金昌市',2,4070), + (3992,'B','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'白银市',2,4070), + (3993,'T','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'天水市',2,4070), + (3994,'W','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'武威市',2,4070), + (3995,'Z','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'张掖市',2,4070), + (3996,'P','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'平凉市',2,4070), + (3997,'J','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'酒泉市',2,4070), + (3998,'Q','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'庆阳市',2,4070), + (3999,'D','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'定西市',2,4070), + (4000,'L','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'陇南市',2,4070), + (4001,'L','2023-07-02 19:41:18','2023-07-02 19:41:18',0,0,'临夏回族自治州',2,4070), + (4002,'G','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'甘南藏族自治州',2,4070), + (4003,'X','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'西宁市',2,4070), + (4004,'H','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'海东市',2,4070), + (4005,'H','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'海北藏族自治州',2,4070), + (4006,'H','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'黄南藏族自治州',2,4070), + (4007,'H','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'海南藏族自治州',2,4070), + (4008,'G','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'果洛藏族自治州',2,4070), + (4009,'Y','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'玉树藏族自治州',2,4070), + (4010,'H','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'海西蒙古族藏族自治州',2,4070), + (4011,'Y','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'银川市',2,4071), + (4012,'S','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'石嘴山市',2,4071), + (4013,'W','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'吴忠市',2,4071), + (4014,'G','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'固原市',2,4071), + (4015,'Z','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'中卫市',2,4071), + (4016,'W','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'乌鲁木齐市',2,4072), + (4017,'K','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'克拉玛依市',2,4072), + (4018,'T','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'吐鲁番市',2,4072), + (4019,'H','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'胡杨河市',2,4072), + (4020,'H','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'哈密市',2,4072), + (4021,'C','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'昌吉回族自治州',2,4072), + (4022,'B','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'博尔塔拉蒙古自治州',2,4072), + (4023,'B','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'巴音郭楞蒙古自治州',2,4072), + (4024,'A','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'阿克苏地区',2,4072), + (4025,'K','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'克孜勒苏柯尔克孜自治州',2,4072), + (4026,'K','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'喀什地区',2,4072), + (4027,'H','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'和田地区',2,4072), + (4028,'Y','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'伊犁哈萨克自治州',2,4072), + (4029,'T','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'塔城地区',2,4072), + (4030,'A','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'阿勒泰地区',2,4072), + (4031,'S','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'石河子市',2,4072), + (4032,'A','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'阿拉尔市',2,4072), + (4033,'T','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'图木舒克市',2,4072), + (4034,'W','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'五家渠市',2,4072), + (4035,'B','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'北屯市',2,4072), + (4036,'T','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'铁门关市',2,4072), + (4037,'S','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'双河市',2,4072), + (4038,'K','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'可克达拉市',2,4072), + (4039,'K','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'昆玉市',2,4072), + (4040,'T','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'台湾省',1,NULL), + (4041,'x','2023-07-02 19:41:19','2023-07-02 19:41:19',0,0,'香港特别行政区',1,NULL), + (4042,'A','2023-07-02 19:41:20','2023-07-02 19:41:20',0,0,'澳门特别行政区',1,NULL), + (4043,'B','2023-07-20 14:47:35','2023-07-20 14:47:35',0,0,'北京市',1,NULL), + (4044,'T','2023-07-20 14:48:29','2023-07-20 14:48:29',0,0,'天津市',1,NULL), + (4045,'H','2023-07-20 14:49:17','2023-07-20 14:49:17',0,0,'河北省',1,NULL), + (4046,'S','2023-07-20 14:50:42','2023-07-20 14:50:42',0,0,'山西省',1,NULL), + (4047,'N','2023-07-20 14:52:06','2023-07-20 14:52:06',0,0,'内蒙古自治区',1,NULL), + (4048,'L','2023-07-20 14:53:12','2023-07-20 14:53:12',0,0,'辽宁省',1,NULL), + (4049,'J','2023-07-20 14:54:39','2023-07-20 14:54:39',0,0,'吉林省',1,NULL), + (4050,'H','2023-07-20 14:55:47','2023-07-20 14:55:47',0,0,'黑龙江省',1,NULL), + (4051,'S','2023-07-20 14:56:53','2023-07-20 14:56:53',0,0,'上海市',1,NULL), + (4052,'J','2023-07-20 14:57:23','2023-07-20 14:57:23',0,0,'江苏省',1,NULL), + (4053,'Z','2023-07-20 15:00:36','2023-07-20 15:00:36',0,0,'浙江省',1,NULL), + (4054,'A','2023-07-20 15:01:37','2023-07-20 15:01:37',0,0,'安徽省',1,NULL), + (4055,'F','2023-07-20 15:04:13','2023-07-20 15:04:13',0,0,'福建省',1,NULL), + (4056,'J','2023-07-20 15:05:20','2023-07-20 15:05:20',0,0,'江西省',1,NULL), + (4057,'S','2023-07-20 15:06:31','2023-07-20 15:06:31',0,0,'山东省',1,NULL), + (4058,'H','2023-07-20 15:07:37','2023-07-20 15:07:37',0,0,'河南省',1,NULL), + (4059,'H','2023-07-20 15:08:51','2023-07-20 15:08:51',0,0,'湖北省',1,NULL), + (4060,'H','2023-07-20 15:10:34','2023-07-20 15:10:34',0,0,'湖南省',1,NULL), + (4061,'G','2023-07-20 15:14:08','2023-07-20 15:14:08',0,0,'广东省',1,NULL), + (4062,'G','2023-07-20 15:15:20','2023-07-20 15:15:20',0,0,'广西壮族自治区',1,NULL), + (4063,'H','2023-07-20 15:16:34','2023-07-20 15:16:34',0,0,'海南省',1,NULL), + (4064,'C','2023-07-20 15:17:45','2023-07-20 15:17:45',0,0,'重庆市',1,NULL), + (4065,'S','2023-07-20 15:18:18','2023-07-20 15:18:18',0,0,'四川省',1,NULL), + (4066,'G','2023-07-20 15:19:34','2023-07-20 15:19:34',0,0,'贵州省',1,NULL), + (4067,'Y','2023-07-20 15:20:45','2023-07-20 15:20:45',0,0,'云南省',1,NULL), + (4068,'X','2023-07-20 15:21:57','2023-07-20 15:21:57',0,0,'西藏自治区',1,NULL), + (4069,'S','2023-07-20 15:22:42','2023-07-20 15:22:42',0,0,'陕西省',1,NULL), + (4070,'G','2023-07-20 15:23:24','2023-07-20 15:23:24',0,0,'甘肃省',1,NULL), + (4071,'N','2023-07-20 15:24:57','2023-07-20 15:24:57',0,0,'宁夏回族自治区',1,NULL), + (4072,'X','2023-07-20 15:25:37','2023-07-20 15:25:37',0,0,'新疆维吾尔自治区',1,NULL); + diff --git a/mallinkService/src/main/java/com/iformall/domain/po/TtMerchantPoi.java b/mallinkService/src/main/java/com/iformall/domain/po/TtMerchantPoi.java index 809377ba9..b9b2c9077 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/TtMerchantPoi.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/TtMerchantPoi.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.google.gson.JsonObject; import com.iformall.domain.po.base.TenantEntity; @@ -10,6 +11,7 @@ import lombok.ToString; import java.math.BigDecimal; import java.util.Date; +import java.util.List; @TableName(value = "tt_merchant_poi") @Data @@ -123,6 +125,11 @@ public class TtMerchantPoi extends TenantEntity { } return object.toString(); } + + @TableField(exist = false) + private List provinceList; + @TableField(exist = false) + private List cityList; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/GaodeCityTree.java b/mallinkService/src/main/java/com/iformall/domain/vo/GaodeCityTree.java new file mode 100644 index 000000000..789d7968c --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/GaodeCityTree.java @@ -0,0 +1,20 @@ +package com.iformall.domain.vo; + +import java.io.Serializable; +import java.text.DecimalFormat; +import java.util.List; + +import com.iformall.domain.po.SysGaodeCity; +import com.iformall.domain.po.WxDateAmountRecord; +import lombok.Data; + +@Data +public class GaodeCityTree implements Serializable{ + + private static final long serialVersionUID = 4494858079134918638L; + + private SysGaodeCity current; + //核销金额记录 + private List childs; + +} diff --git a/mallinkService/src/main/java/com/iformall/service/SysGaoDeService.java b/mallinkService/src/main/java/com/iformall/service/SysGaoDeService.java index 6d562049e..1445e34fb 100644 --- a/mallinkService/src/main/java/com/iformall/service/SysGaoDeService.java +++ b/mallinkService/src/main/java/com/iformall/service/SysGaoDeService.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import com.iformall.domain.po.SysGaodeCity; +import com.iformall.domain.vo.GaodeCityTree; public interface SysGaoDeService { @@ -15,6 +16,6 @@ public interface SysGaoDeService { */ Map getAllCityLabelMap(); - List getAll(); + List getTreeAll(); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/SysGaoDeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/SysGaoDeServiceImpl.java index b0a0fac78..15a57495c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/SysGaoDeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/SysGaoDeServiceImpl.java @@ -3,6 +3,7 @@ package com.iformall.service.impl; import java.util.*; import com.iformall.domain.po.SysGaodeCity; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.GaodeCityTree; import com.iformall.enums.EnumDelStatus; import com.iformall.enums.EnumGaodeCityType; import com.iformall.enums.EnumYesOrNo; @@ -31,6 +32,7 @@ public class SysGaoDeServiceImpl implements SysGaoDeService { SysGaodeCity sgc = new SysGaodeCity(); sgc.setIsHide(EnumYesOrNo.NO.getCode()); sgc.setStatus(EnumDelStatus.NOT_DEL.getCode()); + sgc.setType(EnumGaodeCityType.CITY.getCode()); List sgcList = sysGaodeCityMapper.findList(sgc); if (null != sgcList && sgcList.size() > 0 ) { cacheMap = new HashMap(); @@ -45,10 +47,44 @@ public class SysGaoDeServiceImpl implements SysGaoDeService { } @Override - public List getAll() { + public List getTreeAll() { SysGaodeCity sgc = new SysGaodeCity(); sgc.setIsHide(EnumYesOrNo.NO.getCode()); sgc.setStatus(EnumDelStatus.NOT_DEL.getCode()); - return sysGaodeCityMapper.findList(sgc); + sgc.setType(EnumGaodeCityType.PROVINCE.getCode()); + List provinceList = sysGaodeCityMapper.findList(sgc); + if (null != provinceList && provinceList.size() > 0 ) { + List treeList = new ArrayList(); + for (int i = 0 ; i < provinceList.size() ; i++) { + SysGaodeCity p = provinceList.get(i); + GaodeCityTree pt = new GaodeCityTree(); + pt.setCurrent(p); + treeList.add(pt); + pt.setChilds(getChilds(pt)); + } + return treeList; + } + return null; + } + + private List getChilds(GaodeCityTree parent) { + SysGaodeCity childQ = new SysGaodeCity(); + childQ.setIsHide(EnumYesOrNo.NO.getCode()); + childQ.setStatus(EnumDelStatus.NOT_DEL.getCode()); + childQ.setParentId(parent.getCurrent().getId()); + List childCitys = sysGaodeCityMapper.findList(childQ); + if (null != childCitys) { + List childs = new ArrayList(); + for (int i = 0 ; i < childCitys.size() ; i++) { + SysGaodeCity cc = childCitys.get(i); + GaodeCityTree cct = new GaodeCityTree(); + cct.setCurrent(cc); + childs.add(cct); + cct.setChilds(getChilds(cct)); + } + parent.setChilds(childs); + return childs; + } + return null; } } diff --git a/mallinkService/src/main/resources/mapper/TtMerchantPoiMapper.xml b/mallinkService/src/main/resources/mapper/TtMerchantPoiMapper.xml index a30e44efe..9df1ad86d 100644 --- a/mallinkService/src/main/resources/mapper/TtMerchantPoiMapper.xml +++ b/mallinkService/src/main/resources/mapper/TtMerchantPoiMapper.xml @@ -119,6 +119,20 @@ and `last_sync_status` = #{lastSyncStatus} + + + and `province` in + + #{provinceItem} + + + + + and `city` in + + #{cityItem} + + and `id` in