mq修改

business-service/src/main/java/com/ozs/service/utils/PublishClient.java

@@ -38,7 +38,7 @@ public class PublishClient {
     /**
      * mqtt服务器地址
      */
-    public static final String HOST = "tcp://124.70.58.209:1883";
+    public static final String HOST = "tcp://10.161.12.60:1883";
     /**
      * 主题
      */
@@ -51,8 +51,8 @@ public class PublishClient {
      * 主题实例
      */
     private MqttTopic topic11;
-    private static final String USER_NAME = "guest";
-    private static final String PASS_WORD = "guest";
+    private static final String USER_NAME = "camera-update";
+    private static final String PASS_WORD = "05J5+mtYzx.Ry";
     private MqttMessage message;
 
     /**

business-service/src/main/java/com/ozs/service/utils/SubscribeClient.java

@@ -20,7 +20,7 @@ public class SubscribeClient {
     /**
      * mqtt服务器ip
      */
-    public static  final String HOST="tcp://124.70.58.209:1883";
+    public static  final String HOST="tcp://10.161.12.60:1883";
     /**
      * 主题
      */
@@ -29,8 +29,8 @@ public class SubscribeClient {
      * mqtt 客户机ID
      */
     private final String clientId;
-    private static final String USER_NAME = "guest";
-    private static final String PASS_WORD = "guest";
+    private static final String USER_NAME = "camera-update";
+    private static final String PASS_WORD = "05J5+mtYzx.Ry";
     @SuppressWarnings("unused")
     private ScheduledExecutorService scheduler;
 

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

@@ -208,7 +208,9 @@ public class BaseCameraManagementController extends BaseController {
                 BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
                 SysDept sysDept = deptService.selectDeptById(o.getDeptId());
                 o.setDeptName(sysDept.getDeptName());
-                o.setRailwayName(baseRailwayManagement.getRailwayName());
+                if (!StringUtils.isEmptySunhh(baseRailwayManagement) && !StringUtils.isEmptySunhh(baseRailwayManagement.getRailwayName())) {
+                    o.setRailwayName(baseRailwayManagement.getRailwayName());
+                }
                 String mils = AppendUtils.stringAppend(o.getInstallMile());
                 o.setInstallMiles(mils);
                 if (!ObjectUtils.isEmpty(o.getEndMile())) {