Просмотр исходного кода

中心端识别程序心跳接口开发

gao.qiang 3 месяцев назад
Родитель
Сommit
ac8012816b

+ 1 - 1
business-service/src/main/java/com/ozs/service/utils/PublishCallback.java

@@ -69,7 +69,7 @@ public class PublishCallback implements MqttCallback {
                     sign = (String) object.get("sign");
                     deviceSn = (String) object.get("device_sn");
                 }
-                CallbackUtil.heart(deviceSn);
+//                CallbackUtil.heart(deviceSn);
                 PublishClient.pull(sign, deviceSn);
             } catch (Exception e) {
                 logger.error(e.getMessage());

+ 2 - 2
hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseRailwayManagementController.java

@@ -287,8 +287,8 @@ public class BaseRailwayManagementController extends BaseController {
     @GetMapping("/query")
     @Log(title = "线路台账管理", businessType = BusinessType.SELECT)
     public AjaxResult query() {
-        // List<BaseRailwayManagement> list = baseRailwayManagementService.list();
-        List<BaseRailwayManagement> list = baseRailwayManagementService.listRailway();
+         List<BaseRailwayManagement> list = baseRailwayManagementService.list();
+//        List<BaseRailwayManagement> list = baseRailwayManagementService.listRailway();
         list.sort(new Comparator<BaseRailwayManagement>() {
             @Override
             public int compare(BaseRailwayManagement o1, BaseRailwayManagement o2) {

+ 1 - 0
hazard-admin/src/main/resources/application-druid.yml

@@ -55,3 +55,4 @@ spring:
                 wall:
                     config:
                         multi-statement-allow: true
+            query-timeout: 60000

+ 1 - 1
hazard-admin/src/main/resources/application.yml

@@ -29,7 +29,7 @@ base:
 # 开发环境配置
 server:
   # 服务器的HTTP端口,默认为8080
-  port: 8081
+  port: 5912
   servlet:
     # 应用的访问路径
     context-path: /hazard

+ 1 - 0
hazard-sdk/src/main/resources/application-druid.yml

@@ -55,3 +55,4 @@ spring:
         wall:
           config:
             multi-statement-allow: true
+      query-timeout: 60000