From 3ca40878dae59917b0ec6e677f9e15aa8a69a3d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?= <411641505@qq.com> Date: Mon, 25 Nov 2024 10:27:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BA=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0=E6=9C=BA=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PrintPrinterConfigController.java | 9 ++++++++ .../ktg/print/domain/PrintPrinterConfig.java | 16 +++++++++++++- .../mapper/PrintPrinterConfigMapper.java | 15 +++++++++++++ .../service/IPrintPrinterConfigService.java | 16 ++++++++++++++ .../impl/PrintPrinterConfigServiceImpl.java | 21 +++++++++++++++++++ .../mapper/print/PrintPrinterConfigMapper.xml | 20 ++++++++++++++++-- 6 files changed, 94 insertions(+), 3 deletions(-) diff --git a/ktg-print/src/main/java/com/ktg/print/controller/PrintPrinterConfigController.java b/ktg-print/src/main/java/com/ktg/print/controller/PrintPrinterConfigController.java index 96d87b9..aada5ce 100644 --- a/ktg-print/src/main/java/com/ktg/print/controller/PrintPrinterConfigController.java +++ b/ktg-print/src/main/java/com/ktg/print/controller/PrintPrinterConfigController.java @@ -3,6 +3,7 @@ package com.ktg.print.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ktg.common.constant.UserConstants; import com.ktg.print.domain.PrintPrinterConfig; import com.ktg.print.service.IPrintPrinterConfigService; import org.springframework.security.access.prepost.PreAuthorize; @@ -79,6 +80,10 @@ public class PrintPrinterConfigController extends BaseController @PostMapping public AjaxResult add(@RequestBody PrintPrinterConfig printPrinterConfig) { + if(UserConstants.NOT_UNIQUE.equals(printPrinterConfigService.checkPrinterCodeUnique(printPrinterConfig))){ + return AjaxResult.error("打印机编号已存在!"); + } + return toAjax(printPrinterConfigService.insertPrintPrinterConfig(printPrinterConfig)); } @@ -90,6 +95,10 @@ public class PrintPrinterConfigController extends BaseController @PutMapping public AjaxResult edit(@RequestBody PrintPrinterConfig printPrinterConfig) { + if(UserConstants.NOT_UNIQUE.equals(printPrinterConfigService.checkPrinterCodeUnique(printPrinterConfig))){ + return AjaxResult.error("打印机编号已存在!"); + } + return toAjax(printPrinterConfigService.updatePrintPrinterConfig(printPrinterConfig)); } diff --git a/ktg-print/src/main/java/com/ktg/print/domain/PrintPrinterConfig.java b/ktg-print/src/main/java/com/ktg/print/domain/PrintPrinterConfig.java index 5ff98e9..26566e1 100644 --- a/ktg-print/src/main/java/com/ktg/print/domain/PrintPrinterConfig.java +++ b/ktg-print/src/main/java/com/ktg/print/domain/PrintPrinterConfig.java @@ -18,6 +18,11 @@ public class PrintPrinterConfig extends BaseEntity /** 打印机ID */ private Long printerId; + /** + * 打印机编号 + */ + private String printerCode; + /** 打印机类型 */ @Excel(name = "打印机类型") private String printerType; @@ -91,7 +96,16 @@ public class PrintPrinterConfig extends BaseEntity { return printerId; } - public void setPrinterType(String printerType) + + public String getPrinterCode() { + return printerCode; + } + + public void setPrinterCode(String printerCode) { + this.printerCode = printerCode; + } + + public void setPrinterType(String printerType) { this.printerType = printerType; } diff --git a/ktg-print/src/main/java/com/ktg/print/mapper/PrintPrinterConfigMapper.java b/ktg-print/src/main/java/com/ktg/print/mapper/PrintPrinterConfigMapper.java index 5ee8a11..8a0ac2a 100644 --- a/ktg-print/src/main/java/com/ktg/print/mapper/PrintPrinterConfigMapper.java +++ b/ktg-print/src/main/java/com/ktg/print/mapper/PrintPrinterConfigMapper.java @@ -21,6 +21,14 @@ public interface PrintPrinterConfigMapper */ public PrintPrinterConfig selectPrintPrinterConfigByPrinterId(Long printerId); + /** + * 查询打印机配置 + * + * @param printerCode 打印机编号 + * @return 打印机配置 + */ + public PrintPrinterConfig selectPrintPrinterConfigByPrinterCode(String printerCode); + /** * 查询打印机配置列表 * @@ -29,6 +37,13 @@ public interface PrintPrinterConfigMapper */ public List selectPrintPrinterConfigList(PrintPrinterConfig printPrinterConfig); + /** + * 检查编号是否唯一 + * @param config + * @return + */ + public PrintPrinterConfig checkPrinterCodeUnique(PrintPrinterConfig config); + /** * 新增打印机配置 * diff --git a/ktg-print/src/main/java/com/ktg/print/service/IPrintPrinterConfigService.java b/ktg-print/src/main/java/com/ktg/print/service/IPrintPrinterConfigService.java index 5eb9694..079d608 100644 --- a/ktg-print/src/main/java/com/ktg/print/service/IPrintPrinterConfigService.java +++ b/ktg-print/src/main/java/com/ktg/print/service/IPrintPrinterConfigService.java @@ -20,6 +20,14 @@ public interface IPrintPrinterConfigService */ public PrintPrinterConfig selectPrintPrinterConfigByPrinterId(Long printerId); + /** + * 根据打印机编号查询打印机配置 + * + * @param printerCode 打印机编号 + * @return 打印机配置 + */ + public PrintPrinterConfig selectPrintPrinterConfigByPrinterCode(String printerCode); + /** * 查询打印机配置列表 * @@ -28,6 +36,14 @@ public interface IPrintPrinterConfigService */ public List selectPrintPrinterConfigList(PrintPrinterConfig printPrinterConfig); + + /** + * 检查编号是否唯一 + * @param config + * @return + */ + public String checkPrinterCodeUnique(PrintPrinterConfig config); + /** * 新增打印机配置 * diff --git a/ktg-print/src/main/java/com/ktg/print/service/impl/PrintPrinterConfigServiceImpl.java b/ktg-print/src/main/java/com/ktg/print/service/impl/PrintPrinterConfigServiceImpl.java index f2ce98f..168a200 100644 --- a/ktg-print/src/main/java/com/ktg/print/service/impl/PrintPrinterConfigServiceImpl.java +++ b/ktg-print/src/main/java/com/ktg/print/service/impl/PrintPrinterConfigServiceImpl.java @@ -1,7 +1,10 @@ package com.ktg.print.service.impl; import java.util.List; + +import com.ktg.common.constant.UserConstants; import com.ktg.common.utils.DateUtils; +import com.ktg.common.utils.StringUtils; import com.ktg.print.domain.PrintPrinterConfig; import com.ktg.print.mapper.PrintPrinterConfigMapper; import com.ktg.print.service.IPrintPrinterConfigService; @@ -32,6 +35,11 @@ public class PrintPrinterConfigServiceImpl implements IPrintPrinterConfigService return printPrinterConfigMapper.selectPrintPrinterConfigByPrinterId(printerId); } + @Override + public PrintPrinterConfig selectPrintPrinterConfigByPrinterCode(String printerCode) { + return printPrinterConfigMapper.selectPrintPrinterConfigByPrinterCode(printerCode); + } + /** * 查询打印机配置列表 * @@ -44,6 +52,19 @@ public class PrintPrinterConfigServiceImpl implements IPrintPrinterConfigService return printPrinterConfigMapper.selectPrintPrinterConfigList(printPrinterConfig); } + @Override + public String checkPrinterCodeUnique(PrintPrinterConfig config) { + + PrintPrinterConfig p = printPrinterConfigMapper.checkPrinterCodeUnique(config); + + Long configId = config.getPrinterId() == null? -1L:config.getPrinterId(); + if(StringUtils.isNotNull(p) && configId.longValue() !=p.getPrinterId().longValue()){ + return UserConstants.NOT_UNIQUE; + }else { + return UserConstants.UNIQUE; + } + } + /** * 新增打印机配置 * diff --git a/ktg-print/src/main/resources/mapper/print/PrintPrinterConfigMapper.xml b/ktg-print/src/main/resources/mapper/print/PrintPrinterConfigMapper.xml index 903756e..3a119f0 100644 --- a/ktg-print/src/main/resources/mapper/print/PrintPrinterConfigMapper.xml +++ b/ktg-print/src/main/resources/mapper/print/PrintPrinterConfigMapper.xml @@ -5,6 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -30,13 +31,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select printer_id, printer_type, printer_name, brand, printer_model, connection_type, printer_url, printer_ip, printer_port, client_sid, client_ip, client_port, enable_flag, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from print_printer_config + select printer_id, printer_code, printer_type, printer_name, brand, printer_model, connection_type, printer_url, printer_ip, printer_port, client_sid, client_ip, client_port, enable_flag, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from print_printer_config - + + + + + + insert into print_printer_config + printer_code, printer_type, printer_name, brand, @@ -84,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, + #{printerCode}, #{printerType}, #{printerName}, #{brand}, @@ -112,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update print_printer_config + printer_code = #{printerCode}, printer_type = #{printerType}, printer_name = #{printerName}, brand = #{brand},