czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

适配打印机新参数

This commit is contained in:
谭凯凯 2024-10-12 10:44:10 +08:00 committed by Tankaikai
parent b7e9f74912
commit 0ab7e04fc8
3 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPrintMachineDto.java
View File

@ -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;
}

22
eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPrintMachine.java
View File

@ -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));
}

35
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPrintMachineServiceImpl.java
View File

@ -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());