视频服务右上方数据修改

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

@@ -432,10 +432,12 @@ public class BaseCameraManagementController extends BaseController {
             wrapper1.eq(MsgAlarm::getCameraCode, baseCameraManagement.getCameraCode());
         }
         MsgAlarm msgAlarm = msgAlarmService.getOne(wrapper1);
+        List<Object> list = new ArrayList<>();
         if (ObjectUtils.isEmpty(msgAlarm)) {
-            return error("报警信息表中没有该相机编码:" + baseCameraManagement.getCameraCode() + "的数据");
+            list.add(1);
+        } else {
+            list.add(msgAlarm.getIsLock());
         }
-        List<Object> list = new ArrayList<>();
         list.add(baseRailwayManagement.getRailwayName());
         list.add(AppendUtils.stringAppend(baseCameraManagement.getInstallMile()));
         list.add(baseCameraManagement.getLineDir());
@@ -445,7 +447,7 @@ public class BaseCameraManagementController extends BaseController {
         SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String format1 = dateFormat1.format(new Date());
         list.add(format1);
-        list.add(msgAlarm.getLineDir());
+        list.add(baseCameraManagement.getLineDir());
         return AjaxResult.success(list);
     }
 
@@ -738,40 +740,51 @@ public class BaseCameraManagementController extends BaseController {
     @ApiOperation("根据视频ID获取详细信息")
     @Log(title = "相机台账管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getAlarm(@PathVariable String cameraCode) {
-        LambdaQueryWrapper<MsgAlarm> queryWrapper = new LambdaQueryWrapper<MsgAlarm>();
+        LambdaQueryWrapper<BaseCameraManagement> queryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
         if (!ObjectUtils.isEmpty(cameraCode)) {
-            queryWrapper.eq(MsgAlarm::getCameraCode, cameraCode);
-            queryWrapper.orderByDesc(MsgAlarm::getCreateTime);
+            queryWrapper.eq(BaseCameraManagement::getCameraCode, cameraCode);
         }
-        List<MsgAlarm> msgAlarmList = msgAlarmService.list(queryWrapper);
-        if (msgAlarmList.size() > 0) {
-            MsgAlarm msgAlarm = msgAlarmList.get(0);
-            LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-            if (!ObjectUtils.isEmpty(cameraCode)) {
-                lw.eq(BaseCameraManagement::getCameraCode, cameraCode);
-            }
-            BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
+        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(queryWrapper);
+        if (!ObjectUtils.isEmpty(baseCameraManagement)) {
             LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
             if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
                 wrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
             }
             BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
             MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
-            BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
+            LambdaQueryWrapper<MsgAlarm> wrapper1 = new LambdaQueryWrapper<MsgAlarm>();
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
+                wrapper1.eq(MsgAlarm::getCameraCode, baseCameraManagement.getCameraCode());
+                wrapper1.orderByDesc(MsgAlarm::getCreateTime);
+            }
+            List<MsgAlarm> list = msgAlarmService.list(wrapper1);
+            if (list.size()>0) {
+                MsgAlarm msgAlarm = list.get(0);
+                msgAlarmResp.setAlarmType(msgAlarm.getAlarmType());
+                msgAlarmResp.setIsLock(msgAlarm.getIsLock());
+                msgAlarmResp.setReleasedTime(msgAlarm.getReleasedTime());
+                msgAlarmResp.setAlarmTime(msgAlarm.getAlarmTime());
+                if (!StringUtils.isEmpty(msgAlarm.getImageUrl())) {
+                    String[] split = msgAlarm.getImageUrl().split(";");
+                    ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
+                    log.info("publish--------"+objects);
+                    msgAlarmResp.setImageUrls(objects);
+                }
+            }
+            BeanUtils.copyProperties(baseCameraManagement, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
             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);
             msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
             msgAlarmResp.setLineDir(baseCameraManagement.getLineDir());
-            msgAlarmResp.setAlarmMile(baseCameraManagement.getInstallMile().toString());
             return AjaxResult.success(msgAlarmResp);
-        } else {
-            return success("无报警信息数据");
+        }else {
+            return error("该相机编码在相机台账表中不存在");
         }
     }
 }