业务实体 ：台账管理、报警列表

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

@@ -1,6 +1,7 @@
 package com.ozs.service.entity;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -43,13 +44,13 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      * 相机编码
      */
     @Excel(name = "相机编码")
-    private Long cameraCode;
+    private String cameraCode;
     
     /**
      * 通道编号
      */
     @Excel(name = "通道编号")
-    private Long channel;
+    private String channel;
 
     /**
      * 所属工务段
@@ -92,6 +93,7 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      */
     @Excel(name = "监视相机纬度")
     private String installLatitude;
+
     /**
      * 线路编码
      */
@@ -109,4 +111,29 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      */
     @Excel(name = "物联网卡号")
     private String cardNo;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 修改人
+     */
+    private String updateBy;
+
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
 }

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

@@ -3,6 +3,7 @@ package com.ozs.service.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.Date;
 
 import com.ozs.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -38,7 +39,7 @@ public class BaseDeviceDynamicManagement extends BaseEntity implements Serializa
     /**
      * 相机编码
      */
-    private Long cameraCode;
+    private String cameraCode;
 
     /**
      * 剩余电量
@@ -49,4 +50,29 @@ public class BaseDeviceDynamicManagement extends BaseEntity implements Serializa
      * 相机状态 1正常 2离线
      */
     private Integer cameraState;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 修改人
+     */
+    private String updateBy;
+
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 import java.io.Serializable;
+import java.util.Date;
 
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.core.domain.BaseEntity;
@@ -40,7 +41,7 @@ public class BaseRailwayManagement extends BaseEntity implements Serializable {
      * 线路编码（四位数字）
      */
     @Excel(name = "编码")
-    private Long railwayCode;
+    private String railwayCode;
 
     /**
      * 线路类型（普铁/高铁 ）
@@ -53,4 +54,29 @@ public class BaseRailwayManagement extends BaseEntity implements Serializable {
      */
     @Excel(name = "线路名称")
     private String railwayName;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 修改人
+     */
+    private String updateBy;
+
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
 }

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

@@ -40,12 +40,12 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     /**
      * 报警唯一标识
      */
-    private Long alarmId;
+    private String alarmId;
 
     /**
      * 相机编码
      */
-    private Integer alarmCamera;
+    private String alarmCamera;
 
     /**
      * 报警时间
@@ -57,6 +57,11 @@ public class MsgAlarm extends BaseEntity implements Serializable {
      */
     private String alarmMile;
 
+    /**
+     * 报警线路
+     */
+    private String alarmLine;
+
     /**
      * 报警内容
      */
@@ -81,35 +86,49 @@ public class MsgAlarm extends BaseEntity implements Serializable {
      * 报警病害属性（可以给出泥石流的框定范围）
      */
     private String alarmAttr;
+
     /**
      * 报警图片地址
      */
     private String imageUrl;
 
+    /**
+     * 解除人
+     */
+    private String releasedBy;
+
+    /**
+     * 解除时间
+     */
+    private Date releasedTime;
+
     /**
      * 报警是否解除 1已解除2未解除
      */
     private Integer isLock;
 
     /**
-     * 解除人
+     * 创建人
      */
-    private String releasedBy;
+    private String createBy;
 
     /**
-     * 解除时间
+     * 创建时间
      */
-    private Date releasedTime;
+    private Date createTime;
+
     /**
-     * 报警线路
+     * 修改人
      */
-    private String alarmLine;
+    private String updateBy;
+
     /**
-     * 剩余电量（必填）
+     * 修改时间
      */
-    private Integer electricity;
+    private Date updateTime;
+
     /**
-     * 推送消息是否已读（1已读2未读）
+     * 备注
      */
-    private Integer readState;
+    private String remark;
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 import com.ozs.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -40,12 +41,12 @@ public class MsgAlarmFrequency extends BaseEntity implements Serializable {
     /**
      * 报警唯一标识
      */
-    private Long alarmId;
+    private String alarmId;
 
     /**
      * 报警时间
      */
-    private Long alarmTime;
+    private Date alarmTime;
 
     /**
      * 报警内容
@@ -71,4 +72,29 @@ public class MsgAlarmFrequency extends BaseEntity implements Serializable {
      * 报警图片地址
      */
     private String imageUrl;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 修改人
+     */
+    private String updateBy;
+
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
 }

hazard-sdk/src/main/java/com/ozs/controller/upload/UploadController.java

@@ -60,16 +60,15 @@ public class UploadController {
                 String filename = IdUtils.fastSimpleUUID() + stream.getOriginalFilename().substring(stream.getOriginalFilename().lastIndexOf("."));
                 SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
                 String format1 = dateFormat1.format(new Date());
-                String line = "";
+                Integer line = 0;
                 if (!ObjectUtils.isEmpty(lineDir)) {
-                    line = lineDir == 1 ? "上行" : "下行";
+                    line = lineDir;
                 } else {
-                    line = baseCameraManagement.getLineDir() == 1L ? "上行" : "下行";
+                    line = baseCameraManagement.getLineDir();
                 }
-                String imgName = baseCameraManagement.getRailwayName() + "/" + line + "/" + baseCameraManagement.getInstallMile() +"/"+ format1 + "/" + filename;
+                String imgName = baseCameraManagement.getRemark() + "/" + line + "/" + baseCameraManagement.getInstallMile() +"/"+ format1 + "/" + filename;
                 minioUtils.minIoClientUpload(stream.getInputStream(), imgName);
-                uploadFile = "/" + baseCameraManagement.getRailwayName() + "/" + line + "/" + baseCameraManagement.getInstallMile() +"/"+ format1 + "/" + filename;
-
+                uploadFile = "/" + baseCameraManagement.getRemark() + "/" + line + "/" + baseCameraManagement.getInstallMile() +"/"+ format1 + "/" + filename;
             }
         } else {
             return AjaxResult.error("上传功能出错");