内容管理完善+系统设置(服务员配置)

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

@@ -12,6 +12,7 @@ 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.handler.IFillRuleHandler;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.TokenUtils;

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

@@ -384,4 +384,26 @@ public class BusHotelController extends JeecgController<BusHotel, IBusHotelServi
 		 return Result.OK(lonAndLat);
 	 }
 
+	 /**
+	  * 列表查询
+	  *
+	  * @param busHotel
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "bus_hotel-列表查询")
+	 @ApiOperation(value="bus_hotel-列表查询", notes="bus_hotel-列表查询")
+	 @GetMapping(value = "/queryList")
+	 public Result<List<BusHotel>> queryList(BusHotel busHotel, HttpServletRequest req) {
+		 QueryWrapper<BusHotel> queryWrapper = QueryGenerator.initQueryWrapper(busHotel, req.getParameterMap());
+		 LoginUser user = TokenUtils.getAuthUser();
+		 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+			 queryWrapper.eq("tenant_id",user.getRelTenantIds());
+		 }
+		 queryWrapper.eq("status",1);
+		 queryWrapper.eq("check_status",1);
+		 queryWrapper.eq("del_flag",0);
+		 List<BusHotel> list = busHotelService.list(queryWrapper);
+		 return Result.OK(list);
+	 }
  }

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

@@ -0,0 +1,229 @@
+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.BusWaiter;
+import org.jeecg.modules.business.service.IBusWaiterService;
+import org.jeecg.modules.system.entity.SysUser;
+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-03
+ * @Version: V1.0
+ */
+@Api(tags="服务员配置")
+@RestController
+@RequestMapping("/business/busWaiter")
+@Slf4j
+public class BusWaiterController extends JeecgController<BusWaiter, IBusWaiterService> {
+	@Autowired
+	private IBusWaiterService busWaiterService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busWaiter
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "服务员配置-分页列表查询")
+	@ApiOperation(value="服务员配置-分页列表查询", notes="服务员配置-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusWaiter>> queryPageList(BusWaiter busWaiter,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusWaiter> queryWrapper = QueryGenerator.initQueryWrapper(busWaiter, req.getParameterMap());
+		LoginUser user = TokenUtils.getAuthUser();
+		if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+			queryWrapper.eq("tenant_id",user.getRelTenantIds());
+		}
+		String keyWord = req.getParameter("keyWord");
+		if(oConvertUtils.isNotEmpty(keyWord)){
+			queryWrapper.or().like("name",keyWord);
+			queryWrapper.or().like("work_no",keyWord);
+		}
+		String hotelIds = req.getParameter("hotelId");
+//		String hotelId = req.getParameter("hotelId");
+//		if(oConvertUtils.isNotEmpty(hotelId)){
+//			queryWrapper.eq("hotel_id",hotelId);
+//		}
+		if (oConvertUtils.isNotEmpty(hotelIds)) {
+			List<String> selectionList = Arrays.asList(hotelIds.split(","));
+			queryWrapper.in("hotel_id",selectionList);
+		}else{
+//			if (oConvertUtils.isNotEmpty(hotelId)) {
+//				queryWrapper.eq("hotel_id",hotelId);
+//			}
+		}
+		Page<BusWaiter> page = new Page<BusWaiter>(pageNo, pageSize);
+		IPage<BusWaiter> pageList = busWaiterService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busWaiter
+	 * @return
+	 */
+	@AutoLog(value = "服务员配置-添加")
+	@ApiOperation(value="服务员配置-添加", notes="服务员配置-添加")
+	//@RequiresPermissions("business:bus_waiter_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusWaiter busWaiter) {
+		busWaiter.setDelFlag(CommonConstant.DEL_FLAG_0);
+		if(busWaiter.getTenantId() == null || busWaiter.getTenantId().equals("")){
+			LoginUser user = TokenUtils.getAuthUser();
+			if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				busWaiter.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		busWaiterService.save(busWaiter);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busWaiter
+	 * @return
+	 */
+	@AutoLog(value = "服务员配置-编辑")
+	@ApiOperation(value="服务员配置-编辑", notes="服务员配置-编辑")
+	//@RequiresPermissions("business:bus_waiter_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusWaiter busWaiter) {
+		if(busWaiter.getTenantId() == null || busWaiter.getTenantId().equals("")){
+			LoginUser user = TokenUtils.getAuthUser();
+			if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				busWaiter.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		BusWaiter editModel = busWaiterService.getById(busWaiter.getId());
+		editModel.setWorkNo(busWaiter.getWorkNo());
+		editModel.setName(busWaiter.getName());
+		editModel.setSex(busWaiter.getSex());
+		editModel.setStatus(busWaiter.getStatus());
+		editModel.setRemarks(busWaiter.getRemarks());
+		busWaiterService.updateById(busWaiter);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "服务员配置-通过id删除")
+	@ApiOperation(value="服务员配置-通过id删除", notes="服务员配置-通过id删除")
+	//@RequiresPermissions("business:bus_waiter_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busWaiterService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "服务员配置-批量删除")
+	@ApiOperation(value="服务员配置-批量删除", notes="服务员配置-批量删除")
+	//@RequiresPermissions("business:bus_waiter_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busWaiterService.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<BusWaiter> queryById(@RequestParam(name="id",required=true) String id) {
+		BusWaiter busWaiter = busWaiterService.getById(id);
+		if(busWaiter==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busWaiter);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busWaiter
+    */
+    //@RequiresPermissions("business:bus_waiter_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusWaiter busWaiter) {
+        return super.exportXls(request, busWaiter, BusWaiter.class, "服务员配置");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_waiter_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusWaiter.class);
+    }
+
+}

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

@@ -4,10 +4,8 @@ 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 com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -49,8 +47,10 @@ public class BusAdvert implements Serializable {
     @ApiModelProperty(value = "广告标题")
     private String title;
 	/**投放类型*/
-	@Excel(name = "投放类型", width = 15)
+	@Excel(name = "投放类型", width = 15,dicCode ="advert_site")
     @ApiModelProperty(value = "投放类型")
+    @Dict(dicCode = "advert_site")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer type;
 	/**广告图片*/
 	@Excel(name = "广告图片", width = 15)

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

@@ -0,0 +1,89 @@
+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-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_waiter_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_waiter_info对象", description="服务员配置")
+public class BusWaiter 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 workNo;
+	/**姓名*/
+	@Excel(name = "姓名", width = 15)
+    @ApiModelProperty(value = "姓名")
+    private String name;
+	/**性别(0-默认未知,1-男,2-女)*/
+	@Excel(name = "性别(0-默认未知,1-男,2-女)", width = 15,dicCode="sex")
+    @ApiModelProperty(value = "性别(0-默认未知,1-男,2-女)")
+    @Dict(dicCode = "sex")
+    private Integer sex;
+	/**状态(0-禁用；1-启用)*/
+	@Excel(name = "状态(0-禁用；1-启用)", width = 15)
+    @ApiModelProperty(value = "状态(0-禁用；1-启用)")
+    private Integer status;
+	/**备注信息*/
+	@Excel(name = "备注信息", width = 15)
+    @ApiModelProperty(value = "备注信息")
+    private String remarks;
+	/**删除状态(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/BusWaiterMapper.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.BusWaiter;
+
+/**
+ * @Description: 服务员配置
+ * @Author: jeecg-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+public interface BusWaiterMapper extends BaseMapper<BusWaiter> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusWaiterMapper.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.BusWaiterMapper">
+
+</mapper>

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusWaiter;
+
+/**
+ * @Description: 服务员配置
+ * @Author: jeecg-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+public interface IBusWaiterService extends IService<BusWaiter> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusWaiter;
+import org.jeecg.modules.business.mapper.BusWaiterMapper;
+import org.jeecg.modules.business.service.IBusWaiterService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 服务员配置
+ * @Author: jeecg-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Service
+public class BusWaiterServiceImpl extends ServiceImpl<BusWaiterMapper, BusWaiter> implements IBusWaiterService {
+
+}