Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ docker {
import com.bmuschko.gradle.docker.tasks.image.Dockerfile

task createDockerfile(type: Dockerfile) {
from 'openjdk:19-jdk-buster'
from 'eclipse-temurin:19-jdk'
label(
'maintainer': '[email protected]'
)
Expand Down
19 changes: 17 additions & 2 deletions src/main/kotlin/au/com/sealink/quickprint/ApplicationController.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import au.com.sealink.quickprint.requests.*
import org.springframework.web.bind.annotation.*
import org.springframework.http.MediaType
import kotlinx.coroutines.*
import java.time.LocalDateTime

import java.util.*

Expand All @@ -22,6 +23,7 @@ class ApplicationController(private val repository: PrinterRepository) {

@PostMapping("/print-receipts")
fun printReceipts(@RequestBody request: PrintReceipt) : Response {
System.err.println("[${LocalDateTime.now()}] RECEIPTS: printer='${request.printerName}', tickets=${request.tickets.size}")
val unsupportedTypes = EnumSet.of(ElementType.Barcode, ElementType.Image)
val printer = ReceiptPrinter(request.printerName)
val tickets = request.tickets.map {
Expand All @@ -36,14 +38,21 @@ class ApplicationController(private val repository: PrinterRepository) {
}

GlobalScope.launch {
printer.printTickets(tickets)
try {
printer.printTickets(tickets)
System.err.println("[${LocalDateTime.now()}] RECEIPTS SUCCESS: printer='${request.printerName}'")
} catch (e: Exception) {
System.err.println("[${LocalDateTime.now()}] RECEIPTS FAILED: printer='${request.printerName}', error=${e.javaClass.name}: ${e.message}")
e.printStackTrace()
}
}

return Response()
}

@PostMapping("/print-tickets")
fun printTickets(@RequestBody request: PrintTicket) : Response {
System.err.println("[${LocalDateTime.now()}] TICKETS: printer='${request.printerName}', tickets=${request.tickets.size}, format=${request.pageFormat.width}x${request.pageFormat.height}")
val printer = repository.requestPrinter(request.printerName)
val settings = TicketPageSettings(request.pageFormat.width,
request.pageFormat.height,
Expand All @@ -59,7 +68,13 @@ class ApplicationController(private val repository: PrinterRepository) {
}

GlobalScope.launch {
printer.printTickets(tickets)
try {
printer.printTickets(tickets)
System.err.println("[${LocalDateTime.now()}] TICKETS SUCCESS: printer='${request.printerName}'")
} catch (e: Exception) {
System.err.println("[${LocalDateTime.now()}] TICKETS FAILED: printer='${request.printerName}', error=${e.javaClass.name}: ${e.message}")
e.printStackTrace()
}
}
return Response()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,20 @@ package au.com.sealink.quickprint.core

import au.com.sealink.printing.ticketprinter.PrintServiceLocator
import org.springframework.stereotype.Repository
import java.time.LocalDateTime
import javax.print.PrintService

@Repository
class PrintServicePrinterRepository : PrinterRepository {
override fun requestPrinter(name: String): Printer {
System.err.println("[${LocalDateTime.now()}] PrinterRepository REQUEST: printer='$name'")
return TicketPrinter(name)
}

override fun findAll(): Iterable<PrintService> {
return PrintServiceLocator().all.toList()
System.err.println("[${LocalDateTime.now()}] PrinterRepository ENUM START")
val services = PrintServiceLocator().all.toList()
System.err.println("[${LocalDateTime.now()}] PrinterRepository ENUM FOUND: count=${services.size}, names=${services.joinToString(",") { it.name }}")
return services
}
}
14 changes: 13 additions & 1 deletion src/main/kotlin/au/com/sealink/quickprint/core/TicketPrinter.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,31 @@ package au.com.sealink.quickprint.core
import au.com.sealink.printing.ticketprinter.Ticket
import au.com.sealink.printing.ticketprinter.TicketPageSettings
import au.com.sealink.printing.ticketprinter.TicketPrinter
import java.time.LocalDateTime

class TicketPrinter(private var name: String) : Printer {
private val mPrinter : TicketPrinter = TicketPrinter()

init {
System.err.println("[${LocalDateTime.now()}] TicketPrinter INIT: printer='$name'")
mPrinter.setPrinter(this.name)
System.err.println("[${LocalDateTime.now()}] TicketPrinter INIT SUCCESS: printer='$name'")
}

override fun setTicketPageSettings(settings: TicketPageSettings) {
System.err.println("[${LocalDateTime.now()}] TicketPrinter SET_SETTINGS: printer='$name'")
mPrinter.setTicketPageSettings(settings)
}

override fun printTickets(tickets: List<Ticket>) {
mPrinter.printTickets(tickets)
try {
System.err.println("[${LocalDateTime.now()}] TicketPrinter PRINT START: printer='$name', tickets=${tickets.size}, thread=${Thread.currentThread().name}")
mPrinter.printTickets(tickets)
System.err.println("[${LocalDateTime.now()}] TicketPrinter PRINT SUCCESS: printer='$name'")
} catch (e: Exception) {
System.err.println("[${LocalDateTime.now()}] TicketPrinter PRINT FAILED: printer='$name', error=${e.javaClass.name}: ${e.message}")
e.printStackTrace()
throw e
}
}
}