报警信息临时表增加车次

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

@@ -2,6 +2,7 @@ package com.ozs.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.entity.BaseCameraManagement;
 import com.ozs.entity.vo.BaseCameraManagementHomeVo;
 import com.ozs.entity.vo.BaseCameraManagementVo;
@@ -39,4 +40,6 @@ public interface BaseCameraManagementService extends IService<BaseCameraManageme
     List<BaseCameraManagement> baseCameraManagementList(BaseCameraManagementVo baseCameraManagementVo);
 
     Map<String, Integer> getMessageStatisticsCamera();
+
+    AjaxResult nonContactAlarmCamera();
 }

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

@@ -1,9 +1,12 @@
 package com.ozs.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.generator.config.IFileCreate;
 import com.github.pagehelper.PageHelper;
+import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.exception.ServiceException;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
@@ -203,7 +206,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                 failureNum++;
                 if (ObjectUtils.isEmpty(cameraManagementVos)) {
                     msg = "导入的文档格式不正确";
-                }else {
+                } else {
                     msg = failureNum + "、相机编码 " + cameraManagementVos.getCameraCode() + " 导入失败：";
                 }
                 failureMsg.append(msg);
@@ -381,4 +384,26 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
         map.put("offline", offline);
         return map;
     }
+
+    @Override
+    public AjaxResult nonContactAlarmCamera() {
+        List<BaseCameraManagement> list = new ArrayList<>();
+        QueryWrapper<MsgAlarm> wrapper = new QueryWrapper<>();
+        wrapper.eq("is_release", 2);
+        List<MsgAlarm> msgAlarms = msgAlarmMapper.selectList(wrapper);
+        if (!ObjectUtils.isEmpty(msgAlarms)) {
+            for (MsgAlarm msgAlarm : msgAlarms) {
+                LambdaQueryWrapper<BaseCameraManagement> camera = new LambdaQueryWrapper<BaseCameraManagement>();
+                camera.ge(BaseCameraManagement::getEndMile, msgAlarm.getAlarmMile());
+                camera.le(BaseCameraManagement::getBeginMile, msgAlarm.getAlarmMile());
+                camera.eq(BaseCameraManagement::getLineDir, msgAlarm.getLineDir());
+                camera.eq(BaseCameraManagement::getRailwayCode, msgAlarm.getRailwayCode());
+                List<BaseCameraManagement> baseCameraManagementList = this.list(camera);
+                if (!ObjectUtils.isEmpty(baseCameraManagementList)){
+                    list.addAll(baseCameraManagementList);
+                }
+            }
+        }
+        return AjaxResult.success(list);
+    }
 }

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

@@ -62,6 +62,8 @@ public class BaseVehicleController extends BaseController {
     @Autowired
     private DataScoreUtil dataScoreUtil;
     @Autowired
+    private BaseCameraManagementService baseCameraManagementService;
+    @Autowired
     private BaseVehicleService baseVehicleService;
     @Autowired
     private ISysDictTypeService dictTypeService;
@@ -153,6 +155,19 @@ public class BaseVehicleController extends BaseController {
         return AjaxResult.success(baseVehicleList);
     }
 
+    /**
+     * 未解除报警的相机
+     *
+     * @param 
+     * @return
+     */
+    @ApiOperation(value = "未解除报警的相机")
+    @GetMapping("/vehicleList/nonContactAlarmCamera")
+    @Log(title = "相机信息管理", businessType = BusinessType.SELECT)
+    public AjaxResult nonContactAlarmCamera() {
+        return baseCameraManagementService.nonContactAlarmCamera();
+    }
+
     /**
      * 机车信息表 详情
      *