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

Compare commits

base: xiaodaozi:23ca847b938d589992e0fb36676e8177db7a73be
Branches Tags
xiaodaozi:master
xiaodaozi:2.0
xiaodaozi:1.0
..
compare: xiaodaozi:4376ee65aa79be118bf1d2d3f4cfd2addb7e0a1c
Branches Tags
xiaodaozi:2.0
xiaodaozi:1.0
xiaodaozi:master

No commits in common. "23ca847b938d589992e0fb36676e8177db7a73be" and "4376ee65aa79be118bf1d2d3f4cfd2addb7e0a1c" have entirely different histories.
23ca847b93 ... 4376ee65aa

2 changed files with 25 additions and 29 deletions
Show Stats Expand all files Collapse all files

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

@ -5,13 +5,9 @@ import com.dpkj.common.dto.LexMarkResultDTO;
import com.dpkj.common.vo.Result; import com.dpkj.common.vo.Result;
import com.dpkj.modules.print.request.ReceiptPrintRequest; import com.dpkj.modules.print.request.ReceiptPrintRequest;
import com.dpkj.modules.print.service.PrintService; import com.dpkj.modules.print.service.PrintService;
import com.dpkj.modules.print.vo.PrinterStatus;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PathVariable; 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.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.UnsupportedEncodingException; 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())){ if ( StringUtils.isEmpty(printerConfig.getTimeType())){
throw new RRException("获取打印时间格式出错：" + printerConfig.getTimeType()); throw new RRException("获取打印时间格式出错：" + printerConfig.getTimeType());
} }
// if ( StringUtils.isEmpty(printerConfig.getTerminalNumber())){ if ( StringUtils.isEmpty(printerConfig.getTerminalNumber())){
// throw new RRException("获取终端号出错：" + printerConfig.getTerminalNumber()); throw new RRException("获取终端号出错：" + printerConfig.getTerminalNumber());
// } }
// 强行设置终端号 // 强行设置终端号
// data.put("terminalNumber", printerConfig.getTerminalNumber()); data.put("terminalNumber", printerConfig.getTerminalNumber());
// 强行设置终端号和打印时间 // 强行设置终端号和打印时间
SimpleDateFormat sdf = new SimpleDateFormat(printerConfig.getTimeType()); SimpleDateFormat sdf = new SimpleDateFormat(printerConfig.getTimeType());