代码同步

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

@@ -36,6 +36,19 @@ public class AlarmFreqArea {
     /**
      * 报警频次
      */
-    @Excel(name = "报警频次")
+    @Excel(name = "次数")
     private Integer frequency;
+
+    /**
+     * 行别 字符串
+     */
+    @Excel(name = "行别")
+    @TableField(exist = false)
+    private String lineDirStr;
+
+    /**
+     * 行别 字符串
+     */
+    @TableField(exist = false)
+    private Integer lineDir;
 }

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

@@ -69,4 +69,9 @@ public class BaseCameraManagementVo extends PageVo implements Serializable {
     private Integer online;
     
     private Integer enableOrNot;
+
+    private  String  stationName;
+
+    private String cameraCode;
+    
 }

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

@@ -143,4 +143,6 @@ public class MsgAlarmTemporary  implements Serializable {
      */
     private String source;
 
+    private  String trainNum;
+
 }

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);
+    }
 }

business-service/src/main/resources/mapper/BaseCameraManagementMapper.xml

@@ -9,6 +9,12 @@
             <if test="railwayCode != null and railwayCode != ''">
                 and railway_code = #{railwayCode}
             </if>
+            <if test="cameraCode != null and cameraCode != ''">
+                and camera_code = #{cameraCode}
+            </if>
+            <if test="stationName != null and stationName !=''">
+                and station_name like CONCAT('%', #{stationName}, '%')
+            </if>
             <if test="lineDir != null and lineDir != 0">
                 and line_dir = #{lineDir}
             </if>

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

@@ -246,7 +246,7 @@ public class BaseCameraManagementController extends BaseController {
                     o.setBeginMileBD(new BigDecimal(o.getBeginMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
                 }
                 o.setLineDirStr(o.getLineDir() == 1 ? "上行" : "下行");
-                o.setMilesRange(begin + "-" + end);
+                o.setMilesRange(begin + "~" + end);
                 o.setLongitudeAndLatitude(o.getInstallLongitude() + "," + o.getInstallLongitude());
                 if (roleKey.size() > 0 || "admin".equals(baseUser.getUserName())) {
                     o.setIsStartRecording(1);

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

@@ -131,7 +131,7 @@ public class BaseRailwayManagementController extends BaseController {
                 if (!StringUtils.isEmptySunhh(o.getEndMileage())) {
                     begin = AppendUtils.stringAppend(o.getEndMileage());
                 }
-                o.setMilesRange(end + "-" + begin);
+                o.setMilesRange(end + "~" + begin);
                 return o;
             }).collect(Collectors.toList());
             page.setRecords(dto1);

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();
+    }
+
     /**
      * 机车信息表 详情
      *

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

@@ -236,6 +236,9 @@ public class DataStatisticController extends BaseController {
                 if (!ObjectUtils.isEmpty(l.getAlarmMile())) {
                     l.setAlarmMiles(AppendUtils.stringAppend(Integer.valueOf(l.getAlarmMile())));
                 }
+                if (!ObjectUtils.isEmpty(l.getLineDir())) {
+                    l.setLineDirStr(l.getLineDir() == 1 ? "上行" : "下行");
+                }
             });
         }
         IPage page = msgAlarmService.listToPage(list, pageNum, pageSize);
@@ -267,6 +270,9 @@ public class DataStatisticController extends BaseController {
                 if (!ObjectUtils.isEmpty(l.getAlarmMile())) {
                     l.setAlarmMiles(AppendUtils.stringAppend(Integer.valueOf(l.getAlarmMile())));
                 }
+                if (!ObjectUtils.isEmpty(l.getLineDir())) {
+                    l.setLineDirStr(l.getLineDir() == 1 ? "上行" : "下行");
+                }
             });
             ExcelUtil<AlarmFreqArea> util = new ExcelUtil<>(AlarmFreqArea.class);
             util.exportExcel(response, list, "频繁出现灾害地点排导出");

vehicle-admin/src/main/java/com/ozs/web/controller/sdk/GeoHazardMonitorTokenController.java

@@ -891,6 +891,7 @@ public class GeoHazardMonitorTokenController {
             if (!ObjectUtils.isEmpty(cameraVo.getLineDir())) {
                 wrapper.eq(BaseCameraManagement::getLineDir, cameraVo.getLineDir());
             }
+            wrapper.orderByAsc(BaseCameraManagement::getInstallMile);
             List<BaseCameraManagement> list = baseCameraManagementService.list(wrapper);
             if (list.size() <= 0) {
                 jsonObject.put("resultCode", 0);