From 3bbfa93e13eab60b6d7e259bab2ce15befd47708 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Fri, 20 Dec 2024 09:17:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AF=BC=E5=85=A5=E8=A3=85=E7=BD=AE?=
 =?UTF-8?q?=E5=B8=A6=E4=B8=8A=E6=98=AF=E5=90=A6=E5=B8=A6=E4=BA=91=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/shxy/xymanager_common/model/UploadModel.java     | 1 +
 .../shxy/xymanager_service/impl/TerminalExtServiceImpl.java   | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/UploadModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/UploadModel.java
index aa1b74d..7c5c6aa 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/UploadModel.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/UploadModel.java
@@ -16,4 +16,5 @@ public class UploadModel {
     private List<String> cmdidList;
     @NotNull(message = "channelCount不能为空")
     private Integer channelCount;
+    private Integer hasPan;
 }
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java
index 3ce0690..e3d8bca 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java
@@ -263,6 +263,9 @@ public class TerminalExtServiceImpl implements TerminalExtService {
         if (protocol == null) {
             throw new ApiException("未找到该规约");
         }
+        if (model.getHasPan() == null) {
+            model.setHasPan(0);
+        }
         Date now = new Date();
         for (String cmdid : model.getCmdidList()) {
             Towers tower = new Towers();
@@ -279,6 +282,7 @@ public class TerminalExtServiceImpl implements TerminalExtService {
             term.setLineId(line.getId());
             term.setTowerId(tower.getId());
             term.setProtocol(model.getProtocol());
+            term.setHasPan(model.getHasPan());
             term.setDisplayName(cmdid);
             term.setCreateTime(now);
             term.setUpdateTime(now);