视频上方数据修改

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

@@ -433,21 +433,16 @@ public class BaseCameraManagementController extends BaseController {
         }
         MsgAlarm msgAlarm = msgAlarmService.getOne(wrapper1);
         List<Object> list = new ArrayList<>();
-        if (ObjectUtils.isEmpty(msgAlarm)) {
-            list.add(1);
-        } else {
-            list.add(msgAlarm.getIsLock());
-        }
         list.add(baseRailwayManagement.getRailwayName());
         list.add(AppendUtils.stringAppend(baseCameraManagement.getInstallMile()));
         list.add(baseCameraManagement.getLineDir());
         list.add(baseCameraManagement.getCameraCode());
         list.add(baseDeviceDynamicManagement.getElectricity());
-        list.add(msgAlarm.getIsLock());
-        SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String format1 = dateFormat1.format(new Date());
-        list.add(format1);
-        list.add(baseCameraManagement.getLineDir());
+        if (ObjectUtils.isEmpty(msgAlarm)) {
+            list.add(1);
+        } else {
+            list.add(msgAlarm.getIsLock());
+        }
         return AjaxResult.success(list);
     }