web数据统计修改

.idea/jarRepositories.xml

@@ -2,8 +2,8 @@
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
     <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
+      <option name="id" value="public" />
+      <option name="name" value="aliyun nexus" />
       <option name="url" value="https://maven.aliyun.com/repository/public" />
     </remote-repository>
     <remote-repository>
@@ -11,15 +11,10 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="public" />
-      <option name="name" value="aliyun nexus" />
-      <option name="url" value="https://maven.aliyun.com/repository/public" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
@@ -36,6 +31,11 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/central/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="custom_group" />
       <option name="name" value="Nexus Repository" />
@@ -46,5 +46,10 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
   </component>
 </project>

business-service/src/main/java/com/ozs/entity/vo/AlarmFreqArea.java

@@ -38,4 +38,18 @@ public class AlarmFreqArea {
      */
     @Excel(name = "报警频次")
     private Integer frequency;
+
+    /**
+     * 行别 字符串
+     */
+    @Excel(name = "行别")
+    @TableField(exist = false)
+    private String lineDirStr;
+
+    /**
+     * 行别 字符串
+     */
+    @Excel(name = "行别")
+    @TableField(exist = false)
+    private Integer lineDir;
 }

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/DataStatisticController.java

@@ -236,6 +236,9 @@ public class DataStatisticController extends BaseController {
                 if (!ObjectUtils.isEmpty(l.getAlarmMile())) {
                     l.setAlarmMiles(AppendUtils.stringAppend(Integer.valueOf(l.getAlarmMile())));
                 }
+                if (!ObjectUtils.isEmpty(l.getLineDir())) {
+                    l.setLineDirStr(l.getLineDir() == 1 ? "上行" : "下行");
+                }
             });
         }
         IPage page = msgAlarmService.listToPage(list, pageNum, pageSize);