相机详情，报警详情问题

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

@@ -86,6 +86,7 @@ public class MsgAlarmVo extends PageVo implements Serializable {
      * 报警是否解除 1已解除2未解除
      */
     private Integer isRelease;
+    private String isReleaseName;
 
     /**
      * 用户userID

business-service/src/main/java/com/ozs/service/impl/MsgAlarmServiceImpl.java

@@ -201,6 +201,7 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
         msgAlarmVo1.setLineDirStr(baseCameraManagement.getLineDir() == 1 ? "上行" : "下行");
         msgAlarmVo1.setCameraCode(baseCameraManagement.getCameraCode());
         msgAlarmVo1.setElectricity(baseDeviceDynamicManagement.getElectricity());
+        msgAlarmVo1.setIsReleaseName(msgAlarm.getIsRelease() == 1 ? "已解除" : "未解除");
         return AjaxResult.success(msgAlarmVo1);
     }
 }

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

@@ -553,7 +553,6 @@ public class BaseCameraManagementController extends BaseController {
         return new AjaxResult(200, "ok", CameraUtil.getPlayFlv(cameraCode, one.getChannel()));
     }
 
-
     @ApiOperation("视频邀约")
     @GetMapping("/api/invite/{cameraCode}")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -240,66 +240,18 @@ public class MsgAlarmController extends BaseController {
         util.exportExcel(response, msgAlarmList, "报警信息管理");
     }
 
-    @GetMapping(value = "/getByAlarmId/{alarmId}")
-    @ApiOperation("根据报警信息ID获取详细信息-app")
-    @Log(title = "报警信息管理", businessType = BusinessType.MESSAGE)
-    public AjaxResult getByAlarmId(@PathVariable String alarmId) {
-        MsgAlarm msgAlarm = msgAlarmService.getByAlarmId(alarmId);
-        if (!ObjectUtils.isEmpty(msgAlarm)) {
-//            LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-//            if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
-//                lw.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
-//            }
-//            BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
-//            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();
-//            String[] split = msgAlarm.getImageUrl().split(";");
-//            ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
-//            msgAlarm.setImageUrls(objects);
-//            if (StringUtils.isNotEmpty(msgAlarm.getReleasedBy())) {
-//                BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
-//                msgAlarm.setReleasedByName(user.getNickName());
-//            }
-//            BeanUtils.copyProperties(msgAlarm, 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;
-//            msgAlarmResp.setBeginMile(endMile);
-//            String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
-//            msgAlarmResp.setAlarmMile(mile);
-//            msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
-            return AjaxResult.success(msgAlarmResp);
-        } else {
-            return success("无报警信息数据");
-        }
-    }
-
     @GetMapping(value = "/{id}")
     @ApiOperation("根据报警信息ID获取详细信息")
     @Log(title = "报警信息管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getInfo(@PathVariable Long id) {
         MsgAlarm msgAlarm = msgAlarmService.getById(id);
         if (!ObjectUtils.isEmpty(msgAlarm)) {
-//            LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-//            if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
-//                lw.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
-//            }
-//            BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
             LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
             if (!ObjectUtils.isEmpty(msgAlarm.getRailwayCode())) {
                 wrapper.eq(BaseRailwayManagement::getRailwayCode, msgAlarm.getRailwayCode());
             }
             BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
             MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
-//            String[] split = msgAlarm.getImageUrl().split(";");
-//            ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
-//            msgAlarm.setImageUrls(objects);
             BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
             if (!StringUtils.isEmptySunhh(msgAlarm.getReleasedBy())) {
                 BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
@@ -308,11 +260,6 @@ public class MsgAlarmController extends BaseController {
             if (!StringUtils.isEmptySunhh(baseRailwayManagement) && !StringUtils.isEmptySunhh(baseRailwayManagement.getRailwayName())) {
                 msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             }
-//            msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
-//            String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
-//            String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-//            String endMile = "[" + begin + "]-[" + end + "]";
-//            msgAlarmResp.setBeginMile(endMile);
             String mile = AppendUtils.stringAppend(msgAlarm.getAlarmMile());
             msgAlarmResp.setAlarmMile(mile);
             msgAlarmResp.setLineDirStr(msgAlarm.getLineDir() == 1 ? "上行" : "下行");
@@ -324,9 +271,6 @@ public class MsgAlarmController extends BaseController {
                     msgAlarmResp.setAlarmTypeName(sysDictData.getDictLabel());
                 }
             });
-//            msgAlarmResp.setInstallLongitude(msgAlarm.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
-//            SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
-//            msgAlarmResp.setDeptName(sysDept.getDeptName());
             return AjaxResult.success(msgAlarmResp);
         } else {
             return success("无报警信息数据");