From 0ab7e04fc8bd1c2cc12df296d88081477e8a6345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Sat, 12 Oct 2024 10:44:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=89=93=E5=8D=B0=E6=9C=BA?= =?UTF-8?q?=E6=96=B0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashier/dto/shop/TbPrintMachineDto.java | 8 +++++ .../ysk/cashier/pojo/shop/TbPrintMachine.java | 22 ++++++++++-- .../shopimpl/TbPrintMachineServiceImpl.java | 35 ++++++++++++------- 3 files changed, 49 insertions(+), 16 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPrintMachineDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPrintMachineDto.java index 79880cf2..fb3ac279 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPrintMachineDto.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPrintMachineDto.java @@ -81,4 +81,12 @@ public class TbPrintMachineDto implements Serializable { /** Android打印机需要标识设备ID */ private String productId; + + private String receiptSize; + private String classifyPrint; + private String tablePrint; + private String printQty; + private String printMethod; + private String printType; + private String printReceipt; } \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPrintMachine.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPrintMachine.java index 9cb43445..02e3584f 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPrintMachine.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPrintMachine.java @@ -15,12 +15,13 @@ */ package cn.ysk.cashier.pojo.shop; -import lombok.Data; import cn.hutool.core.bean.BeanUtil; -import io.swagger.annotations.ApiModelProperty; import cn.hutool.core.bean.copier.CopyOptions; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import javax.persistence.*; -import javax.validation.constraints.*; +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -109,6 +110,21 @@ public class TbPrintMachine implements Serializable { @ApiModelProperty(value = "Android打印机需要标识设备ID ") private String productId; + @Column(name = "`receipt_size`") + private String receiptSize; + @Column(name = "`classify_print`") + private String classifyPrint; + @Column(name = "`table_print`") + private String tablePrint; + @Column(name = "`print_qty`") + private String printQty; + @Column(name = "`print_method`") + private String printMethod; + @Column(name = "`print_type`") + private String printType; + @Column(name = "`print_receipt`") + private String printReceipt; + public void copy(TbPrintMachine source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPrintMachineServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPrintMachineServiceImpl.java index 34094907..72381db7 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPrintMachineServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPrintMachineServiceImpl.java @@ -15,33 +15,33 @@ */ package cn.ysk.cashier.service.impl.shopimpl; -import cn.ysk.cashier.exception.BadRequestException; -import cn.ysk.cashier.pojo.shop.TbPrintMachine; import cn.ysk.cashier.dto.shop.PrintMachineDto; +import cn.ysk.cashier.dto.shop.TbPrintMachineDto; +import cn.ysk.cashier.dto.shop.TbPrintMachineQueryCriteria; +import cn.ysk.cashier.exception.BadRequestException; +import cn.ysk.cashier.mapper.shop.TbPrintMachineMapper; +import cn.ysk.cashier.pojo.shop.TbPrintMachine; +import cn.ysk.cashier.repository.shop.TbPrintMachineRepository; +import cn.ysk.cashier.service.shop.TbPrintMachineService; import cn.ysk.cashier.utils.FileUtil; import cn.ysk.cashier.utils.ListUtil; import cn.ysk.cashier.utils.QueryHelp; import cn.ysk.cashier.utils.ValidationUtil; import cn.ysk.cashier.vo.TbPrintMachineVO; import lombok.RequiredArgsConstructor; -import cn.ysk.cashier.repository.shop.TbPrintMachineRepository; -import cn.ysk.cashier.service.shop.TbPrintMachineService; -import cn.ysk.cashier.dto.shop.TbPrintMachineDto; -import cn.ysk.cashier.dto.shop.TbPrintMachineQueryCriteria; -import cn.ysk.cashier.mapper.shop.TbPrintMachineMapper; import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; -import java.time.Instant; -import java.util.List; -import java.util.Map; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.time.Instant; import java.util.ArrayList; import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** * @website https://eladmin.vip @@ -152,6 +152,15 @@ public class TbPrintMachineServiceImpl implements TbPrintMachineService { map.put("分类Id", tbPrintMachine.getCategoryIds()); map.put("现在打印机支持USB 和 网络两种", tbPrintMachine.getContentType()); map.put("主配置", tbPrintMachine.getConfig()); + + map.put("小票尺寸", tbPrintMachine.getReceiptSize()); + map.put("分类打印", tbPrintMachine.getClassifyPrint()); + map.put("桌台打印", tbPrintMachine.getTablePrint()); + map.put("打印数量", tbPrintMachine.getPrintQty()); + map.put("打印方式", tbPrintMachine.getPrintMethod()); + map.put("打印类型", tbPrintMachine.getPrintType()); + map.put("打印单据", tbPrintMachine.getPrintReceipt()); + map.put(" createdAt", tbPrintMachine.getCreatedAt()); map.put(" updatedAt", tbPrintMachine.getUpdatedAt()); map.put("分类", tbPrintMachine.getCategoryList());