代码修改

business-service/src/main/java/com/ozs/service/BaseCameraManagementService.java

@@ -42,7 +42,7 @@ public interface BaseCameraManagementService extends IService<BaseCameraManageme
 
     Map<String, Integer> getMessageStatisticsCamera();
 
-    AjaxResult nonContactAlarmCamera();
+    AjaxResult nonContactAlarmCamera(String cameraCode);
 
     List<String> videoCaptureUrl(BaseVehicleTerminalDto baseVehicleTerminalDto);
 }

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

@@ -388,7 +388,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
     }
 
     @Override
-    public AjaxResult nonContactAlarmCamera() {
+    public AjaxResult nonContactAlarmCamera(String cameraCode) {
         List<BaseCameraManagement> list = new ArrayList<>();
         QueryWrapper<MsgAlarm> wrapper = new QueryWrapper<>();
         wrapper.eq("is_release", 2);
@@ -402,6 +402,9 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                 camera.eq(BaseCameraManagement::getRailwayCode, msgAlarm.getRailwayCode());
                 camera.eq(BaseCameraManagement::getOnline, 2);
                 camera.eq(BaseCameraManagement::getEnableOrNot, 1);
+                if (StringUtils.isNotEmpty(cameraCode)){
+                    wrapper.eq("camera_code", cameraCode);
+                }
                 List<BaseCameraManagement> baseCameraManagementList = this.list(camera);
                 if (!ObjectUtils.isEmpty(baseCameraManagementList)) {
                     list.addAll(baseCameraManagementList);

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

@@ -160,10 +160,10 @@ public class BaseVehicleController extends BaseController {
      * @return
      */
     @ApiOperation(value = "未解除报警的相机")
-    @GetMapping("/vehicleList/nonContactAlarmCamera")
+    @GetMapping("/vehicleList/nonContactAlarmCamera/{cameraCode}")
     @Log(title = "相机信息管理", businessType = BusinessType.SELECT)
-    public AjaxResult nonContactAlarmCamera() {
-        return baseCameraManagementService.nonContactAlarmCamera();
+    public AjaxResult nonContactAlarmCamera(@PathVariable("cameraCode") String cameraCode) {
+        return baseCameraManagementService.nonContactAlarmCamera(cameraCode);
     }
 
     /**