jtoms 4 年之前
父节点
当前提交
1505020221

+ 4 - 4
src/main/java/com/zhiqiyun/open/mvc/controller/PlaceCategoryController.java

@@ -38,7 +38,7 @@ public class PlaceCategoryController {
     @Autowired
     private OauthService oauthService;
 
-    @Permission(value = "bz.data.type.find", tags = "查询文旅场所分类")
+    @Permission(value = "place.category.find", tags = "查询文旅场所分类")
     @PostMapping("/findPage")
     public Result findPage(@RequestBody QueryPlaceCategoryParam param) {
 
@@ -56,7 +56,7 @@ public class PlaceCategoryController {
         return Result.instance(Result.Code.SUCCESS).setData(resultData);
     }
 
-    @Permission(value = "bz.data.type.add", tags = "新建文旅场所分类")
+    @Permission(value = "place.category.add", tags = "新建文旅场所分类")
     @PostMapping("/save")
     public Result save(@Valid @RequestBody SavePlaceCategoryParam param) throws Exception {
 
@@ -81,7 +81,7 @@ public class PlaceCategoryController {
         return Result.instance(Result.Code.MESSAGE_SUCCESS);
     }
 
-    @Permission(value = "bz.data.type.edit", tags = "更新文旅场所分类")
+    @Permission(value = "place.category.edit", tags = "更新文旅场所分类")
     @PostMapping("/updateById")
     public Result updateById(Long id, @Valid @RequestBody SavePlaceCategoryParam param) {
         PlaceCategory entity = new PlaceCategory();
@@ -102,7 +102,7 @@ public class PlaceCategoryController {
         return Result.instance(Result.Code.MESSAGE_SUCCESS);
     }
 
-    @Permission(value = "bz.data.type.delete", tags = "删除文旅场所分类")
+    @Permission(value = "place.category.delete", tags = "删除文旅场所分类")
     @PostMapping("/deleteByIds")
     public Result deleteByIds(@RequestBody List<Long> ids) {
         this.placeCategoryService.removeByIds(ids);

+ 4 - 4
src/main/java/com/zhiqiyun/open/mvc/controller/PlaceCategoryExtendColumnController.java

@@ -31,7 +31,7 @@ public class PlaceCategoryExtendColumnController {
     @Autowired
     private SequenceService sequenceService;
 
-    @Permission(value = "bz.data.type.extend.column", tags = "查询文旅场所分类扩展字段")
+    @Permission(value = "place.category.extend.column.find", tags = "查询文旅场所分类扩展字段")
     @PostMapping("/findPage")
     public Result findPage(@RequestBody QueryPlaceCategoryExtendColumnParam param) {
 
@@ -52,7 +52,7 @@ public class PlaceCategoryExtendColumnController {
         return Result.instance(Result.Code.SUCCESS).setData(resultData);
     }
 
-    @Permission(value = "bz.data.type.extend.column", tags = "新建文旅场所分类扩展字段")
+    @Permission(value = "place.category.extend.column.add", tags = "新建文旅场所分类扩展字段")
     @PostMapping("/save")
     public Result save(@Valid @RequestBody SavePlaceCategoryExtendColumnParam param) throws Exception {
 
@@ -70,7 +70,7 @@ public class PlaceCategoryExtendColumnController {
         return Result.instance(Result.Code.MESSAGE_SUCCESS);
     }
 
-    @Permission(value = "bz.data.type.extend.column", tags = "更新文旅场所分类扩展字段")
+    @Permission(value = "place.category.extend.column.edit", tags = "更新文旅场所分类扩展字段")
     @PostMapping("/updateById")
     public Result updateById(Long id, @Valid @RequestBody SavePlaceCategoryExtendColumnParam param) {
         PlaceCategoryExtendColumn entity = new PlaceCategoryExtendColumn();
@@ -87,7 +87,7 @@ public class PlaceCategoryExtendColumnController {
         return Result.instance(Result.Code.MESSAGE_SUCCESS);
     }
 
-    @Permission(value = "bz.data.type.extend.column", tags = "删除文旅场所分类扩展字段")
+    @Permission(value = "place.category.extend.column.delete", tags = "删除文旅场所分类扩展字段")
     @PostMapping("/deleteByIds")
     public Result deleteByIds(@RequestBody List<Long> ids) {
         this.placeCategoryExtendColumnService.removeByIds(ids);

+ 0 - 121
src/main/resources/db/migration/V1.0.3__bz.sql

@@ -1,121 +0,0 @@
-DROP TABLE IF EXISTS `bz_base_info`;
-CREATE TABLE `bz_base_info`
-(
-    `id`             BIGINT(20)     NOT NULL COMMENT 'ID',
-    `data_type`      INT(11)        NULL     DEFAULT NULL COMMENT '类型',
-    `name`           VARCHAR(50)    NULL     DEFAULT NULL COMMENT '名称',
-    `litpics`        VARCHAR(500)   NULL     DEFAULT NULL COMMENT '图片',
-    `brief`          VARCHAR(500)   NULL     DEFAULT NULL COMMENT '简介',
-    `address`        VARCHAR(100)   NULL     DEFAULT NULL COMMENT '地址',
-    `contacts`       VARCHAR(50)    NULL     DEFAULT NULL COMMENT '联系人',
-    `contact_number` VARCHAR(50)    NULL     DEFAULT NULL COMMENT '联系电话',
-    `lng`            DECIMAL(20, 6) NOT NULL DEFAULT '0.000000' COMMENT '经度(坐标)',
-    `lat`            DECIMAL(20, 6) NOT NULL DEFAULT '0.000000' COMMENT '纬度(坐标)',
-    `created_time`   DATETIME       NULL     DEFAULT NULL COMMENT '创建时间',
-    `created_by`     BIGINT(20)     NULL     DEFAULT NULL COMMENT '创建人',
-    `updated_time`   DATETIME       NULL     DEFAULT NULL COMMENT '修改时间',
-    `updated_by`     BIGINT(20)     NULL     DEFAULT NULL COMMENT '修改人',
-    PRIMARY KEY (`id`)
-) COMMENT ='文旅场所基础信息' ENGINE = InnoDB;
-
-DROP TABLE IF EXISTS `bz_holiday_village_info`;
-CREATE TABLE `bz_holiday_village_info`
-(
-    `id`             BIGINT(20)   NOT NULL COMMENT 'ID',
-    `business_hours` VARCHAR(200) NULL DEFAULT NULL COMMENT '开放时间',
-    PRIMARY KEY (`id`)
-) COMMENT ='度假村扩展信息表' ENGINE = InnoDB;
-
-DROP TABLE IF EXISTS `bz_home_stay_info`;
-CREATE TABLE `bz_home_stay_info`
-(
-    `id`               BIGINT(20) NOT NULL COMMENT 'ID',
-    `total_room_count` INT(1)     NOT NULL COMMENT '客房总数',
-    PRIMARY KEY (`id`)
-) COMMENT ='民宿扩展信息表' ENGINE = InnoDB;
-
-DROP TABLE IF EXISTS `bz_hotel_info`;
-CREATE TABLE `bz_hotel_info`
-(
-    `id`               BIGINT(20) NOT NULL COMMENT 'ID',
-    `grade`            INT(1)     NULL DEFAULT NULL COMMENT '等级',
-    `total_room_count` INT(1)     NOT NULL COMMENT '客房总数',
-    PRIMARY KEY (`id`)
-) COMMENT ='酒店扩展信息表' ENGINE = InnoDB;
-
-DROP TABLE IF EXISTS `bz_scenery_info`;
-CREATE TABLE `bz_scenery_info`
-(
-    `id`    BIGINT(20) NOT NULL COMMENT 'ID',
-    `grade` INT(1)     NULL DEFAULT NULL COMMENT '等级',
-    PRIMARY KEY (`id`)
-) COMMENT ='景区扩展信息表' ENGINE = InnoDB;
-
-
-DROP TABLE IF EXISTS `bz_tourist_info`;
-CREATE TABLE `bz_tourist_info`
-(
-    `id`                      BIGINT(20)   NOT NULL COMMENT 'ID',
-    `total_tour_guides_count` VARCHAR(200) NULL DEFAULT NULL COMMENT '导游人数',
-    PRIMARY KEY (`id`)
-) COMMENT ='旅行社扩展信息表' ENGINE = InnoDB;
-
-DROP TABLE IF EXISTS `bz_venue_info`;
-CREATE TABLE `bz_venue_info`
-(
-    `id`             BIGINT(20)   NOT NULL COMMENT 'ID',
-    `business_hours` VARCHAR(200) NULL DEFAULT NULL COMMENT '开放时间',
-    PRIMARY KEY (`id`)
-) COMMENT ='场馆扩展信息表' ENGINE = InnoDB;
-
-
-REPLACE
-    INTO `authority_info` (`id`, `parent_id`, `name`, `remark`)
-VALUES (1400, 0, 'bz.base.venue', '场馆基本信息管理'),
-       (1401, 1400, 'bz.base.venue.find', '查询'),
-       (1402, 1400, 'bz.base.venue.add', '添加'),
-       (1403, 1400, 'bz.base.venue.edit', '修改'),
-       (1404, 1400, 'bz.base.venue.delete', '删除');
-
-
-REPLACE
-    INTO `authority_info` (`id`, `parent_id`, `name`, `remark`)
-VALUES (1500, 0, 'bz.base.scenery', '景区基本信息管理'),
-       (1501, 1500, 'bz.base.scenery.find', '查询'),
-       (1502, 1500, 'bz.base.scenery.add', '添加'),
-       (1503, 1500, 'bz.base.scenery.edit', '修改'),
-       (1504, 1500, 'bz.base.scenery.delete', '删除');
-
-
-REPLACE
-    INTO `authority_info` (`id`, `parent_id`, `name`, `remark`)
-VALUES (1600, 0, 'bz.base.holiday.village', '度假村基本信息管理'),
-       (1601, 1600, 'bz.base.holiday.village.find', '查询'),
-       (1602, 1600, 'bz.base.holiday.village.add', '添加'),
-       (1603, 1600, 'bz.base.holiday.village.edit', '修改'),
-       (1604, 1600, 'bz.base.holiday.village.delete', '删除');
-
-REPLACE
-    INTO `authority_info` (`id`, `parent_id`, `name`, `remark`)
-VALUES (1700, 0, 'bz.base.hotel', '酒店基本信息管理'),
-       (1701, 1700, 'bz.base.hotel.find', '查询'),
-       (1702, 1700, 'bz.base.hotel.add', '添加'),
-       (1703, 1700, 'bz.base.hotel.edit', '修改'),
-       (1704, 1700, 'bz.base.hotel.delete', '删除');
-
-
-REPLACE
-    INTO `authority_info` (`id`, `parent_id`, `name`, `remark`)
-VALUES (1800, 0, 'bz.base.home.stay', '民宿基本信息管理'),
-       (1801, 1800, 'bz.base.home.stay.find', '查询'),
-       (1802, 1800, 'bz.base.home.stay.add', '添加'),
-       (1803, 1800, 'bz.base.home.stay.edit', '修改'),
-       (1804, 1800, 'bz.base.home.stay.delete', '删除');
-
-REPLACE
-    INTO `authority_info` (`id`, `parent_id`, `name`, `remark`)
-VALUES (1900, 0, 'bz.base.tourist', '旅行社基本信息管理'),
-       (1901, 1900, 'bz.base.tourist.find', '查询'),
-       (1902, 1900, 'bz.base.tourist.add', '添加'),
-       (1903, 1900, 'bz.base.tourist.edit', '修改'),
-       (1904, 1900, 'bz.base.tourist.delete', '删除');

+ 12 - 0
src/main/resources/db/migration/V1.0.7__place.sql → src/main/resources/db/migration/V1.0.3__place.sql

@@ -1,3 +1,15 @@
+DROP TABLE IF EXISTS `bz_base_info`;
+DROP TABLE IF EXISTS `bz_holiday_village_info`;
+DROP TABLE IF EXISTS `bz_home_stay_info`;
+DROP TABLE IF EXISTS `bz_hotel_info`;
+DROP TABLE IF EXISTS `bz_scenery_info`;
+DROP TABLE IF EXISTS `bz_tourist_info`;
+DROP TABLE IF EXISTS `bz_venue_info`;
+DROP TABLE IF EXISTS `bz_data_type_extend_column`;
+DROP TABLE IF EXISTS `bz_data_type`;
+DROP TABLE IF EXISTS `bz_data_base_info_extend`;
+DROP TABLE IF EXISTS `bz_data_base_info`;
+
 DROP TABLE IF EXISTS `place_category`;
 CREATE TABLE `place_category`
 (

+ 5 - 5
src/main/resources/db/migration/V1.0.4__passenger_equipment.sql

@@ -30,8 +30,8 @@ CREATE TABLE `passenger_equipment_people`
 
 REPLACE
 INTO `authority_info` (`id`, `parent_id`, `name`, `remark`)
-VALUES (2000, 0, 'bz.passenger.equipment', '客户监控设备管理'),
-       (2001, 2000, 'bz.passenger.equipment.find', '查询'),
-       (2002, 2000, 'bz.passenger.equipment.add', '添加'),
-       (2003, 2000, 'bz.passenger.equipment.edit', '修改'),
-       (2004, 2000, 'bz.passenger.equipment.delete', '删除');
+VALUES (1700, 0, 'bz.passenger.equipment', '客户监控设备管理'),
+       (1701, 1700, 'bz.passenger.equipment.find', '查询'),
+       (1702, 1700, 'bz.passenger.equipment.add', '添加'),
+       (1703, 1700, 'bz.passenger.equipment.edit', '修改'),
+       (1704, 1700, 'bz.passenger.equipment.delete', '删除');

+ 4 - 4
src/main/resources/db/migration/V1.0.5__statistics.sql

@@ -1,9 +1,9 @@
 REPLACE
 INTO `authority_info` (`id`, `parent_id`, `name`, `remark`)
-VALUES (2100, 0, 'statistics', '数据统计分析'),
-       (2101, 2100, 'statistics.complaint', '客诉信息管理'),
-       (2102, 2100, 'statistics.file.manage', '多媒体信息管理'),
-       (2103, 2100, 'statistics.gis.map.base', 'GIS地图分布');
+VALUES (1800, 0, 'statistics', '数据统计分析'),
+       (1801, 1800, 'statistics.complaint', '客诉信息管理'),
+       (1802, 1800, 'statistics.file.manage', '多媒体信息管理'),
+       (1803, 1800, 'statistics.gis.map.base', 'GIS地图分布');
 
 DROP TABLE IF EXISTS `statistics_upload_file_info`;
 CREATE TABLE `statistics_upload_file_info`

+ 16 - 16
src/main/resources/db/migration/V1.0.6__cultural_tourism.sql

@@ -25,11 +25,11 @@ CREATE TABLE `category_organization`
 
 REPLACE
 INTO `authority_info` (`id`, `parent_id`, `name`, `remark`)
-VALUES (2200, 0, 'category.organization', '机构目录管理'),
-       (2201, 2200, 'category.organization.find', '查询'),
-       (2202, 2200, 'category.organization.add', '添加'),
-       (2203, 2200, 'category.organization.edit', '修改'),
-       (2204, 2200, 'category.organization.delete', '删除');
+VALUES (1900, 0, 'category.organization', '机构目录管理'),
+       (1901, 1900, 'category.organization.find', '查询'),
+       (1902, 1900, 'category.organization.add', '添加'),
+       (1903, 1900, 'category.organization.edit', '修改'),
+       (1904, 1900, 'category.organization.delete', '删除');
 
 
 DROP TABLE IF EXISTS `category_occupation`;
@@ -48,11 +48,11 @@ CREATE TABLE `category_occupation`
 
 REPLACE
 INTO `authority_info` (`id`, `parent_id`, `name`, `remark`)
-VALUES (2300, 0, 'category.occupation', '文旅岗位目录管理'),
-       (2301, 2300, 'category.occupation.find', '查询'),
-       (2302, 2300, 'category.occupation.add', '添加'),
-       (2303, 2300, 'category.occupation.edit', '修改'),
-       (2304, 2300, 'category.occupation.delete', '删除');
+VALUES (2000, 0, 'category.occupation', '文旅岗位目录管理'),
+       (2001, 2000, 'category.occupation.find', '查询'),
+       (2002, 2000, 'category.occupation.add', '添加'),
+       (2003, 2000, 'category.occupation.edit', '修改'),
+       (2004, 2000, 'category.occupation.delete', '删除');
 
 
 DROP TABLE IF EXISTS `category_material`;
@@ -67,12 +67,12 @@ CREATE TABLE `category_material`
     `updated_time` DATETIME NULL DEFAULT NULL COMMENT '修改时间',
     `updated_by`   BIGINT(20) NULL DEFAULT NULL COMMENT '修改人',
     PRIMARY KEY (`id`)
-) COMMENT ='文旅岗位目录管理' ENGINE = InnoDB;
+) COMMENT ='物务资源目录管理' ENGINE = InnoDB;
 
 REPLACE
 INTO `authority_info` (`id`, `parent_id`, `name`, `remark`)
-VALUES (2400, 0, 'category.material', '文旅岗位目录管理'),
-       (2401, 2400, 'category.material.find', '查询'),
-       (2402, 2400, 'category.material.add', '添加'),
-       (2403, 2400, 'category.material.edit', '修改'),
-       (2404, 2400, 'category.material.delete', '删除');
+VALUES (2100, 0, 'category.material', '物务资源目录管理'),
+       (2101, 2100, 'category.material.find', '查询'),
+       (2102, 2100, 'category.material.add', '添加'),
+       (2103, 2100, 'category.material.edit', '修改'),
+       (2104, 2100, 'category.material.delete', '删除');