From 39a5096151b7f25896fc53a59c66268e90b26843 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 3 Apr 2024 15:48:52 +0800 Subject: [PATCH] =?UTF-8?q?PC=E6=89=93=E5=8D=B0=E6=9C=BA=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BA=E7=B1=BB=E5=9E=8B=20=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TbPrintPCMachineController.java | 11 +++++++++++ .../service/TbPrintPCMachineService.java | 16 ++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbPrintPCMachineController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbPrintPCMachineController.java index cba3b75..8485323 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbPrintPCMachineController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbPrintPCMachineController.java @@ -37,6 +37,17 @@ public class TbPrintPCMachineController { return tbPrintPCMachineService.queryByPage(tbPrintMachine); } + /** + * 根据类型查询打印机列表 + * subType 打印类型（分类）label标签cash小票kitchen出品 + * connectionType local + * @return + */ + @GetMapping("/bySubType") + public Result queryBySubType(TbPrintPCMachine tbPrintPCMachine) { + return tbPrintPCMachineService.queryBySubType(tbPrintPCMachine); + } + /** * 通过主键查询单条数据 * diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbPrintPCMachineService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbPrintPCMachineService.java index a231191..7b0aaa2 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbPrintPCMachineService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbPrintPCMachineService.java @@ -79,6 +79,22 @@ public class TbPrintPCMachineService { return Result.success(CodeEnum.SUCCESS, pageInfo); } + public Result queryBySubType(TbPrintPCMachine tbPrintMachine) { + tbPrintMachine.setStatus(1); + List tbPrintMachines = tbPrintMachineMapper.queryAll(tbPrintMachine); + + List printMachineList = new ArrayList<>(); + for (TbPrintPCMachine printMachine : tbPrintMachines) { + PrintMachineDto tbPrintMachineVO = new PrintMachineDto(); + if (StringUtils.isNotBlank(printMachine.getConfig())) { + tbPrintMachineVO.setConfig(JSON.parseObject(printMachine.getConfig(), PrintConfig.class)); + } + BeanUtils.copyProperties(printMachine, tbPrintMachineVO); + printMachineList.add(tbPrintMachineVO); + } + return Result.success(CodeEnum.SUCCESS, printMachineList); + } + /** * 新增数据 *