Home Explore Help
Sign In
ytrd-project-management
/
GeoHazardMonitor
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

gao.qiang 1 year ago
parent
43b5fc9daa ef58dba885
commit
1a2d92e687
2 changed files with 1 additions and 2 deletions
Split View Show Diff Stats
  1. 0 1
      business-service/src/main/resources/mapper/service/MsgAlarmMapper.xml
  2. 1 1
      hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

+ 0 - 1
business-service/src/main/resources/mapper/service/MsgAlarmMapper.xml
View File 

@@ -391,7 +391,6 @@
 
                a.line_dir         AS lineDir,
 
                a.alarm_type       AS alarmType,
 
                a.camera_code      AS cameraCode,
 
-               a.id               AS id,
 
                a.content          AS content,
 
                a.alarm_confidence AS alarmConfidence,
 
                a.alarm_attr       AS alarmAttr,

+ 1 - 1
hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java
View File 

@@ -235,7 +235,7 @@ public class CameraUtil {
 
         String endTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, endTm);
 
 
         String param = "channel=" + channel + "&startTime=" + startTime + "&endTime=" + endTime;
 
-        String s = HttpUtils.sendGet(webUrl + "/api/record/flv/list", param);
 
+        String s = HttpUtils.sendGet(webUrl + "/recordpro/api/list", param);
 
         // 视频拼接
 
         if (!StringUtils.isBlank(s) && !"null".equals(s) && !s.startsWith("<!DOCTYPE html>")) {
 
             List<Map<String, Object>> maps = JSON.parseArray(s, Map.class);