取消终端号设置

This commit is contained in:
余文财 2025-05-19 20:11:33 +08:00
parent 148321f002
commit eb983fef76
1 changed files with 9 additions and 6 deletions

View File

@ -13,16 +13,19 @@ import com.dpkj.modules.autoReplyPrint.utils.FolderUtils;
import com.dpkj.modules.autoReplyPrint.vo.PrinterStatus; import com.dpkj.modules.autoReplyPrint.vo.PrinterStatus;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.thymeleaf.util.StringUtils; import org.thymeleaf.util.StringUtils;
import javax.annotation.Resource;
import java.io.File; import java.io.File;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import javax.annotation.Resource;
/** /**
* 小票打印机控制层 * 小票打印机控制层
* *
@ -59,10 +62,10 @@ public class ReceiptPrintController {
JSONObject data = JSONObject.parseObject(URLDecoder.decode(request.getTemplateFillData(), "UTF-8")); JSONObject data = JSONObject.parseObject(URLDecoder.decode(request.getTemplateFillData(), "UTF-8"));
// 强行设置终端号 // 强行设置终端号 不需要固定前端自己穿
data.put("terminalNumber", printerConfig.getTerminalNumber()); // data.put("terminalNumber", printerConfig.getTerminalNumber());
// 强行设置终端号和打印时间 // 强行设置打印时间
SimpleDateFormat sdf = new SimpleDateFormat(printerConfig.getTimeType()); SimpleDateFormat sdf = new SimpleDateFormat(printerConfig.getTimeType());
String formattedDate = sdf.format( new Date()); String formattedDate = sdf.format( new Date());
data.put("printTime", formattedDate); data.put("printTime", formattedDate);