心跳接口修改

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

@@ -38,10 +38,12 @@ public class BaseTerminalLog extends BaseEntity implements Serializable {
     /**
      * 终端经度
      */
+    @TableField(exist = false)
     private String terminalLongitude;
 
     /**
      * 终端纬度
      */
+    @TableField(exist = false)
     private String terminalLatitude;
 }

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

@@ -578,7 +578,7 @@ public class GeoHazardMonitorTokenController {
             boolean save = vehiclePositionService.save(vehiclePosition);
             baseVideoTrains.setTrainsMile(heartbeatVo.getCurrentMile());
             //目视距离和里程位置
-            if (save ) {
+            if (save) {
                 LambdaQueryWrapper<MsgAlarm> queryWrapper = new LambdaQueryWrapper<>();
                 if (heartbeatVo.getLineDir() == 1) {
                     queryWrapper.ge(MsgAlarm::getAlarmMile, heartbeatVo.getCurrentMile());
@@ -818,7 +818,7 @@ public class GeoHazardMonitorTokenController {
                             }
                         }
                     } else if (!"[]".equals(preAlarm.getPreAlarmList())) {
-                        log.info("preAlarm.getPreAlarmList()------"+preAlarm.getPreAlarmList());
+                        log.info("preAlarm.getPreAlarmList()------" + preAlarm.getPreAlarmList());
                         List<PreAlarmListResponse> responseList = new ArrayList<>();
                         List<PreAlarmResponse.PreAlarmList> preAlarmList = JSON.parseArray(preAlarm.getPreAlarmList(), PreAlarmResponse.PreAlarmList.class);
                         Comparator<PreAlarmResponse.PreAlarmList> distanceComparator = new Comparator<PreAlarmResponse.PreAlarmList>() {
@@ -1011,7 +1011,7 @@ public class GeoHazardMonitorTokenController {
                         respHeartbeatVo.setIsAlarm(2);
                     }
                 } else if (!"[]".equals(preAlarm.getPreAlarmList())) {
-                    log.info("preAlarm.getPreAlarmList()------"+preAlarm.getPreAlarmList());
+                    log.info("preAlarm.getPreAlarmList()------" + preAlarm.getPreAlarmList());
                     List<PreAlarmListResponse> responseList = new ArrayList<>();
                     List<PreAlarmResponse.PreAlarmList> preAlarmList = JSON.parseArray(preAlarm.getPreAlarmList(), PreAlarmResponse.PreAlarmList.class);
                     Comparator<PreAlarmResponse.PreAlarmList> distanceComparator = new Comparator<PreAlarmResponse.PreAlarmList>() {
@@ -1775,7 +1775,7 @@ public class GeoHazardMonitorTokenController {
             LambdaQueryWrapper<BaseTerminal> terminal = new LambdaQueryWrapper<>();
             terminal.eq(BaseTerminal::getTerminalCode, baseTerminalLog.getTerminalCode());
             boolean update = baseTerminalService.update(baseTerminal1, terminal);
-            if (baseTerminalLogService.save(baseTerminalLog)) {
+            if (baseTerminalLogService.save(baseTerminalLog) && update) {
                 AjaxResults1 = new AjaxResults(1, "ok");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
             } else {