打印机配置增加打印机编号

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));
     }
 

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;
     }

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<PrintPrinterConfig> selectPrintPrinterConfigList(PrintPrinterConfig printPrinterConfig);
 
+    /**
+     * 检查编号是否唯一
+     * @param config
+     * @return
+     */
+    public PrintPrinterConfig checkPrinterCodeUnique(PrintPrinterConfig config);
+
     /**
      * 新增打印机配置
      * 

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<PrintPrinterConfig> selectPrintPrinterConfigList(PrintPrinterConfig printPrinterConfig);
 
+
+    /**
+     * 检查编号是否唯一
+     * @param config
+     * @return
+     */
+    public String checkPrinterCodeUnique(PrintPrinterConfig config);
+
     /**
      * 新增打印机配置
      * 

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;
+        }
+    }
+
     /**
      * 新增打印机配置
      *