修改导出

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

@@ -34,7 +34,7 @@ public class DeviceStateResp extends PageVo implements Serializable {
     private String lineDir;
     @Excel(name = "相机状态")
     private String isDisable;
-    @Excel(name = "电量")
+    @Excel(name = "电量（%）")
     private Integer electricity;
     @Excel(name = "相机编码")
     private String cameraCode;

business-service/src/main/resources/mapper/service/BaseCameraManagementMapper.xml

@@ -173,13 +173,13 @@
                 and
                 <trim prefix="(" prefixOverrides="or" suffix=")">
                     <if test="dsUserId != null and dsUserId != ''">
-                        or a.create_by=#{dsUserId}
+                        or ca.create_by=#{dsUserId}
                     </if>
                     <if test="dsDeptId != null and dsDeptId != 0">
-                        or a.dept_id=#{dsDeptId}
+                        or ca.dept_id=#{dsDeptId}
                     </if>
                     <if test="dsDeptIds != null">
-                        or a.dept_id in
+                        or ca.dept_id in
                         <foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
                             #{item}
                         </foreach>

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -189,7 +189,7 @@ public class CameraUtil {
             return wsUrl + "/ws/" + channel + "/" + cameraCode;
         }
         if (!flay) {
-            return bakUrl + "/hdl/" + channel + "/" + cameraCode;
+            return webUrl + "/hdl/" + channel + "/" + cameraCode ;
         }
         return webUrl + "/hdl/" + channel + "/" + cameraCode;
     }
@@ -535,7 +535,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
      */
     public static String getRecordUrl(String cameraCode, String channel, Date startTm, Date endTm) {
         String result = null;
-        String url = webUrl + "/gb28181/api/invite?id=" + cameraCode + "&channel=" + channel + "&startTime=" + startTm.getTime()/1000 + "&endTime=" + endTm.getTime()/1000;
+        String url = bakUrl + "/gb28181/api/invite?id=" + cameraCode + "&channel=" + channel + "&startTime=" + startTm.getTime()/1000 + "&endTime=" + endTm.getTime()/1000;
         try {
             result = HttpClientUtil.get(url);
             if (result.equals("200")) {
@@ -565,7 +565,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         JSONArray streamArray = null;
         while (!success && retryCount < maxRetries) {
             try {
-                String data = HttpClientUtil.gets(webUrl + "/api/summary");
+                String data = HttpClientUtil.gets(bakUrl + "/api/summary");
                 log.info("data------------------>" + data);
                 if (StringUtils.isNotEmpty(data)) {
                     JSONObject jsonObject = JSONObject.parseObject(data);

hazard-admin/src/main/resources/application.yml

@@ -19,7 +19,7 @@ base:
   ffmpegPath: /usr/local/bin/ffmpeg
   filePath: /opt/streams/record/flv/
   webUrl: http://124.70.58.209:9080
-  bakUrl: http://124.70.58.209:18891
+  bakUrl: http://124.70.58.209:9080
   wsUrl: ws://124.70.58.209:9080
   defaultPassword: yn5aq5Mt.106.tky
   imgUrl: http://124.70.58.209:18801/picbucket