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/BusPrintTemplateController.java

@@ -0,0 +1,230 @@
+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.BusPrintTemplate;
+import org.jeecg.modules.business.entity.BusRoomPayType;
+import org.jeecg.modules.business.entity.BusWaiter;
+import org.jeecg.modules.business.service.IBusPrintTemplateService;
+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-11
+ * @Version: V1.0
+ */
+@Api(tags="打印模板")
+@RestController
+@RequestMapping("/business/busPrintTemplate")
+@Slf4j
+public class BusPrintTemplateController extends JeecgController<BusPrintTemplate, IBusPrintTemplateService> {
+	@Autowired
+	private IBusPrintTemplateService busPrintTemplateService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busPrintTemplate
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "打印模板-分页列表查询")
+	@ApiOperation(value="打印模板-分页列表查询", notes="打印模板-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusPrintTemplate>> queryPageList(BusPrintTemplate busPrintTemplate,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusPrintTemplate> queryWrapper = QueryGenerator.initQueryWrapper(busPrintTemplate, req.getParameterMap());
+		Page<BusPrintTemplate> page = new Page<BusPrintTemplate>(pageNo, pageSize);
+		IPage<BusPrintTemplate> pageList = busPrintTemplateService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busPrintTemplate
+	 * @return
+	 */
+	@AutoLog(value = "打印模板-添加")
+	@ApiOperation(value="打印模板-添加", notes="打印模板-添加")
+	//@RequiresPermissions("business:bus_print_template_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusPrintTemplate busPrintTemplate) {
+		busPrintTemplate.setDelFlag(CommonConstant.DEL_FLAG_0);
+		if(busPrintTemplate.getTenantId() == null || busPrintTemplate.getTenantId().equals("")){
+			LoginUser user = TokenUtils.getAuthUser();
+			if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				busPrintTemplate.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		busPrintTemplateService.save(busPrintTemplate);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busPrintTemplate
+	 * @return
+	 */
+	@AutoLog(value = "打印模板-编辑")
+	@ApiOperation(value="打印模板-编辑", notes="打印模板-编辑")
+	//@RequiresPermissions("business:bus_print_template_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusPrintTemplate busPrintTemplate) {
+		if(busPrintTemplate.getTenantId() == null || busPrintTemplate.getTenantId().equals("")){
+			LoginUser user = TokenUtils.getAuthUser();
+			if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				busPrintTemplate.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		BusPrintTemplate editModel = busPrintTemplateService.getById(busPrintTemplate.getId());
+		editModel.setName(busPrintTemplate.getName());
+		editModel.setSpecs(busPrintTemplate.getSpecs());
+		editModel.setRemarks(busPrintTemplate.getRemarks());
+		editModel.setPreview(busPrintTemplate.getPreview());
+		editModel.setDefaultPrint(busPrintTemplate.getDefaultPrint());
+		editModel.setPrintType(busPrintTemplate.getPrintType());
+		editModel.setIsShowRefund(busPrintTemplate.getIsShowRefund());
+		editModel.setPrintSum(busPrintTemplate.getPrintSum());
+		editModel.setPrintContentOffset(busPrintTemplate.getPrintContentOffset());
+		editModel.setPrintPaperOffset(busPrintTemplate.getPrintPaperOffset());
+		busPrintTemplateService.updateById(editModel);
+//		busPrintTemplateService.updateById(busPrintTemplate);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "打印模板-通过id删除")
+	@ApiOperation(value="打印模板-通过id删除", notes="打印模板-通过id删除")
+	//@RequiresPermissions("business:bus_print_template_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busPrintTemplateService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "打印模板-批量删除")
+	@ApiOperation(value="打印模板-批量删除", notes="打印模板-批量删除")
+	//@RequiresPermissions("business:bus_print_template_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busPrintTemplateService.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<BusPrintTemplate> queryById(@RequestParam(name="id",required=true) String id) {
+		BusPrintTemplate busPrintTemplate = busPrintTemplateService.getById(id);
+		if(busPrintTemplate==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busPrintTemplate);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busPrintTemplate
+    */
+    //@RequiresPermissions("business:bus_print_template_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusPrintTemplate busPrintTemplate) {
+        return super.exportXls(request, busPrintTemplate, BusPrintTemplate.class, "打印模板");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_print_template_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusPrintTemplate.class);
+    }
+	 /**
+	  * 通过hotelId查询
+	  *
+	  * @param hotelId
+	  * @return
+	  */
+	 //@AutoLog(value = "打印模板-通过hotelId查询")
+	 @ApiOperation(value="打印模板-通过hotelId查询", notes="打印模板-通过hotelId查询")
+	 @GetMapping(value = "/queryByHotelId")
+	 public Result<BusPrintTemplate> queryByHotelId(@RequestParam(name="hotelId",required=true) String hotelId) {
+		 QueryWrapper<BusPrintTemplate> queryWrapper = new QueryWrapper<BusPrintTemplate>();
+		 queryWrapper.eq("hotel_id", hotelId);
+		 BusPrintTemplate resultModel = busPrintTemplateService.getOne(queryWrapper);
+		 if(resultModel==null) {
+			 return Result.error("");
+		 }
+		 return Result.OK(resultModel);
+	 }
+}

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

@@ -0,0 +1,108 @@
+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-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_print_template_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_print_template_info对象", description="打印模板")
+public class BusPrintTemplate 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 name;
+	/**规格*/
+	@Excel(name = "规格", width = 15)
+    @ApiModelProperty(value = "规格")
+    private String specs;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+	/**默认打印机*/
+	@Excel(name = "默认打印机", width = 15)
+    @ApiModelProperty(value = "默认打印机")
+    private String defaultPrint;
+	/**打印类型(1-明细；2-汇总)*/
+	@Excel(name = "打印类型(1-明细；2-汇总)", width = 15)
+    @ApiModelProperty(value = "打印类型(1-明细；2-汇总)")
+    private Integer printType;
+	/**打印份数*/
+	@Excel(name = "打印份数", width = 15)
+    @ApiModelProperty(value = "打印份数")
+    private Integer printSum;
+	/**打印预览*/
+	@Excel(name = "打印预览", width = 15)
+    @ApiModelProperty(value = "打印预览")
+    private Boolean preview;
+	/**打印时内容宽度偏差*/
+	@Excel(name = "打印时内容宽度偏差", width = 15)
+    @ApiModelProperty(value = "打印时内容宽度偏差")
+    private String printContentOffset;
+	/**打印时纸张宽度偏差*/
+	@Excel(name = "打印时纸张宽度偏差", width = 15)
+    @ApiModelProperty(value = "打印时纸张宽度偏差")
+    private String printPaperOffset;
+	/**是否显示退菜(0-是；1-否)*/
+	@Excel(name = "是否显示退菜(0-是；1-否)", width = 15)
+    @ApiModelProperty(value = "是否显示退菜(0-是；1-否)")
+    private Integer isShowRefund;
+    /**删除状态(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/BusPrintTemplateMapper.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.BusPrintTemplate;
+
+/**
+ * @Description: 打印模板
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+public interface BusPrintTemplateMapper extends BaseMapper<BusPrintTemplate> {
+
+}

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

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusPrintTemplate;
+
+/**
+ * @Description: 打印模板
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+public interface IBusPrintTemplateService extends IService<BusPrintTemplate> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusPrintTemplate;
+import org.jeecg.modules.business.mapper.BusPrintTemplateMapper;
+import org.jeecg.modules.business.service.IBusPrintTemplateService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 打印模板
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Service
+public class BusPrintTemplateServiceImpl extends ServiceImpl<BusPrintTemplateMapper, BusPrintTemplate> implements IBusPrintTemplateService {
+
+}