用户逻辑修改

business-service/src/main/java/com/ozs/service/entity/BaseCameraManagement.java

@@ -105,29 +105,4 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      */
     @Excel(name = "物联网卡号")
     private String cardNum;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 修改人
-     */
-    private String updateBy;
-
-    /**
-     * 修改时间
-     */
-    private Date updateTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
 }

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

@@ -0,0 +1,90 @@
+package com.ozs.service.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ozs.common.annotation.Excel;
+import com.ozs.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警信息表
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-02-22
+ */
+@Data
+public class MsgAlarmResp implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 线路名称
+     */
+    private String railwayName;
+
+    /**
+     * 报警病害类型（目前只有1泥石流，后续可扩展使用）
+     */
+    private Integer alarmType;
+
+    /**
+     * 报警行别(1上行2下行)
+     */
+    private Integer lineDir;
+
+    /**
+     * 所属工务段编码(单位id)
+     */
+    @Excel(name = "所属工务段编码(单位id)")
+    private String deptId;
+
+    /**
+     * 报警里程位置
+     */
+    private String alarmMile;
+
+
+    /**
+     * 监控范围开始里程位置
+     */
+    @Excel(name = "监控范围开始里程位置")
+    private Integer beginMile;
+
+    /**
+     * 监控范围结束里程位置
+     */
+    @Excel(name = "监控范围结束里程位置")
+    private Integer endMile;
+
+    /**
+     * 监视相机经度
+     */
+    @Excel(name = "监视相机经度")
+    private String installLongitude;
+
+    /**
+     * 监视相机纬度
+     */
+    @Excel(name = "监视相机纬度")
+    private String installLatitude;
+    
+    /**
+     * 解除人
+     */
+    private String releasedBy;
+
+    /**
+     * 解除时间
+     */
+    private Date releasedTime;
+    
+}

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

@@ -11,7 +11,7 @@
 			a.install_mile AS installMile, 
 			a.id AS id
 		FROM
-		    base_camera_management AS a left join
+		    base_camera_management AS a inner join
 		    base_railway_management AS l  on  a.railway_code=l.railway_code
 		<where>
 

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

@@ -15,15 +15,20 @@ import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.framework.config.ServerConfig;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseDeviceDynamicManagement;
+import com.ozs.service.entity.BaseRailwayManagement;
+import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.vo.BaseCameraManagementVo;
 import com.ozs.service.entity.vo.BaseCameraResVo;
+import com.ozs.service.entity.vo.MsgAlarmResp;
 import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseDeviceDynamicManagementService;
 import com.ozs.service.service.BaseRailwayManagementService;
+import com.ozs.service.service.MsgAlarmService;
 import com.ozs.web.core.config.CaneraConfig;
 import com.ozs.web.core.util.CameraUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.http.MediaType;
@@ -64,9 +69,11 @@ public class BaseCameraManagementController extends BaseController {
     @Resource
     BaseDeviceDynamicManagementService baseDeviceDynamicManagementService;
     @Autowired
-    private CaneraConfig caneraConfig;
-    @Autowired
     private ServerConfig serverConfig;
+    @Autowired
+    private MsgAlarmService msgAlarmService;
+    @Autowired
+    private BaseRailwayManagementService baseRailwayManagementService;
 
     /**
      * 相机台账管理分页
@@ -250,5 +257,38 @@ public class BaseCameraManagementController extends BaseController {
     public AjaxResult cameraTree(@RequestParam(value = "name", required = false) String name) {
         return success(baseDeviceDynamicManagementService.cameraTree(name));
     }
+
+    @GetMapping(value = "/getAlarm/{cameraCode}")
+    @ApiOperation("根据视频ID获取详细信息")
+    public AjaxResult getAlarm(@PathVariable String cameraCode) {
+        LambdaQueryWrapper<MsgAlarm> queryWrapper = new LambdaQueryWrapper<MsgAlarm>();
+        if (!ObjectUtils.isEmpty(cameraCode)) {
+            queryWrapper.eq(MsgAlarm::getCameraCode, cameraCode);
+            queryWrapper.orderByDesc(MsgAlarm::getCreateTime);
+        }
+        List<MsgAlarm> msgAlarmList = msgAlarmService.list(queryWrapper);
+        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);
+        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);
+        msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
+        msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
+        msgAlarmResp.setEndMile(baseCameraManagement.getEndMile());
+        msgAlarmResp.setBeginMile(baseCameraManagement.getBeginMile());
+        msgAlarmResp.setInstallLatitude(baseCameraManagement.getInstallLatitude());
+        msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude());
+        msgAlarmResp.setLineDir(baseCameraManagement.getLineDir());
+       msgAlarmResp.setAlarmMile(baseCameraManagement.getInstallMile().toString());
+        return AjaxResult.success(msgAlarmResp);
+    }
 }
 

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

@@ -9,15 +9,21 @@ import com.ozs.HazardApplication;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.utils.StringUtils;
+import com.ozs.service.entity.BaseCameraManagement;
+import com.ozs.service.entity.BaseRailwayManagement;
 import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.MsgAlarmFrequency;
 import com.ozs.service.entity.vo.HistoricalAlarmVo;
+import com.ozs.service.entity.vo.MsgAlarmResp;
 import com.ozs.service.entity.vo.MsgAlarmVo;
+import com.ozs.service.service.BaseCameraManagementService;
+import com.ozs.service.service.BaseRailwayManagementService;
 import com.ozs.service.service.MsgAlarmFrequencyService;
 import com.ozs.service.service.MsgAlarmService;
 import com.ozs.web.core.config.WebSocketService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -49,6 +55,10 @@ public class MsgAlarmController extends BaseController {
     MsgAlarmService msgAlarmService;
     @Resource
     MsgAlarmFrequencyService msgAlarmFrequencyService;
+    @Autowired
+    BaseCameraManagementService baseCameraManagementService;
+    @Autowired
+    BaseRailwayManagementService baseRailwayManagementService;
 
     /**
      * 测试消息推送
@@ -110,7 +120,26 @@ public class MsgAlarmController extends BaseController {
     @GetMapping(value = "/{id}")
     @ApiOperation("根据报警信息ID获取详细信息")
     public AjaxResult getInfo(@PathVariable Long id) {
-        return AjaxResult.success(msgAlarmService.getById(id));
+        MsgAlarm msgAlarm = msgAlarmService.getById(id);
+        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();
+        BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
+        msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
+        msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
+        msgAlarmResp.setEndMile(baseCameraManagement.getEndMile());
+        msgAlarmResp.setBeginMile(baseCameraManagement.getBeginMile());
+        msgAlarmResp.setInstallLatitude(baseCameraManagement.getInstallLatitude());
+        msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude());
+        return AjaxResult.success(msgAlarmResp);
     }
 
 
@@ -135,11 +164,11 @@ public class MsgAlarmController extends BaseController {
         return AjaxResult.success(list);
     }
 
-    @GetMapping(value = "/videoHistoricalAlarm/{alarmCamera}")
+    @GetMapping(value = "/videoHistoricalAlarm/{alarmId}")
     @ApiOperation("视频服务历史报警信息")
-    public AjaxResult videoHistoricalAlarm(@PathVariable Long alarmCamera) {
+    public AjaxResult videoHistoricalAlarm(@PathVariable Long alarmId) {
         QueryWrapper<MsgAlarm> wrapper = new QueryWrapper<>();
-        wrapper.eq("alarm_camera", alarmCamera);
+        wrapper.eq("alarm_id", alarmId);
         wrapper.orderByDesc("alarm_time");
         List<MsgAlarm> list = msgAlarmService.list(wrapper);
         return AjaxResult.success(list);