接口响应时间测试

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

@@ -85,7 +85,7 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     private Integer lineDir;
 
     /**
-     * 报警病害类型（1泥石流2异物侵线 3断轨监测）
+     * 报警病害类型（1泥石流2异物侵限 3断轨监测）
      */
     private Integer alarmType;
     @TableField(exist = false)

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

@@ -79,7 +79,7 @@ public class MsgAlarmFrequency extends BaseEntity implements Serializable {
     private Integer alarmConfidence;
 
     /**
-     * 报警病害类型（1泥石流2异物侵线 3断轨监测）
+     * 报警病害类型（1泥石流2异物侵限 3断轨监测）
      */
     private Integer alarmType;
 

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

@@ -67,7 +67,7 @@ public class MsgAlarmDTO implements Serializable {
     private Integer lineDir;
 
     /**
-     * 报警病害类型（1泥石流2异物侵线 3断轨监测）
+     * 报警病害类型（1泥石流2异物侵限 3断轨监测）
      */
     private Integer alarmType;
 

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

@@ -41,7 +41,7 @@ public class MsgAlarmResp implements Serializable {
     private String railwayName;
 
     /**
-     * 报警病害类型（1泥石流2异物侵线 3断轨监测）
+     * 报警病害类型（1泥石流2异物侵限 3断轨监测）
      */
     private Integer alarmType;
     private String alarmTypeStr;

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

@@ -84,7 +84,7 @@ public class MsgAlarmTemporary  implements Serializable {
     private Integer lineDir;
 
     /**
-     * 报警病害类型（1泥石流2异物侵线 3断轨监测）
+     * 报警病害类型（1泥石流2异物侵限 3断轨监测）
      */
     private Integer alarmType;
     @TableField(exist = false)

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

@@ -44,7 +44,7 @@ public class ReqMsgAlarmVo implements Serializable {
     private String content;
 
     /**
-     * 报警病害类型（1泥石流2异物侵线 3断轨监测）
+     * 报警病害类型（1泥石流2异物侵限 3断轨监测）
      */
     private Integer alarmType;
 

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -258,7 +258,7 @@ public class MsgAlarmController extends BaseController {
             String mils = AppendUtils.stringAppend(o.getAlarmMile());
             o.setAlarmMiles(mils);
             o.setLineDirName(o.getLineDir() == 1 ? "上行" : "下行");
-            o.setAlarmTypeStr(o.getAlarmType() == 1 ? "泥石流" : (o.getAlarmType() == 2 ? "异物侵线" : (o.getAlarmType() == 3 ? "断轨监测" : "未知")));
+            o.setAlarmTypeStr(o.getAlarmType() == 1 ? "泥石流" : (o.getAlarmType() == 2 ? "异物侵限" : (o.getAlarmType() == 3 ? "断轨监测" : "未知")));
             o.setIsReleaseName(o.getIsRelease() == 1 ? "已解除" : (o.getIsRelease() == 2 ? "未解除" : "未知"));
             List<SysDictData> data = dictTypeService.selectDictDataByType("sys_alarm_type");
             data.stream().forEach(sysDictData -> {
@@ -358,7 +358,7 @@ public class MsgAlarmController extends BaseController {
                 msgAlarmResp.setAlarmAttrName(msgAlarm.getAlarmAttr());
             }
             msgAlarmResp.setLineDirStr(msgAlarm.getLineDir() == 1 ? "上行" : "下行");
-            msgAlarmResp.setAlarmTypeStr(msgAlarm.getAlarmType() == 1 ? "泥石流" : (msgAlarm.getAlarmType() == 2 ? "异物侵线" : (msgAlarm.getAlarmType() == 3 ? "断轨监测" : "未知")));
+            msgAlarmResp.setAlarmTypeStr(msgAlarm.getAlarmType() == 1 ? "泥石流" : (msgAlarm.getAlarmType() == 2 ? "异物侵限" : (msgAlarm.getAlarmType() == 3 ? "断轨监测" : "未知")));
             msgAlarmResp.setIsReleaseName(msgAlarm.getIsRelease() == 1 ? "已解除" : (msgAlarm.getIsRelease() == 2 ? "未解除" : "未知"));
             msgAlarmResp.setAlarmLevel(msgAlarm.getAlarmLevel());
             List<SysDictData> data = dictTypeService.selectDictDataByType("sys_alarm_type");

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmTemporaryController.java

@@ -124,7 +124,7 @@ public class MsgAlarmTemporaryController extends BaseController {
                 o.setAlarmMiles(mils);
                 o.setLineDirName(o.getLineDir() == 1 ? "上行" : "下行");
                 o.setStareName(o.getStare() == 1 ? "未生效" : "已生效");
-                o.setAlarmTypeStr(o.getAlarmType() == 1 ? "泥石流" : (o.getAlarmType() == 2 ? "异物侵线" : (o.getAlarmType() == 3 ? "断轨监测" : "未知")));
+                o.setAlarmTypeStr(o.getAlarmType() == 1 ? "泥石流" : (o.getAlarmType() == 2 ? "异物侵限" : (o.getAlarmType() == 3 ? "断轨监测" : "未知")));
                 List<SysDictData> data = dictTypeService.selectDictDataByType("sys_alarm_type");
                 data.stream().forEach(sysDictData -> {
                     if (sysDictData.getDictValue().equals(o.getAlarmType().toString())) {

vehicle-admin/src/main/java/com/ozs/web/controller/sdk/GeoHazardMonitorTokenController.java

@@ -510,6 +510,7 @@ public class GeoHazardMonitorTokenController {
     @PostMapping("/api/terminal/heartbeat")
     @Transactional
     public String heartbeat(@RequestBody ParameterVo parameterVo, HttpServletRequest request) {
+        long begin = System.currentTimeMillis();
         Map<String, Object> twoMap = new HashMap<>();
         int distance = 0;
         RespHeartbeatVo respHeartbeatVo = new RespHeartbeatVo();
@@ -790,6 +791,8 @@ public class GeoHazardMonitorTokenController {
                 jsonObject.put("resultCode", 1);
                 jsonObject.put("message", "ok");
                 jsonObject.put("data", respHeartbeatVo);
+                long end = System.currentTimeMillis();
+                System.out.println("-------------------"+(begin-end)/1000);
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
             } else {
                 jsonObject.put("resultCode", 0);

vehicle-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -729,7 +729,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         };
 
         try {
-            String result = executor.submit(task).get(2, TimeUnit.SECONDS); // 设置5秒超时时间
+            String result = executor.submit(task).get(1, TimeUnit.SECONDS); // 设置5秒超时时间
             System.out.println("Response: " + result);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
             // 请求超时处理逻辑