1.加入超速报警

王通
1 parent b94f2938
Showing 8 changed files with 81 additions and 25 deletions
src/main/java/com/bsth/message/entity/AlarmDSMVo.java
src/main/java/com/bsth/message/handler/RabbitMessageHandler.java
src/main/resources/application-dev.properties
src/main/resources/application.properties
src/main/resources/static/pages/base/station/list.html
src/main/resources/static/real_control_v2/fragments/north/nav/alarm/dsm.html
src/main/resources/static/real_control_v2/js/alarm/alarm.js
src/main/resources/static/real_control_v2/js/safe_driv/safeDriv.js
@@ -103,6 +103,21 @@ public class AlarmDSMVo implements AlarmVo {
  
     private String lineCode;
  
+    /**
+     * 限速值(0.01km/h)
+     */
+    private int speedLimit;
+
+    /**
+     * 超速速度峰值(0.01km/h)
+     */
+    private int speedPeak;
+
+    /**
+     * 超速持续时长(S)
+     */
+    private int duration;
+
     public String getClientId() {
         return clientId;
     }
@@ -252,6 +267,34 @@ public class AlarmDSMVo implements AlarmVo {
         this.lineCode = lineCode;
     }
  
+    public int getSpeedLimit() {
+        return speedLimit;
+    }
+
+    public void setSpeedLimit(int speedLimit) {
+        this.speedLimit = speedLimit;
+    }
+
+    public int getSpeedPeak() {
+        return speedPeak;
+    }
+
+    public void setSpeedPeak(int speedPeak) {
+        this.speedPeak = speedPeak;
+    }
+
+    public int getDuration() {
+        return duration;
+    }
+
+    public void setDuration(int duration) {
+        this.duration = duration;
+    }
+
+    public String getAttach() {
+        return String.format("峰值(km/h):%d[%d],持续(s):%d", speedPeak / 100,  speedLimit/ 100, duration);
+    }
+
     @Override
     public int hashCode() {
         return String.format("%s_%d_%d", this.clientId, this.alarmTimeBegin, this.type).hashCode();
@@ -42,6 +42,9 @@ public class RabbitMessageHandler {
                 alarmVo = mapper.readValue(message, AlarmDSMVo.class);
             } else if ("adas".equals(data.get("alarmType"))) {
                 alarmVo = mapper.readValue(message, AlarmADASVo.class);
+            } else if ("over-speed".equals(data.get("alarmType"))) {
+                alarmVo = mapper.readValue(message, AlarmDSMVo.class);
+                ((AlarmDSMVo)alarmVo).setType(17);
             }
             if (alarmVo != null) {
                 if (alarmVo.getVehicleCode() == null) {
@@ -50,6 +53,7 @@ public class RabbitMessageHandler {
                 }
                 GpsEntity gps = gpsRealData.getByNbbm(alarmVo.getVehicleCode());
                 if (gps == null || gps.getLineId() == null) {
+                    alarmVo.setLineCode("249231");
                     log.warn("报警未匹配到线路,alarmVo: {}", alarmVo);
                 } else {
                     alarmVo.setLineCode(gps.getLineId());
@@ -18,9 +18,9 @@ spring.datasource.driver-class-name= com.mysql.jdbc.Driver
 ##spring.datasource.url= jdbc:mysql://192.168.168.222/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.username= root
 #spring.datasource.password=
-spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://192.168.168.152/control_dy?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= root
+spring.datasource.password= root2jsp
 #spring.datasource.url= jdbc:mysql://192.168.168.241/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.username= root
 #spring.datasource.password= root2jsp
@@ -46,16 +46,16 @@ spring.kafka.consumer.key-deserializer= org.apache.kafka.common.serialization.St
 spring.kafka.consumer.value-deserializer= org.apache.kafka.common.serialization.StringDeserializer
  
 rabbit.use= true
-spring.rabbitmq.host= 10.10.2.21
+spring.rabbitmq.host= 192.168.168.167
 spring.rabbitmq.port= 5672
 spring.rabbitmq.username= bsth
 spring.rabbitmq.password= bsth001
 spring.rabbitmq.virtual-host= /dsm
  
-minio.url= http://10.10.2.21:9008
-minio.accessKey= umupRhEzO9EiVhLnJ7b9
-minio.secretKey= VzjQUTN6c8p70HyX8AryRrB6ZjEsF2K28ndctHQh
-minio.bucket= dsm
+minio.url= http://192.168.168.167:9000
+minio.accessKey= RY5KuSaAPpfZ6D6mIR3x
+minio.secretKey= BexuwVnJ2ikqV03OpO1wSKabU1x9gGtEf6NCFgpu
+minio.bucket= adas
  
 sso.enabled= false
 sso.systemcode = SYS0019
-spring.profiles.active = cloud
+spring.profiles.active = dev
  
 spring.view.suffix=.html
 server.session-timeout=-1
@@ -50,7 +50,9 @@
 								<td>
 									<input type="text" class="form-control form-filter input-sm" id="stationCode" name="stationCode_like">
 								</td>
-								<td></td>
+								<td>
+									<input type="text" class="form-control form-filter input-sm" id="passLines" name="passLines_like">
+								</td>
 								<td>
 									 <input type="text" class="form-control form-filter input-sm" id="standardStationCode" name="standardStationCode_like">
 								</td>
@@ -22,8 +22,7 @@
                         <option value="3">抽烟报警</option>
                         <option value="4">分神驾驶报警</option>
                         <option value="5">驾驶员异常报警</option>
-                        <option value="6">用户自定义报警</option>
-                        <option value="7">用户自定义报警</option>
+                        <option value="17">超速报警</option>
                     </select>
                     <button class="uk-button">检索</button>
                     <!--<a id="showSSSpVedioModal" style="color: red;float: right;font-size: 12px;">查看实时视频</a>-->
@@ -40,8 +39,7 @@
                     <th style="width: 12%;">异常类型</th>
                     <th style="width: 16%;">时间</th>
                     <th style="width: 16%;">报警等级</th>
-                    <th style="width: 16%;">疲劳程度</th>
-                    <th style="width: 10%;">附件</th>
+                    <th style="width: 20%;">附件/附加信息</th>
                 </tr>
                 </thead>
                 <tbody data-uk-observe>
@@ -57,15 +55,18 @@
     <script id="alarm-dsm-table-template" type="text/html">
         {{each array as dsm i}}
         <tr>
-            <td style="width: 14%;">{{dsm.lineCode}}</td>
-            <td style="width: 14%;">{{dsm.vehicleCode}}</td>
-            <td style="width: 13%;">{{dsm.vehiclePlate}}</td>
-            <td style="width: 13%;">{{dsm.alarmDescription}}</td>
-            <td style="width: 10%;">{{dsm.timeStr}}</td>
-            <td style="width: 10%;">{{dsm.level}}</td>
-            <td style="width: 10%;">{{dsm.fatigueDegree}}</td>
-            <td>
+            <td style="width: 10%;">{{dsm.lineCode}}</td>
+            <td style="width: 11%;">{{dsm.vehicleCode}}</td>
+            <td style="width: 12%;">{{dsm.vehiclePlate}}</td>
+            <td style="width: 12%;">{{dsm.alarmDescription}}</td>
+            <td style="width: 16%;">{{dsm.timeStr}}</td>
+            <td style="width: 16%;">{{dsm.level}}</td>
+            <td style="width: 20%;">
+                {{if dsm.speedLimit == 0}}
                 <a class="image_link" click="" data-url="{{dsm.paths.join(',')}}" title="{{dsm.title}}">查看</a>
+                {{else}}
+                {{dsm.attach}}
+                {{/if}}
             </td>
         </tr>
         {{/each}}
@@ -4,18 +4,22 @@
 var gb_alarm = (function () {
     var code2des = {
         6401: '前向碰撞报警', 6402: '车道偏离报警', 6403: '车距过近报警', 6404: '行人碰撞报警', 6405: '频繁变道报警', 6406: '道路标识超限报警', 6407: '障碍物报警',
-        6501: '疲劳驾驶报警', 6502: '接打电话报警', 6503: '抽烟报警', 6504: '分神驾驶报警', 6505: '驾驶员异常报警', 6506: '用户自定义报警', 6507: '用户自定义报警'
+        6501: '疲劳驾驶报警', 6502: '接打电话报警', 6503: '抽烟报警', 6504: '分神驾驶报警', 6505: '驾驶员异常报警', 6506: '用户自定义报警', 6507: '用户自定义报警', 6517: '超速报警'
     };
     var $wrap = $('.multi_plat_msg_pop_wrap');
     var max = 5;
  
     var pop = function (data) {
         //时间格式化
-        data.timeStr = moment(data.alarmTimeBegin).format('/');
+        data.timeStr = moment(data.ts).format('HH时mm分ss秒');
         if (data.alarmType === 'adas') {
             data.content = '[' + code2des[6400 + data.type] + ']';
         } else if (data.alarmType === 'dsm') {
             data.content = '[' + code2des[6500 + data.type] + ']';
+        } else if (data.alarmType === 'over-speed') {
+            debugger
+            data.content = '[' + code2des[6500 + data.type] + ']';
+
         }
         data.url = data.paths.join(',');
  
@@ -110,12 +110,14 @@ var gb_safe_driv = (function () {
             case 'adas':
                 var urls = $(this).data('url').split(','), items = [];
                 urls.forEach(function (url, idx) {
-                    if (url.endsWith('.bin')) return;
+                    if (!url || url.endsWith('.bin')) return;
                     items.push({title: '附件' + (idx + 1), source: 'http://118.113.164.50:9008/dsm/' + url});
                 });
                 $(this).remove();
  
-                UIkit.lightbox.create(items, {keyboard: true}).show();
+                if (items.length > 0) {
+                    UIkit.lightbox.create(items, {keyboard: true}).show();
+                }
                 break;
             default:
                 break;