stjdydayou 4 лет назад
Родитель
Сommit
472f7c23b0
19 измененных файлов с 298 добавлено и 81 удалено
  1. 10 4
      src/main/java/com/zhiqiyun/open/core/models/bz/BaseDataInfo.java
  2. 2 0
      src/main/java/com/zhiqiyun/open/core/models/bz/HomeStayInfo.java
  3. 2 0
      src/main/java/com/zhiqiyun/open/core/models/bz/HotelInfo.java
  4. 2 0
      src/main/java/com/zhiqiyun/open/core/models/bz/TouristInfo.java
  5. 54 0
      src/main/java/com/zhiqiyun/open/core/service/impl/HomeStayInfoServiceImpl.java
  6. 53 0
      src/main/java/com/zhiqiyun/open/core/service/impl/TouristInfoServiceImpl.java
  7. 15 0
      src/main/java/com/zhiqiyun/open/mvc/controller/HolidayVillageInfoController.java
  8. 37 15
      src/main/java/com/zhiqiyun/open/mvc/controller/HomeStayInfoController.java
  9. 15 0
      src/main/java/com/zhiqiyun/open/mvc/controller/HotelInfoController.java
  10. 15 0
      src/main/java/com/zhiqiyun/open/mvc/controller/SceneryInfoController.java
  11. 33 11
      src/main/java/com/zhiqiyun/open/mvc/controller/TouristInfoController.java
  12. 15 0
      src/main/java/com/zhiqiyun/open/mvc/controller/VenueInfoController.java
  13. 0 20
      src/main/java/com/zhiqiyun/open/mvc/params/SaveHomeStayInfoParams.java
  14. 0 20
      src/main/java/com/zhiqiyun/open/mvc/params/SaveTouristInfoParams.java
  15. 2 1
      src/main/java/com/zhiqiyun/open/mvc/params/bz/QueryHomeStayInfoParams.java
  16. 2 1
      src/main/java/com/zhiqiyun/open/mvc/params/bz/QueryTouristInfoParams.java
  17. 15 0
      src/main/java/com/zhiqiyun/open/mvc/params/bz/SaveHomeStayInfoParams.java
  18. 15 0
      src/main/java/com/zhiqiyun/open/mvc/params/bz/SaveTouristInfoParams.java
  19. 11 9
      src/main/resources/db/migration/V1.0.3__bz.sql

+ 10 - 4
src/main/java/com/zhiqiyun/open/core/models/bz/BaseDataInfo.java

@@ -1,14 +1,12 @@
 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.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
@@ -26,4 +24,12 @@ public class BaseDataInfo {
     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;
 }

+ 2 - 0
src/main/java/com/zhiqiyun/open/core/models/bz/HomeStayInfo.java

@@ -12,6 +12,8 @@ public class HomeStayInfo {
 	@TableId(type = IdType.INPUT)
 	private Long id;
 
+	private Integer totalRoomCount;
+
 	@TableField(exist = false)
 	private BaseDataInfo baseDataInfo;
 }

+ 2 - 0
src/main/java/com/zhiqiyun/open/core/models/bz/HotelInfo.java

@@ -15,6 +15,8 @@ public class HotelInfo {
 
     private HotelGrade grade;
 
+    private Integer totalRoomCount;
+
     @TableField(exist = false)
     private BaseDataInfo baseDataInfo;
 }

+ 2 - 0
src/main/java/com/zhiqiyun/open/core/models/bz/TouristInfo.java

@@ -12,6 +12,8 @@ public class TouristInfo {
     @TableId(type = IdType.INPUT)
     private Long id;
 
+    private Integer totalTourGuidesCount;
+
     @TableField(exist = false)
     private BaseDataInfo baseDataInfo;
 }

+ 54 - 0
src/main/java/com/zhiqiyun/open/core/service/impl/HomeStayInfoServiceImpl.java

@@ -1,11 +1,65 @@
 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.bz.BaseDataInfo;
+import com.zhiqiyun.open.core.models.bz.HomeStayInfo;
 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);
+    }
 }

+ 53 - 0
src/main/java/com/zhiqiyun/open/core/service/impl/TouristInfoServiceImpl.java

@@ -1,11 +1,64 @@
 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.bz.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);
+    }
 }

+ 15 - 0
src/main/java/com/zhiqiyun/open/mvc/controller/HolidayVillageInfoController.java

@@ -7,11 +7,15 @@ import com.zhiqiyun.open.annotation.Permission;
 import com.zhiqiyun.open.core.models.bz.BaseDataInfo;
 import com.zhiqiyun.open.core.models.bz.HolidayVillageInfo;
 import com.zhiqiyun.open.core.models.bz.SceneryInfo;
+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;
@@ -33,6 +37,9 @@ public class HolidayVillageInfoController {
     @Autowired
     private SequenceService sequenceService;
 
+    @Autowired
+    private OauthService oauthService;
+
     @Permission(value = "bz.base.holiday.village.find", tags = "查询度假村")
     @PostMapping("/findPage")
     public Result findPage(@RequestBody QueryHolidayVillageInfoParams params) {
@@ -88,6 +95,14 @@ public class HolidayVillageInfoController {
         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;

+ 37 - 15
src/main/java/com/zhiqiyun/open/mvc/controller/HomeStayInfoController.java

@@ -4,12 +4,17 @@ 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.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.QueryHomeStayInfoParams;
-import com.zhiqiyun.open.mvc.params.SaveHomeStayInfoParams;
+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;
@@ -31,7 +36,10 @@ public class HomeStayInfoController {
     @Autowired
     private SequenceService sequenceService;
 
-    @Permission(value = "bz.base.home.stay.find", tags = "查询场馆")
+    @Autowired
+    private OauthService oauthService;
+
+    @Permission(value = "bz.base.home.stay.find", tags = "查询民宿")
     @PostMapping("/findPage")
     public Result findPage(@RequestBody QueryHomeStayInfoParams params) {
 
@@ -60,33 +68,47 @@ public class HomeStayInfoController {
         return Result.instance(Result.Code.SUCCESS).setData(resultData);
     }
 
-    @Permission(value = "bz.base.home.stay.add", tags = "保存场馆")
+    @Permission(value = "bz.base.home.stay.add", tags = "保存民宿")
     @PostMapping("/save")
     public Result save(@Valid @RequestBody SaveHomeStayInfoParams params) {
 
-        HomeStayInfo homeStayInfo = new HomeStayInfo();
-        BeanUtils.copyProperties(params, homeStayInfo);
-        homeStayInfo.setId(this.sequenceService.nextId());
-        this.homeStayInfoService.save(homeStayInfo);
+        this.homeStayInfoService.save(this.buildEntity(this.sequenceService.nextId(), params));
 
         return Result.instance(Result.Code.MESSAGE_SUCCESS);
     }
 
-    @Permission(value = "bz.base.home.stay.edit", tags = "编辑场馆")
+    @Permission(value = "bz.base.home.stay.edit", tags = "编辑民宿")
     @PostMapping("/updateById")
     public Result updateById(Long id, @Valid @RequestBody SaveHomeStayInfoParams params) {
 
-        HomeStayInfo homeStayInfo = new HomeStayInfo();
-        BeanUtils.copyProperties(params, homeStayInfo);
-        homeStayInfo.setId(id);
-
-        this.homeStayInfoService.updateById(homeStayInfo);
+        this.homeStayInfoService.updateById(this.buildEntity(id, params));
 
         return Result.instance(Result.Code.MESSAGE_SUCCESS);
     }
 
 
-    @Permission(value = "bz.base.home.stay.delete", tags = "删除场馆")
+    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);

+ 15 - 0
src/main/java/com/zhiqiyun/open/mvc/controller/HotelInfoController.java

@@ -6,11 +6,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhiqiyun.open.annotation.Permission;
 import com.zhiqiyun.open.core.models.bz.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;
@@ -32,6 +36,9 @@ public class HotelInfoController {
     @Autowired
     private SequenceService sequenceService;
 
+    @Autowired
+    private OauthService oauthService;
+
     @Permission(value = "bz.base.hotel.find", tags = "查询酒店")
     @PostMapping("/findPage")
     public Result findPage(@RequestBody QueryHotelInfoParams params) {
@@ -91,6 +98,14 @@ public class HotelInfoController {
         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;

+ 15 - 0
src/main/java/com/zhiqiyun/open/mvc/controller/SceneryInfoController.java

@@ -6,11 +6,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhiqiyun.open.annotation.Permission;
 import com.zhiqiyun.open.core.models.bz.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;
@@ -32,6 +36,9 @@ public class SceneryInfoController {
     @Autowired
     private SequenceService sequenceService;
 
+    @Autowired
+    private OauthService oauthService;
+
     @Permission(value = "bz.base.scenery.find", tags = "查询景区")
     @PostMapping("/findPage")
     public Result findPage(@RequestBody QuerySceneryInfoParams params) {
@@ -90,6 +97,14 @@ public class SceneryInfoController {
         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;

+ 33 - 11
src/main/java/com/zhiqiyun/open/mvc/controller/TouristInfoController.java

@@ -4,12 +4,17 @@ 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.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.QueryTouristInfoParams;
-import com.zhiqiyun.open.mvc.params.SaveTouristInfoParams;
+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;
@@ -31,6 +36,9 @@ public class TouristInfoController {
     @Autowired
     private SequenceService sequenceService;
 
+    @Autowired
+    private OauthService oauthService;
+
     @Permission(value = "bz.base.tourist.find", tags = "查询场馆")
     @PostMapping("/findPage")
     public Result findPage(@RequestBody QueryTouristInfoParams params) {
@@ -64,10 +72,7 @@ public class TouristInfoController {
     @PostMapping("/save")
     public Result save(@Valid @RequestBody SaveTouristInfoParams params) {
 
-        TouristInfo touristInfo = new TouristInfo();
-        BeanUtils.copyProperties(params, touristInfo);
-        touristInfo.setId(this.sequenceService.nextId());
-        this.touristInfoService.save(touristInfo);
+        this.touristInfoService.save(this.buildEntity(this.sequenceService.nextId(), params));
 
         return Result.instance(Result.Code.MESSAGE_SUCCESS);
     }
@@ -76,16 +81,33 @@ public class TouristInfoController {
     @PostMapping("/updateById")
     public Result updateById(Long id, @Valid @RequestBody SaveTouristInfoParams params) {
 
-        TouristInfo touristInfo = new TouristInfo();
-        BeanUtils.copyProperties(params, touristInfo);
-        touristInfo.setId(id);
-
-        this.touristInfoService.updateById(touristInfo);
+        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) {

+ 15 - 0
src/main/java/com/zhiqiyun/open/mvc/controller/VenueInfoController.java

@@ -6,11 +6,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhiqiyun.open.annotation.Permission;
 import com.zhiqiyun.open.core.models.bz.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 org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +36,9 @@ public class VenueInfoController {
     @Autowired
     private SequenceService sequenceService;
 
+    @Autowired
+    private OauthService oauthService;
+
     @Permission(value = "bz.base.venue.find", tags = "查询场馆")
     @PostMapping("/findPage")
     public Result findPage(@RequestBody QueryVenueInfoParams params) {
@@ -88,6 +95,14 @@ public class VenueInfoController {
         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;

+ 0 - 20
src/main/java/com/zhiqiyun/open/mvc/params/SaveHomeStayInfoParams.java

@@ -1,20 +0,0 @@
-package com.zhiqiyun.open.mvc.params;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-@Data
-public class SaveHomeStayInfoParams {
-    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;
-}

+ 0 - 20
src/main/java/com/zhiqiyun/open/mvc/params/SaveTouristInfoParams.java

@@ -1,20 +0,0 @@
-package com.zhiqiyun.open.mvc.params;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-@Data
-public class SaveTouristInfoParams {
-    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;
-}

+ 2 - 1
src/main/java/com/zhiqiyun/open/mvc/params/QueryHomeStayInfoParams.java → src/main/java/com/zhiqiyun/open/mvc/params/bz/QueryHomeStayInfoParams.java

@@ -1,5 +1,6 @@
-package com.zhiqiyun.open.mvc.params;
+package com.zhiqiyun.open.mvc.params.bz;
 
+import com.zhiqiyun.open.mvc.params.QueryPageParams;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

+ 2 - 1
src/main/java/com/zhiqiyun/open/mvc/params/QueryTouristInfoParams.java → src/main/java/com/zhiqiyun/open/mvc/params/bz/QueryTouristInfoParams.java

@@ -1,5 +1,6 @@
-package com.zhiqiyun.open.mvc.params;
+package com.zhiqiyun.open.mvc.params.bz;
 
+import com.zhiqiyun.open.mvc.params.QueryPageParams;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

+ 15 - 0
src/main/java/com/zhiqiyun/open/mvc/params/bz/SaveHomeStayInfoParams.java

@@ -0,0 +1,15 @@
+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;
+
+}

+ 15 - 0
src/main/java/com/zhiqiyun/open/mvc/params/bz/SaveTouristInfoParams.java

@@ -0,0 +1,15 @@
+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;
+
+}

+ 11 - 9
src/main/resources/db/migration/V1.0.3__bz.sql

@@ -11,10 +11,10 @@ CREATE TABLE `bz_base_info`
     `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`   VARCHAR(200)   NULL     DEFAULT NULL COMMENT '创建时间',
-    `created_by`     VARCHAR(200)   NULL     DEFAULT NULL COMMENT '创建人',
-    `updated_time`   VARCHAR(200)   NULL     DEFAULT NULL COMMENT '修改时间',
-    `updated_by`     VARCHAR(200)   NULL     DEFAULT NULL 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;
 
@@ -29,15 +29,17 @@ CREATE TABLE `bz_holiday_village_info`
 DROP TABLE IF EXISTS `bz_home_stay_info`;
 CREATE TABLE `bz_home_stay_info`
 (
-    `id` BIGINT(20) NOT NULL COMMENT 'ID',
+    `id`               BIGINT(20) NOT NULL COMMENT 'ID',
+    `total_room_count` INT(1)     NOT NULL COMMENT '客房总数',
     PRIMARY KEY (`id`)
 ) COMMENT ='民宿扩展信息表' ENGINE = InnoDB;
 
 DROP TABLE IF EXISTS `bz_hotel_info`;
 CREATE TABLE `bz_hotel_info`
 (
-    `id`    BIGINT(20) NOT NULL COMMENT 'ID',
-    `grade` INT(1)     NULL DEFAULT NULL COMMENT '等级',
+    `id`               BIGINT(20) NOT NULL COMMENT 'ID',
+    `grade`            INT(1)     NULL DEFAULT NULL COMMENT '等级',
+    `total_room_count` INT(1)     NOT NULL COMMENT '客房总数',
     PRIMARY KEY (`id`)
 ) COMMENT ='酒店扩展信息表' ENGINE = InnoDB;
 
@@ -53,8 +55,8 @@ CREATE TABLE `bz_scenery_info`
 DROP TABLE IF EXISTS `bz_tourist_info`;
 CREATE TABLE `bz_tourist_info`
 (
-    `id`             BIGINT(20)   NOT NULL COMMENT 'ID',
-    `business_hours` VARCHAR(200) NULL DEFAULT NULL COMMENT '营业时间',
+    `id`                      BIGINT(20)   NOT NULL COMMENT 'ID',
+    `total_tour_guides_count` VARCHAR(200) NULL DEFAULT NULL COMMENT '导游人数',
     PRIMARY KEY (`id`)
 ) COMMENT ='旅行社扩展信息表' ENGINE = InnoDB;