设备状态页面添加修改时间

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

@@ -1,5 +1,6 @@
 package com.ozs.service.entity.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.vo.PageVo;
 import lombok.AllArgsConstructor;
@@ -8,6 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @author Administrator
@@ -38,6 +40,9 @@ public class DeviceStateResp extends PageVo implements Serializable {
     private String cameraCode;
     @Excel(name = "序列号")
     private String cameraSn;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
     private String railwayCode;
     private String deptId;
 }

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

@@ -138,7 +138,8 @@
         END AS isDisable,
         man.electricity,
         ca.camera_code AS cameraCode,
-        ca.camera_sn AS cameraSn
+        ca.camera_sn AS cameraSn,
+        man.update_time AS updateTime
         FROM
         base_camera_management AS ca
         LEFT JOIN base_railway_management AS ra ON ca.railway_code = ra.railway_code

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -369,7 +369,7 @@ public class BaseCameraManagementController extends BaseController {
                 BigDecimal begin = new BigDecimal(baseCameraManagement.getBeginMiles());
                 baseCameraManagement.setBeginMile(begin.multiply(BigDecimal.valueOf(1000)).intValue());
             }
-        }else {
+        } else {
             baseCameraManagement.setBeginMile(null);
         }
         if (!baseCameraManagement.getInstallMiles().matches(PATTERN)) {
@@ -385,7 +385,7 @@ public class BaseCameraManagementController extends BaseController {
                 BigDecimal end = new BigDecimal(baseCameraManagement.getEndMiles());
                 baseCameraManagement.setEndMile(end.multiply(BigDecimal.valueOf(1000)).intValue());
             }
-        }else {
+        } else {
             baseCameraManagement.setEndMile(null);
         }
         BaseCameraManagement management = baseCameraManagementService.getById(baseCameraManagement.getId());
@@ -402,8 +402,8 @@ public class BaseCameraManagementController extends BaseController {
         }
         one.setCameraCode(baseCameraManagement.getCameraCode());
         LambdaUpdateWrapper<BaseCameraManagement> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(BaseCameraManagement::getId,baseCameraManagement.getId());
-        if (baseCameraManagementService.update(baseCameraManagement,wrapper) && baseDeviceDynamicManagementService.updateById(one)) {
+        wrapper.eq(BaseCameraManagement::getId, baseCameraManagement.getId());
+        if (baseCameraManagementService.update(baseCameraManagement, wrapper) && baseDeviceDynamicManagementService.updateById(one)) {
             return AjaxResult.success();
         }
         return AjaxResult.error();
@@ -452,7 +452,7 @@ public class BaseCameraManagementController extends BaseController {
         }
         String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
         baseCameraManagement.setInstalls(mils);
-        if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile()) && !ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
             String en = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
             String beg = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
             baseCameraManagement.setBeginString(beg);
@@ -528,19 +528,19 @@ public class BaseCameraManagementController extends BaseController {
             ExcelUtil<BaseCameraManagementVos> util = new ExcelUtil<BaseCameraManagementVos>(BaseCameraManagementVos.class);
             ExcelUtil<String> utils = new ExcelUtil<String>(String.class);
             InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/baseCameraManagement.xlsx");
-            List<String> accountManage = utils.importExcels(StringUtils.EMPTY, file.getInputStream(),0);
-            List<String> accountManageLists = utils.importExcels(StringUtils.EMPTY, resourceAsStream,0);
+            List<String> accountManage = utils.importExcels(StringUtils.EMPTY, file.getInputStream(), 0);
+            List<String> accountManageLists = utils.importExcels(StringUtils.EMPTY, resourceAsStream, 0);
             boolean stats = accountManage.stream().sorted().collect(Collectors.joining())
                     .equals(accountManageLists.stream().sorted().collect(Collectors.joining()));
             if (stats) {
-                 accountManageList = util.importExcel(file.getInputStream());
-            }else {
+                accountManageList = util.importExcel(file.getInputStream());
+            } else {
                 return AjaxResult.error("表头格式不正确,请按照模板样式编写");
             }
             String message = baseCameraManagementService.importBaseAccountManagement(accountManageList, updateSupport, getUserId());
             return AjaxResult.success(message);
         } catch (Exception exception) {
-           return AjaxResult.error(exception.getMessage());
+            return AjaxResult.error(exception.getMessage());
         }
     }
 
@@ -655,7 +655,7 @@ public class BaseCameraManagementController extends BaseController {
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult apiRecordsList(@RequestBody
                                      @NotNull(message = "相机编码不能为空")
-                                             List<String> cameraCodes) {
+                                     List<String> cameraCodes) {
         List<String> list = new ArrayList<>();
         for (String cameraCode : cameraCodes) {
             LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
@@ -802,7 +802,7 @@ public class BaseCameraManagementController extends BaseController {
                 return success();
             }
             return error();
-        }else {
+        } else {
             return error("已自动开启录制,关闭按钮已失效");
         }
     }
@@ -835,7 +835,7 @@ public class BaseCameraManagementController extends BaseController {
             } else {
                 return error("开启视频录制失败");
             }
-        }else {
+        } else {
             return error("已自动开启录制,无需按钮再次开启录制");
         }
     }
@@ -898,17 +898,17 @@ public class BaseCameraManagementController extends BaseController {
             BeanUtils.copyProperties(baseCameraManagement, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
-            if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile()) && !ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
                 String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
                 String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-                String endMile =   begin + "~" + end ;
+                String endMile = begin + "~" + end;
                 msgAlarmResp.setBeginMile(endMile);
             }
             String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
             msgAlarmResp.setAlarmMile(mile);
-            if (!ObjectUtils.isEmpty(baseCameraManagement.getInstallLongitude())&&!ObjectUtils.isEmpty(baseCameraManagement.getInstallLatitude())) {
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getInstallLongitude()) && !ObjectUtils.isEmpty(baseCameraManagement.getInstallLatitude())) {
                 msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
-            }else {
+            } else {
                 msgAlarmResp.setInstallLongitude(null);
             }
             msgAlarmResp.setLineDir(baseCameraManagement.getLineDir());
@@ -932,7 +932,7 @@ public class BaseCameraManagementController extends BaseController {
         if (ObjectUtils.isEmpty(one)) {
             throw new BaseException("相机编号【" + vo.getCameraCode() + "】不存在");
         }
-        return new AjaxResult(200, "ok", CameraUtil.getRecordUrl(one.getCameraCode(),one.getChannel(), vo.getStartTime(), vo.getEntTime()));
+        return new AjaxResult(200, "ok", CameraUtil.getRecordUrl(one.getCameraCode(), one.getChannel(), vo.getStartTime(), vo.getEntTime()));
     }
 
     @GetMapping("/api/getRecordByAlarmId")
@@ -943,24 +943,7 @@ public class BaseCameraManagementController extends BaseController {
         wrapper.eq(MsgAlarm::getAlarmId, alarmId);
         MsgAlarm msgAlarm = msgAlarmService.getOne(wrapper);
         if (ObjectUtils.isEmpty(msgAlarm.getReleasedUrl())) {
-            Map<String, Object> map = baseCameraManagementService.getCameraChannelByAlarmId(alarmId);
-            if (!ObjectUtils.isEmpty(map)
-                    && map.size() > 0
-                    && !org.apache.commons.lang3.StringUtils.isBlank(map.get("channel").toString())) {
-                String url = null;
-                if (map.get("isLock").toString().equals("1")) {
-                    url = com.ozs.web.core.util.CameraUtil.historyPlayListStr(map.get("channel").toString(),
-                            (Date) map.get("alarmTime"),
-                            (Date) map.get("releasedTime"),
-                            true);
-                    msgAlarm.setReleasedUrl(url);
-                    msgAlarmService.updateById(msgAlarm);
-                }
-                return error("报警ID为:【" + alarmId + "】的相机信息还未生成报警回放视频");
-            } else {
-                return error("报警ID为:【" + alarmId + "】的相机信息不存在");
-            }
-
+            return error("当前相机暂无回放视频");
         } else {
             return new AjaxResult(200, "ok", caneraConfig.getRecordUrl() + msgAlarm.getReleasedUrl());
         }
@@ -968,6 +951,7 @@ public class BaseCameraManagementController extends BaseController {
 
     /**
      * 测试minio删除图片
+     *
      * @return
      */
     @GetMapping("/removePrice/{number}")
@@ -979,6 +963,7 @@ public class BaseCameraManagementController extends BaseController {
 
     /**
      * 设备状态页面
+     *
      * @param deviceStateResp
      * @return
      */
@@ -1024,18 +1009,18 @@ public class BaseCameraManagementController extends BaseController {
      * 获取离线相机和电量低的相机
      */
     @GetMapping("/getMalfunctionAndLowCameraManagement")
-    public AjaxResult  getMalfunctionAndLowCameraManagement(){
+    public AjaxResult getMalfunctionAndLowCameraManagement() {
         HashMap<String, Long> map = new HashMap<>();
         LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(BaseDeviceDynamicManagement::getIsDisable,2);
+        wrapper.eq(BaseDeviceDynamicManagement::getIsDisable, 2);
         long isDisable = baseDeviceDynamicManagementService.count(wrapper);
-        map.put("isDisable",isDisable);
+        map.put("isDisable", isDisable);
         LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.le(BaseDeviceDynamicManagement::getElectricity,10);
+        queryWrapper.le(BaseDeviceDynamicManagement::getElectricity, 10);
         long electricity = baseDeviceDynamicManagementService.count(queryWrapper);
-        map.put("electricity",electricity);
-        map.put("count",isDisable+electricity);
-        return  AjaxResult.success(map);
+        map.put("electricity", electricity);
+        map.put("count", isDisable + electricity);
+        return AjaxResult.success(map);
     }
 }
 

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

@@ -230,7 +230,7 @@ public class CameraUtil {
 
 
     /**
-     * 历史回放流（获取）
+     * 历史回放流（获取）旧
      *
      * @param channel 相机通道
      * @param startTm 开始时间
@@ -255,6 +255,17 @@ public class CameraUtil {
         }
     }
 
+    /**
+     * 报警视频回放新
+     * @param channel
+     * @param cameraCode
+     * @param startTm
+     * @param endTm
+     * @return
+     */
+    public static String alarmHistoryPlay(String channel,String cameraCode, Date startTm, Date endTm) {
+
+    }
 
     /**
      * 过滤符合条件的视频