xiaodaozi
/
yinyitong-zhongyuyuan-dll-stand
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.0' into 1.0

This commit is contained in:
石崇礼 2025-03-29 12:20:57 +08:00
parent a5f37fd4f0 23ca847b93
commit 8095ead92c
2 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/dpkj/modules/print/controller/RegisterController.java
View File

@ -5,9 +5,13 @@ import com.dpkj.common.dto.LexMarkResultDTO;
import com.dpkj.common.vo.Result;
import com.dpkj.modules.print.request.ReceiptPrintRequest;
import com.dpkj.modules.print.service.PrintService;
import com.dpkj.modules.print.vo.PrinterStatus;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PathVariable;
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.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;

8
src/main/java/com/dpkj/modules/print/service/impl/RegisterServiceImpl.java
View File

@ -54,12 +54,12 @@ public class RegisterServiceImpl implements PrintService {
if (StringUtils.isEmpty(printerConfig.getTimeType())) {
throw new RRException("获取打印时间格式出错：" + printerConfig.getTimeType());
}
if ( StringUtils.isEmpty(printerConfig.getTerminalNumber())){
throw new RRException("获取终端号出错：" + printerConfig.getTerminalNumber());
}
// if ( StringUtils.isEmpty(printerConfig.getTerminalNumber())){
// throw new RRException("获取终端号出错：" + printerConfig.getTerminalNumber());
// }
// 强行设置终端号
data.put("terminalNumber", printerConfig.getTerminalNumber());
// data.put("terminalNumber", printerConfig.getTerminalNumber());
// 强行设置终端号和打印时间
SimpleDateFormat sdf = new SimpleDateFormat(printerConfig.getTimeType());