update

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

@@ -0,0 +1,9 @@
+package com.zhiqiyun.open.core.mapper;
+
+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/models/bz/HolidayVillageInfo.java

@@ -0,0 +1,28 @@
+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.typeHandler.FastjsonTypeHandler;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@TableName(value = "bz_holiday_village_info", autoResultMap = true)
+public class HolidayVillageInfo {
+	@TableId(type = IdType.INPUT)
+	private Long id;
+	private String name;
+	@TableField(typeHandler = FastjsonTypeHandler.class)
+	private List<String> litpics;
+	private String brief;
+	private String address;
+	private String contacts;
+	private String contactNumber;
+	private String businessHours;
+	private BigDecimal lng;
+	private BigDecimal lat;
+}

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

@@ -0,0 +1,7 @@
+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/impl/HolidayVillageInfoServiceImpl.java

@@ -0,0 +1,14 @@
+package com.zhiqiyun.open.core.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhiqiyun.open.core.mapper.HolidayVillageInfoMapper;
+import com.zhiqiyun.open.core.mapper.VenueInfoMapper;
+import com.zhiqiyun.open.core.models.bz.HolidayVillageInfo;
+import com.zhiqiyun.open.core.models.bz.VenueInfo;
+import com.zhiqiyun.open.core.service.HolidayVillageInfoService;
+import com.zhiqiyun.open.core.service.VenueInfoService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class HolidayVillageInfoServiceImpl extends ServiceImpl<HolidayVillageInfoMapper, HolidayVillageInfo> implements HolidayVillageInfoService {
+}

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

@@ -0,0 +1,95 @@
+package com.zhiqiyun.open.mvc.manager.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.bz.HolidayVillageInfo;
+import com.zhiqiyun.open.core.service.HolidayVillageInfoService;
+import com.zhiqiyun.open.core.service.SequenceService;
+import com.zhiqiyun.open.mvc.Result;
+import com.zhiqiyun.open.mvc.manager.params.QueryHolidayVillageInfoParams;
+import com.zhiqiyun.open.mvc.manager.params.SaveHolidayVillageInfoParams;
+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;
+
+    @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.getContactNumber())) {
+            queryWrapper.like("contact_number", params.getContactNumber());
+        }
+        if (StringUtils.isNotBlank(params.getKeyword())) {
+            queryWrapper.and(true, wrapper -> {
+                wrapper.like("name", params.getKeyword());
+                wrapper.or();
+                wrapper.like("brief", params.getKeyword());
+                wrapper.or();
+                wrapper.like("address", params.getKeyword());
+                wrapper.or();
+                wrapper.like("contacts", params.getKeyword());
+            });
+        }
+
+        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) {
+
+        HolidayVillageInfo holidayVillageInfo = new HolidayVillageInfo();
+        BeanUtils.copyProperties(params, holidayVillageInfo);
+        holidayVillageInfo.setId(this.sequenceService.nextId());
+        this.holidayVillageInfoService.save(holidayVillageInfo);
+
+        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) {
+
+        HolidayVillageInfo holidayVillageInfo = new HolidayVillageInfo();
+        BeanUtils.copyProperties(params, holidayVillageInfo);
+        holidayVillageInfo.setId(id);
+
+        this.holidayVillageInfoService.updateById(holidayVillageInfo);
+
+        return Result.instance(Result.Code.MESSAGE_SUCCESS);
+    }
+
+
+    @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/manager/controller/SceneryInfoController.java

@@ -44,14 +44,14 @@ public class SceneryInfoController {
             queryWrapper.eq("grade", params.getGrade());
         }
         if (StringUtils.isNotBlank(params.getKeyword())) {
-            queryWrapper.and(true, sceneryInfoQueryWrapper -> {
-                sceneryInfoQueryWrapper.like("name", params.getKeyword());
-                sceneryInfoQueryWrapper.or();
-                sceneryInfoQueryWrapper.like("brief", params.getKeyword());
-                sceneryInfoQueryWrapper.or();
-                sceneryInfoQueryWrapper.like("address", params.getKeyword());
-                sceneryInfoQueryWrapper.or();
-                sceneryInfoQueryWrapper.like("contacts", params.getKeyword());
+            queryWrapper.and(true, wrapper -> {
+                wrapper.like("name", params.getKeyword());
+                wrapper.or();
+                wrapper.like("brief", params.getKeyword());
+                wrapper.or();
+                wrapper.like("address", params.getKeyword());
+                wrapper.or();
+                wrapper.like("contacts", params.getKeyword());
             });
         }
 

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

@@ -45,17 +45,14 @@ public class VenueInfoController {
             queryWrapper.like("contact_number", params.getContactNumber());
         }
         if (StringUtils.isNotBlank(params.getKeyword())) {
-            queryWrapper.and(true, new Consumer<QueryWrapper<VenueInfo>>() {
-                @Override
-                public void accept(QueryWrapper<VenueInfo> venueInfoQueryWrapper) {
-                    venueInfoQueryWrapper.like("name", params.getKeyword());
-                    venueInfoQueryWrapper.or();
-                    venueInfoQueryWrapper.like("brief", params.getKeyword());
-                    venueInfoQueryWrapper.or();
-                    venueInfoQueryWrapper.like("address", params.getKeyword());
-                    venueInfoQueryWrapper.or();
-                    venueInfoQueryWrapper.like("contacts", params.getKeyword());
-                }
+            queryWrapper.and(true, wrapper -> {
+                wrapper.like("name", params.getKeyword());
+                wrapper.or();
+                wrapper.like("brief", params.getKeyword());
+                wrapper.or();
+                wrapper.like("address", params.getKeyword());
+                wrapper.or();
+                wrapper.like("contacts", params.getKeyword());
             });
         }
 

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

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

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

@@ -0,0 +1,20 @@
+package com.zhiqiyun.open.mvc.manager.params;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class SaveHolidayVillageInfoParams {
+    private String name;
+    private List<String> litpics;
+    private String describe;
+    private String brief;
+    private String address;
+    private String contacts;
+    private String contactNumber;
+    private String businessHours;
+    private BigDecimal lng;
+    private BigDecimal lat;
+}

src/main/resources/db/migration/V1.0.4__bz_scenery_info.sql

@@ -17,69 +17,8 @@ CREATE TABLE `bz_scenery_info`
 
 REPLACE
 INTO `authority_info` (`id`, `parent_id`, `name`, `remark`)
-VALUES (1500, 0, 'bz.base.scenery', '场馆基本信息管理'),
+VALUES (1500, 0, 'bz.base.scenery', '景区基本信息管理'),
        (1501, 1500, 'bz.base.scenery.find', '查询'),
        (1502, 1500, 'bz.base.scenery.add', '添加'),
        (1503, 1500, 'bz.base.scenery.edit', '修改'),
        (1504, 1500, 'bz.base.scenery.delete', '删除');
-
-
-DROP TABLE IF EXISTS `bz_weather_info`;
-CREATE TABLE `bz_weather_info`
-(
-    `id`            BIGINT(30) NOT NULL COMMENT 'ID',
-    `province_name` VARCHAR(50)  NOT NULL COMMENT '省份名',
-    `city_name`     VARCHAR(100) NOT NULL COMMENT '城市名',
-    `adcode`        VARCHAR(50)  NOT NULL COMMENT '区域编码',
-    `weather`       VARCHAR(50)  NOT NULL COMMENT '天气现象（汉字描述）',
-    `temperature`   VARCHAR(50)  NOT NULL COMMENT '实时气温，单位：摄氏度',
-    `winddirection` VARCHAR(50)  NOT NULL COMMENT '风向描述',
-    `windpower`     VARCHAR(50)  NOT NULL COMMENT '风力级别，单位：级',
-    `humidity`      VARCHAR(50)  NOT NULL COMMENT '空气湿度',
-    `pm25`          INT(11) NOT NULL COMMENT '空气湿度',
-    `aqi`           INT(11) NOT NULL COMMENT 'AQI',
-    `air_quality`   VARCHAR(50)  NOT NULL COMMENT '空气质量',
-    `reporttime`    DATETIME     NOT NULL COMMENT '发布的时间',
-    PRIMARY KEY (`id`)
-) COMMENT='交通信息表' ENGINE=InnoDB;
-
-DROP TABLE IF EXISTS `bz_tourist_agency_info`;
-CREATE TABLE `bz_tourist_agency_info`
-(
-    `id`      BIGINT(30) NOT NULL COMMENT 'ID',
-    `name`    VARCHAR(50)  NOT NULL COMMENT '名称',
-    `address` VARCHAR(50)  NOT NULL COMMENT '地址',
-    `summary` VARCHAR(500) NOT NULL COMMENT '简介',
-    `lng`     FLOAT        NOT NULL COMMENT '经度（坐标）',
-    `lat`     FLOAT        NOT NULL COMMENT '纬度（坐标）',
-    PRIMARY KEY (`id`)
-) COMMENT='旅行社信息表' ENGINE=InnoDB;
-
-DROP TABLE IF EXISTS `bz_hotel_info`;
-CREATE TABLE `bz_hotel_info`
-(
-    `id`               BIGINT(30) NOT NULL COMMENT 'ID',
-    `name`             VARCHAR(50)  NOT NULL COMMENT '名称',
-    `hotel_type`       INT(2) NOT NULL COMMENT '1、酒店,2、民宿',
-    `address`          VARCHAR(50)  NOT NULL COMMENT '地址',
-    `summary`          VARCHAR(500) NOT NULL COMMENT '简介',
-    `total_rooms`      INT(11) NOT NULL COMMENT '房间总数',
-    `checked_in_rooms` INT(11) NOT NULL COMMENT '已经入住房间数',
-    `lng`              FLOAT        NOT NULL COMMENT '经度（坐标）',
-    `lat`              FLOAT        NOT NULL COMMENT '纬度（坐标）',
-    PRIMARY KEY (`id`)
-) COMMENT='酒店与民宿信息表' ENGINE=InnoDB;
-
-
-DROP TABLE IF EXISTS `bz_holiday_resort_info`;
-CREATE TABLE `bz_holiday_resort_info`
-(
-    `id`      BIGINT(30) NOT NULL COMMENT 'ID',
-    `name`    VARCHAR(50)  NOT NULL COMMENT '名称',
-    `address` VARCHAR(50)  NOT NULL COMMENT '地址',
-    `grade`   VARCHAR(50) NULL DEFAULT NULL COMMENT '等级',
-    `summary` VARCHAR(500) NOT NULL COMMENT '简介',
-    `lng`     FLOAT        NOT NULL COMMENT '经度（坐标）',
-    `lat`     FLOAT        NOT NULL COMMENT '纬度（坐标）',
-    PRIMARY KEY (`id`)
-) COMMENT='度假区信息表' ENGINE=InnoDB;

src/main/resources/db/migration/V1.0.5__bz_holiday_village.sql

@@ -0,0 +1,84 @@
+DROP TABLE IF EXISTS `bz_holiday_village_info`;
+CREATE TABLE `bz_holiday_village_info`
+(
+    `id`             BIGINT(20) NOT NULL COMMENT 'ID',
+    `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 '联系电话',
+    `business_hours` VARCHAR(200) NULL DEFAULT NULL COMMENT '开放时间',
+    `lng`            DECIMAL(20, 6) NOT NULL DEFAULT '0.000000' COMMENT '经度（坐标）',
+    `lat`            DECIMAL(20, 6) NOT NULL DEFAULT '0.000000' COMMENT '纬度（坐标）',
+    PRIMARY KEY (`id`)
+) COMMENT='度假村信息表' ENGINE=InnoDB;
+
+REPLACE
+INTO `authority_info` (`id`, `parent_id`, `name`, `remark`)
+VALUES (1600, 0, 'bz.base.holiday.village', '度假村基本信息管理'),
+       (1601, 1600, 'bz.base.holiday.village.find', '查询'),
+       (1602, 1600, 'bz.base.holiday.village.add', '添加'),
+       (1603, 1600, 'bz.base.holiday.village.edit', '修改'),
+       (1604, 1600, 'bz.base.holiday.village.delete', '删除');
+
+
+DROP TABLE IF EXISTS `bz_weather_info`;
+CREATE TABLE `bz_weather_info`
+(
+    `id`            BIGINT(30) NOT NULL COMMENT 'ID',
+    `province_name` VARCHAR(50)  NOT NULL COMMENT '省份名',
+    `city_name`     VARCHAR(100) NOT NULL COMMENT '城市名',
+    `adcode`        VARCHAR(50)  NOT NULL COMMENT '区域编码',
+    `weather`       VARCHAR(50)  NOT NULL COMMENT '天气现象（汉字描述）',
+    `temperature`   VARCHAR(50)  NOT NULL COMMENT '实时气温，单位：摄氏度',
+    `winddirection` VARCHAR(50)  NOT NULL COMMENT '风向描述',
+    `windpower`     VARCHAR(50)  NOT NULL COMMENT '风力级别，单位：级',
+    `humidity`      VARCHAR(50)  NOT NULL COMMENT '空气湿度',
+    `pm25`          INT(11) NOT NULL COMMENT '空气湿度',
+    `aqi`           INT(11) NOT NULL COMMENT 'AQI',
+    `air_quality`   VARCHAR(50)  NOT NULL COMMENT '空气质量',
+    `reporttime`    DATETIME     NOT NULL COMMENT '发布的时间',
+    PRIMARY KEY (`id`)
+) COMMENT='交通信息表' ENGINE=InnoDB;
+
+DROP TABLE IF EXISTS `bz_tourist_agency_info`;
+CREATE TABLE `bz_tourist_agency_info`
+(
+    `id`      BIGINT(30) NOT NULL COMMENT 'ID',
+    `name`    VARCHAR(50)  NOT NULL COMMENT '名称',
+    `address` VARCHAR(50)  NOT NULL COMMENT '地址',
+    `summary` VARCHAR(500) NOT NULL COMMENT '简介',
+    `lng`     FLOAT        NOT NULL COMMENT '经度（坐标）',
+    `lat`     FLOAT        NOT NULL COMMENT '纬度（坐标）',
+    PRIMARY KEY (`id`)
+) COMMENT='旅行社信息表' ENGINE=InnoDB;
+
+DROP TABLE IF EXISTS `bz_hotel_info`;
+CREATE TABLE `bz_hotel_info`
+(
+    `id`               BIGINT(30) NOT NULL COMMENT 'ID',
+    `name`             VARCHAR(50)  NOT NULL COMMENT '名称',
+    `hotel_type`       INT(2) NOT NULL COMMENT '1、酒店,2、民宿',
+    `address`          VARCHAR(50)  NOT NULL COMMENT '地址',
+    `summary`          VARCHAR(500) NOT NULL COMMENT '简介',
+    `total_rooms`      INT(11) NOT NULL COMMENT '房间总数',
+    `checked_in_rooms` INT(11) NOT NULL COMMENT '已经入住房间数',
+    `lng`              FLOAT        NOT NULL COMMENT '经度（坐标）',
+    `lat`              FLOAT        NOT NULL COMMENT '纬度（坐标）',
+    PRIMARY KEY (`id`)
+) COMMENT='酒店与民宿信息表' ENGINE=InnoDB;
+
+
+DROP TABLE IF EXISTS `bz_holiday_resort_info`;
+CREATE TABLE `bz_holiday_resort_info`
+(
+    `id`      BIGINT(30) NOT NULL COMMENT 'ID',
+    `name`    VARCHAR(50)  NOT NULL COMMENT '名称',
+    `address` VARCHAR(50)  NOT NULL COMMENT '地址',
+    `grade`   VARCHAR(50) NULL DEFAULT NULL COMMENT '等级',
+    `summary` VARCHAR(500) NOT NULL COMMENT '简介',
+    `lng`     FLOAT        NOT NULL COMMENT '经度（坐标）',
+    `lat`     FLOAT        NOT NULL COMMENT '纬度（坐标）',
+    PRIMARY KEY (`id`)
+) COMMENT='度假区信息表' ENGINE=InnoDB;