update

src/main/java/com/zhiqiyun/open/core/enmus/BzDataType.java

@@ -1,46 +0,0 @@
-package com.zhiqiyun.open.core.enmus;
-
-
-public enum BzDataType implements IBaseEnum {
-    /**
-     *
-     */
-    VENUE(1, "场馆"),
-    SCENERY(2, "景区"),
-    HOLIDAY_VILLAGE(3, "度假村"),
-    HOTEL(4, "酒店"),
-    HOME_STAY(5, "民宿"),
-    TOURIST(6, "旅行社");
-
-    private final int value;
-    private final String text;
-
-    BzDataType(int value, String text) {
-        this.value = value;
-        this.text = text;
-    }
-
-    public static BzDataType valueOf(int value) {
-        BzDataType[] values = BzDataType.values();
-        for (BzDataType type : values) {
-            if (type.value == value) {
-                return type;
-            }
-        }
-        return null;
-    }
-
-
-    public String getText() {
-        return text;
-    }
-
-    public Integer getValue() {
-        return value;
-    }
-
-    @Override
-    public String getName() {
-        return this.name();
-    }
-}

src/main/java/com/zhiqiyun/open/core/mapper/base/BzDataInfoMapper.java

@@ -0,0 +1,9 @@
+package com.zhiqiyun.open.core.mapper.base;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhiqiyun.open.core.models.base.BzDataBaseInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface BzDataInfoMapper extends BaseMapper<BzDataBaseInfo> {
+}

src/main/java/com/zhiqiyun/open/core/mapper/base/BzDataTypeExtendColumnMapper.java

@@ -0,0 +1,9 @@
+package com.zhiqiyun.open.core.mapper.base;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhiqiyun.open.core.models.base.BzDataTypeExtendColumn;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface BzDataTypeExtendColumnMapper extends BaseMapper<BzDataTypeExtendColumn> {
+}

src/main/java/com/zhiqiyun/open/core/mapper/base/CategoryBaseMapper.java → src/main/java/com/zhiqiyun/open/core/mapper/base/BzDataTypeMapper.java

@@ -1,9 +1,9 @@
 package com.zhiqiyun.open.core.mapper.base;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiqiyun.open.core.models.base.CategoryBase;
+import com.zhiqiyun.open.core.models.base.BzDataType;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface CategoryBaseMapper extends BaseMapper<CategoryBase> {
+public interface BzDataTypeMapper extends BaseMapper<BzDataType> {
 }

src/main/java/com/zhiqiyun/open/core/mapper/base/CategoryBaseExtendColumnMapper.java

@@ -1,9 +0,0 @@
-package com.zhiqiyun.open.core.mapper.base;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiqiyun.open.core.models.base.CategoryBaseExtendColumn;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface CategoryBaseExtendColumnMapper extends BaseMapper<CategoryBaseExtendColumn> {
-}

src/main/java/com/zhiqiyun/open/core/mapper/bz/BaseDataInfoMapper.java

@@ -1,9 +0,0 @@
-package com.zhiqiyun.open.core.mapper.bz;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface BaseDataInfoMapper extends BaseMapper<BaseDataInfo> {
-}

src/main/java/com/zhiqiyun/open/core/mapper/bz/HolidayVillageInfoMapper.java

@@ -1,9 +0,0 @@
-package com.zhiqiyun.open.core.mapper.bz;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiqiyun.open.core.models.bz.HolidayVillageInfo;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface HolidayVillageInfoMapper extends BaseMapper<HolidayVillageInfo> {
-}

src/main/java/com/zhiqiyun/open/core/mapper/bz/HomeStayInfoMapper.java

@@ -1,9 +0,0 @@
-package com.zhiqiyun.open.core.mapper.bz;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiqiyun.open.core.models.bz.HomeStayInfo;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface HomeStayInfoMapper extends BaseMapper<HomeStayInfo> {
-}

src/main/java/com/zhiqiyun/open/core/mapper/bz/HotelInfoMapper.java

@@ -1,9 +0,0 @@
-package com.zhiqiyun.open.core.mapper.bz;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiqiyun.open.core.models.bz.HotelInfo;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface HotelInfoMapper extends BaseMapper<HotelInfo> {
-}

src/main/java/com/zhiqiyun/open/core/mapper/bz/SceneryInfoMapper.java

@@ -1,10 +0,0 @@
-package com.zhiqiyun.open.core.mapper.bz;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiqiyun.open.core.models.bz.SceneryInfo;
-import com.zhiqiyun.open.core.models.bz.VenueInfo;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface SceneryInfoMapper extends BaseMapper<SceneryInfo> {
-}

src/main/java/com/zhiqiyun/open/core/mapper/bz/TouristInfoMapper.java

@@ -1,9 +0,0 @@
-package com.zhiqiyun.open.core.mapper.bz;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiqiyun.open.core.models.bz.TouristInfo;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface TouristInfoMapper extends BaseMapper<TouristInfo> {
-}

src/main/java/com/zhiqiyun/open/core/mapper/bz/VenueInfoMapper.java

@@ -1,9 +0,0 @@
-package com.zhiqiyun.open.core.mapper.bz;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiqiyun.open.core.models.bz.VenueInfo;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface VenueInfoMapper extends BaseMapper<VenueInfo> {
-}

src/main/java/com/zhiqiyun/open/core/models/base/BaseDataInfo.java

@@ -1,35 +0,0 @@
-package com.zhiqiyun.open.core.models.base;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.zhiqiyun.open.core.enmus.BzDataType;
-import com.zhiqiyun.open.core.typeHandler.FastjsonTypeHandler;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-@Data
-@TableName(value = "bz_base_info", autoResultMap = true)
-public class BaseDataInfo {
-    @TableId(type = IdType.INPUT)
-    private Long id;
-    private String name;
-    private BzDataType dataType;
-    @TableField(typeHandler = FastjsonTypeHandler.class)
-    private List<String> litpics;
-    private String brief;
-    private String address;
-    private String contacts;
-    private String contactNumber;
-    private BigDecimal lng;
-    private BigDecimal lat;
-
-    @TableField(updateStrategy = FieldStrategy.NEVER)
-    private Date createdTime;
-    @TableField(updateStrategy = FieldStrategy.NEVER)
-    private Long createdBy;
-
-    private Date updatedTime;
-    private Long updatedBy;
-}

src/main/java/com/zhiqiyun/open/core/models/base/BzDataBaseInfo.java

@@ -0,0 +1,37 @@
+package com.zhiqiyun.open.core.models.base;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.zhiqiyun.open.core.typeHandler.FastjsonTypeHandler;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@TableName(value = "bz_data_base_info", autoResultMap = true)
+public class BzDataBaseInfo {
+	@TableId(type = IdType.INPUT)
+	private Long id;
+	private String name;
+	private Long dataTypeId;
+	@TableField(typeHandler = FastjsonTypeHandler.class)
+	private List<String> litpics;
+	private String brief;
+	private String address;
+	private String contacts;
+	private String contactNumber;
+	private BigDecimal lng;
+	private BigDecimal lat;
+
+	@TableField(updateStrategy = FieldStrategy.NEVER)
+	private Date createdTime;
+	@TableField(updateStrategy = FieldStrategy.NEVER)
+	private Long createdBy;
+
+	private Date updatedTime;
+	private Long updatedBy;
+
+	@TableField(exist = false)
+	private BzDataType dataType;
+}

src/main/java/com/zhiqiyun/open/core/models/base/BzDataBaseInfoExtend.java

@@ -0,0 +1,28 @@
+package com.zhiqiyun.open.core.models.base;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.zhiqiyun.open.core.enmus.ExtendColumnFieldType;
+import com.zhiqiyun.open.core.typeHandler.FastjsonTypeHandler;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@TableName(value = "bz_data_base_info_extend", autoResultMap = true)
+public class BzDataBaseInfoExtend implements Serializable {
+
+	private static final long serialVersionUID = 484658831498971046L;
+
+	@TableId(type = IdType.INPUT)
+	private Long id;
+	private Long dataTypeId;
+	private Long baseInfoId;
+	private String fieldKey;
+	private String fieldLabel;
+	private String sortNumber;
+	private ExtendColumnFieldType fieldType;
+	private String fieldValue;
+}

src/main/java/com/zhiqiyun/open/core/models/base/CategoryBase.java → src/main/java/com/zhiqiyun/open/core/models/base/BzDataType.java

@@ -7,8 +7,8 @@ import java.io.Serializable;
 import java.util.Date;
 
 @Data
-@TableName("category_base")
-public class CategoryBase implements Serializable {
+@TableName("bz_data_type")
+public class BzDataType implements Serializable {
 
     private static final long serialVersionUID = -3306018969325222999L;
 

src/main/java/com/zhiqiyun/open/core/models/base/BzDataTypeExtendColumn.java

@@ -0,0 +1,22 @@
+package com.zhiqiyun.open.core.models.base;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.zhiqiyun.open.core.enmus.ExtendColumnFieldType;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@TableName("bz_data_type_extend_column")
+public class BzDataTypeExtendColumn implements Serializable {
+
+	private static final long serialVersionUID = -3306018969325222999L;
+
+	private Long id;
+	private String dataTypeId;
+	private String fieldKey;
+	private String fieldLabel;
+	private ExtendColumnFieldType fieldType;
+	private String defaultValue;
+	private Integer sortNumber;
+}

src/main/java/com/zhiqiyun/open/core/models/base/CategoryBaseExtendColumn.java

@@ -1,22 +0,0 @@
-package com.zhiqiyun.open.core.models.base;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.zhiqiyun.open.core.enmus.ExtendColumnFieldType;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-@TableName("category_base_extend_column")
-public class CategoryBaseExtendColumn implements Serializable {
-
-    private static final long serialVersionUID = -3306018969325222999L;
-
-    private Long id;
-    private String categoryId;
-    private String fieldKey;
-    private String fieldLabel;
-    private ExtendColumnFieldType fieldType;
-    private String defaultValue;
-    private Integer sortNumber;
-}

src/main/java/com/zhiqiyun/open/core/models/bz/HolidayVillageInfo.java

@@ -1,20 +0,0 @@
-package com.zhiqiyun.open.core.models.bz;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-import lombok.Data;
-
-@Data
-@TableName(value = "bz_holiday_village_info", autoResultMap = true)
-public class HolidayVillageInfo {
-	@TableId(type = IdType.INPUT)
-	private Long id;
-
-	private String businessHours;
-
-	@TableField(exist = false)
-	private BaseDataInfo baseDataInfo;
-}

src/main/java/com/zhiqiyun/open/core/models/bz/HomeStayInfo.java

@@ -1,20 +0,0 @@
-package com.zhiqiyun.open.core.models.bz;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-import lombok.Data;
-
-@Data
-@TableName(value = "bz_home_stay_info", autoResultMap = true)
-public class HomeStayInfo {
-	@TableId(type = IdType.INPUT)
-	private Long id;
-
-	private Integer totalRoomCount;
-
-	@TableField(exist = false)
-	private BaseDataInfo baseDataInfo;
-}

src/main/java/com/zhiqiyun/open/core/models/bz/HotelInfo.java

@@ -1,23 +0,0 @@
-package com.zhiqiyun.open.core.models.bz;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.zhiqiyun.open.core.enmus.HotelGrade;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-import lombok.Data;
-
-@Data
-@TableName(value = "bz_hotel_info", autoResultMap = true)
-public class HotelInfo {
-    @TableId(type = IdType.INPUT)
-    private Long id;
-
-    private HotelGrade grade;
-
-    private Integer totalRoomCount;
-
-    @TableField(exist = false)
-    private BaseDataInfo baseDataInfo;
-}

src/main/java/com/zhiqiyun/open/core/models/bz/PassengerEquipment.java

@@ -1,11 +1,10 @@
 package com.zhiqiyun.open.core.models.bz;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.zhiqiyun.open.core.enmus.BzDataType;
+import com.zhiqiyun.open.core.models.base.BzDataType;
 import com.zhiqiyun.open.core.typeHandler.FastjsonTypeHandler;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.scheduling.annotation.Scheduled;
 
 import java.util.Date;
 import java.util.List;
@@ -13,33 +12,34 @@ import java.util.List;
 @Data
 @TableName(value = "passenger_equipment", autoResultMap = true)
 public class PassengerEquipment {
-    @TableId(type = IdType.INPUT)
-    private Long id;
-    private BzDataType dataType;
-    private Long bzId;
-    private String brief;
-    @TableField(typeHandler = FastjsonTypeHandler.class)
-    private List<String> litpics;
+	@TableId(type = IdType.INPUT)
+	private Long id;
+	private Long bzId;
+	private String brief;
+	@TableField(typeHandler = FastjsonTypeHandler.class)
+	private List<String> litpics;
 
-    @TableField(updateStrategy = FieldStrategy.NEVER)
-    private Date createdTime;
-    @TableField(updateStrategy = FieldStrategy.NEVER)
-    private Long createdBy;
+	@TableField(updateStrategy = FieldStrategy.NEVER)
+	private Date createdTime;
+	@TableField(updateStrategy = FieldStrategy.NEVER)
+	private Long createdBy;
 
-    private Date updatedTime;
-    private Long updatedBy;
+	private Date updatedTime;
+	private Long updatedBy;
 
-    @TableField(exist = false)
-    private String litpic;
-    @TableField(exist = false)
-    private Long inPeopleCount;
-    @TableField(exist = false)
-    private Long outPeopleCount;
+	@TableField(exist = false)
+	private String litpic;
+	@TableField(exist = false)
+	private Long inPeopleCount;
+	@TableField(exist = false)
+	private Long outPeopleCount;
+	@TableField(exist = false)
+	private BzDataType dataType;
 
-    public String getLitpic() {
-        if (StringUtils.isBlank(this.litpic) && this.litpics != null && this.litpics.size() > 0) {
-            this.litpic = this.litpics.get(0);
-        }
-        return this.litpic;
-    }
+	public String getLitpic() {
+		if (StringUtils.isBlank(this.litpic) && this.litpics != null && this.litpics.size() > 0) {
+			this.litpic = this.litpics.get(0);
+		}
+		return this.litpic;
+	}
 }

src/main/java/com/zhiqiyun/open/core/models/bz/SceneryInfo.java

@@ -1,21 +0,0 @@
-package com.zhiqiyun.open.core.models.bz;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.zhiqiyun.open.core.enmus.SceneryGrade;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-import lombok.Data;
-
-@Data
-@TableName(value = "bz_scenery_info", autoResultMap = true)
-public class SceneryInfo {
-    @TableId(type = IdType.INPUT)
-    private Long id;
-
-    private SceneryGrade grade;
-
-    @TableField(exist = false)
-    private BaseDataInfo baseDataInfo;
-}

src/main/java/com/zhiqiyun/open/core/models/bz/TouristInfo.java

@@ -1,20 +0,0 @@
-package com.zhiqiyun.open.core.models.bz;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-import lombok.Data;
-
-@Data
-@TableName(value = "bz_tourist_info", autoResultMap = true)
-public class TouristInfo {
-    @TableId(type = IdType.INPUT)
-    private Long id;
-
-    private Integer totalTourGuidesCount;
-
-    @TableField(exist = false)
-    private BaseDataInfo baseDataInfo;
-}

src/main/java/com/zhiqiyun/open/core/models/bz/VenueInfo.java

@@ -1,20 +0,0 @@
-package com.zhiqiyun.open.core.models.bz;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-import lombok.Data;
-
-@Data
-@TableName(value = "bz_venue_info", autoResultMap = true)
-public class VenueInfo {
-    @TableId(type = IdType.INPUT)
-    private Long id;
-
-    private String businessHours;
-
-    @TableField(exist = false)
-    private BaseDataInfo baseDataInfo;
-}

src/main/java/com/zhiqiyun/open/core/service/BaseDataInfoService.java

@@ -1,7 +0,0 @@
-package com.zhiqiyun.open.core.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-
-public interface BaseDataInfoService extends IService<BaseDataInfo> {
-}

src/main/java/com/zhiqiyun/open/core/service/BzDataBaseInfoService.java

@@ -0,0 +1,7 @@
+package com.zhiqiyun.open.core.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhiqiyun.open.core.models.base.BzDataBaseInfo;
+
+public interface BzDataBaseInfoService extends IService<BzDataBaseInfo> {
+}

src/main/java/com/zhiqiyun/open/core/service/BzDataTypeExtendColumnService.java

@@ -0,0 +1,7 @@
+package com.zhiqiyun.open.core.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhiqiyun.open.core.models.base.BzDataTypeExtendColumn;
+
+public interface BzDataTypeExtendColumnService extends IService<BzDataTypeExtendColumn> {
+}

src/main/java/com/zhiqiyun/open/core/service/BzDataTypeService.java

@@ -0,0 +1,7 @@
+package com.zhiqiyun.open.core.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhiqiyun.open.core.models.base.BzDataType;
+
+public interface BzDataTypeService extends IService<BzDataType> {
+}

src/main/java/com/zhiqiyun/open/core/service/CategoryBaseExtendColumnService.java

@@ -1,7 +0,0 @@
-package com.zhiqiyun.open.core.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhiqiyun.open.core.models.base.CategoryBaseExtendColumn;
-
-public interface CategoryBaseExtendColumnService extends IService<CategoryBaseExtendColumn> {
-}

src/main/java/com/zhiqiyun/open/core/service/CategoryBaseService.java

@@ -1,7 +0,0 @@
-package com.zhiqiyun.open.core.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhiqiyun.open.core.models.base.CategoryBase;
-
-public interface CategoryBaseService extends IService<CategoryBase> {
-}

src/main/java/com/zhiqiyun/open/core/service/HolidayVillageInfoService.java

@@ -1,7 +0,0 @@
-package com.zhiqiyun.open.core.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhiqiyun.open.core.models.bz.HolidayVillageInfo;
-
-public interface HolidayVillageInfoService extends IService<HolidayVillageInfo> {
-}

src/main/java/com/zhiqiyun/open/core/service/HomeStayInfoService.java

@@ -1,7 +0,0 @@
-package com.zhiqiyun.open.core.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhiqiyun.open.core.models.bz.HomeStayInfo;
-
-public interface HomeStayInfoService extends IService<HomeStayInfo> {
-}

src/main/java/com/zhiqiyun/open/core/service/HotelInfoService.java

@@ -1,7 +0,0 @@
-package com.zhiqiyun.open.core.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhiqiyun.open.core.models.bz.HotelInfo;
-
-public interface HotelInfoService extends IService<HotelInfo> {
-}

src/main/java/com/zhiqiyun/open/core/service/SceneryInfoService.java

@@ -1,8 +0,0 @@
-package com.zhiqiyun.open.core.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhiqiyun.open.core.models.bz.SceneryInfo;
-import com.zhiqiyun.open.core.models.bz.VenueInfo;
-
-public interface SceneryInfoService extends IService<SceneryInfo> {
-}

src/main/java/com/zhiqiyun/open/core/service/TouristInfoService.java

@@ -1,7 +0,0 @@
-package com.zhiqiyun.open.core.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhiqiyun.open.core.models.bz.TouristInfo;
-
-public interface TouristInfoService extends IService<TouristInfo> {
-}

src/main/java/com/zhiqiyun/open/core/service/VenueInfoService.java

@@ -1,7 +0,0 @@
-package com.zhiqiyun.open.core.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhiqiyun.open.core.models.bz.VenueInfo;
-
-public interface VenueInfoService extends IService<VenueInfo> {
-}

src/main/java/com/zhiqiyun/open/core/service/impl/BaseDataInfoServiceImpl.java

@@ -1,11 +0,0 @@
-package com.zhiqiyun.open.core.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiqiyun.open.core.mapper.bz.BaseDataInfoMapper;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-import com.zhiqiyun.open.core.service.BaseDataInfoService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class BaseDataInfoServiceImpl extends ServiceImpl<BaseDataInfoMapper, BaseDataInfo> implements BaseDataInfoService {
-}

src/main/java/com/zhiqiyun/open/core/service/impl/BzDataBaseInfoServiceImpl.java

@@ -0,0 +1,11 @@
+package com.zhiqiyun.open.core.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhiqiyun.open.core.mapper.base.BzDataInfoMapper;
+import com.zhiqiyun.open.core.models.base.BzDataBaseInfo;
+import com.zhiqiyun.open.core.service.BzDataBaseInfoService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class BzDataBaseInfoServiceImpl extends ServiceImpl<BzDataInfoMapper, BzDataBaseInfo> implements BzDataBaseInfoService {
+}

src/main/java/com/zhiqiyun/open/core/service/impl/BzDataTypeExtendColumnServiceImpl.java

@@ -0,0 +1,11 @@
+package com.zhiqiyun.open.core.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhiqiyun.open.core.mapper.base.BzDataTypeExtendColumnMapper;
+import com.zhiqiyun.open.core.models.base.BzDataTypeExtendColumn;
+import com.zhiqiyun.open.core.service.BzDataTypeExtendColumnService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class BzDataTypeExtendColumnServiceImpl extends ServiceImpl<BzDataTypeExtendColumnMapper, BzDataTypeExtendColumn> implements BzDataTypeExtendColumnService {
+}

src/main/java/com/zhiqiyun/open/core/service/impl/BzDataTypeServiceImpl.java

@@ -0,0 +1,11 @@
+package com.zhiqiyun.open.core.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhiqiyun.open.core.mapper.base.BzDataTypeMapper;
+import com.zhiqiyun.open.core.models.base.BzDataType;
+import com.zhiqiyun.open.core.service.BzDataTypeService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class BzDataTypeServiceImpl extends ServiceImpl<BzDataTypeMapper, BzDataType> implements BzDataTypeService {
+}

src/main/java/com/zhiqiyun/open/core/service/impl/CategoryBaseExtendColumnServiceImpl.java

@@ -1,11 +0,0 @@
-package com.zhiqiyun.open.core.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiqiyun.open.core.mapper.base.CategoryBaseExtendColumnMapper;
-import com.zhiqiyun.open.core.models.base.CategoryBaseExtendColumn;
-import com.zhiqiyun.open.core.service.CategoryBaseExtendColumnService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class CategoryBaseExtendColumnServiceImpl extends ServiceImpl<CategoryBaseExtendColumnMapper, CategoryBaseExtendColumn> implements CategoryBaseExtendColumnService {
-}

src/main/java/com/zhiqiyun/open/core/service/impl/CategoryBaseServiceImpl.java

@@ -1,11 +0,0 @@
-package com.zhiqiyun.open.core.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiqiyun.open.core.mapper.base.CategoryBaseMapper;
-import com.zhiqiyun.open.core.models.base.CategoryBase;
-import com.zhiqiyun.open.core.service.CategoryBaseService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class CategoryBaseServiceImpl extends ServiceImpl<CategoryBaseMapper, CategoryBase> implements CategoryBaseService {
-}

src/main/java/com/zhiqiyun/open/core/service/impl/HolidayVillageInfoServiceImpl.java

@@ -1,64 +0,0 @@
-package com.zhiqiyun.open.core.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiqiyun.open.core.enmus.BzDataType;
-import com.zhiqiyun.open.core.mapper.bz.BaseDataInfoMapper;
-import com.zhiqiyun.open.core.mapper.bz.HolidayVillageInfoMapper;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-import com.zhiqiyun.open.core.models.bz.HolidayVillageInfo;
-import com.zhiqiyun.open.core.service.HolidayVillageInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.io.Serializable;
-import java.util.Collection;
-
-@Service
-public class HolidayVillageInfoServiceImpl extends ServiceImpl<HolidayVillageInfoMapper, HolidayVillageInfo> implements HolidayVillageInfoService {
-
-    @Autowired
-    private BaseDataInfoMapper baseDataInfoMapper;
-
-    @Override
-    public <E extends IPage<HolidayVillageInfo>> E page(E page, Wrapper<HolidayVillageInfo> queryWrapper) {
-        E p = this.getBaseMapper().selectPage(page, queryWrapper);
-        for (HolidayVillageInfo entity : p.getRecords()) {
-            BaseDataInfo baseDataInfo = this.baseDataInfoMapper.selectById(entity.getId());
-            entity.setBaseDataInfo(baseDataInfo);
-        }
-        return p;
-    }
-
-    @Override
-    @Transactional
-    public boolean save(HolidayVillageInfo entity) {
-        BaseDataInfo baseDataInfo = entity.getBaseDataInfo();
-        baseDataInfo.setId(entity.getId());
-        baseDataInfo.setDataType(BzDataType.HOLIDAY_VILLAGE);
-
-        this.baseDataInfoMapper.insert(baseDataInfo);
-        return super.save(entity);
-    }
-
-    @Override
-    @Transactional
-    public boolean updateById(HolidayVillageInfo entity) {
-
-        BaseDataInfo baseDataInfo = entity.getBaseDataInfo();
-        baseDataInfo.setId(entity.getId());
-        baseDataInfo.setDataType(BzDataType.HOLIDAY_VILLAGE);
-
-        this.baseDataInfoMapper.updateById(baseDataInfo);
-        return super.updateById(entity);
-    }
-
-    @Override
-    @Transactional
-    public boolean removeByIds(Collection<? extends Serializable> idList) {
-        this.baseDataInfoMapper.deleteBatchIds(idList);
-        return super.removeByIds(idList);
-    }
-}

src/main/java/com/zhiqiyun/open/core/service/impl/HomeStayInfoServiceImpl.java

@@ -1,64 +0,0 @@
-package com.zhiqiyun.open.core.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiqiyun.open.core.enmus.BzDataType;
-import com.zhiqiyun.open.core.mapper.bz.BaseDataInfoMapper;
-import com.zhiqiyun.open.core.mapper.bz.HomeStayInfoMapper;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-import com.zhiqiyun.open.core.models.bz.HomeStayInfo;
-import com.zhiqiyun.open.core.service.HomeStayInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.io.Serializable;
-import java.util.Collection;
-
-@Service
-public class HomeStayInfoServiceImpl extends ServiceImpl<HomeStayInfoMapper, HomeStayInfo> implements HomeStayInfoService {
-
-    @Autowired
-    private BaseDataInfoMapper baseDataInfoMapper;
-
-    @Override
-    public <E extends IPage<HomeStayInfo>> E page(E page, Wrapper<HomeStayInfo> queryWrapper) {
-        E p = this.getBaseMapper().selectPage(page, queryWrapper);
-        for (HomeStayInfo entity : p.getRecords()) {
-            BaseDataInfo baseDataInfo = this.baseDataInfoMapper.selectById(entity.getId());
-            entity.setBaseDataInfo(baseDataInfo);
-        }
-        return p;
-    }
-
-    @Override
-    @Transactional
-    public boolean save(HomeStayInfo entity) {
-        BaseDataInfo baseDataInfo = entity.getBaseDataInfo();
-        baseDataInfo.setId(entity.getId());
-        baseDataInfo.setDataType(BzDataType.HOME_STAY);
-
-        this.baseDataInfoMapper.insert(baseDataInfo);
-        return super.save(entity);
-    }
-
-    @Override
-    @Transactional
-    public boolean updateById(HomeStayInfo entity) {
-
-        BaseDataInfo baseDataInfo = entity.getBaseDataInfo();
-        baseDataInfo.setId(entity.getId());
-        baseDataInfo.setDataType(BzDataType.HOME_STAY);
-
-        this.baseDataInfoMapper.updateById(baseDataInfo);
-        return super.updateById(entity);
-    }
-
-    @Override
-    @Transactional
-    public boolean removeByIds(Collection<? extends Serializable> idList) {
-        this.baseDataInfoMapper.deleteBatchIds(idList);
-        return super.removeByIds(idList);
-    }
-}

src/main/java/com/zhiqiyun/open/core/service/impl/HotelInfoServiceImpl.java

@@ -1,64 +0,0 @@
-package com.zhiqiyun.open.core.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiqiyun.open.core.enmus.BzDataType;
-import com.zhiqiyun.open.core.mapper.bz.BaseDataInfoMapper;
-import com.zhiqiyun.open.core.mapper.bz.HotelInfoMapper;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-import com.zhiqiyun.open.core.models.bz.HotelInfo;
-import com.zhiqiyun.open.core.service.HotelInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.io.Serializable;
-import java.util.Collection;
-
-@Service
-public class HotelInfoServiceImpl extends ServiceImpl<HotelInfoMapper, HotelInfo> implements HotelInfoService {
-
-    @Autowired
-    private BaseDataInfoMapper baseDataInfoMapper;
-
-    @Override
-    public <E extends IPage<HotelInfo>> E page(E page, Wrapper<HotelInfo> queryWrapper) {
-        E p = this.getBaseMapper().selectPage(page, queryWrapper);
-        for (HotelInfo entity : p.getRecords()) {
-            BaseDataInfo baseDataInfo = this.baseDataInfoMapper.selectById(entity.getId());
-            entity.setBaseDataInfo(baseDataInfo);
-        }
-        return p;
-    }
-
-    @Override
-    @Transactional
-    public boolean save(HotelInfo entity) {
-        BaseDataInfo baseDataInfo = entity.getBaseDataInfo();
-        baseDataInfo.setId(entity.getId());
-        baseDataInfo.setDataType(BzDataType.HOTEL);
-
-        this.baseDataInfoMapper.insert(baseDataInfo);
-        return super.save(entity);
-    }
-
-    @Override
-    @Transactional
-    public boolean updateById(HotelInfo entity) {
-
-        BaseDataInfo baseDataInfo = entity.getBaseDataInfo();
-        baseDataInfo.setId(entity.getId());
-        baseDataInfo.setDataType(BzDataType.HOTEL);
-
-        this.baseDataInfoMapper.updateById(baseDataInfo);
-        return super.updateById(entity);
-    }
-
-    @Override
-    @Transactional
-    public boolean removeByIds(Collection<? extends Serializable> idList) {
-        this.baseDataInfoMapper.deleteBatchIds(idList);
-        return super.removeByIds(idList);
-    }
-}

src/main/java/com/zhiqiyun/open/core/service/impl/SceneryInfoServiceImpl.java

@@ -1,64 +0,0 @@
-package com.zhiqiyun.open.core.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiqiyun.open.core.enmus.BzDataType;
-import com.zhiqiyun.open.core.mapper.bz.BaseDataInfoMapper;
-import com.zhiqiyun.open.core.mapper.bz.SceneryInfoMapper;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-import com.zhiqiyun.open.core.models.bz.SceneryInfo;
-import com.zhiqiyun.open.core.service.SceneryInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.io.Serializable;
-import java.util.Collection;
-
-@Service
-public class SceneryInfoServiceImpl extends ServiceImpl<SceneryInfoMapper, SceneryInfo> implements SceneryInfoService {
-
-    @Autowired
-    private BaseDataInfoMapper baseDataInfoMapper;
-
-    @Override
-    public <E extends IPage<SceneryInfo>> E page(E page, Wrapper<SceneryInfo> queryWrapper) {
-        E p = this.getBaseMapper().selectPage(page, queryWrapper);
-        for (SceneryInfo entity : p.getRecords()) {
-            BaseDataInfo baseDataInfo = this.baseDataInfoMapper.selectById(entity.getId());
-            entity.setBaseDataInfo(baseDataInfo);
-        }
-        return p;
-    }
-
-    @Override
-    @Transactional
-    public boolean save(SceneryInfo entity) {
-        BaseDataInfo baseDataInfo = entity.getBaseDataInfo();
-        baseDataInfo.setId(entity.getId());
-        baseDataInfo.setDataType(BzDataType.SCENERY);
-
-        this.baseDataInfoMapper.insert(baseDataInfo);
-        return super.save(entity);
-    }
-
-    @Override
-    @Transactional
-    public boolean updateById(SceneryInfo entity) {
-
-        BaseDataInfo baseDataInfo = entity.getBaseDataInfo();
-        baseDataInfo.setId(entity.getId());
-        baseDataInfo.setDataType(BzDataType.SCENERY);
-
-        this.baseDataInfoMapper.updateById(baseDataInfo);
-        return super.updateById(entity);
-    }
-
-    @Override
-    @Transactional
-    public boolean removeByIds(Collection<? extends Serializable> idList) {
-        this.baseDataInfoMapper.deleteBatchIds(idList);
-        return super.removeByIds(idList);
-    }
-}

src/main/java/com/zhiqiyun/open/core/service/impl/TouristInfoServiceImpl.java

@@ -1,64 +0,0 @@
-package com.zhiqiyun.open.core.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiqiyun.open.core.enmus.BzDataType;
-import com.zhiqiyun.open.core.mapper.bz.BaseDataInfoMapper;
-import com.zhiqiyun.open.core.mapper.bz.TouristInfoMapper;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-import com.zhiqiyun.open.core.models.bz.TouristInfo;
-import com.zhiqiyun.open.core.service.TouristInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.io.Serializable;
-import java.util.Collection;
-
-@Service
-public class TouristInfoServiceImpl extends ServiceImpl<TouristInfoMapper, TouristInfo> implements TouristInfoService {
-
-    @Autowired
-    private BaseDataInfoMapper baseDataInfoMapper;
-
-    @Override
-    public <E extends IPage<TouristInfo>> E page(E page, Wrapper<TouristInfo> queryWrapper) {
-        E p = this.getBaseMapper().selectPage(page, queryWrapper);
-        for (TouristInfo entity : p.getRecords()) {
-            BaseDataInfo baseDataInfo = this.baseDataInfoMapper.selectById(entity.getId());
-            entity.setBaseDataInfo(baseDataInfo);
-        }
-        return p;
-    }
-
-    @Override
-    @Transactional
-    public boolean save(TouristInfo entity) {
-        BaseDataInfo baseDataInfo = entity.getBaseDataInfo();
-        baseDataInfo.setId(entity.getId());
-        baseDataInfo.setDataType(BzDataType.TOURIST);
-
-        this.baseDataInfoMapper.insert(baseDataInfo);
-        return super.save(entity);
-    }
-
-    @Override
-    @Transactional
-    public boolean updateById(TouristInfo entity) {
-
-        BaseDataInfo baseDataInfo = entity.getBaseDataInfo();
-        baseDataInfo.setId(entity.getId());
-        baseDataInfo.setDataType(BzDataType.TOURIST);
-
-        this.baseDataInfoMapper.updateById(baseDataInfo);
-        return super.updateById(entity);
-    }
-
-    @Override
-    @Transactional
-    public boolean removeByIds(Collection<? extends Serializable> idList) {
-        this.baseDataInfoMapper.deleteBatchIds(idList);
-        return super.removeByIds(idList);
-    }
-}

src/main/java/com/zhiqiyun/open/core/service/impl/VenueInfoServiceImpl.java

@@ -1,64 +0,0 @@
-package com.zhiqiyun.open.core.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiqiyun.open.core.enmus.BzDataType;
-import com.zhiqiyun.open.core.mapper.bz.BaseDataInfoMapper;
-import com.zhiqiyun.open.core.mapper.bz.VenueInfoMapper;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-import com.zhiqiyun.open.core.models.bz.VenueInfo;
-import com.zhiqiyun.open.core.service.VenueInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.io.Serializable;
-import java.util.Collection;
-
-@Service
-public class VenueInfoServiceImpl extends ServiceImpl<VenueInfoMapper, VenueInfo> implements VenueInfoService {
-
-    @Autowired
-    private BaseDataInfoMapper baseDataInfoMapper;
-
-    @Override
-    public <E extends IPage<VenueInfo>> E page(E page, Wrapper<VenueInfo> queryWrapper) {
-        E p = this.getBaseMapper().selectPage(page, queryWrapper);
-        for (VenueInfo entity : p.getRecords()) {
-            BaseDataInfo baseDataInfo = this.baseDataInfoMapper.selectById(entity.getId());
-            entity.setBaseDataInfo(baseDataInfo);
-        }
-        return p;
-    }
-
-    @Override
-    @Transactional
-    public boolean save(VenueInfo entity) {
-        BaseDataInfo baseDataInfo = entity.getBaseDataInfo();
-        baseDataInfo.setId(entity.getId());
-        baseDataInfo.setDataType(BzDataType.VENUE);
-
-        this.baseDataInfoMapper.insert(baseDataInfo);
-        return super.save(entity);
-    }
-
-    @Override
-    @Transactional
-    public boolean updateById(VenueInfo entity) {
-
-        BaseDataInfo baseDataInfo = entity.getBaseDataInfo();
-        baseDataInfo.setId(entity.getId());
-        baseDataInfo.setDataType(BzDataType.VENUE);
-
-        this.baseDataInfoMapper.updateById(baseDataInfo);
-        return super.updateById(entity);
-    }
-
-    @Override
-    @Transactional
-    public boolean removeByIds(Collection<? extends Serializable> idList) {
-        this.baseDataInfoMapper.deleteBatchIds(idList);
-        return super.removeByIds(idList);
-    }
-}

src/main/java/com/zhiqiyun/open/mvc/controller/BzDataBaseInfoController.java

@@ -0,0 +1,127 @@
+package com.zhiqiyun.open.mvc.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhiqiyun.open.annotation.Permission;
+import com.zhiqiyun.open.core.models.base.BzDataBaseInfo;
+import com.zhiqiyun.open.core.models.base.BzDataType;
+import com.zhiqiyun.open.core.models.base.BzDataTypeExtendColumn;
+import com.zhiqiyun.open.core.models.user.OauthInfo;
+import com.zhiqiyun.open.core.service.*;
+import com.zhiqiyun.open.mvc.Result;
+import com.zhiqiyun.open.mvc.params.base.QueryBzDataBaseInfoParam;
+import com.zhiqiyun.open.mvc.params.base.SaveBzDataBaseInfoParam;
+import com.zhiqiyun.open.utils.DateUtil;
+import com.zhiqiyun.open.utils.ServletContext;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+@RequestMapping("/bz/data/info")
+public class BzDataBaseInfoController {
+
+	@Autowired
+	private BzDataTypeService bzDataTypeService;
+
+	@Autowired
+	private BzDataTypeExtendColumnService bzDataTypeExtendColumnService;
+
+	@Autowired
+	private BzDataBaseInfoService bzDataBaseInfoService;
+
+	@Autowired
+	private SequenceService sequenceService;
+
+	@Autowired
+	private OauthService oauthService;
+
+	@Permission(value = "bz.data.type.find", tags = "查询基础数据分类")
+	@PostMapping("/findPage")
+	public Result findPage(@RequestBody QueryBzDataBaseInfoParam param) {
+
+		QueryWrapper<BzDataBaseInfo> wrapper = new QueryWrapper<>();
+
+		if (StringUtils.isNotBlank(param.getName())) {
+			wrapper.like("name", param.getName());
+		}
+		Page<BzDataBaseInfo> page = param.getPage();
+		page.addOrder(OrderItem.asc("sort_number"));
+		page.addOrder(OrderItem.desc("id"));
+
+		Page<BzDataBaseInfo> resultData = this.bzDataBaseInfoService.page(page, wrapper);
+
+		return Result.instance(Result.Code.SUCCESS).setData(resultData);
+	}
+
+	@Permission(value = "bz.data.type.add", tags = "新建基础数据分类")
+	@PostMapping("/save")
+	public Result save(@Valid @RequestBody SaveBzDataBaseInfoParam param) throws Exception {
+
+		BzDataBaseInfo entity = new BzDataBaseInfo();
+		BeanUtils.copyProperties(param, entity);
+
+		OauthInfo oauthInfo = this.oauthService.getAuth(ServletContext.getAccessToken());
+
+		entity.setCreatedTime(DateUtil.current());
+		entity.setCreatedBy(oauthInfo.getId());
+
+		entity.setUpdatedTime(DateUtil.current());
+		entity.setUpdatedBy(oauthInfo.getId());
+		entity.setId(this.sequenceService.nextId());
+
+		this.bzDataBaseInfoService.save(entity);
+
+		return Result.instance(Result.Code.MESSAGE_SUCCESS);
+	}
+
+	@Permission(value = "bz.data.type.edit", tags = "更新基础数据分类")
+	@PostMapping("/updateById")
+	public Result updateById(Long id, @Valid @RequestBody SaveBzDataBaseInfoParam param) {
+		BzDataBaseInfo entity = new BzDataBaseInfo();
+		BeanUtils.copyProperties(param, entity);
+
+		OauthInfo oauthInfo = this.oauthService.getAuth(ServletContext.getAccessToken());
+
+		entity.setUpdatedBy(oauthInfo.getId());
+		entity.setUpdatedTime(DateUtil.current());
+		entity.setId(id);
+
+		this.bzDataBaseInfoService.updateById(entity);
+
+		return Result.instance(Result.Code.MESSAGE_SUCCESS);
+	}
+
+	@Permission(value = "bz.data.type.delete", tags = "删除基础数据分类")
+	@PostMapping("/deleteByIds")
+	public Result deleteByIds(@RequestBody List<Long> ids) {
+		this.bzDataBaseInfoService.removeByIds(ids);
+		return Result.instance(Result.Code.MESSAGE_SUCCESS);
+	}
+
+	@PostMapping("/findAllDataType")
+	@Permission(value = {"bz.data.type.edit", "bz.data.type.add"}, tags = "获取所有场所类型", writeLog = false)
+	public Result findAllDataType() {
+		List<BzDataType> listData = this.bzDataTypeService.list();
+		return Result.instance(Result.Code.SUCCESS).setData(listData);
+
+	}
+
+	@PostMapping("/findDataTypeExtendColumn")
+	@Permission(value = {"bz.data.type.edit", "bz.data.type.add"}, tags = "获取所有场所类型扩展字段", writeLog = false)
+	public Result findDataTypeExtendColumn(Long dataTypeId) {
+		QueryWrapper<BzDataTypeExtendColumn> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("data_type_id", dataTypeId);
+		List<BzDataTypeExtendColumn> listData = this.bzDataTypeExtendColumnService.list(queryWrapper);
+		return Result.instance(Result.Code.SUCCESS).setData(listData);
+
+	}
+}

src/main/java/com/zhiqiyun/open/mvc/controller/CategoryBaseController.java → src/main/java/com/zhiqiyun/open/mvc/controller/BzDataTypeController.java

@@ -4,15 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhiqiyun.open.annotation.Permission;
-import com.zhiqiyun.open.core.models.base.CategoryBase;
+import com.zhiqiyun.open.core.models.base.BzDataType;
 import com.zhiqiyun.open.core.models.user.OauthInfo;
-import com.zhiqiyun.open.core.service.CategoryBaseExtendColumnService;
-import com.zhiqiyun.open.core.service.CategoryBaseService;
+import com.zhiqiyun.open.core.service.BzDataTypeService;
 import com.zhiqiyun.open.core.service.OauthService;
 import com.zhiqiyun.open.core.service.SequenceService;
 import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.params.base.QueryCategoryBaseParam;
-import com.zhiqiyun.open.mvc.params.base.SaveCategoryBaseParam;
+import com.zhiqiyun.open.mvc.params.base.QueryBzDataTypeParam;
+import com.zhiqiyun.open.mvc.params.base.SaveBzDataTypeParam;
 import com.zhiqiyun.open.utils.DateUtil;
 import com.zhiqiyun.open.utils.ServletContext;
 import org.apache.commons.lang3.StringUtils;
@@ -27,14 +26,11 @@ import javax.validation.Valid;
 import java.util.List;
 
 @RestController
-@RequestMapping("/category/base")
-public class CategoryBaseController {
+@RequestMapping("/bz/data/type")
+public class BzDataTypeController {
 
     @Autowired
-    private CategoryBaseService categoryBaseService;
-
-    @Autowired
-    private CategoryBaseExtendColumnService categoryBaseExtendColumnService;
+    private BzDataTypeService bzDataTypeService;
 
     @Autowired
     private SequenceService sequenceService;
@@ -42,29 +38,29 @@ public class CategoryBaseController {
     @Autowired
     private OauthService oauthService;
 
-    @Permission(value = "category.base.find", tags = "查询基础数据分类")
+    @Permission(value = "bz.data.type.find", tags = "查询基础数据分类")
     @PostMapping("/findPage")
-    public Result findPage(@RequestBody QueryCategoryBaseParam param) {
+    public Result findPage(@RequestBody QueryBzDataTypeParam param) {
 
-        QueryWrapper<CategoryBase> wrapper = new QueryWrapper<>();
+        QueryWrapper<BzDataType> wrapper = new QueryWrapper<>();
 
         if (StringUtils.isNotBlank(param.getName())) {
             wrapper.like("name", param.getName());
         }
-        Page<CategoryBase> page = param.getPage();
+        Page<BzDataType> page = param.getPage();
         page.addOrder(OrderItem.asc("sort_number"));
         page.addOrder(OrderItem.desc("id"));
 
-        Page<CategoryBase> resultData = this.categoryBaseService.page(page, wrapper);
+        Page<BzDataType> resultData = this.bzDataTypeService.page(page, wrapper);
 
         return Result.instance(Result.Code.SUCCESS).setData(resultData);
     }
 
-    @Permission(value = "category.base.add", tags = "新建基础数据分类")
+    @Permission(value = "bz.data.type.add", tags = "新建基础数据分类")
     @PostMapping("/save")
-    public Result save(@Valid @RequestBody SaveCategoryBaseParam param) throws Exception {
+    public Result save(@Valid @RequestBody SaveBzDataTypeParam param) throws Exception {
 
-        CategoryBase entity = new CategoryBase();
+        BzDataType entity = new BzDataType();
         BeanUtils.copyProperties(param, entity);
 
         OauthInfo oauthInfo = this.oauthService.getAuth(ServletContext.getAccessToken());
@@ -80,15 +76,15 @@ public class CategoryBaseController {
         entity.setUpdatedBy(oauthInfo.getId());
         entity.setId(this.sequenceService.nextId());
 
-        this.categoryBaseService.save(entity);
+        this.bzDataTypeService.save(entity);
 
         return Result.instance(Result.Code.MESSAGE_SUCCESS);
     }
 
-    @Permission(value = "category.base.edit", tags = "更新基础数据分类")
+    @Permission(value = "bz.data.type.edit", tags = "更新基础数据分类")
     @PostMapping("/updateById")
-    public Result updateById(Long id, @Valid @RequestBody SaveCategoryBaseParam param) {
-        CategoryBase entity = new CategoryBase();
+    public Result updateById(Long id, @Valid @RequestBody SaveBzDataTypeParam param) {
+        BzDataType entity = new BzDataType();
         BeanUtils.copyProperties(param, entity);
 
         OauthInfo oauthInfo = this.oauthService.getAuth(ServletContext.getAccessToken());
@@ -101,15 +97,15 @@ public class CategoryBaseController {
         entity.setUpdatedTime(DateUtil.current());
         entity.setId(id);
 
-        this.categoryBaseService.updateById(entity);
+        this.bzDataTypeService.updateById(entity);
 
         return Result.instance(Result.Code.MESSAGE_SUCCESS);
     }
 
-    @Permission(value = "category.base.delete", tags = "删除基础数据分类")
+    @Permission(value = "bz.data.type.delete", tags = "删除基础数据分类")
     @PostMapping("/deleteByIds")
     public Result deleteByIds(@RequestBody List<Long> ids) {
-        this.categoryBaseService.removeByIds(ids);
+        this.bzDataTypeService.removeByIds(ids);
         return Result.instance(Result.Code.MESSAGE_SUCCESS);
     }
 }

src/main/java/com/zhiqiyun/open/mvc/controller/CategoryBaseExtendColumnController.java → src/main/java/com/zhiqiyun/open/mvc/controller/BzDataTypeExtendColumnController.java

@@ -4,12 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhiqiyun.open.annotation.Permission;
-import com.zhiqiyun.open.core.models.base.CategoryBaseExtendColumn;
-import com.zhiqiyun.open.core.service.CategoryBaseExtendColumnService;
+import com.zhiqiyun.open.core.models.base.BzDataTypeExtendColumn;
+import com.zhiqiyun.open.core.service.BzDataTypeExtendColumnService;
 import com.zhiqiyun.open.core.service.SequenceService;
 import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.params.base.QueryCategoryBaseExtendColumnParam;
-import com.zhiqiyun.open.mvc.params.base.SaveCategoryBaseExtendColumnParam;
+import com.zhiqiyun.open.mvc.params.base.QueryBzDataTypeExtendColumnParam;
+import com.zhiqiyun.open.mvc.params.base.BzDataTypeExtendColumnParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,20 +22,20 @@ import javax.validation.Valid;
 import java.util.List;
 
 @RestController
-@RequestMapping("/category/base/extend/column")
-public class CategoryBaseExtendColumnController {
+@RequestMapping("/bz/data/type/extend/column")
+public class BzDataTypeExtendColumnController {
 
     @Autowired
-    private CategoryBaseExtendColumnService categoryBaseExtendColumnService;
+    private BzDataTypeExtendColumnService bzDataTypeExtendColumnService;
 
     @Autowired
     private SequenceService sequenceService;
 
-    @Permission(value = "category.base.extend.column", tags = "查询基础数据分类扩展字段")
+    @Permission(value = "bz.data.type.extend.column", tags = "查询基础数据分类扩展字段")
     @PostMapping("/findPage")
-    public Result findPage(@RequestBody QueryCategoryBaseExtendColumnParam param) {
+    public Result findPage(@RequestBody QueryBzDataTypeExtendColumnParam param) {
 
-        QueryWrapper<CategoryBaseExtendColumn> wrapper = new QueryWrapper<>();
+        QueryWrapper<BzDataTypeExtendColumn> wrapper = new QueryWrapper<>();
 
         if (StringUtils.isNotBlank(param.getFieldKey())) {
             wrapper.eq("field_key", param.getFieldKey());
@@ -43,20 +43,20 @@ public class CategoryBaseExtendColumnController {
         if (StringUtils.isNotBlank(param.getFieldLabel())) {
             wrapper.like("field_label", param.getFieldLabel());
         }
-        Page<CategoryBaseExtendColumn> page = param.getPage();
+        Page<BzDataTypeExtendColumn> page = param.getPage();
         page.addOrder(OrderItem.asc("sort_number"));
         page.addOrder(OrderItem.desc("id"));
 
-        Page<CategoryBaseExtendColumn> resultData = this.categoryBaseExtendColumnService.page(page, wrapper);
+        Page<BzDataTypeExtendColumn> resultData = this.bzDataTypeExtendColumnService.page(page, wrapper);
 
         return Result.instance(Result.Code.SUCCESS).setData(resultData);
     }
 
-    @Permission(value = "category.base.extend.column", tags = "新建基础数据分类扩展字段")
+    @Permission(value = "bz.data.type.extend.column", tags = "新建基础数据分类扩展字段")
     @PostMapping("/save")
-    public Result save(@Valid @RequestBody SaveCategoryBaseExtendColumnParam param) throws Exception {
+    public Result save(@Valid @RequestBody BzDataTypeExtendColumnParam param) throws Exception {
 
-        CategoryBaseExtendColumn entity = new CategoryBaseExtendColumn();
+        BzDataTypeExtendColumn entity = new BzDataTypeExtendColumn();
         BeanUtils.copyProperties(param, entity);
 
         if (param.getSortNumber() == null) {
@@ -65,15 +65,15 @@ public class CategoryBaseExtendColumnController {
 
         entity.setId(this.sequenceService.nextId());
 
-        this.categoryBaseExtendColumnService.save(entity);
+        this.bzDataTypeExtendColumnService.save(entity);
 
         return Result.instance(Result.Code.MESSAGE_SUCCESS);
     }
 
-    @Permission(value = "category.base.extend.column", tags = "更新基础数据分类扩展字段")
+    @Permission(value = "bz.data.type.extend.column", tags = "更新基础数据分类扩展字段")
     @PostMapping("/updateById")
-    public Result updateById(Long id, @Valid @RequestBody SaveCategoryBaseExtendColumnParam param) {
-        CategoryBaseExtendColumn entity = new CategoryBaseExtendColumn();
+    public Result updateById(Long id, @Valid @RequestBody BzDataTypeExtendColumnParam param) {
+        BzDataTypeExtendColumn entity = new BzDataTypeExtendColumn();
         BeanUtils.copyProperties(param, entity);
 
         if (param.getSortNumber() == null) {
@@ -82,15 +82,15 @@ public class CategoryBaseExtendColumnController {
 
         entity.setId(id);
 
-        this.categoryBaseExtendColumnService.updateById(entity);
+        this.bzDataTypeExtendColumnService.updateById(entity);
 
         return Result.instance(Result.Code.MESSAGE_SUCCESS);
     }
 
-    @Permission(value = "category.base.extend.column", tags = "删除基础数据分类扩展字段")
+    @Permission(value = "bz.data.type.extend.column", tags = "删除基础数据分类扩展字段")
     @PostMapping("/deleteByIds")
     public Result deleteByIds(@RequestBody List<Long> ids) {
-        this.categoryBaseExtendColumnService.removeByIds(ids);
+        this.bzDataTypeExtendColumnService.removeByIds(ids);
         return Result.instance(Result.Code.MESSAGE_SUCCESS);
     }
 }

src/main/java/com/zhiqiyun/open/mvc/controller/HolidayVillageInfoController.java

@@ -1,111 +0,0 @@
-package com.zhiqiyun.open.mvc.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhiqiyun.open.annotation.Permission;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-import com.zhiqiyun.open.core.models.bz.HolidayVillageInfo;
-import com.zhiqiyun.open.core.models.user.OauthInfo;
-import com.zhiqiyun.open.core.service.HolidayVillageInfoService;
-import com.zhiqiyun.open.core.service.OauthService;
-import com.zhiqiyun.open.core.service.SequenceService;
-import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.params.bz.QueryHolidayVillageInfoParams;
-import com.zhiqiyun.open.mvc.params.bz.SaveHolidayVillageInfoParams;
-import com.zhiqiyun.open.utils.DateUtil;
-import com.zhiqiyun.open.utils.ServletContext;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-import java.util.List;
-
-@RestController
-@RequestMapping("/bz/base/holiday/village")
-public class HolidayVillageInfoController {
-
-    @Autowired
-    private HolidayVillageInfoService holidayVillageInfoService;
-
-    @Autowired
-    private SequenceService sequenceService;
-
-    @Autowired
-    private OauthService oauthService;
-
-    @Permission(value = "bz.base.holiday.village.find", tags = "查询度假村")
-    @PostMapping("/findPage")
-    public Result findPage(@RequestBody QueryHolidayVillageInfoParams params) {
-
-        QueryWrapper<HolidayVillageInfo> queryWrapper = new QueryWrapper<>();
-
-        if (StringUtils.isNotBlank(params.getKeyword())) {
-            StringBuilder sb = new StringBuilder("select id from bz_base_info where");
-            sb.append(" name like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or brief like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or address like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or contacts like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or contact_number like ").append("'%").append(params.getKeyword()).append("%'");
-            queryWrapper.inSql("id", sb.toString());
-        }
-
-        Page<HolidayVillageInfo> page = params.getPage();
-        page.addOrder(OrderItem.desc("id"));
-
-        Page<HolidayVillageInfo> resultData = this.holidayVillageInfoService.page(page, queryWrapper);
-
-        return Result.instance(Result.Code.SUCCESS).setData(resultData);
-    }
-
-    @Permission(value = "bz.base.holiday.village.add", tags = "保存度假村")
-    @PostMapping("/save")
-    public Result save(@Valid @RequestBody SaveHolidayVillageInfoParams params) {
-
-        this.holidayVillageInfoService.save(this.buildEntity(this.sequenceService.nextId(), params));
-
-        return Result.instance(Result.Code.MESSAGE_SUCCESS);
-    }
-
-    @Permission(value = "bz.base.holiday.village.edit", tags = "编辑度假村")
-    @PostMapping("/updateById")
-    public Result updateById(Long id, @Valid @RequestBody SaveHolidayVillageInfoParams params) {
-
-        this.holidayVillageInfoService.updateById(this.buildEntity(id, params));
-
-        return Result.instance(Result.Code.MESSAGE_SUCCESS);
-    }
-
-    private HolidayVillageInfo buildEntity(Long id, @Valid SaveHolidayVillageInfoParams params) {
-
-        HolidayVillageInfo entity = new HolidayVillageInfo();
-        BaseDataInfo baseDataInfo = new BaseDataInfo();
-
-        BeanUtils.copyProperties(params, entity);
-        BeanUtils.copyProperties(params.getBaseDataInfo(), baseDataInfo);
-
-
-        OauthInfo oauthInfo = this.oauthService.getAuth(ServletContext.getAccessToken());
-
-        baseDataInfo.setCreatedTime(DateUtil.current());
-        baseDataInfo.setUpdatedTime(DateUtil.current());
-        baseDataInfo.setCreatedBy(oauthInfo.getId());
-        baseDataInfo.setUpdatedBy(oauthInfo.getId());
-
-        entity.setBaseDataInfo(baseDataInfo);
-        entity.setId(id);
-        return entity;
-    }
-
-    @Permission(value = "bz.base.holiday.village.delete", tags = "删除度假村")
-    @PostMapping("/deleteByIds")
-    public Result deleteByIds(@RequestBody List<Long> ids) {
-        this.holidayVillageInfoService.removeByIds(ids);
-        return Result.instance(Result.Code.MESSAGE_SUCCESS);
-    }
-}

src/main/java/com/zhiqiyun/open/mvc/controller/HomeStayInfoController.java

@@ -1,112 +0,0 @@
-package com.zhiqiyun.open.mvc.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhiqiyun.open.annotation.Permission;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-import com.zhiqiyun.open.core.models.bz.HomeStayInfo;
-import com.zhiqiyun.open.core.models.user.OauthInfo;
-import com.zhiqiyun.open.core.service.HomeStayInfoService;
-import com.zhiqiyun.open.core.service.OauthService;
-import com.zhiqiyun.open.core.service.SequenceService;
-import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.params.bz.QueryHomeStayInfoParams;
-import com.zhiqiyun.open.mvc.params.bz.SaveHomeStayInfoParams;
-import com.zhiqiyun.open.utils.DateUtil;
-import com.zhiqiyun.open.utils.ServletContext;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-import java.util.List;
-
-@RestController
-@RequestMapping("/bz/base/home/stay")
-public class HomeStayInfoController {
-
-    @Autowired
-    private HomeStayInfoService homeStayInfoService;
-
-    @Autowired
-    private SequenceService sequenceService;
-
-    @Autowired
-    private OauthService oauthService;
-
-    @Permission(value = "bz.base.home.stay.find", tags = "查询民宿")
-    @PostMapping("/findPage")
-    public Result findPage(@RequestBody QueryHomeStayInfoParams params) {
-
-        QueryWrapper<HomeStayInfo> queryWrapper = new QueryWrapper<>();
-
-        if (StringUtils.isNotBlank(params.getKeyword())) {
-            StringBuilder sb = new StringBuilder("select id from bz_base_info where");
-            sb.append(" name like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or brief like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or address like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or contacts like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or contact_number like ").append("'%").append(params.getKeyword()).append("%'");
-            queryWrapper.inSql("id", sb.toString());
-        }
-
-        Page<HomeStayInfo> page = params.getPage();
-        page.addOrder(OrderItem.desc("id"));
-
-        Page<HomeStayInfo> resultData = this.homeStayInfoService.page(page, queryWrapper);
-
-        return Result.instance(Result.Code.SUCCESS).setData(resultData);
-    }
-
-    @Permission(value = "bz.base.home.stay.add", tags = "保存民宿")
-    @PostMapping("/save")
-    public Result save(@Valid @RequestBody SaveHomeStayInfoParams params) {
-
-        this.homeStayInfoService.save(this.buildEntity(this.sequenceService.nextId(), params));
-
-        return Result.instance(Result.Code.MESSAGE_SUCCESS);
-    }
-
-    @Permission(value = "bz.base.home.stay.edit", tags = "编辑民宿")
-    @PostMapping("/updateById")
-    public Result updateById(Long id, @Valid @RequestBody SaveHomeStayInfoParams params) {
-
-        this.homeStayInfoService.updateById(this.buildEntity(id, params));
-
-        return Result.instance(Result.Code.MESSAGE_SUCCESS);
-    }
-
-
-    private HomeStayInfo buildEntity(Long id, @Valid SaveHomeStayInfoParams params) {
-
-        HomeStayInfo entity = new HomeStayInfo();
-        BaseDataInfo baseDataInfo = new BaseDataInfo();
-
-        BeanUtils.copyProperties(params, entity);
-        BeanUtils.copyProperties(params.getBaseDataInfo(), baseDataInfo);
-
-
-        OauthInfo oauthInfo = this.oauthService.getAuth(ServletContext.getAccessToken());
-
-        baseDataInfo.setCreatedTime(DateUtil.current());
-        baseDataInfo.setUpdatedTime(DateUtil.current());
-        baseDataInfo.setCreatedBy(oauthInfo.getId());
-        baseDataInfo.setUpdatedBy(oauthInfo.getId());
-
-        entity.setBaseDataInfo(baseDataInfo);
-        entity.setId(id);
-        return entity;
-    }
-
-    @Permission(value = "bz.base.home.stay.delete", tags = "删除民宿")
-    @PostMapping("/deleteByIds")
-    public Result deleteByIds(@RequestBody List<Long> ids) {
-        this.homeStayInfoService.removeByIds(ids);
-        return Result.instance(Result.Code.MESSAGE_SUCCESS);
-    }
-}

src/main/java/com/zhiqiyun/open/mvc/controller/HotelInfoController.java

@@ -1,116 +0,0 @@
-package com.zhiqiyun.open.mvc.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhiqiyun.open.annotation.Permission;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-import com.zhiqiyun.open.core.models.bz.HotelInfo;
-import com.zhiqiyun.open.core.models.user.OauthInfo;
-import com.zhiqiyun.open.core.service.HotelInfoService;
-import com.zhiqiyun.open.core.service.OauthService;
-import com.zhiqiyun.open.core.service.SequenceService;
-import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.params.bz.QueryHotelInfoParams;
-import com.zhiqiyun.open.mvc.params.bz.SaveHotelInfoParams;
-import com.zhiqiyun.open.utils.DateUtil;
-import com.zhiqiyun.open.utils.ServletContext;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-import java.util.List;
-
-@RestController
-@RequestMapping("/bz/base/hotel")
-public class HotelInfoController {
-
-    @Autowired
-    private HotelInfoService hotelInfoService;
-
-    @Autowired
-    private SequenceService sequenceService;
-
-    @Autowired
-    private OauthService oauthService;
-
-    @Permission(value = "bz.base.hotel.find", tags = "查询酒店")
-    @PostMapping("/findPage")
-    public Result findPage(@RequestBody QueryHotelInfoParams params) {
-
-        QueryWrapper<HotelInfo> queryWrapper = new QueryWrapper<>();
-
-        if (params.getGrade() != null) {
-            queryWrapper.eq("grade", params.getGrade());
-        }
-
-        if (StringUtils.isNotBlank(params.getKeyword())) {
-            StringBuilder sb = new StringBuilder("select id from bz_base_info where");
-            sb.append(" name like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or brief like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or address like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or contacts like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or contact_number like ").append("'%").append(params.getKeyword()).append("%'");
-            queryWrapper.inSql("id", sb.toString());
-        }
-
-        Page<HotelInfo> page = params.getPage();
-        page.addOrder(OrderItem.desc("id"));
-
-        Page<HotelInfo> resultData = this.hotelInfoService.page(page, queryWrapper);
-
-        return Result.instance(Result.Code.SUCCESS).setData(resultData);
-    }
-
-    @Permission(value = "bz.base.hotel.add", tags = "保存酒店")
-    @PostMapping("/save")
-    public Result save(@Valid @RequestBody SaveHotelInfoParams params) {
-
-        this.hotelInfoService.save(this.buildEntity(this.sequenceService.nextId(), params));
-
-        return Result.instance(Result.Code.MESSAGE_SUCCESS);
-    }
-
-    @Permission(value = "bz.base.hotel.edit", tags = "编辑酒店")
-    @PostMapping("/updateById")
-    public Result updateById(Long id, @Valid @RequestBody SaveHotelInfoParams params) {
-
-        this.hotelInfoService.updateById(this.buildEntity(id, params));
-
-        return Result.instance(Result.Code.MESSAGE_SUCCESS);
-    }
-
-
-    private HotelInfo buildEntity(Long id, @Valid SaveHotelInfoParams params) {
-
-        HotelInfo entity = new HotelInfo();
-        BaseDataInfo baseDataInfo = new BaseDataInfo();
-
-        BeanUtils.copyProperties(params, entity);
-        BeanUtils.copyProperties(params.getBaseDataInfo(), baseDataInfo);
-
-
-        OauthInfo oauthInfo = this.oauthService.getAuth(ServletContext.getAccessToken());
-
-        baseDataInfo.setCreatedTime(DateUtil.current());
-        baseDataInfo.setUpdatedTime(DateUtil.current());
-        baseDataInfo.setCreatedBy(oauthInfo.getId());
-        baseDataInfo.setUpdatedBy(oauthInfo.getId());
-
-        entity.setBaseDataInfo(baseDataInfo);
-        entity.setId(id);
-        return entity;
-    }
-
-    @Permission(value = "bz.base.hotel.delete", tags = "删除酒店")
-    @PostMapping("/deleteByIds")
-    public Result deleteByIds(@RequestBody List<Long> ids) {
-        this.hotelInfoService.removeByIds(ids);
-        return Result.instance(Result.Code.MESSAGE_SUCCESS);
-    }
-}

src/main/java/com/zhiqiyun/open/mvc/controller/IndexController.java

@@ -1,120 +0,0 @@
-package com.zhiqiyun.open.mvc.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dliyun.oap.framework.service.RouterService;
-import com.dliyun.oap.framework.service.ServiceMethodHandler;
-import com.zhiqiyun.open.core.enmus.BzDataType;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-import com.zhiqiyun.open.core.service.AppKeyInfoService;
-import com.zhiqiyun.open.core.service.BaseDataInfoService;
-import com.zhiqiyun.open.mvc.Result;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Slf4j
-@Controller
-public class IndexController {
-    @Autowired
-    private RouterService routerService;
-
-    @Autowired
-    private AppKeyInfoService appKeyInfoService;
-
-    @Autowired
-    private BaseDataInfoService baseDataInfoService;
-
-    @ResponseBody
-    @PostMapping("/bz/base/findSelectByKeyword")
-    public Result findSelectBaseInfoByKeyword(String keyword) throws IOException {
-        QueryWrapper<BaseDataInfo> queryWrapper = new QueryWrapper<>();
-
-        if (StringUtils.isNotBlank(keyword)) {
-            queryWrapper.like("id", keyword);
-            queryWrapper.or();
-            queryWrapper.like("name", keyword);
-            queryWrapper.or();
-            queryWrapper.like("brief", keyword);
-            queryWrapper.or();
-            queryWrapper.like("address", keyword);
-            queryWrapper.or();
-            queryWrapper.like("contacts", keyword);
-            queryWrapper.or();
-            queryWrapper.like("contact_number", keyword);
-        }
-        queryWrapper.last("limit 10");
-        queryWrapper.orderByDesc("id");
-
-        List<BaseDataInfo> listData = this.baseDataInfoService.list(queryWrapper);
-        return Result.instance(Result.Code.SUCCESS).setData(listData);
-    }
-
-    @ResponseBody
-    @PostMapping("/bz/base/findByMapBounds")
-    public Result findByMapBounds(BigDecimal maxlng, BigDecimal maxlat, BigDecimal minlng, BigDecimal minlat, BzDataType dataType) {
-        QueryWrapper<BaseDataInfo> queryWrapper = new QueryWrapper<>();
-        if (maxlng != null) {
-            queryWrapper.le("lng", maxlng);
-        }
-        if (maxlat != null) {
-            queryWrapper.le("lat", maxlat);
-        }
-        if (minlng != null) {
-            queryWrapper.ge("lng", minlng);
-        }
-        if (minlat != null) {
-            queryWrapper.ge("lat", minlat);
-        }
-        if (dataType != null) {
-            queryWrapper.eq("data_type", dataType);
-        }
-
-        List<BaseDataInfo> listData = this.baseDataInfoService.list(queryWrapper);
-        return Result.instance(Result.Code.SUCCESS).setData(listData);
-    }
-
-    @ResponseBody
-    @PostMapping("/bz/base/findByGroupByDataType")
-    public Result findByGroupByDataType() {
-        QueryWrapper<BaseDataInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("data_type, count(1) num");
-        queryWrapper.groupBy("data_type");
-        List<Map<String, Object>> listData = this.baseDataInfoService.listMaps(queryWrapper);
-        for (Map<String, Object> dataMap : listData) {
-            BzDataType dataType = BzDataType.valueOf(Integer.parseInt(dataMap.get("data_type").toString()));
-            dataMap.put("dataType", dataType);
-        }
-        return Result.instance(Result.Code.SUCCESS).setData(listData);
-    }
-
-    @GetMapping("/")
-    public void index(HttpServletResponse response) throws IOException {
-        response.sendRedirect("/index.html");
-    }
-
-    @ResponseBody
-    @PostMapping("/dashboard")
-    public Result dashboard() throws IOException {
-        Map<String, ServiceMethodHandler> serviceMethodHandlerMap = this.routerService.getOapContext().getAllServiceMethodHandlers();
-        int serviceMethodHandlerCount = serviceMethodHandlerMap.size();
-
-        long appKeyCount = this.appKeyInfoService.count();
-
-        Map<String, Object> dataMap = new HashMap<>();
-        dataMap.put("serviceMethodHandlerCount", serviceMethodHandlerCount);
-        dataMap.put("appKeyCount", appKeyCount);
-
-        return Result.instance(Result.Code.SUCCESS).setData(dataMap);
-    }
-}

src/main/java/com/zhiqiyun/open/mvc/controller/SceneryInfoController.java

@@ -1,114 +0,0 @@
-package com.zhiqiyun.open.mvc.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhiqiyun.open.annotation.Permission;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-import com.zhiqiyun.open.core.models.bz.SceneryInfo;
-import com.zhiqiyun.open.core.models.user.OauthInfo;
-import com.zhiqiyun.open.core.service.OauthService;
-import com.zhiqiyun.open.core.service.SceneryInfoService;
-import com.zhiqiyun.open.core.service.SequenceService;
-import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.params.bz.QuerySceneryInfoParams;
-import com.zhiqiyun.open.mvc.params.bz.SaveSceneryInfoParams;
-import com.zhiqiyun.open.utils.DateUtil;
-import com.zhiqiyun.open.utils.ServletContext;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-import java.util.List;
-
-@RestController
-@RequestMapping("/bz/base/scenery")
-public class SceneryInfoController {
-
-    @Autowired
-    private SceneryInfoService sceneryInfoService;
-
-    @Autowired
-    private SequenceService sequenceService;
-
-    @Autowired
-    private OauthService oauthService;
-
-    @Permission(value = "bz.base.scenery.find", tags = "查询景区")
-    @PostMapping("/findPage")
-    public Result findPage(@RequestBody QuerySceneryInfoParams params) {
-
-        QueryWrapper<SceneryInfo> queryWrapper = new QueryWrapper<>();
-
-        if (params.getGrade() != null) {
-            queryWrapper.eq("grade", params.getGrade());
-        }
-        if (StringUtils.isNotBlank(params.getKeyword())) {
-            StringBuilder sb = new StringBuilder("select id from bz_base_info where");
-            sb.append(" name like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or brief like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or address like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or contacts like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or contact_number like ").append("'%").append(params.getKeyword()).append("%'");
-            queryWrapper.inSql("id", sb.toString());
-        }
-
-        Page<SceneryInfo> page = params.getPage();
-        page.addOrder(OrderItem.desc("id"));
-
-        Page<SceneryInfo> resultData = this.sceneryInfoService.page(page, queryWrapper);
-
-        return Result.instance(Result.Code.SUCCESS).setData(resultData);
-    }
-
-    @Permission(value = "bz.base.scenery.add", tags = "保存景区")
-    @PostMapping("/save")
-    public Result save(@Valid @RequestBody SaveSceneryInfoParams params) {
-
-        this.sceneryInfoService.save(this.buildEntity(this.sequenceService.nextId(), params));
-
-        return Result.instance(Result.Code.MESSAGE_SUCCESS);
-    }
-
-    @Permission(value = "bz.base.scenery.edit", tags = "编辑景区")
-    @PostMapping("/updateById")
-    public Result updateById(Long id, @RequestBody SaveSceneryInfoParams params) {
-
-        this.sceneryInfoService.updateById(this.buildEntity(id, params));
-
-        return Result.instance(Result.Code.MESSAGE_SUCCESS);
-    }
-
-    private SceneryInfo buildEntity(Long id, @Valid SaveSceneryInfoParams params) {
-
-        SceneryInfo entity = new SceneryInfo();
-        BaseDataInfo baseDataInfo = new BaseDataInfo();
-
-        BeanUtils.copyProperties(params, entity);
-        BeanUtils.copyProperties(params.getBaseDataInfo(), baseDataInfo);
-
-
-        OauthInfo oauthInfo = this.oauthService.getAuth(ServletContext.getAccessToken());
-
-        baseDataInfo.setCreatedTime(DateUtil.current());
-        baseDataInfo.setUpdatedTime(DateUtil.current());
-        baseDataInfo.setCreatedBy(oauthInfo.getId());
-        baseDataInfo.setUpdatedBy(oauthInfo.getId());
-
-        entity.setBaseDataInfo(baseDataInfo);
-        entity.setId(id);
-        return entity;
-    }
-
-    @Permission(value = "bz.base.scenery.delete", tags = "删除景区")
-    @PostMapping("/deleteByIds")
-    public Result deleteByIds(@RequestBody List<Long> ids) {
-        this.sceneryInfoService.removeByIds(ids);
-        return Result.instance(Result.Code.MESSAGE_SUCCESS);
-    }
-}

src/main/java/com/zhiqiyun/open/mvc/controller/TouristInfoController.java

@@ -1,112 +0,0 @@
-package com.zhiqiyun.open.mvc.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhiqiyun.open.annotation.Permission;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-import com.zhiqiyun.open.core.models.bz.TouristInfo;
-import com.zhiqiyun.open.core.models.user.OauthInfo;
-import com.zhiqiyun.open.core.service.OauthService;
-import com.zhiqiyun.open.core.service.SequenceService;
-import com.zhiqiyun.open.core.service.TouristInfoService;
-import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.params.bz.QueryTouristInfoParams;
-import com.zhiqiyun.open.mvc.params.bz.SaveTouristInfoParams;
-import com.zhiqiyun.open.utils.DateUtil;
-import com.zhiqiyun.open.utils.ServletContext;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-import java.util.List;
-
-@RestController
-@RequestMapping("/bz/base/tourist")
-public class TouristInfoController {
-
-    @Autowired
-    private TouristInfoService touristInfoService;
-
-    @Autowired
-    private SequenceService sequenceService;
-
-    @Autowired
-    private OauthService oauthService;
-
-    @Permission(value = "bz.base.tourist.find", tags = "查询场馆")
-    @PostMapping("/findPage")
-    public Result findPage(@RequestBody QueryTouristInfoParams params) {
-
-        QueryWrapper<TouristInfo> queryWrapper = new QueryWrapper<>();
-
-        if (StringUtils.isNotBlank(params.getKeyword())) {
-            StringBuilder sb = new StringBuilder("select id from bz_base_info where");
-            sb.append(" name like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or brief like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or address like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or contacts like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or contact_number like ").append("'%").append(params.getKeyword()).append("%'");
-            queryWrapper.inSql("id", sb.toString());
-        }
-
-        Page<TouristInfo> page = params.getPage();
-        page.addOrder(OrderItem.desc("id"));
-
-        Page<TouristInfo> resultData = this.touristInfoService.page(page, queryWrapper);
-
-        return Result.instance(Result.Code.SUCCESS).setData(resultData);
-    }
-
-    @Permission(value = "bz.base.tourist.add", tags = "保存场馆")
-    @PostMapping("/save")
-    public Result save(@Valid @RequestBody SaveTouristInfoParams params) {
-
-        this.touristInfoService.save(this.buildEntity(this.sequenceService.nextId(), params));
-
-        return Result.instance(Result.Code.MESSAGE_SUCCESS);
-    }
-
-    @Permission(value = "bz.base.tourist.edit", tags = "编辑场馆")
-    @PostMapping("/updateById")
-    public Result updateById(Long id, @Valid @RequestBody SaveTouristInfoParams params) {
-
-        this.touristInfoService.updateById(this.buildEntity(id, params));
-
-        return Result.instance(Result.Code.MESSAGE_SUCCESS);
-    }
-
-
-    private TouristInfo buildEntity(Long id, @Valid SaveTouristInfoParams params) {
-
-        TouristInfo entity = new TouristInfo();
-        BaseDataInfo baseDataInfo = new BaseDataInfo();
-
-        BeanUtils.copyProperties(params, entity);
-        BeanUtils.copyProperties(params.getBaseDataInfo(), baseDataInfo);
-
-        OauthInfo oauthInfo = this.oauthService.getAuth(ServletContext.getAccessToken());
-
-        baseDataInfo.setCreatedTime(DateUtil.current());
-        baseDataInfo.setUpdatedTime(DateUtil.current());
-        baseDataInfo.setCreatedBy(oauthInfo.getId());
-        baseDataInfo.setUpdatedBy(oauthInfo.getId());
-
-        entity.setBaseDataInfo(baseDataInfo);
-        entity.setId(id);
-        return entity;
-    }
-
-
-    @Permission(value = "bz.base.tourist.delete", tags = "删除场馆")
-    @PostMapping("/deleteByIds")
-    public Result deleteByIds(@RequestBody List<Long> ids) {
-        this.touristInfoService.removeByIds(ids);
-        return Result.instance(Result.Code.MESSAGE_SUCCESS);
-    }
-}

src/main/java/com/zhiqiyun/open/mvc/controller/VenueInfoController.java

@@ -1,112 +0,0 @@
-package com.zhiqiyun.open.mvc.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhiqiyun.open.annotation.Permission;
-import com.zhiqiyun.open.core.models.base.BaseDataInfo;
-import com.zhiqiyun.open.core.models.bz.VenueInfo;
-import com.zhiqiyun.open.core.models.user.OauthInfo;
-import com.zhiqiyun.open.core.service.OauthService;
-import com.zhiqiyun.open.core.service.SequenceService;
-import com.zhiqiyun.open.core.service.VenueInfoService;
-import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.params.bz.QueryVenueInfoParams;
-import com.zhiqiyun.open.mvc.params.bz.SaveVenueInfoParams;
-import com.zhiqiyun.open.utils.DateUtil;
-import com.zhiqiyun.open.utils.ServletContext;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-import java.util.List;
-
-@Slf4j
-@RestController
-@RequestMapping("/bz/base/venue")
-public class VenueInfoController {
-
-    @Autowired
-    private VenueInfoService venueInfoService;
-
-    @Autowired
-    private SequenceService sequenceService;
-
-    @Autowired
-    private OauthService oauthService;
-
-    @Permission(value = "bz.base.venue.find", tags = "查询场馆")
-    @PostMapping("/findPage")
-    public Result findPage(@RequestBody QueryVenueInfoParams params) {
-        QueryWrapper<VenueInfo> queryWrapper = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(params.getKeyword())) {
-            StringBuilder sb = new StringBuilder("select id from bz_base_info where");
-            sb.append(" name like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or brief like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or address like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or contacts like ").append("'%").append(params.getKeyword()).append("%'");
-            sb.append(" or contact_number like ").append("'%").append(params.getKeyword()).append("%'");
-            queryWrapper.inSql("id", sb.toString());
-        }
-
-        Page<VenueInfo> page = params.getPage();
-        page.addOrder(OrderItem.desc("id"));
-
-        Page<VenueInfo> resultData = this.venueInfoService.page(page, queryWrapper);
-
-        return Result.instance(Result.Code.SUCCESS).setData(resultData);
-    }
-
-    @Permission(value = "bz.base.venue.add", tags = "保存场馆")
-    @PostMapping("/save")
-    public Result save(@Valid @RequestBody SaveVenueInfoParams params) {
-
-        this.venueInfoService.save(this.buildEntity(this.sequenceService.nextId(), params));
-
-        return Result.instance(Result.Code.MESSAGE_SUCCESS);
-    }
-
-    @Permission(value = "bz.base.venue.edit", tags = "编辑场馆")
-    @PostMapping("/updateById")
-    public Result updateById(Long id, @Valid @RequestBody SaveVenueInfoParams params) {
-
-        this.venueInfoService.updateById(this.buildEntity(id, params));
-
-        return Result.instance(Result.Code.MESSAGE_SUCCESS);
-    }
-
-
-    private VenueInfo buildEntity(Long id, @Valid SaveVenueInfoParams params) {
-
-        VenueInfo entity = new VenueInfo();
-        BaseDataInfo baseDataInfo = new BaseDataInfo();
-
-        BeanUtils.copyProperties(params, entity);
-        BeanUtils.copyProperties(params.getBaseDataInfo(), baseDataInfo);
-
-
-        OauthInfo oauthInfo = this.oauthService.getAuth(ServletContext.getAccessToken());
-
-        baseDataInfo.setCreatedTime(DateUtil.current());
-        baseDataInfo.setUpdatedTime(DateUtil.current());
-        baseDataInfo.setCreatedBy(oauthInfo.getId());
-        baseDataInfo.setUpdatedBy(oauthInfo.getId());
-
-        entity.setBaseDataInfo(baseDataInfo);
-        entity.setId(id);
-        return entity;
-    }
-
-    @Permission(value = "bz.base.venue.delete", tags = "删除场馆")
-    @PostMapping("/deleteByIds")
-    public Result deleteByIds(@RequestBody List<Long> ids) {
-        this.venueInfoService.removeByIds(ids);
-        return Result.instance(Result.Code.MESSAGE_SUCCESS);
-    }
-}

src/main/java/com/zhiqiyun/open/mvc/params/base/SaveCategoryBaseExtendColumnParam.java → src/main/java/com/zhiqiyun/open/mvc/params/base/BzDataTypeExtendColumnParam.java

@@ -4,8 +4,8 @@ import com.zhiqiyun.open.core.enmus.ExtendColumnFieldType;
 import lombok.Data;
 
 @Data
-public class SaveCategoryBaseExtendColumnParam {
-    private String categoryId;
+public class BzDataTypeExtendColumnParam {
+    private String dataTypeId;
     private String fieldKey;
     private String fieldLabel;
     private Integer sortNumber;

src/main/java/com/zhiqiyun/open/mvc/params/bz/QueryHomeStayInfoParams.java → src/main/java/com/zhiqiyun/open/mvc/params/base/QueryBzDataBaseInfoParam.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.params.bz;
+package com.zhiqiyun.open.mvc.params.base;
 
 import com.zhiqiyun.open.mvc.params.QueryPageParams;
 import lombok.Data;
@@ -6,6 +6,6 @@ import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class QueryHomeStayInfoParams extends QueryPageParams {
-	private String keyword;
+public class QueryBzDataBaseInfoParam extends QueryPageParams {
+    private String name;
 }

src/main/java/com/zhiqiyun/open/mvc/params/base/QueryCategoryBaseExtendColumnParam.java → src/main/java/com/zhiqiyun/open/mvc/params/base/QueryBzDataTypeExtendColumnParam.java

@@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class QueryCategoryBaseExtendColumnParam extends QueryPageParams {
+public class QueryBzDataTypeExtendColumnParam extends QueryPageParams {
     private String fieldKey;
     private String fieldLabel;
 }

src/main/java/com/zhiqiyun/open/mvc/params/base/QueryCategoryBaseParam.java → src/main/java/com/zhiqiyun/open/mvc/params/base/QueryBzDataTypeParam.java

@@ -6,6 +6,6 @@ import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class QueryCategoryBaseParam extends QueryPageParams {
+public class QueryBzDataTypeParam extends QueryPageParams {
     private String name;
 }

src/main/java/com/zhiqiyun/open/mvc/params/base/SaveBzDataBaseInfoExtendParam.java

@@ -0,0 +1,15 @@
+package com.zhiqiyun.open.mvc.params.base;
+
+import com.zhiqiyun.open.core.enmus.ExtendColumnFieldType;
+import lombok.Data;
+
+@Data
+public class SaveBzDataBaseInfoExtendParam {
+	private Long dataTypeId;
+	private Long baseInfoId;
+	private String fieldKey;
+	private String fieldLabel;
+	private String sortNumber;
+	private ExtendColumnFieldType fieldType;
+	private String fieldValue;
+}

src/main/java/com/zhiqiyun/open/mvc/params/base/SaveBzDataBaseInfoParam.java

@@ -0,0 +1,21 @@
+package com.zhiqiyun.open.mvc.params.base;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class SaveBzDataBaseInfoParam {
+	private String name;
+	private Long dataTypeId;
+	private List<String> litpics;
+	private String brief;
+	private String address;
+	private String contacts;
+	private String contactNumber;
+	private BigDecimal lng;
+	private BigDecimal lat;
+
+	private List<SaveBzDataBaseInfoExtendParam> listExtends;
+}

src/main/java/com/zhiqiyun/open/mvc/params/base/SaveCategoryBaseParam.java → src/main/java/com/zhiqiyun/open/mvc/params/base/SaveBzDataTypeParam.java

@@ -3,7 +3,7 @@ package com.zhiqiyun.open.mvc.params.base;
 import lombok.Data;
 
 @Data
-public class SaveCategoryBaseParam {
+public class SaveBzDataTypeParam {
     private String name;
     private String remark;
     private Integer sortNumber;

src/main/java/com/zhiqiyun/open/mvc/params/bz/QueryHolidayVillageInfoParams.java

@@ -1,11 +0,0 @@
-package com.zhiqiyun.open.mvc.params.bz;
-
-import com.zhiqiyun.open.mvc.params.QueryPageParams;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class QueryHolidayVillageInfoParams extends QueryPageParams {
-	private String keyword;
-}

src/main/java/com/zhiqiyun/open/mvc/params/bz/QueryHotelInfoParams.java

@@ -1,14 +0,0 @@
-package com.zhiqiyun.open.mvc.params.bz;
-
-import com.zhiqiyun.open.core.enmus.HotelGrade;
-import com.zhiqiyun.open.core.enmus.SceneryGrade;
-import com.zhiqiyun.open.mvc.params.QueryPageParams;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class QueryHotelInfoParams extends QueryPageParams {
-	private String keyword;
-	private HotelGrade grade;
-}

src/main/java/com/zhiqiyun/open/mvc/params/bz/QueryPassengerEquipmentParams.java

@@ -1,6 +1,6 @@
 package com.zhiqiyun.open.mvc.params.bz;
 
-import com.zhiqiyun.open.core.enmus.BzDataType;
+import com.zhiqiyun.open.core.models.base.BzDataType;
 import com.zhiqiyun.open.mvc.params.QueryPageParams;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/zhiqiyun/open/mvc/params/bz/QuerySceneryInfoParams.java

@@ -1,13 +0,0 @@
-package com.zhiqiyun.open.mvc.params.bz;
-
-import com.zhiqiyun.open.core.enmus.SceneryGrade;
-import com.zhiqiyun.open.mvc.params.QueryPageParams;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class QuerySceneryInfoParams extends QueryPageParams {
-	private String keyword;
-	private SceneryGrade grade;
-}

src/main/java/com/zhiqiyun/open/mvc/params/bz/QueryTouristInfoParams.java

@@ -1,11 +0,0 @@
-package com.zhiqiyun.open.mvc.params.bz;
-
-import com.zhiqiyun.open.mvc.params.QueryPageParams;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class QueryTouristInfoParams extends QueryPageParams {
-	private String keyword;
-}

src/main/java/com/zhiqiyun/open/mvc/params/bz/QueryVenueInfoParams.java

@@ -1,11 +0,0 @@
-package com.zhiqiyun.open.mvc.params.bz;
-
-import com.zhiqiyun.open.mvc.params.QueryPageParams;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class QueryVenueInfoParams extends QueryPageParams {
-	private String keyword;
-}

src/main/java/com/zhiqiyun/open/mvc/params/bz/SaveHolidayVillageInfoParams.java

@@ -1,15 +0,0 @@
-package com.zhiqiyun.open.mvc.params.bz;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-@Data
-public class SaveHolidayVillageInfoParams {
-
-    private BaseDataInfoParam baseDataInfo;
-
-    private String businessHours;
-
-}

src/main/java/com/zhiqiyun/open/mvc/params/bz/SaveHomeStayInfoParams.java

@@ -1,15 +0,0 @@
-package com.zhiqiyun.open.mvc.params.bz;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-@Data
-public class SaveHomeStayInfoParams {
-
-    private BaseDataInfoParam baseDataInfo;
-
-    private Integer totalRoomCount;
-
-}

src/main/java/com/zhiqiyun/open/mvc/params/bz/SaveHotelInfoParams.java

@@ -1,14 +0,0 @@
-package com.zhiqiyun.open.mvc.params.bz;
-
-import com.zhiqiyun.open.core.enmus.HotelGrade;
-import lombok.Data;
-
-@Data
-public class SaveHotelInfoParams {
-
-    private HotelGrade grade;
-
-    private Integer totalRoomCount;
-
-    private BaseDataInfoParam baseDataInfo;
-}

src/main/java/com/zhiqiyun/open/mvc/params/bz/SavePassengerEquipmentParams.java

@@ -1,6 +1,6 @@
 package com.zhiqiyun.open.mvc.params.bz;
 
-import com.zhiqiyun.open.core.enmus.BzDataType;
+import com.zhiqiyun.open.core.models.base.BzDataType;
 import lombok.Data;
 
 import java.util.List;
@@ -8,9 +8,9 @@ import java.util.List;
 @Data
 public class SavePassengerEquipmentParams {
 
-    private BzDataType dataType;
-    private Long bzId;
-    private String brief;
-    private List<String> litpics;
+	private BzDataType dataType;
+	private Long bzId;
+	private String brief;
+	private List<String> litpics;
 
 }

src/main/java/com/zhiqiyun/open/mvc/params/bz/SaveSceneryInfoParams.java

@@ -1,13 +0,0 @@
-package com.zhiqiyun.open.mvc.params.bz;
-
-import com.zhiqiyun.open.core.enmus.SceneryGrade;
-import lombok.Data;
-
-@Data
-public class SaveSceneryInfoParams {
-
-    private BaseDataInfoParam baseDataInfo;
-
-    private SceneryGrade grade;
-
-}

src/main/java/com/zhiqiyun/open/mvc/params/bz/SaveTouristInfoParams.java

@@ -1,15 +0,0 @@
-package com.zhiqiyun.open.mvc.params.bz;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-@Data
-public class SaveTouristInfoParams {
-
-    private BaseDataInfoParam baseDataInfo;
-
-    private Integer totalTourGuidesCount;
-
-}

src/main/java/com/zhiqiyun/open/mvc/params/bz/SaveVenueInfoParams.java

@@ -1,12 +0,0 @@
-package com.zhiqiyun.open.mvc.params.bz;
-
-import lombok.Data;
-
-@Data
-public class SaveVenueInfoParams {
-
-    private BaseDataInfoParam baseDataInfo;
-
-    private String businessHours;
-
-}

src/main/java/com/zhiqiyun/open/router/apis/BzApi.java

@@ -1,181 +0,0 @@
-package com.zhiqiyun.open.router.apis;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dliyun.oap.framework.annotation.ServiceMethod;
-import com.dliyun.oap.framework.annotation.ServiceMethodBean;
-import com.dliyun.oap.framework.response.OapResponse;
-import com.zhiqiyun.open.core.models.bz.*;
-import com.zhiqiyun.open.core.service.*;
-import com.zhiqiyun.open.router.request.bz.*;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-
-@Slf4j
-@ServiceMethodBean
-public class BzApi {
-
-    @Autowired
-    private HolidayVillageInfoService holidayVillageInfoService;
-
-    @Autowired
-    private VenueInfoService venueInfoService;
-
-    @Autowired
-    private SceneryInfoService sceneryInfoService;
-
-    @Autowired
-    private HotelInfoService hotelInfoService;
-
-    @Autowired
-    private HomeStayInfoService homeStayInfoService;
-
-    @Autowired
-    private TouristInfoService touristInfoService;
-
-    @ServiceMethod(method = "bz.list.page.venue.info", title = "场馆信息")
-    public OapResponse listPageVenueInfo(VenueInfoRequest request) {
-        QueryWrapper<VenueInfo> queryWrapper = new QueryWrapper<>();
-
-        if (StringUtils.isNotBlank(request.getKeyword())) {
-            queryWrapper.and(true, wrapper -> {
-                wrapper.like("name", request.getKeyword());
-                wrapper.or();
-                wrapper.like("brief", request.getKeyword());
-                wrapper.or();
-                wrapper.like("address", request.getKeyword());
-                wrapper.or();
-                wrapper.like("contacts", request.getKeyword());
-            });
-        }
-
-        Page<VenueInfo> page = new Page<>(request.getCurrent(), request.getSize());
-        page.addOrder(OrderItem.desc("id"));
-
-        Page<VenueInfo> resultData = this.venueInfoService.page(page, queryWrapper);
-
-        return OapResponse.success().setBody(resultData);
-    }
-
-    @ServiceMethod(method = "bz.list.page.scenery.info", title = "酒店信息")
-    public OapResponse listPageSceneryInfo(SceneryInfoRequest request) {
-        QueryWrapper<SceneryInfo> queryWrapper = new QueryWrapper<>();
-
-        if (StringUtils.isNotBlank(request.getKeyword())) {
-            queryWrapper.and(true, wrapper -> {
-                wrapper.like("name", request.getKeyword());
-                wrapper.or();
-                wrapper.like("brief", request.getKeyword());
-                wrapper.or();
-                wrapper.like("address", request.getKeyword());
-                wrapper.or();
-                wrapper.like("contacts", request.getKeyword());
-            });
-        }
-
-        Page<SceneryInfo> page = new Page<>(request.getCurrent(), request.getSize());
-        page.addOrder(OrderItem.desc("id"));
-
-        Page<SceneryInfo> resultData = this.sceneryInfoService.page(page, queryWrapper);
-
-        return OapResponse.success().setBody(resultData);
-    }
-
-    @ServiceMethod(method = "bz.list.page.holiday.village.info", title = "查询度假村信息")
-    public OapResponse listPageHolidayVillageInfo(HolidayVillageInfoRequest request) {
-        QueryWrapper<HolidayVillageInfo> queryWrapper = new QueryWrapper<>();
-
-        if (StringUtils.isNotBlank(request.getKeyword())) {
-            queryWrapper.and(true, wrapper -> {
-                wrapper.like("name", request.getKeyword());
-                wrapper.or();
-                wrapper.like("brief", request.getKeyword());
-                wrapper.or();
-                wrapper.like("address", request.getKeyword());
-                wrapper.or();
-                wrapper.like("contacts", request.getKeyword());
-            });
-        }
-
-        Page<HolidayVillageInfo> page = new Page<>(request.getCurrent(), request.getSize());
-        page.addOrder(OrderItem.desc("id"));
-
-        Page<HolidayVillageInfo> resultData = this.holidayVillageInfoService.page(page, queryWrapper);
-
-        return OapResponse.success().setBody(resultData);
-    }
-
-    @ServiceMethod(method = "bz.list.page.hotel.info", title = "查询酒店信息")
-    public OapResponse listPageHotelInfo(HotelInfoRequest request) {
-        QueryWrapper<HotelInfo> queryWrapper = new QueryWrapper<>();
-
-        if (StringUtils.isNotBlank(request.getKeyword())) {
-            queryWrapper.and(true, wrapper -> {
-                wrapper.like("name", request.getKeyword());
-                wrapper.or();
-                wrapper.like("brief", request.getKeyword());
-                wrapper.or();
-                wrapper.like("address", request.getKeyword());
-                wrapper.or();
-                wrapper.like("contacts", request.getKeyword());
-            });
-        }
-
-        Page<HotelInfo> page = new Page<>(request.getCurrent(), request.getSize());
-        page.addOrder(OrderItem.desc("id"));
-
-        Page<HotelInfo> resultData = this.hotelInfoService.page(page, queryWrapper);
-
-        return OapResponse.success().setBody(resultData);
-    }
-
-    @ServiceMethod(method = "bz.list.page.home.stay.info", title = "查询酒店信息")
-    public OapResponse listPageHomeStayInfo(HomeStayRequest request) {
-        QueryWrapper<HomeStayInfo> queryWrapper = new QueryWrapper<>();
-
-        if (StringUtils.isNotBlank(request.getKeyword())) {
-            queryWrapper.and(true, wrapper -> {
-                wrapper.like("name", request.getKeyword());
-                wrapper.or();
-                wrapper.like("brief", request.getKeyword());
-                wrapper.or();
-                wrapper.like("address", request.getKeyword());
-                wrapper.or();
-                wrapper.like("contacts", request.getKeyword());
-            });
-        }
-
-        Page<HomeStayInfo> page = new Page<>(request.getCurrent(), request.getSize());
-        page.addOrder(OrderItem.desc("id"));
-
-        Page<HomeStayInfo> resultData = this.homeStayInfoService.page(page, queryWrapper);
-
-        return OapResponse.success().setBody(resultData);
-    }
-
-    @ServiceMethod(method = "bz.list.page.tourist.info", title = "查询酒店信息")
-    public OapResponse listPageTouristInfo(TouristRequest request) {
-        QueryWrapper<TouristInfo> queryWrapper = new QueryWrapper<>();
-
-        if (StringUtils.isNotBlank(request.getKeyword())) {
-            queryWrapper.and(true, wrapper -> {
-                wrapper.like("name", request.getKeyword());
-                wrapper.or();
-                wrapper.like("brief", request.getKeyword());
-                wrapper.or();
-                wrapper.like("address", request.getKeyword());
-                wrapper.or();
-                wrapper.like("contacts", request.getKeyword());
-            });
-        }
-
-        Page<TouristInfo> page = new Page<>(request.getCurrent(), request.getSize());
-        page.addOrder(OrderItem.desc("id"));
-
-        Page<TouristInfo> resultData = this.touristInfoService.page(page, queryWrapper);
-
-        return OapResponse.success().setBody(resultData);
-    }
-}

src/main/java/com/zhiqiyun/open/router/apis/CategoryApi.java

@@ -1,18 +1,13 @@
 package com.zhiqiyun.open.router.apis;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dliyun.oap.framework.annotation.ServiceMethod;
 import com.dliyun.oap.framework.annotation.ServiceMethodBean;
 import com.dliyun.oap.framework.response.OapResponse;
-import com.zhiqiyun.open.core.models.bz.SceneryInfo;
-import com.zhiqiyun.open.core.models.bz.VenueInfo;
 import com.zhiqiyun.open.core.models.category.CategoryMaterial;
 import com.zhiqiyun.open.core.models.category.CategoryOccupation;
 import com.zhiqiyun.open.core.service.CategoryMaterialService;
 import com.zhiqiyun.open.core.service.CategoryOccupationService;
-import com.zhiqiyun.open.router.request.bz.SceneryInfoRequest;
 import com.zhiqiyun.open.router.request.category.CategoryMaterialRequest;
 import com.zhiqiyun.open.router.request.category.CategoryOccupationRequest;
 import lombok.extern.slf4j.Slf4j;

src/main/resources/db/migration/V1.0.7__base.sql

@@ -1,5 +1,5 @@
-DROP TABLE IF EXISTS `category_base`;
-CREATE TABLE `category_base`
+DROP TABLE IF EXISTS `bz_data_type`;
+CREATE TABLE `bz_data_type`
 (
     `id`           BIGINT(20) NOT NULL COMMENT 'ID',
     `name`         VARCHAR(50) NOT NULL COMMENT '分类名称',
@@ -10,27 +10,81 @@ CREATE TABLE `category_base`
     `updated_time` DATETIME NULL DEFAULT NULL COMMENT '修改时间',
     `updated_by`   BIGINT(20) NULL DEFAULT NULL COMMENT '修改人',
     PRIMARY KEY (`id`)
-) COMMENT ='基础数据分类管理' ENGINE = InnoDB;
+) COMMENT ='基础数据类型管理' ENGINE = InnoDB;
 
-DROP TABLE IF EXISTS `category_base_extend_column`;
-CREATE TABLE `category_base_extend_column`
+DROP TABLE IF EXISTS `bz_data_type_extend_column`;
+CREATE TABLE `bz_data_type_extend_column`
 (
     `id`            BIGINT(20) NOT NULL COMMENT 'ID',
-    `category_id`   VARCHAR(50)  NOT NULL COMMENT '分类ID',
+    `data_type_id`  VARCHAR(50)  NOT NULL COMMENT '分类ID',
     `field_key`     VARCHAR(50)  NOT NULL COMMENT '字段Key',
     `field_label`   VARCHAR(100) NOT NULL COMMENT '字段名称',
     `sort_number`   INT(11) NOT NULL DEFAULT 0 COMMENT '排序ID',
     `field_type`    INT(11) NULL DEFAULT NULL COMMENT '字段类型',
     `default_value` TEXT NULL DEFAULT NULL COMMENT '默认值',
     PRIMARY KEY (`id`)
-) COMMENT ='基础数据分类管理' ENGINE = InnoDB;
+) COMMENT ='基础数据类型扩展字段管理' ENGINE = InnoDB;
 
 
+DROP TABLE IF EXISTS `bz_data_base_info`;
+CREATE TABLE `bz_data_base_info`
+(
+    `id`             BIGINT(20) NOT NULL COMMENT 'ID',
+    `data_type_id`   BIGINT(20) 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_data_base_info_extend`;
+CREATE TABLE `bz_data_base_info_extend`
+(
+    `id`           BIGINT(20) NOT NULL COMMENT 'ID',
+    `data_type_id`  VARCHAR(50)  NOT NULL COMMENT '分类ID',
+    `base_info_id` BIGINT(20) NOT NULL COMMENT '基本信息ID',
+    `field_key`     VARCHAR(50)  NOT NULL COMMENT '字段Key',
+    `field_label`   VARCHAR(100) NOT NULL COMMENT '字段名称',
+    `sort_number`   INT(11) NOT NULL DEFAULT 0 COMMENT '排序ID',
+    `field_type`    INT(11) NULL DEFAULT NULL COMMENT '字段类型',
+    `field_value`  TEXT NULL DEFAULT NULL COMMENT '字段值',
+    PRIMARY KEY (`id`)
+) COMMENT ='基础数据类型扩展字段管理' ENGINE = InnoDB;
+
+
+
+REPLACE
+INTO `authority_info` (`id`, `parent_id`, `name`, `remark`)
+VALUES (1400, 0, 'bz.data.info', '文旅场所基础信息'),
+       (1401, 1400, 'bz.data.info.find', '查询'),
+       (1402, 1400, 'bz.data.info.add', '添加'),
+       (1403, 1400, 'bz.data.info.edit', '修改'),
+       (1404, 1400, 'bz.data.info.delete', '删除');
+
 REPLACE
 INTO `authority_info` (`id`, `parent_id`, `name`, `remark`)
-VALUES (2500, 0, 'category.base', '基础数据分类管理'),
-       (2501, 2500, 'category.base.find', '查询'),
-       (2502, 2500, 'category.base.add', '添加'),
-       (2503, 2500, 'category.base.edit', '修改'),
-       (2504, 2500, 'category.base.delete', '删除'),
-       (2505, 2500, 'category.base.extend.column', '扩展字段管理');
+VALUES (1500, 0, 'bz.data.type', '基础数据类型管理'),
+       (1501, 1500, 'bz.data.type.find', '查询'),
+       (1502, 1500, 'bz.data.type.add', '添加'),
+       (1503, 1500, 'bz.data.type.edit', '修改'),
+       (1504, 1500, 'bz.data.type.delete', '删除');
+
+REPLACE
+INTO `authority_info` (`id`, `parent_id`, `name`, `remark`)
+VALUES (1600, 0, 'bz.data.type.extend.column', '基础数据扩展字段管理'),
+       (1601, 1600, 'bz.data.type.extend.column.find', '查询'),
+       (1602, 1600, 'bz.data.type.extend.column.add', '添加'),
+       (1603, 1600, 'bz.data.type.extend.column.edit', '修改'),
+       (1604, 1600, 'bz.data.type.extend.column.delete', '删除');
+
+