diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/BigScreenController.java b/gather-app/src/main/java/com/ruoyi/business/controller/BigScreenController.java
index ebc5dc0..bfab1ea 100644
--- a/gather-app/src/main/java/com/ruoyi/business/controller/BigScreenController.java
+++ b/gather-app/src/main/java/com/ruoyi/business/controller/BigScreenController.java
@@ -231,14 +231,17 @@ public class BigScreenController extends BaseController {
             //派出所信息表
             int pcs = policeStationInfoService.count();
             //警务室信息表
-            int jws = policeOfficeInfoService.count();
+            int jws = policeOfficeInfoService.lambdaQuery().like(MetaPoliceOfficeInfo::getPoliceOfficeName, "警务室").count();;
             //  执法警员统计 gbs获取的数据中 在线的执法记录仪设备
             int countZfjy = videoStatusService.getGbsListOnline();
 
+            Integer countZwz = policeOfficeInfoService.lambdaQuery().like(MetaPoliceOfficeInfo::getPoliceOfficeName, "警务站").count();
+
             PoliceForceDistributionVo bean = new PoliceForceDistributionVo();
             bean.setPcsCount(StringKit.toString(pcs));
             bean.setJwsCount(StringKit.toString(jws));
             bean.setZfjyCount(StringKit.toString(countZfjy));
+            bean.setZwzCount(StringKit.toString(countZwz));
             return AjaxResult.success(bean);
         } catch (Exception e) {
             logger.info(StringKit.toString(e));
diff --git a/gather-app/src/main/java/com/ruoyi/business/domain/vo/PoliceForceDistributionVo.java b/gather-app/src/main/java/com/ruoyi/business/domain/vo/PoliceForceDistributionVo.java
index 4ebfe4e..6e4a5ec 100644
--- a/gather-app/src/main/java/com/ruoyi/business/domain/vo/PoliceForceDistributionVo.java
+++ b/gather-app/src/main/java/com/ruoyi/business/domain/vo/PoliceForceDistributionVo.java
@@ -32,4 +32,8 @@ public class PoliceForceDistributionVo {
     @ApiModelProperty("执法警员总数")
     private String zfjyCount;
 
+
+    @ApiModelProperty("警务工作站总数")
+    private String zwzCount;
+
 }
diff --git a/gather-app/src/main/java/com/ruoyi/database/controller/MetaPoliceOfficeInfoController.java b/gather-app/src/main/java/com/ruoyi/database/controller/MetaPoliceOfficeInfoController.java
index ddb6aa6..8453fa0 100644
--- a/gather-app/src/main/java/com/ruoyi/database/controller/MetaPoliceOfficeInfoController.java
+++ b/gather-app/src/main/java/com/ruoyi/database/controller/MetaPoliceOfficeInfoController.java
@@ -35,9 +35,19 @@ public class MetaPoliceOfficeInfoController extends BaseController {
 
     @GetMapping
     @ApiOperation("查询警务室信息表")
-    public TableDataInfo<MetaPoliceOfficeInfo> list(MetaPoliceOfficeInfo metaPoliceOfficeInfo) {
+    public TableDataInfo<MetaPoliceOfficeInfo> list() {
         startPage();
-        List<MetaPoliceOfficeInfo> list = metaPoliceOfficeInfoService.list(new QueryWrapper<>(metaPoliceOfficeInfo));
+        List<MetaPoliceOfficeInfo> list = metaPoliceOfficeInfoService
+                .lambdaQuery().like(MetaPoliceOfficeInfo::getPoliceOfficeName,"警务室").list();
+        return getDataTable(list);
+    }
+
+    @GetMapping("/work")
+    @ApiOperation("查询警务室工作站信息表")
+    public TableDataInfo<MetaPoliceOfficeInfo> workList() {
+        startPage();
+        List<MetaPoliceOfficeInfo> list = metaPoliceOfficeInfoService
+                .lambdaQuery().like(MetaPoliceOfficeInfo::getPoliceOfficeName,"警务站").list();
         return getDataTable(list);
     }
 
diff --git a/gather-app/src/main/java/com/ruoyi/database/controller/TransitVehicleRecordController.java b/gather-app/src/main/java/com/ruoyi/database/controller/TransitVehicleRecordController.java
index ff77070..8766a1c 100644
--- a/gather-app/src/main/java/com/ruoyi/database/controller/TransitVehicleRecordController.java
+++ b/gather-app/src/main/java/com/ruoyi/database/controller/TransitVehicleRecordController.java
@@ -1,6 +1,7 @@
 package com.ruoyi.database.controller;
 
 
+import cn.hutool.core.io.resource.FileObjectResource;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -13,6 +14,7 @@ import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.database.domain.*;
+import com.ruoyi.database.domain.vo.TransitVehicleRecordVO;
 import com.ruoyi.database.service.BoneVehicleService;
 import com.ruoyi.database.service.DevopsDeviceInfoService;
 import com.ruoyi.database.service.TransitImpVehicleRecordService;
@@ -76,6 +78,15 @@ public class TransitVehicleRecordController extends BaseController {
         return getDataTable(list);
     }
 
+//    @GetMapping("/track")
+//    @ApiOperation("查询车辆轨迹")
+//    public TableDataInfo<TransitVehicleRecordVO> trackList(TransitVehicleRecord transitVehicleRecord) {
+//        List<TransitVehicleRecord> list = transitVehicleRecordService.list(new QueryWrapper<>(transitVehicleRecord));
+//        for (TransitVehicleRecord transitVehicleRecord1 : list){
+//
+//        }
+//    }
+
     @PostMapping
     @ApiOperation("新增车辆记录表")
     @Log(title = "车辆记录表", businessType = BusinessType.INSERT)