web bug修改

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

@@ -10,12 +10,14 @@ import com.ozs.entity.vo.CameraTreeVo;
 import com.ozs.entity.vo.VehicleTreeVo;
 import com.ozs.mapper.*;
 import com.ozs.service.BaseDeviceDynamicManagementService;
+import com.ozs.service.BaseTerminalService;
 import com.ozs.service.VehiclePositionService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
+import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -42,6 +44,8 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
     BaseVehicleTerminalMapper baseVehicleTerminalMapper;
     @Autowired
     BaseVehicleMapper baseVehicleMapper;
+    @Resource
+    private BaseTerminalService baseTerminalService;
 
     @Override
     public CameraTree cameraTree(CameraTreeVo cameraTreeVo) {
@@ -181,8 +185,10 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                         if (!ObjectUtils.isEmpty(collect)) {
                             collect.sort((o1, o2) -> o1.getTravelMile().compareTo(o2.getTravelMile()));
                             List<VehicleTree> childrens = collect.stream().map(vp -> {
+                                BaseTerminal baseTerminal = baseTerminalService.getOne(new LambdaQueryWrapper<BaseTerminal>().eq(BaseTerminal::getTerminalCode, vp.getTerminalCode()));
                                 LambdaQueryWrapper<BaseVehicle> lambdaQueryWrapper = new LambdaQueryWrapper();
                                 lambdaQueryWrapper.eq(BaseVehicle::getVehicleCode, vp.getVehicleCode());
+                                lambdaQueryWrapper.eq(BaseVehicle::getEnds,baseTerminal.getEnd());
                                 BaseVehicle baseVehicle = baseVehicleMapper.selectOne(lambdaQueryWrapper);
                                 return VehicleTree.builder()
                                         .code(vp.getTerminalCode())

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

@@ -1079,10 +1079,11 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
      * 机车状态修改
      */
     public void heartbeat() {
+        log.info("机车状态修改---------------执行了");
         List<BaseTerminal> list = baseTerminalService.list();
         for (BaseTerminal baseTerminal : list) {
             QueryWrapper<BaseTerminalLog> wrapper = new QueryWrapper<>();
-            wrapper.eq("terminal_code", baseTerminal);
+            wrapper.eq("terminal_code", baseTerminal.getTerminalCode());
             wrapper.orderByDesc("create_time");
             wrapper.last("limit 1");
             BaseTerminalLog baseTerminalLog = baseTerminalLogService.getOne(wrapper);
@@ -1334,7 +1335,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
             log.info("--------------->playbackURLs-----异步开始-");
             log.info("frontValue------------->" + frontValue);
             log.info("laterValue------------->" + laterValue);
-            TimeUnit.SECONDS.sleep(65 * Integer.parseInt(laterValue));
+//            TimeUnit.SECONDS.sleep(65 * Integer.parseInt(laterValue));
             log.info("--------------->playbackURLs");
             PlaybackVo playbackVo = new PlaybackVo();
             playbackVo.setCameraIndexCode(code);

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

@@ -328,10 +328,8 @@ public class DataStatisticController extends BaseController {
     @Log(title = "查询终端数、机车数、相机数、预警数", businessType = BusinessType.SELECT)
     public AjaxResult getNum() {
         Long alarmNum = msgAlarmService.getAlarmNum();
-        Long vehicleNum = baseVehicleService.count(new LambdaQueryWrapper<BaseVehicle>().groupBy(BaseVehicle::getVehicleCode));
-        QueryWrapper<BaseTerminal> wrapper = new QueryWrapper<BaseTerminal>();
-        wrapper.lambda().eq(BaseTerminal::getStatus, 1);
-        Long terminalNum = baseTerminalService.count(new LambdaQueryWrapper<BaseTerminal>().groupBy(BaseTerminal::getTerminalCode));
+        Long vehicleNum = baseVehicleService.count(new QueryWrapper<BaseVehicle>().select("DISTINCT vehicle_code"));
+        Long terminalNum = baseTerminalService.count(new QueryWrapper<BaseTerminal>().select("DISTINCT terminal_code"));
         Long cameraNum = baseCameraManagementService.count();
         DataStatisticNum dataStatisticNum = new DataStatisticNum();
         if (!ObjectUtils.isEmpty(alarmNum)) {