异物侵限报警修改

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

@@ -40,7 +40,7 @@ public class DeviceResumeResp extends PageVo implements Serializable {
     @Excel(name = "线路类型",readConverterExp = "1=高铁,2=普铁")
     private Integer railwayType;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "新增时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createTime ;
     @Excel(name = "相机状态",readConverterExp = "1=正常,2=故障")
     private String isDisable;

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

@@ -39,7 +39,7 @@ public class ElectricityResumeResp extends PageVo implements Serializable {
     @Excel(name = "线路类型",readConverterExp = "1=高铁,2=普铁")
     private Integer railwayType;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "新增时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createTime ;
     @Excel(name = "电量（%）")
     private Integer electricity;

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

@@ -48,8 +48,8 @@ public class BaseDeviceResumeController extends BaseController {
     @GetMapping("/exportDeviceResume")
     @Log(title = "设备状态履历", businessType = BusinessType.EXPORT)
     public void exportDeviceResume(HttpServletResponse response, @RequestParam(value = "cameraCode") String cameraCode,
-                                   @RequestParam(value = "startTime", required = false) String startTime,
-                                   @RequestParam(value = "endTime", required = false) String endTime) {
+                                   @RequestParam(value ="startTime", required = false) String startTime,
+                                   @RequestParam(value ="endTime", required = false) String endTime) {
         List<DeviceResumeResp> deviceResumeRespList = baseDeviceResumeService.exportDeviceResume(cameraCode, startTime, endTime);
         ExcelUtil<DeviceResumeResp> util = new ExcelUtil<>(DeviceResumeResp.class);
         util.exportExcel(response, deviceResumeRespList, "设备状态履历数据");

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

@@ -1019,13 +1019,13 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         Set<String> inactiveCameraCodes = new HashSet<>(allCameraCodes);
         inactiveCameraCodes.removeAll(loggedCameraCodes);
 
+        // 保存设备状态变更记录
+        saveDeviceResume(loggedCameraCodes, 1);
+        saveDeviceResume(inactiveCameraCodes, 2);
         // 更新设备状态
         updateDeviceStatus(loggedCameraCodes, 1); // 启用设备
         updateDeviceStatus(inactiveCameraCodes, 2); // 禁用设备
 
-        // 保存设备状态变更记录
-        saveDeviceResume(loggedCameraCodes, 1);
-        saveDeviceResume(inactiveCameraCodes, 2);
     }
 
     // 辅助方法：更新设备状态