相机新增字段

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

@@ -41,6 +41,12 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     @Excel(name = "监控相机安装里程位置(单位KM)")
     private String installMiles;
 
+    /**
+     * 测点名称
+     */
+    @Excel(name = "测点名称")
+    private String measurePointName;
+
     /**
      *线路名称
      */
@@ -186,6 +192,12 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      */
     @TableField(exist = false)
     private Integer isStartRecording;
+
+    /**
+     * 相机序列号
+     */
+    @Excel(name = "序列号")
+    private String cameraSn;
     
     @Excel(name = "备注")
     private String remark;

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

@@ -151,7 +151,10 @@ public class MsgAlarmResp implements Serializable {
      * 1已报警2未报警
      */
     private Integer failureToAlarm;
-    
 
+    /**
+     * 测点名称
+     */
+    private String measurePointName;
 
 }

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

@@ -474,6 +474,7 @@ public class BaseCameraManagementController extends BaseController {
         list.add(baseCameraManagement.getLineDir());
         list.add(baseCameraManagement.getCameraCode());
         list.add(baseDeviceDynamicManagement.getElectricity());
+        list.add(baseCameraManagement.getMeasurePointName());
         if (list1.size() <= 0) {
             list.add(1);
         } else {