diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/CrawlerCraneCurrentData.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/CrawlerCraneCurrentData.java
index 4febe4875..9507c3431 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/CrawlerCraneCurrentData.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/CrawlerCraneCurrentData.java
@@ -126,10 +126,10 @@ public class CrawlerCraneCurrentData implements Serializable {
     @ApiModelProperty(value = "门限位")
     private String thresholdPosition;
     /**
-     * 俯仰角
+     * 导向俯仰角
      */
-    @Excel(name = "俯仰角", width = 15)
-    @ApiModelProperty(value = "俯仰角")
+    @Excel(name = "导向俯仰角", width = 15)
+    @ApiModelProperty(value = "导向俯仰角")
     private String pitchAngle;
     /**
      * 幅度
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/TunnelBoringMachineCurrentData.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/TunnelBoringMachineCurrentData.java
index 474297d64..ecaeaed78 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/TunnelBoringMachineCurrentData.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/TunnelBoringMachineCurrentData.java
@@ -223,10 +223,10 @@ public class TunnelBoringMachineCurrentData implements Serializable {
     @ApiModelProperty(value = "贯入度")
     private String penetration;
     /**
-     * 俯仰角
+     * 导向俯仰角
      */
-    @Excel(name = "俯仰角", width = 15)
-    @ApiModelProperty(value = "俯仰角")
+    @Excel(name = "导向俯仰角", width = 15)
+    @ApiModelProperty(value = "导向俯仰角")
     private String pitchAngle;
     /**
      * 水平偏差趋势
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TunnelBoringMachineCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TunnelBoringMachineCurrentDataServiceImpl.java
index e6d4633a2..a114b5741 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TunnelBoringMachineCurrentDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TunnelBoringMachineCurrentDataServiceImpl.java
@@ -109,7 +109,7 @@ public class TunnelBoringMachineCurrentDataServiceImpl extends ServiceImpl<Tunne
                     JSONObject obj = values.getJSONObject(i);
                     if (obj.getString("colName").equals("环号")) {
                         tunnelBoringMachineCurrentData.setCurrentNumber(obj.getInteger("val"));
-                        tunnelBoringMachineCurrentData.setMileageCompleted(obj.getString("val"));
+//                        tunnelBoringMachineCurrentData.setMileageCompleted(obj.getString("val"));
 //                        tunnelBoringMachineCurrentData.setGroutingStatus();
 //                        tunnelBoringMachineCurrentData.setCommunicationStatus();
 //                        tunnelBoringMachineCurrentData.setHingeStatus();
@@ -150,10 +150,10 @@ public class TunnelBoringMachineCurrentDataServiceImpl extends ServiceImpl<Tunne
                     if (obj.getString("colName").equals("贯入度")) {
                         tunnelBoringMachineCurrentData.setPenetration(obj.getString("val"));
                     }
-                    if (obj.getString("colName").equals("俯仰角")) {
+                    if (obj.getString("colName").equals("导向俯仰角")) {
                         tunnelBoringMachineCurrentData.setPitchAngle(obj.getString("val"));
                     }
-                    if (obj.getString("colName").equals("滚动角")) {
+                    if (obj.getString("colName").equals("导向滚动角")) {
                         tunnelBoringMachineCurrentData.setRollPosition(obj.getDouble("val"));
                     }
                     if (obj.getString("colName").equals("刀盘转速")) {
@@ -282,6 +282,9 @@ public class TunnelBoringMachineCurrentDataServiceImpl extends ServiceImpl<Tunne
         List<String> dayList = DateUtils.getNowFewDaysAgoList(15);
         List<TunnelBoringMachineStat> resultList = new ArrayList<>();
         for (String s : dayList) {
+            if (s.equals(DateUtil.formatDate(new Date()))) {
+                continue;
+            }
             List<TunnelBoringMachineStat> collect = machineStatList.stream().filter(m -> DateUtil.formatDate(m.getCreateTime()).equals(s)).collect(Collectors.toList());
             if (collect.size() > 0) {
                 resultList.add(collect.get(0));
diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java
index b73340c48..9641efaac 100644
--- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java
@@ -410,10 +410,10 @@ public class VideoItemServiceImpl extends ServiceImpl<VideoItemMapper, VideoItem
                 String videoPassword = MapUtils.getString(entityMap, "videoPassword");
                 if (StringUtils.isNotBlank(videoPassword)) {
                     entityMap.put("url", "ezopen://" + videoPassword +"@open.ys7.com/" + MapUtils.getString(entityMap, "serialNumber") + "/" +
-                            MapUtils.getString(entityMap, "verificationCode") + ".hd.live");
+                            MapUtils.getString(entityMap, "verificationCode") + ".live");
                 } else {
                     entityMap.put("url", "ezopen://open.ys7.com/" + MapUtils.getString(entityMap, "serialNumber") + "/" +
-                            MapUtils.getString(entityMap, "verificationCode") + ".hd.live");
+                            MapUtils.getString(entityMap, "verificationCode") + ".live");
                 }
 
             }
diff --git a/src/main/java/com/zhgd/xmgl/task/TunnelBoringMachineTask.java b/src/main/java/com/zhgd/xmgl/task/TunnelBoringMachineTask.java
index b87b17c37..ffcf3dcc3 100644
--- a/src/main/java/com/zhgd/xmgl/task/TunnelBoringMachineTask.java
+++ b/src/main/java/com/zhgd/xmgl/task/TunnelBoringMachineTask.java
@@ -193,7 +193,7 @@ public class TunnelBoringMachineTask {
                 JSONObject obj = values.getJSONObject(i);
                 if (obj.getString("colName").equals("环号")) {
                     tunnelBoringMachineCurrentData.setCurrentNumber(obj.getInteger("val"));
-                    tunnelBoringMachineCurrentData.setMileageCompleted(obj.getString("val"));
+//                    tunnelBoringMachineCurrentData.setMileageCompleted(obj.getString("val"));
 //                        tunnelBoringMachineCurrentData.setGroutingStatus();
 //                        tunnelBoringMachineCurrentData.setCommunicationStatus();
 //                        tunnelBoringMachineCurrentData.setHingeStatus();
@@ -234,10 +234,10 @@ public class TunnelBoringMachineTask {
                 if (obj.getString("colName").equals("贯入度")) {
                     tunnelBoringMachineCurrentData.setPenetration(obj.getString("val"));
                 }
-                if (obj.getString("colName").equals("俯仰角")) {
+                if (obj.getString("colName").equals("导向俯仰角")) {
                     tunnelBoringMachineCurrentData.setPitchAngle(obj.getString("val"));
                 }
-                if (obj.getString("colName").equals("滚动角")) {
+                if (obj.getString("colName").equals("导向滚动角")) {
                     tunnelBoringMachineCurrentData.setRollPosition(obj.getDouble("val"));
                 }
                 if (obj.getString("colName").equals("刀盘转速")) {