机车表修改

business-service/src/main/java/com/ozs/service/impl/BaseTerminalServiceImpl.java

@@ -75,14 +75,16 @@ public class BaseTerminalServiceImpl extends ServiceImpl<BaseTerminalMapper, Bas
             List<BaseTerminal> dto1 = pageR.getRecords().stream().map(o -> {
                 LambdaQueryWrapper<BaseVehicleTerminal> wrapper1 = new LambdaQueryWrapper<>();
                 wrapper1.eq(BaseVehicleTerminal::getTerminalCode, o.getTerminalCode());
-                BaseVehicleTerminal baseVehicleTerminal = baseVehicleTerminalMapper.selectOne(wrapper1);
-                if (!ObjectUtils.isEmpty(baseVehicleTerminal)) {
-                    LambdaQueryWrapper<BaseVehicle> wrapper2 = new LambdaQueryWrapper<>();
-                    wrapper2.eq(BaseVehicle::getVehicleCode, baseVehicleTerminal.getVehicleCode());
-                    BaseVehicle baseVehicle = baseVehicleMapper.selectOne(wrapper2);
-                    if (!ObjectUtils.isEmpty(baseVehicle)) {
-                        o.setVehicleCode(baseVehicle.getVehicleCode());
-                        o.setEnd(baseVehicle.getEnds());
+                List<BaseVehicleTerminal> baseVehicleTerminals = baseVehicleTerminalMapper.selectList(wrapper1);
+                if (!ObjectUtils.isEmpty(baseVehicleTerminals)) {
+                    for (BaseVehicleTerminal baseVehicleTerminal : baseVehicleTerminals) {
+                        LambdaQueryWrapper<BaseVehicle> wrapper2 = new LambdaQueryWrapper<>();
+                        wrapper2.eq(BaseVehicle::getVehicleCode, baseVehicleTerminal.getVehicleCode());
+                        BaseVehicle baseVehicle = baseVehicleMapper.selectOne(wrapper2);
+                        if (!ObjectUtils.isEmpty(baseVehicle)) {
+                            o.setVehicleCode(baseVehicle.getVehicleCode());
+                            o.setEnd(baseVehicle.getEnds());
+                        }
                     }
                 }
                 return o;

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

@@ -79,6 +79,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.core.parameters.P;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -321,7 +322,7 @@ public class GeoHazardMonitorTokenController {
             BaseUser admin = baseUserService.getUserName("admin");
             MsgAlarmFrequency msgAlarmVice = new MsgAlarmFrequency();
             if (ObjectUtils.isEmpty(alarm)) {
-                List<String> stringList=new ArrayList<>();
+                List<String> stringList = new ArrayList<>();
                 MsgAlarm msgAlarm = new MsgAlarm();
                 BeanUtils.copyProperties(reqMsgAlarmVo, msgAlarm);
                 BeanUtils.copyProperties(reqMsgAlarmVo, msgAlarmVice);
@@ -749,7 +750,7 @@ public class GeoHazardMonitorTokenController {
                                         }
                                     }
                                 });
-                            }else {
+                            } else {
                                 cameraVos.setCameraCode("");
                                 cameraVos.setCurrentStream("");
                             }
@@ -1001,7 +1002,7 @@ public class GeoHazardMonitorTokenController {
                                                 }
                                             }
                                         });
-                                    }else {
+                                    } else {
                                         cameraVos.setCameraCode("");
                                         cameraVos.setCurrentStream("");
                                     }
@@ -1277,7 +1278,7 @@ public class GeoHazardMonitorTokenController {
                                             }
                                         }
                                     });
-                                }else {
+                                } else {
                                     cameraVos.setCameraCode("");
                                     cameraVos.setCurrentStream("");
                                 }
@@ -1467,7 +1468,11 @@ public class GeoHazardMonitorTokenController {
                 log.info("---------data---结果-------" + respHeartbeatVo);
                 if (ObjectUtils.isEmpty(respHeartbeatVo.getPreAlarmList())) {
                     if (!ObjectUtils.isEmpty(respHeartbeatVo.getCameraList())) {
-                        AjaxResults1 = new AjaxResults(1, "ok", respHeartbeatVo);
+                        if (respHeartbeatVo.getCameraList().get(0).getCameraCode().equals("")) {
+                            AjaxResults1 = new AjaxResults(1, "该里程无摄像机", respHeartbeatVo);
+                        }else {
+                            AjaxResults1 = new AjaxResults(1, "ok", respHeartbeatVo);
+                        }
                     } else {
                         AjaxResults1 = new AjaxResults(0, "视频加载中", respHeartbeatVo);
                     }