diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.8__update_view_create_table.sql b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.8__update_view_create_table.sql new file mode 100644 index 0000000000..4680d4535a --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.8__update_view_create_table.sql @@ -0,0 +1,51 @@ +CREATE TABLE `business_bind_org` ( + `ID` varchar(64) CHARACTER SET utf8mb4 NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 NOT NULL COMMENT '客户Id', + `business_org_id` varchar(64) CHARACTER SET utf8mb4 NOT NULL COMMENT '本系统业务机构ID', + `business_code` varchar(32) CHARACTER SET utf8mb4 NOT NULL COMMENT '综治ca;网格化wgh', + `third_org_id` varchar(64) CHARACTER SET utf8mb4 NOT NULL COMMENT '第三方机构ID', + `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', + `REVISION` int(11) NOT NULL DEFAULT '1' COMMENT '乐观锁', + `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`), + KEY `idx_grid_grid_id` (`third_org_id`(8)) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; + + +DROP VIEW view_grid_comm_street; + +CREATE ALGORITHM = UNDEFINED DEFINER = `root` @`%` SQL SECURITY DEFINER VIEW `view_grid_comm_street_ca` AS SELECT +`g4`.`grid_id` AS `grid_id`, +`g4`.`grid_name` AS `grid_name`, +`g3`.`grid_id` AS `community_id`, +`g3`.`grid_name` AS `community_name`, +`g2`.`grid_id` AS `street_id`, +`g2`.`grid_name` AS `street_name`, +concat( `g2`.`grid_id`, ':', `g3`.`grid_id`, ':', `g4`.`grid_id` ) AS `grid_id_path`, +`bbo`.`business_org_id` AS `business_org_id` +FROM + ((( + `ca_bm_grid` `g4` + JOIN `ca_bm_grid` `g3` ON ((( + `g3`.`grid_id` = `g4`.`parent_id` + ) + AND ( `g3`.`grid_level` = 'level3' ) + AND ( `g3`.`delete_flag` = 'normal' )))) + JOIN `ca_bm_grid` `g2` ON ((( + `g2`.`grid_id` = `g3`.`parent_id` + ) + AND ( `g2`.`grid_level` = 'level2' ) + AND ( `g2`.`delete_flag` = 'normal' )))) + LEFT JOIN `business_bind_org` `bbo` ON ((( + `g4`.`grid_id` = `bbo`.`business_org_id` + ) + AND ( `bbo`.`business_code` = 'ca' ) + AND ( `bbo`.`DEL_FLAG` = '0' )))) +WHERE + (( + `g4`.`grid_level` = 'level4' + ) + AND ( `g4`.`delete_flag` = 'normal' )) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml index 24afdf1451..8d91b0b087 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml @@ -88,7 +88,7 @@ vs.street_name FROM ca_loudong as ca - LEFT JOIN view_grid_comm_street as vs on ca.grid_id = vs.grid_id + LEFT JOIN view_grid_comm_street_ca as vs on ca.grid_id = vs.grid_id ca.delete_flag = 'normal' diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml index f3c7bb973e..4fa522780d 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml @@ -85,7 +85,7 @@ vs.street_name FROM ca_pingfang as ca - left join view_grid_comm_street as vs on ca.grid_id = vs.grid_id + left join view_grid_comm_street_ca as vs on ca.grid_id = vs.grid_id ca.delete_flag = 'normal' diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml index c350e49bb1..4dedc59b1f 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml @@ -77,7 +77,7 @@ vs.street_name FROM ca_rental as ca - left join view_grid_comm_street as vs on ca.grid_id = vs.grid_id + left join view_grid_comm_street_ca as vs on ca.grid_id = vs.grid_id ca.delete_flag = 'normal' diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml index 12cc55aaaa..c541483cf0 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml @@ -106,7 +106,7 @@ vs.street_name FROM ca_resident as ca - left join view_grid_comm_street as vs on ca.grid_id = vs.grid_id + left join view_grid_comm_street_ca as vs on ca.grid_id = vs.grid_id ca.delete_flag = 'normal' diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml index 0c109d744b..593b137b9a 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml @@ -109,7 +109,7 @@ vs.street_name FROM ca_rotators as ca - left join view_grid_comm_street as vs on vs.grid_id = ca.grid_id + left join view_grid_comm_street_ca as vs on vs.grid_id = ca.grid_id ca.delete_flag = 'normal'