配置文件修改

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

@@ -244,7 +244,6 @@ public class MsgAlarmCloud extends BaseEntity implements Serializable {
     /**
      *所属工务段名称
      */
-    @Excel(name = "所属工务段")
     @TableField(exist = false)
     private String deptName;
 
@@ -261,15 +260,4 @@ public class MsgAlarmCloud extends BaseEntity implements Serializable {
     @Excel(name = "版本名称")
     @TableField(exist = false)
     private String versionName;
-
-    /**
-     * 相机序列号
-     */
-    @Excel(name = "设备序列号")
-    @TableField(exist = false)
-    private String cameraSn;
-
-
-    @TableField(exist = false)
-    private Integer unlockNum;
 }

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

@@ -66,6 +66,11 @@ public class MsgAlarmResp implements Serializable {
      * 报警里程位置
      */
     private String alarmMile;
+
+    /**
+     * 报警里程位置
+     */
+    private String alarmMiles;
     /**
      * 通道编号
      */

hazard-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -169,7 +169,7 @@ public class SysUserController extends BaseController {
             }
             SysDept sysDept = deptService.selectDeptById(sysUser.getDeptId());
             if (!ObjectUtils.isEmpty(sysDept)) {
-                sysUser.getDept().setDeptName(sysDept.getDeptName());
+                sysUser.setDeptName(sysDept.getDeptName());
             }
         }
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);

hazard-admin/src/main/java/com/ozs/web/controller/websocket/WebSocketConteoller.java

@@ -148,7 +148,7 @@ public class WebSocketConteoller extends BaseController {
         }
         msgAlarmResp.setAlarmType(msgAlarmCloud.getAlarmType());
         String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
-        msgAlarmResp.setAlarmMile(mile);
+        msgAlarmResp.setAlarmMiles(mile);
         String cameraCode = baseCameraManagement.getCameraCode();
         msgAlarmResp.setCameraCode(cameraCode);
         BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(new LambdaQueryWrapper<BaseRailwayManagement>()

hazard-admin/src/main/resources/application-druid.yml

@@ -42,9 +42,6 @@ spring:
                 # 设置白名单，不填则允许所有访问
                 allow:
                 url-pattern: /druid/*
-                # 控制台管理用户名和密码
-                login-username: ruoyi
-                login-password: 123456
             filter:
                 stat:
                     enabled: true

hazard-sdk/src/main/resources/application-druid.yml

@@ -42,9 +42,6 @@ spring:
         # 设置白名单，不填则允许所有访问
         allow:
         url-pattern: /druid/*
-        # 控制台管理用户名和密码
-        login-username: ruoyi
-        login-password: 123456
       filter:
         stat:
           enabled: true