Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusAdvertContentController.java

@@ -0,0 +1,208 @@
+package org.jeecg.modules.business.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.common.util.dynamic.db.DataSourceCachePool;
+import org.jeecg.common.util.oConvertUtils;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.business.entity.BusAdvertContent;
+import org.jeecg.modules.business.entity.BusHotel;
+import org.jeecg.modules.business.service.IBusAdvertContentService;
+import org.jeecg.modules.system.entity.SysDataSource;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: bus_advert_content_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-02
+ * @Version: V1.0
+ */
+@Api(tags="bus_advert_content_info")
+@RestController
+@RequestMapping("/business/busAdvertContent")
+@Slf4j
+public class BusAdvertContentController extends JeecgController<BusAdvertContent, IBusAdvertContentService> {
+	@Autowired
+	private IBusAdvertContentService busAdvertContentService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busAdvertContent
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "bus_advert_content_info-分页列表查询")
+	@ApiOperation(value="bus_advert_content_info-分页列表查询", notes="bus_advert_content_info-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusAdvertContent>> queryPageList(BusAdvertContent busAdvertContent,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusAdvertContent> queryWrapper = QueryGenerator.initQueryWrapper(busAdvertContent, req.getParameterMap());
+		Page<BusAdvertContent> page = new Page<BusAdvertContent>(pageNo, pageSize);
+		IPage<BusAdvertContent> pageList = busAdvertContentService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busAdvertContent
+	 * @return
+	 */
+	@AutoLog(value = "bus_advert_content_info-添加")
+	@ApiOperation(value="bus_advert_content_info-添加", notes="bus_advert_content_info-添加")
+	//@RequiresPermissions("business:bus_advert_content_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusAdvertContent busAdvertContent) {
+		busAdvertContent.setStatus(1);
+		busAdvertContent.setDelFlag(CommonConstant.DEL_FLAG_0);
+		if(busAdvertContent.getTenantId() == null || busAdvertContent.getTenantId().equals("")){
+			LoginUser user = TokenUtils.getAuthUser();
+			if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				busAdvertContent.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		busAdvertContentService.save(busAdvertContent);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busAdvertContent
+	 * @return
+	 */
+	@AutoLog(value = "bus_advert_content_info-编辑")
+	@ApiOperation(value="bus_advert_content_info-编辑", notes="bus_advert_content_info-编辑")
+	//@RequiresPermissions("business:bus_advert_content_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusAdvertContent busAdvertContent) {
+		if(busAdvertContent.getTenantId() == null || busAdvertContent.getTenantId().equals("")){
+			LoginUser user = TokenUtils.getAuthUser();
+			if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				busAdvertContent.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		BusAdvertContent editModel = busAdvertContentService.getById(busAdvertContent.getId());
+		editModel.setTitle(busAdvertContent.getTitle());
+		editModel.setContent(busAdvertContent.getContent());
+		editModel.setOrderBy(busAdvertContent.getOrderBy());
+		editModel.setStatus(busAdvertContent.getStatus());
+		busAdvertContentService.updateById(editModel);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "bus_advert_content_info-通过id删除")
+	@ApiOperation(value="bus_advert_content_info-通过id删除", notes="bus_advert_content_info-通过id删除")
+	//@RequiresPermissions("business:bus_advert_content_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busAdvertContentService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "bus_advert_content_info-批量删除")
+	@ApiOperation(value="bus_advert_content_info-批量删除", notes="bus_advert_content_info-批量删除")
+	//@RequiresPermissions("business:bus_advert_content_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busAdvertContentService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "bus_advert_content_info-通过id查询")
+	@ApiOperation(value="bus_advert_content_info-通过id查询", notes="bus_advert_content_info-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusAdvertContent> queryById(@RequestParam(name="id",required=true) String id) {
+		BusAdvertContent busAdvertContent = busAdvertContentService.getById(id);
+		if(busAdvertContent==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busAdvertContent);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busAdvertContent
+    */
+    //@RequiresPermissions("business:bus_advert_content_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusAdvertContent busAdvertContent) {
+        return super.exportXls(request, busAdvertContent, BusAdvertContent.class, "bus_advert_content_info");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_advert_content_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusAdvertContent.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusAdvertController.java

@@ -0,0 +1,208 @@
+package org.jeecg.modules.business.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.common.util.oConvertUtils;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.business.entity.BusAdvert;
+import org.jeecg.modules.business.entity.BusAdvertContent;
+import org.jeecg.modules.business.service.IBusAdvertService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: 广告管理
+ * @Author: jeecg-boot
+ * @Date:   2023-03-02
+ * @Version: V1.0
+ */
+@Api(tags="广告管理")
+@RestController
+@RequestMapping("/business/busAdvert")
+@Slf4j
+public class BusAdvertController extends JeecgController<BusAdvert, IBusAdvertService> {
+	@Autowired
+	private IBusAdvertService busAdvertService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busAdvert
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "广告管理-分页列表查询")
+	@ApiOperation(value="广告管理-分页列表查询", notes="广告管理-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusAdvert>> queryPageList(BusAdvert busAdvert,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusAdvert> queryWrapper = QueryGenerator.initQueryWrapper(busAdvert, req.getParameterMap());
+		Page<BusAdvert> page = new Page<BusAdvert>(pageNo, pageSize);
+		IPage<BusAdvert> pageList = busAdvertService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busAdvert
+	 * @return
+	 */
+	@AutoLog(value = "广告管理-添加")
+	@ApiOperation(value="广告管理-添加", notes="广告管理-添加")
+	//@RequiresPermissions("business:bus_advert_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusAdvert busAdvert) {
+		busAdvert.setStatus(1);
+		busAdvert.setDelFlag(CommonConstant.DEL_FLAG_0);
+		if(busAdvert.getTenantId() == null || busAdvert.getTenantId().equals("")){
+			LoginUser user = TokenUtils.getAuthUser();
+			if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				busAdvert.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		busAdvertService.save(busAdvert);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busAdvert
+	 * @return
+	 */
+	@AutoLog(value = "广告管理-编辑")
+	@ApiOperation(value="广告管理-编辑", notes="广告管理-编辑")
+	//@RequiresPermissions("business:bus_advert_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusAdvert busAdvert) {
+		if(busAdvert.getTenantId() == null || busAdvert.getTenantId().equals("")){
+			LoginUser user = TokenUtils.getAuthUser();
+			if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				busAdvert.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		BusAdvert editModel = busAdvertService.getById(busAdvert.getId());
+		editModel.setTitle(busAdvert.getTitle());
+		editModel.setType(busAdvert.getType());
+		editModel.setLogo(busAdvert.getLogo());
+		editModel.setSrc(busAdvert.getSrc());
+		editModel.setOrderBy(busAdvert.getOrderBy());
+		editModel.setStatus(busAdvert.getStatus());
+		busAdvertService.updateById(busAdvert);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "广告管理-通过id删除")
+	@ApiOperation(value="广告管理-通过id删除", notes="广告管理-通过id删除")
+	//@RequiresPermissions("business:bus_advert_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busAdvertService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "广告管理-批量删除")
+	@ApiOperation(value="广告管理-批量删除", notes="广告管理-批量删除")
+	//@RequiresPermissions("business:bus_advert_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busAdvertService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "广告管理-通过id查询")
+	@ApiOperation(value="广告管理-通过id查询", notes="广告管理-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusAdvert> queryById(@RequestParam(name="id",required=true) String id) {
+		BusAdvert busAdvert = busAdvertService.getById(id);
+		if(busAdvert==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busAdvert);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busAdvert
+    */
+    //@RequiresPermissions("business:bus_advert_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusAdvert busAdvert) {
+        return super.exportXls(request, busAdvert, BusAdvert.class, "广告管理");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_advert_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusAdvert.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusHotelController.java

@@ -172,8 +172,8 @@ public class BusHotelController extends JeecgController<BusHotel, IBusHotelServi
 				 throw new JeecgBootException("当前登录人租户信息错误");
 			 }
 		 }
-		 BusHotel editHotel = new BusHotel();
-		 editHotel.setId(busHotel.getId());
+		 BusHotel editHotel = busHotelService.getById(busHotel.getId());//new BusHotel();
+//		 editHotel.setId(busHotel.getId());
 		 editHotel.setName(busHotel.getName());
 		 editHotel.setStar(busHotel.getStar());
 
@@ -202,8 +202,8 @@ public class BusHotelController extends JeecgController<BusHotel, IBusHotelServi
 		 editHotel.setUpdateBy(JwtUtil.getUserNameByToken(request));
 		 editHotel.setUpdateTime(new Date());
 		 busHotelService.editHotelInfo(editHotel);
-		 BusHotel result = busHotelService.getById(busHotel.getId());
-		 return Result.OK(result);
+//		 BusHotel result = busHotelService.getById(busHotel.getId());
+		 return Result.OK(editHotel);
 	 }
 
 	 /**
@@ -225,16 +225,16 @@ public class BusHotelController extends JeecgController<BusHotel, IBusHotelServi
 				 throw new JeecgBootException("当前登录人租户信息错误");
 			 }
 		 }
-		 BusHotel editHotel = new BusHotel();
-		 editHotel.setId(busHotel.getId());
+		 BusHotel editHotel = busHotelService.getById(busHotel.getId());//new BusHotel();
+//		 editHotel.setId(busHotel.getId());
 		 editHotel.setEwmLogo(busHotel.getEwmLogo());
 		 editHotel.setImgs(busHotel.getImgs());
 
 		 editHotel.setUpdateBy(JwtUtil.getUserNameByToken(request));
 		 editHotel.setUpdateTime(new Date());
 		 busHotelService.editHotelInfo(editHotel);
-		 BusHotel result = busHotelService.getById(busHotel.getId());
-		 return Result.OK(result);
+//		 BusHotel result = busHotelService.getById(busHotel.getId());
+		 return Result.OK(editHotel);
 	 }
 
 	 /**
@@ -256,13 +256,13 @@ public class BusHotelController extends JeecgController<BusHotel, IBusHotelServi
 				 throw new JeecgBootException("当前登录人租户信息错误");
 			 }
 		 }
-		 BusHotel editHotel = new BusHotel();
-		 BusHotel oldHotel = busHotelService.getById(busHotel.getId());
+		 BusHotel editHotel = busHotelService.getById(busHotel.getId());//new BusHotel();
+//		 BusHotel oldHotel = busHotelService.getById(busHotel.getId());
 		 //认证信息必须与酒店联系人一致
-		 if (oldHotel == null ){
+		 if (editHotel == null ){
 			 throw new JeecgBootException("当前编辑信息不存在");
 		 }
-		 if(!oldHotel.getLinkName().equals(busHotel.getSfzName())){
+		 if(!editHotel.getLinkName().equals(busHotel.getSfzName())){
 			 throw new JeecgBootException("当前实名信息与酒店联系人信息不一致");
 		 }
 		 editHotel.setId(busHotel.getId());
@@ -280,8 +280,8 @@ public class BusHotelController extends JeecgController<BusHotel, IBusHotelServi
 		 editHotel.setUpdateBy(JwtUtil.getUserNameByToken(request));
 		 editHotel.setUpdateTime(new Date());
 		 busHotelService.editHotelInfo(editHotel);
-		 BusHotel result = busHotelService.getById(busHotel.getId());
-		 return Result.OK(result);
+//		 BusHotel result = busHotelService.getById(busHotel.getId());
+		 return Result.OK(editHotel);
 	 }
 
 	/**

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusAdvert.java

@@ -0,0 +1,92 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 广告管理
+ * @Author: jeecg-boot
+ * @Date:   2023-03-02
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_advert_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_advert_info对象", description="广告管理")
+public class BusAdvert implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**广告标题*/
+	@Excel(name = "广告标题", width = 15)
+    @ApiModelProperty(value = "广告标题")
+    private String title;
+	/**投放类型*/
+	@Excel(name = "投放类型", width = 15)
+    @ApiModelProperty(value = "投放类型")
+    private Integer type;
+	/**广告图片*/
+	@Excel(name = "广告图片", width = 15)
+    @ApiModelProperty(value = "广告图片")
+    private String logo;
+	/**链接*/
+	@Excel(name = "链接", width = 15)
+    @ApiModelProperty(value = "链接")
+    private String src;
+	/**排序*/
+	@Excel(name = "排序", width = 15)
+    @ApiModelProperty(value = "排序")
+    private Integer orderBy;
+	/**状态(0-禁用；1-启用)*/
+	@Excel(name = "状态(0-禁用；1-启用)", width = 15)
+    @ApiModelProperty(value = "状态(0-禁用；1-启用)")
+    private Integer status;
+	/**删除状态(0-正常,1-已删除)*/
+	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+    @TableLogic
+    private Integer delFlag;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusAdvertContent.java

@@ -0,0 +1,84 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: bus_advert_content_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-02
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_advert_content_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_advert_content_info对象", description="bus_advert_content_info")
+public class BusAdvertContent implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**广告标题*/
+	@Excel(name = "广告标题", width = 15)
+    @ApiModelProperty(value = "广告标题")
+    private String title;
+	/**广告内容*/
+	@Excel(name = "广告内容", width = 15)
+    @ApiModelProperty(value = "广告内容")
+    private String content;
+	/**排序*/
+	@Excel(name = "排序", width = 15)
+    @ApiModelProperty(value = "排序")
+    private Integer orderBy;
+	/**状态(0-禁用；1-启用)*/
+	@Excel(name = "状态(0-禁用；1-启用)", width = 15)
+    @ApiModelProperty(value = "状态(0-禁用；1-启用)")
+    private Integer status;
+	/**删除状态(0-正常,1-已删除)*/
+	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+    @TableLogic
+    private Integer delFlag;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusAdvertContentMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.business.entity.BusAdvertContent;
+
+/**
+ * @Description: bus_advert_content_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-02
+ * @Version: V1.0
+ */
+public interface BusAdvertContentMapper extends BaseMapper<BusAdvertContent> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusAdvertMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.business.entity.BusAdvert;
+
+/**
+ * @Description: 广告管理
+ * @Author: jeecg-boot
+ * @Date:   2023-03-02
+ * @Version: V1.0
+ */
+public interface BusAdvertMapper extends BaseMapper<BusAdvert> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusAdvertContentMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.demo.business.mapper.BusAdvertContentMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusAdvertMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.demo.business.mapper.BusAdvertMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusAdvertContentService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusAdvertContent;
+
+/**
+ * @Description: bus_advert_content_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-02
+ * @Version: V1.0
+ */
+public interface IBusAdvertContentService extends IService<BusAdvertContent> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusAdvertService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusAdvert;
+
+/**
+ * @Description: 广告管理
+ * @Author: jeecg-boot
+ * @Date:   2023-03-02
+ * @Version: V1.0
+ */
+public interface IBusAdvertService extends IService<BusAdvert> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusAdvertContentServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusAdvertContent;
+import org.jeecg.modules.business.mapper.BusAdvertContentMapper;
+import org.jeecg.modules.business.service.IBusAdvertContentService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: bus_advert_content_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-02
+ * @Version: V1.0
+ */
+@Service
+public class BusAdvertContentServiceImpl extends ServiceImpl<BusAdvertContentMapper, BusAdvertContent> implements IBusAdvertContentService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusAdvertServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusAdvert;
+import org.jeecg.modules.business.mapper.BusAdvertMapper;
+import org.jeecg.modules.business.service.IBusAdvertService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 广告管理
+ * @Author: jeecg-boot
+ * @Date:   2023-03-02
+ * @Version: V1.0
+ */
+@Service
+public class BusAdvertServiceImpl extends ServiceImpl<BusAdvertMapper, BusAdvert> implements IBusAdvertService {
+
+}