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); + } + /** * 新增数据 *