三跨管理

src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java

@@ -39,47 +39,47 @@ public class TbThreeSpanVo {
     /**
      * 上层线路
      */
-    private Long upperLine;
+    private String upperLine;
 
     /**
      * 下层线路
      */
-    private Long lowerLine;
+    private String lowerLine;
 
     /**
      * 交叉角度
      */
-    private Long intersectionAngle;
+    private String intersectionAngle;
 
     /**
      * 垂直距离（m）
      */
-    private Long verticalDistance;
+    private String verticalDistance;
 
     /**
      * 安全裕度（°）
      */
-    private Long safetyMargin;
+    private String safetyMargin;
 
     /**
      * 垂直净距（m）
      */
-    private Long verticalClearDistance;
+    private String verticalClearDistance;
 
     /**
      * 杆塔间距（m）
      */
-    private Long towerSpacing;
+    private String towerSpacing;
 
     /**
      * 公路宽度（m）
      */
-    private Long highwayWidth;
+    private String highwayWidth;
 
     /**
      * 是否可用1.可用 0.不可用
      */
-    private Long isActive;
+    private String isActive;
 
     /**
      * 创建时间
@@ -101,6 +101,10 @@ public class TbThreeSpanVo {
      */
     private Long updateUserId;
 
+    /**
+     * 搜索
+     */
+    private String keyWord;
 
     private int pageNum = 1;
     private int pageSize = 10;

src/main/java/com/bonus/digitalSignage/basic/vo/TbTowerVo.java

@@ -36,11 +36,13 @@ public class TbTowerVo {
     /**
      * 经度
      */
+    @Excel(name = "经度", sort = 2)
     private String lon;
 
     /**
-     * 经度
+     * 纬度
      */
+    @Excel(name = "纬度", sort = 3)
     private String lat;
 
     /**
@@ -56,16 +58,19 @@ public class TbTowerVo {
     /**
      * 排序
      */
+    @Excel(name = "排序", sort = 4)
     private Integer sort;
 
     /**
      * 中央子午线
      */
+    @Excel(name = "中央子午线", sort = 5)
     private String centralMeridian;
 
     /**
      * 类型 1.WGS-84地心坐标系  2.2000国家大地坐标系
      */
+    @Excel(name = "坐标系", sort = 6,readConverterExp = "1=WGS-84地心坐标系,2=2000国家大地坐标系")
     private String uploadType;
 
     /**

src/main/resources/mappers/basic/TbThreeSpanMapper.xml

@@ -64,12 +64,18 @@
 
 
     <select id="getTbThreeSpanList" resultType="com.bonus.digitalSignage.basic.vo.TbThreeSpanVo">
-        select id as id,pro_id as proId,span_type as spanType,tower_id as towerId,next_tower_id as nextTowerId,
+        select tts.id as id,tts.pro_id as proId,tts.span_type as spanType,tts.tower_id as towerId,tts.next_tower_id as nextTowerId,
-        upper_line as upperLine,lower_line as lowerLine,intersection_angle as intersectionAngle,
+        tts.upper_line as upperLine,tts.lower_line as lowerLine,tts.intersection_angle as intersectionAngle,
-        vertical_distance as verticalDistance,safety_margin as safetyMargin,vertical_clear_distance as verticalClearDistance,
+        tts.vertical_distance as verticalDistance,tts.safety_margin as safetyMargin,tts.vertical_clear_distance as verticalClearDistance,
-        tower_spacing as towerSpacing,highway_width as highwayWidth
+        tts.tower_spacing as towerSpacing,tts.highway_width as highwayWidth
-        from tb_three_span where pro_id = #{proId} and is_actvice = '1'
+        from tb_three_span tts
-        <if test="towerName != '' and towerName != null">and tower_name  like concat('%', #{towerName}, '%')</if>
+        left join tb_tower tt on tts.tower_id = tt.id
+        left join tb_tower tt2 on tts.tower_id = tt.id
+        where tts.pro_id = #{proId} and tts.is_active = '1'
+        <if test="keyWord != '' and keyWord != null">
+            and (tt.tower_name like concat('%',#{keyWord},'%') or
+            tt2.tower_name like concat('%',#{keyWord},'%'))
+        </if>
     </select>
     <select id="getTbThreeSpanById" resultType="com.bonus.digitalSignage.basic.vo.TbThreeSpanVo">
         select id as id,pro_id as proId,span_type as spanType,tower_id as towerId,next_tower_id as nextTowerId,