From de34ebfe4c33697ca9f7e33d813e9f9a8bf1fd32 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Tue, 6 Jan 2026 14:41:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86-=E7=BA=BF?=
 =?UTF-8?q?=E8=B7=AF=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/service/impl/TbTowerServiceImpl.java           | 2 +-
 .../com/bonus/digitalSignage/basic/vo/TbTowerVo.java     | 9 +++++++++
 src/main/resources/mappers/basic/TbTowerMapper.xml       | 9 ++++++++-
 .../js/basic/lineManagement/child/towerFormTemp.js       | 8 ++++++++
 .../pages/basic/lineManagement/child/towerFormTemp.html  | 4 +++-
 5 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java
index 7b3348c..bb10e26 100644
--- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java
+++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java
@@ -131,7 +131,7 @@ public class TbTowerServiceImpl implements TbTowerService {
             if(tbThreeSpanVo.size()>0 || tbCablewaTransVo.size()>0){
                 return ServerResponse.createErroe("修改失败-已有三跨点和索道点的杆塔不允许删除和修改");
             }
-            //如果改变杆塔类型，先删后加
+            //如果改变坐标系，先删后加
             if (StringUtils.isNotNull(tbTower) && tbTower.getUploadType()!=data.getUploadType()){
                 delTbTower(data);
                 ServerResponse res = addTbTower(data);
diff --git a/src/main/java/com/bonus/digitalSignage/basic/vo/TbTowerVo.java b/src/main/java/com/bonus/digitalSignage/basic/vo/TbTowerVo.java
index 0f1a265..a2f5480 100644
--- a/src/main/java/com/bonus/digitalSignage/basic/vo/TbTowerVo.java
+++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbTowerVo.java
@@ -55,6 +55,15 @@ public class TbTowerVo {
      */
     private String baiduLat;
 
+    /**
+     * 杆塔类型*/
+    private String towerType;
+
+    /**
+     * 海拔高度
+     */
+    private String altitude;
+
     /**
      * 排序
      */
diff --git a/src/main/resources/mappers/basic/TbTowerMapper.xml b/src/main/resources/mappers/basic/TbTowerMapper.xml
index e285ea0..acce0b6 100644
--- a/src/main/resources/mappers/basic/TbTowerMapper.xml
+++ b/src/main/resources/mappers/basic/TbTowerMapper.xml
@@ -16,6 +16,9 @@
             <if test="uploadType != null ">upload_type,</if>
             <if test="createTime != null">create_time,</if>
             <if test="createUserId != null ">create_user_id,</if>
+            <if test="altitude != null ">altitude,</if>
+            <if test="towerType != null ">tower_type,</if>
+
             is_actvice
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -30,6 +33,8 @@
             <if test="uploadType != null ">#{uploadType},</if>
             <if test="createTime != null ">#{createTime},</if>
             <if test="createUserId != null ">#{createUserId},</if>
+            <if test="altitude != null ">#{altitude},</if>
+            <if test="towerType != null ">#{towerType},</if>
             1
         </trim>
     </insert>
@@ -46,6 +51,8 @@
             <if test="uploadType != null">upload_type = #{uploadType},</if>
             <if test="updateUserId != null">update_user_id = #{updateUserId},</if>
             <if test="isActvice != null">is_actvice = #{isActvice},</if>
+            <if test="altitude != null">altitude = #{altitude},</if>
+            <if test="towerType != null">tower_type = #{towerType},</if>
             update_time = now()
         </trim>
         where id = #{id}
@@ -64,7 +71,7 @@
     <select id="getTbTowerById" resultType="com.bonus.digitalSignage.basic.vo.TbTowerVo">
         select id as id,pro_id as proId,tower_name as towerName,lon as lon,lat as lat,
                baidu_lon as baiduLon,baidu_lat as baiduLat,sort as sort,central_meridian as centralMeridian,
-               upload_type as uploadType
+               upload_type as uploadType,altitude, tower_type as towerType
         from tb_tower where id = #{id}
     </select>
     <select id="getTbTowerBySort" resultType="com.bonus.digitalSignage.basic.vo.TbTowerVo">
diff --git a/src/main/resources/static/js/basic/lineManagement/child/towerFormTemp.js b/src/main/resources/static/js/basic/lineManagement/child/towerFormTemp.js
index 48c41aa..560ca01 100644
--- a/src/main/resources/static/js/basic/lineManagement/child/towerFormTemp.js
+++ b/src/main/resources/static/js/basic/lineManagement/child/towerFormTemp.js
@@ -28,6 +28,8 @@ function setParams(params) {
         $('input[name="longitude"]').attr('lay-verify', 'required|longitude');
         $('input[name="latitude"]').attr('lay-verify', 'required|latitude');
 */
+        // 初始化下拉选项
+        initSelects();
         console.log(idParam + "idParam");
         if (idParam) {
             getTowerById();
@@ -170,6 +172,12 @@ function setParams(params) {
     });
 }
 
+// 初始化下拉选项
+function initSelects() {
+    let proStatusData = getDistinctListByParentCode({ dictCode: "tower_type" });
+    setSelectValueNameCode(proStatusData, "towerType", "请选择杆塔类型");
+}
+
 // 根据id获取杆塔信息
 function getTowerById() {
     let loadingMsg = layer.msg("数据加载中,请稍候...", { icon: 16, time: 0 });
diff --git a/src/main/resources/static/pages/basic/lineManagement/child/towerFormTemp.html b/src/main/resources/static/pages/basic/lineManagement/child/towerFormTemp.html
index c798d82..6602ad5 100644
--- a/src/main/resources/static/pages/basic/lineManagement/child/towerFormTemp.html
+++ b/src/main/resources/static/pages/basic/lineManagement/child/towerFormTemp.html
@@ -134,7 +134,9 @@
             <div class="layui-form-item">
                 <label class="layui-form-label"><span class="required-mark">*</span>杆塔类型:</label>
                 <div class="layui-input-inline">
-                    <!-- 下拉选 -->
+                    <select id="towerType" name="towerType" lay-search="">
+
+                    </select>
                 </div>
             </div>