diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
index 2a645d3..3366498 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "耦合关联分析管理")
 @RestController
 @RequestMapping("/system/analysisCoupling")
 public class AnalysisCouplingController {

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
index 2a645d3..3366498 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "耦合关联分析管理")
 @RestController
 @RequestMapping("/system/analysisCoupling")
 public class AnalysisCouplingController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
index dc25430..6648e88 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "地下空洞基本信息接口")
 @RestController
 @RequestMapping("/system/busHole")
 public class BusHoleController {

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
index 2a645d3..3366498 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "耦合关联分析管理")
 @RestController
 @RequestMapping("/system/analysisCoupling")
 public class AnalysisCouplingController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
index dc25430..6648e88 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "地下空洞基本信息接口")
 @RestController
 @RequestMapping("/system/busHole")
 public class BusHoleController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
index 32d8a36..a90f0bc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
@@ -1,9 +1,24 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.dto.TimeRequest;
+import com.casic.missiles.modular.system.entity.BusPatrolCar;
+import com.casic.missiles.modular.system.service.IBusPatrolCarService;
+import com.casic.missiles.modular.system.service.IBusPatrolTaskService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * 首页 前端控制器
@@ -12,9 +27,36 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "首页显示信息接口")
 @RestController
 @RequestMapping("/system/busOverView")
 public class BusOverViewController {
 
+    @Resource
+    private IBusPatrolCarService iBusPatrolCarService;
+    @Resource
+    private IBusPatrolTaskService iBusPatrolTaskService;
+
+    @ApiOperation("巡检车信息")
+    @PostMapping("/carList")
+    public ReturnDTO carList() {
+        return ReturnUtil.success(iBusPatrolCarService.getCarList());
+    }
+
+
+    @ApiOperation("根据时间获取巡检任务和公里数")
+    @PostMapping("/taskCount")
+    public ReturnDTO taskCount(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskCount(timeRequest.getBeginDate(),timeRequest.getEndDate()));
+    }
+
+
+    @ApiOperation("巡检任务趋势")
+    @PostMapping("/taskTime")
+    public ReturnDTO taskTime(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskTime(timeRequest.getTimeType()));
+    }
+
+
 }
 

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
index 2a645d3..3366498 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "耦合关联分析管理")
 @RestController
 @RequestMapping("/system/analysisCoupling")
 public class AnalysisCouplingController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
index dc25430..6648e88 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "地下空洞基本信息接口")
 @RestController
 @RequestMapping("/system/busHole")
 public class BusHoleController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
index 32d8a36..a90f0bc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
@@ -1,9 +1,24 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.dto.TimeRequest;
+import com.casic.missiles.modular.system.entity.BusPatrolCar;
+import com.casic.missiles.modular.system.service.IBusPatrolCarService;
+import com.casic.missiles.modular.system.service.IBusPatrolTaskService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * 首页 前端控制器
@@ -12,9 +27,36 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "首页显示信息接口")
 @RestController
 @RequestMapping("/system/busOverView")
 public class BusOverViewController {
 
+    @Resource
+    private IBusPatrolCarService iBusPatrolCarService;
+    @Resource
+    private IBusPatrolTaskService iBusPatrolTaskService;
+
+    @ApiOperation("巡检车信息")
+    @PostMapping("/carList")
+    public ReturnDTO carList() {
+        return ReturnUtil.success(iBusPatrolCarService.getCarList());
+    }
+
+
+    @ApiOperation("根据时间获取巡检任务和公里数")
+    @PostMapping("/taskCount")
+    public ReturnDTO taskCount(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskCount(timeRequest.getBeginDate(),timeRequest.getEndDate()));
+    }
+
+
+    @ApiOperation("巡检任务趋势")
+    @PostMapping("/taskTime")
+    public ReturnDTO taskTime(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskTime(timeRequest.getTimeType()));
+    }
+
+
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
index dce5046..065a164 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
@@ -46,5 +46,14 @@
         Page<BusPatrolCar> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iBusPatrolCarService.page(page, queryWrapper)));
     }
+
+
+    @ApiOperation("更新车辆位置、在线离线状态及最新时间")
+    @PostMapping("/updateStatus")
+    public ReturnDTO updateStatus(@RequestBody BusPatrolCar busPatrolCar) {
+
+        return ReturnUtil.success(iBusPatrolCarService.updateById(busPatrolCar));
+
+    }
 }
 

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
index 2a645d3..3366498 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "耦合关联分析管理")
 @RestController
 @RequestMapping("/system/analysisCoupling")
 public class AnalysisCouplingController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
index dc25430..6648e88 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "地下空洞基本信息接口")
 @RestController
 @RequestMapping("/system/busHole")
 public class BusHoleController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
index 32d8a36..a90f0bc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
@@ -1,9 +1,24 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.dto.TimeRequest;
+import com.casic.missiles.modular.system.entity.BusPatrolCar;
+import com.casic.missiles.modular.system.service.IBusPatrolCarService;
+import com.casic.missiles.modular.system.service.IBusPatrolTaskService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * 首页 前端控制器
@@ -12,9 +27,36 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "首页显示信息接口")
 @RestController
 @RequestMapping("/system/busOverView")
 public class BusOverViewController {
 
+    @Resource
+    private IBusPatrolCarService iBusPatrolCarService;
+    @Resource
+    private IBusPatrolTaskService iBusPatrolTaskService;
+
+    @ApiOperation("巡检车信息")
+    @PostMapping("/carList")
+    public ReturnDTO carList() {
+        return ReturnUtil.success(iBusPatrolCarService.getCarList());
+    }
+
+
+    @ApiOperation("根据时间获取巡检任务和公里数")
+    @PostMapping("/taskCount")
+    public ReturnDTO taskCount(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskCount(timeRequest.getBeginDate(),timeRequest.getEndDate()));
+    }
+
+
+    @ApiOperation("巡检任务趋势")
+    @PostMapping("/taskTime")
+    public ReturnDTO taskTime(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskTime(timeRequest.getTimeType()));
+    }
+
+
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
index dce5046..065a164 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
@@ -46,5 +46,14 @@
         Page<BusPatrolCar> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iBusPatrolCarService.page(page, queryWrapper)));
     }
+
+
+    @ApiOperation("更新车辆位置、在线离线状态及最新时间")
+    @PostMapping("/updateStatus")
+    public ReturnDTO updateStatus(@RequestBody BusPatrolCar busPatrolCar) {
+
+        return ReturnUtil.success(iBusPatrolCarService.updateById(busPatrolCar));
+
+    }
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
index aaced3a..7e74e41 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "管线占压基本信息接口")
 @RestController
 @RequestMapping("/system/busPipeOverstock")
 public class BusPipeOverstockController {

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
index 2a645d3..3366498 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "耦合关联分析管理")
 @RestController
 @RequestMapping("/system/analysisCoupling")
 public class AnalysisCouplingController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
index dc25430..6648e88 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "地下空洞基本信息接口")
 @RestController
 @RequestMapping("/system/busHole")
 public class BusHoleController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
index 32d8a36..a90f0bc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
@@ -1,9 +1,24 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.dto.TimeRequest;
+import com.casic.missiles.modular.system.entity.BusPatrolCar;
+import com.casic.missiles.modular.system.service.IBusPatrolCarService;
+import com.casic.missiles.modular.system.service.IBusPatrolTaskService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * 首页 前端控制器
@@ -12,9 +27,36 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "首页显示信息接口")
 @RestController
 @RequestMapping("/system/busOverView")
 public class BusOverViewController {
 
+    @Resource
+    private IBusPatrolCarService iBusPatrolCarService;
+    @Resource
+    private IBusPatrolTaskService iBusPatrolTaskService;
+
+    @ApiOperation("巡检车信息")
+    @PostMapping("/carList")
+    public ReturnDTO carList() {
+        return ReturnUtil.success(iBusPatrolCarService.getCarList());
+    }
+
+
+    @ApiOperation("根据时间获取巡检任务和公里数")
+    @PostMapping("/taskCount")
+    public ReturnDTO taskCount(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskCount(timeRequest.getBeginDate(),timeRequest.getEndDate()));
+    }
+
+
+    @ApiOperation("巡检任务趋势")
+    @PostMapping("/taskTime")
+    public ReturnDTO taskTime(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskTime(timeRequest.getTimeType()));
+    }
+
+
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
index dce5046..065a164 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
@@ -46,5 +46,14 @@
         Page<BusPatrolCar> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iBusPatrolCarService.page(page, queryWrapper)));
     }
+
+
+    @ApiOperation("更新车辆位置、在线离线状态及最新时间")
+    @PostMapping("/updateStatus")
+    public ReturnDTO updateStatus(@RequestBody BusPatrolCar busPatrolCar) {
+
+        return ReturnUtil.success(iBusPatrolCarService.updateById(busPatrolCar));
+
+    }
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
index aaced3a..7e74e41 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "管线占压基本信息接口")
 @RestController
 @RequestMapping("/system/busPipeOverstock")
 public class BusPipeOverstockController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
index 47f03ee..980b879 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.modular.system.entity.BusPatrolCar;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检车辆基本信息表 Mapper 接口
@@ -15,4 +17,6 @@
 @Mapper
 public interface BusPatrolCarMapper extends BaseMapper<BusPatrolCar> {
 
+    List<BusPatrolCar> getCarList();
+
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
index 2a645d3..3366498 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "耦合关联分析管理")
 @RestController
 @RequestMapping("/system/analysisCoupling")
 public class AnalysisCouplingController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
index dc25430..6648e88 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "地下空洞基本信息接口")
 @RestController
 @RequestMapping("/system/busHole")
 public class BusHoleController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
index 32d8a36..a90f0bc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
@@ -1,9 +1,24 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.dto.TimeRequest;
+import com.casic.missiles.modular.system.entity.BusPatrolCar;
+import com.casic.missiles.modular.system.service.IBusPatrolCarService;
+import com.casic.missiles.modular.system.service.IBusPatrolTaskService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * 首页 前端控制器
@@ -12,9 +27,36 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "首页显示信息接口")
 @RestController
 @RequestMapping("/system/busOverView")
 public class BusOverViewController {
 
+    @Resource
+    private IBusPatrolCarService iBusPatrolCarService;
+    @Resource
+    private IBusPatrolTaskService iBusPatrolTaskService;
+
+    @ApiOperation("巡检车信息")
+    @PostMapping("/carList")
+    public ReturnDTO carList() {
+        return ReturnUtil.success(iBusPatrolCarService.getCarList());
+    }
+
+
+    @ApiOperation("根据时间获取巡检任务和公里数")
+    @PostMapping("/taskCount")
+    public ReturnDTO taskCount(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskCount(timeRequest.getBeginDate(),timeRequest.getEndDate()));
+    }
+
+
+    @ApiOperation("巡检任务趋势")
+    @PostMapping("/taskTime")
+    public ReturnDTO taskTime(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskTime(timeRequest.getTimeType()));
+    }
+
+
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
index dce5046..065a164 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
@@ -46,5 +46,14 @@
         Page<BusPatrolCar> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iBusPatrolCarService.page(page, queryWrapper)));
     }
+
+
+    @ApiOperation("更新车辆位置、在线离线状态及最新时间")
+    @PostMapping("/updateStatus")
+    public ReturnDTO updateStatus(@RequestBody BusPatrolCar busPatrolCar) {
+
+        return ReturnUtil.success(iBusPatrolCarService.updateById(busPatrolCar));
+
+    }
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
index aaced3a..7e74e41 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "管线占压基本信息接口")
 @RestController
 @RequestMapping("/system/busPipeOverstock")
 public class BusPipeOverstockController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
index 47f03ee..980b879 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.modular.system.entity.BusPatrolCar;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检车辆基本信息表 Mapper 接口
@@ -15,4 +17,6 @@
 @Mapper
 public interface BusPatrolCarMapper extends BaseMapper<BusPatrolCar> {
 
+    List<BusPatrolCar> getCarList();
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
index edcf5e6..0027fef 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
@@ -18,7 +18,19 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, CAR_NAME, CAR_PLATE, DESCRIPTION, DEPT_ID, LONGITUDE, LATITUDE, `STATUS`, VALID, TS
+        pc.*
+        <!--ID, CAR_NAME, CAR_PLATE, DESCRIPTION, DEPT_ID, LONGITUDE, LATITUDE, `STATUS`, VALID, TS -->
     </sql>
 
+
+    <select id="getCarList" resultType="com.casic.missiles.modular.system.entity.BusPatrolCar">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        bd.DEVICE_MODEL AS deviceModel
+        FROM bus_patrol_car pc
+        LEFT JOIN bus_device_info bd ON bd.CAR_ID = pc.ID
+        WHERE  pc.VALID=0 AND bd.VALID=0
+    </select>
+
+
 </mapper>

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
index 2a645d3..3366498 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "耦合关联分析管理")
 @RestController
 @RequestMapping("/system/analysisCoupling")
 public class AnalysisCouplingController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
index dc25430..6648e88 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "地下空洞基本信息接口")
 @RestController
 @RequestMapping("/system/busHole")
 public class BusHoleController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
index 32d8a36..a90f0bc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
@@ -1,9 +1,24 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.dto.TimeRequest;
+import com.casic.missiles.modular.system.entity.BusPatrolCar;
+import com.casic.missiles.modular.system.service.IBusPatrolCarService;
+import com.casic.missiles.modular.system.service.IBusPatrolTaskService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * 首页 前端控制器
@@ -12,9 +27,36 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "首页显示信息接口")
 @RestController
 @RequestMapping("/system/busOverView")
 public class BusOverViewController {
 
+    @Resource
+    private IBusPatrolCarService iBusPatrolCarService;
+    @Resource
+    private IBusPatrolTaskService iBusPatrolTaskService;
+
+    @ApiOperation("巡检车信息")
+    @PostMapping("/carList")
+    public ReturnDTO carList() {
+        return ReturnUtil.success(iBusPatrolCarService.getCarList());
+    }
+
+
+    @ApiOperation("根据时间获取巡检任务和公里数")
+    @PostMapping("/taskCount")
+    public ReturnDTO taskCount(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskCount(timeRequest.getBeginDate(),timeRequest.getEndDate()));
+    }
+
+
+    @ApiOperation("巡检任务趋势")
+    @PostMapping("/taskTime")
+    public ReturnDTO taskTime(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskTime(timeRequest.getTimeType()));
+    }
+
+
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
index dce5046..065a164 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
@@ -46,5 +46,14 @@
         Page<BusPatrolCar> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iBusPatrolCarService.page(page, queryWrapper)));
     }
+
+
+    @ApiOperation("更新车辆位置、在线离线状态及最新时间")
+    @PostMapping("/updateStatus")
+    public ReturnDTO updateStatus(@RequestBody BusPatrolCar busPatrolCar) {
+
+        return ReturnUtil.success(iBusPatrolCarService.updateById(busPatrolCar));
+
+    }
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
index aaced3a..7e74e41 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "管线占压基本信息接口")
 @RestController
 @RequestMapping("/system/busPipeOverstock")
 public class BusPipeOverstockController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
index 47f03ee..980b879 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.modular.system.entity.BusPatrolCar;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检车辆基本信息表 Mapper 接口
@@ -15,4 +17,6 @@
 @Mapper
 public interface BusPatrolCarMapper extends BaseMapper<BusPatrolCar> {
 
+    List<BusPatrolCar> getCarList();
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
index edcf5e6..0027fef 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
@@ -18,7 +18,19 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, CAR_NAME, CAR_PLATE, DESCRIPTION, DEPT_ID, LONGITUDE, LATITUDE, `STATUS`, VALID, TS
+        pc.*
+        <!--ID, CAR_NAME, CAR_PLATE, DESCRIPTION, DEPT_ID, LONGITUDE, LATITUDE, `STATUS`, VALID, TS -->
     </sql>
 
+
+    <select id="getCarList" resultType="com.casic.missiles.modular.system.entity.BusPatrolCar">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        bd.DEVICE_MODEL AS deviceModel
+        FROM bus_patrol_car pc
+        LEFT JOIN bus_device_info bd ON bd.CAR_ID = pc.ID
+        WHERE  pc.VALID=0 AND bd.VALID=0
+    </select>
+
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
index da1c687..99a99fe 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
@@ -5,7 +5,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 
 @Data

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
index 2a645d3..3366498 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "耦合关联分析管理")
 @RestController
 @RequestMapping("/system/analysisCoupling")
 public class AnalysisCouplingController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
index dc25430..6648e88 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "地下空洞基本信息接口")
 @RestController
 @RequestMapping("/system/busHole")
 public class BusHoleController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
index 32d8a36..a90f0bc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
@@ -1,9 +1,24 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.dto.TimeRequest;
+import com.casic.missiles.modular.system.entity.BusPatrolCar;
+import com.casic.missiles.modular.system.service.IBusPatrolCarService;
+import com.casic.missiles.modular.system.service.IBusPatrolTaskService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * 首页 前端控制器
@@ -12,9 +27,36 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "首页显示信息接口")
 @RestController
 @RequestMapping("/system/busOverView")
 public class BusOverViewController {
 
+    @Resource
+    private IBusPatrolCarService iBusPatrolCarService;
+    @Resource
+    private IBusPatrolTaskService iBusPatrolTaskService;
+
+    @ApiOperation("巡检车信息")
+    @PostMapping("/carList")
+    public ReturnDTO carList() {
+        return ReturnUtil.success(iBusPatrolCarService.getCarList());
+    }
+
+
+    @ApiOperation("根据时间获取巡检任务和公里数")
+    @PostMapping("/taskCount")
+    public ReturnDTO taskCount(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskCount(timeRequest.getBeginDate(),timeRequest.getEndDate()));
+    }
+
+
+    @ApiOperation("巡检任务趋势")
+    @PostMapping("/taskTime")
+    public ReturnDTO taskTime(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskTime(timeRequest.getTimeType()));
+    }
+
+
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
index dce5046..065a164 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
@@ -46,5 +46,14 @@
         Page<BusPatrolCar> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iBusPatrolCarService.page(page, queryWrapper)));
     }
+
+
+    @ApiOperation("更新车辆位置、在线离线状态及最新时间")
+    @PostMapping("/updateStatus")
+    public ReturnDTO updateStatus(@RequestBody BusPatrolCar busPatrolCar) {
+
+        return ReturnUtil.success(iBusPatrolCarService.updateById(busPatrolCar));
+
+    }
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
index aaced3a..7e74e41 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "管线占压基本信息接口")
 @RestController
 @RequestMapping("/system/busPipeOverstock")
 public class BusPipeOverstockController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
index 47f03ee..980b879 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.modular.system.entity.BusPatrolCar;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检车辆基本信息表 Mapper 接口
@@ -15,4 +17,6 @@
 @Mapper
 public interface BusPatrolCarMapper extends BaseMapper<BusPatrolCar> {
 
+    List<BusPatrolCar> getCarList();
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
index edcf5e6..0027fef 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
@@ -18,7 +18,19 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, CAR_NAME, CAR_PLATE, DESCRIPTION, DEPT_ID, LONGITUDE, LATITUDE, `STATUS`, VALID, TS
+        pc.*
+        <!--ID, CAR_NAME, CAR_PLATE, DESCRIPTION, DEPT_ID, LONGITUDE, LATITUDE, `STATUS`, VALID, TS -->
     </sql>
 
+
+    <select id="getCarList" resultType="com.casic.missiles.modular.system.entity.BusPatrolCar">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        bd.DEVICE_MODEL AS deviceModel
+        FROM bus_patrol_car pc
+        LEFT JOIN bus_device_info bd ON bd.CAR_ID = pc.ID
+        WHERE  pc.VALID=0 AND bd.VALID=0
+    </select>
+
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
index da1c687..99a99fe 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
@@ -5,7 +5,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 
 @Data
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TimeRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TimeRequest.java
new file mode 100644
index 0000000..18609b8
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TimeRequest.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TimeRequest {
+
+    @ApiModelProperty("开始时间")
+    private String beginDate;
+
+    @ApiModelProperty("结束时间")
+    private String endDate;
+
+    @ApiModelProperty("按周:week,月：month,年：year")
+    private String timeType;
+
+
+}

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
index 2a645d3..3366498 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "耦合关联分析管理")
 @RestController
 @RequestMapping("/system/analysisCoupling")
 public class AnalysisCouplingController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
index dc25430..6648e88 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "地下空洞基本信息接口")
 @RestController
 @RequestMapping("/system/busHole")
 public class BusHoleController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
index 32d8a36..a90f0bc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
@@ -1,9 +1,24 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.dto.TimeRequest;
+import com.casic.missiles.modular.system.entity.BusPatrolCar;
+import com.casic.missiles.modular.system.service.IBusPatrolCarService;
+import com.casic.missiles.modular.system.service.IBusPatrolTaskService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * 首页 前端控制器
@@ -12,9 +27,36 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "首页显示信息接口")
 @RestController
 @RequestMapping("/system/busOverView")
 public class BusOverViewController {
 
+    @Resource
+    private IBusPatrolCarService iBusPatrolCarService;
+    @Resource
+    private IBusPatrolTaskService iBusPatrolTaskService;
+
+    @ApiOperation("巡检车信息")
+    @PostMapping("/carList")
+    public ReturnDTO carList() {
+        return ReturnUtil.success(iBusPatrolCarService.getCarList());
+    }
+
+
+    @ApiOperation("根据时间获取巡检任务和公里数")
+    @PostMapping("/taskCount")
+    public ReturnDTO taskCount(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskCount(timeRequest.getBeginDate(),timeRequest.getEndDate()));
+    }
+
+
+    @ApiOperation("巡检任务趋势")
+    @PostMapping("/taskTime")
+    public ReturnDTO taskTime(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskTime(timeRequest.getTimeType()));
+    }
+
+
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
index dce5046..065a164 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
@@ -46,5 +46,14 @@
         Page<BusPatrolCar> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iBusPatrolCarService.page(page, queryWrapper)));
     }
+
+
+    @ApiOperation("更新车辆位置、在线离线状态及最新时间")
+    @PostMapping("/updateStatus")
+    public ReturnDTO updateStatus(@RequestBody BusPatrolCar busPatrolCar) {
+
+        return ReturnUtil.success(iBusPatrolCarService.updateById(busPatrolCar));
+
+    }
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
index aaced3a..7e74e41 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "管线占压基本信息接口")
 @RestController
 @RequestMapping("/system/busPipeOverstock")
 public class BusPipeOverstockController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
index 47f03ee..980b879 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.modular.system.entity.BusPatrolCar;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检车辆基本信息表 Mapper 接口
@@ -15,4 +17,6 @@
 @Mapper
 public interface BusPatrolCarMapper extends BaseMapper<BusPatrolCar> {
 
+    List<BusPatrolCar> getCarList();
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
index edcf5e6..0027fef 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
@@ -18,7 +18,19 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, CAR_NAME, CAR_PLATE, DESCRIPTION, DEPT_ID, LONGITUDE, LATITUDE, `STATUS`, VALID, TS
+        pc.*
+        <!--ID, CAR_NAME, CAR_PLATE, DESCRIPTION, DEPT_ID, LONGITUDE, LATITUDE, `STATUS`, VALID, TS -->
     </sql>
 
+
+    <select id="getCarList" resultType="com.casic.missiles.modular.system.entity.BusPatrolCar">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        bd.DEVICE_MODEL AS deviceModel
+        FROM bus_patrol_car pc
+        LEFT JOIN bus_device_info bd ON bd.CAR_ID = pc.ID
+        WHERE  pc.VALID=0 AND bd.VALID=0
+    </select>
+
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
index da1c687..99a99fe 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
@@ -5,7 +5,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 
 @Data
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TimeRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TimeRequest.java
new file mode 100644
index 0000000..18609b8
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TimeRequest.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TimeRequest {
+
+    @ApiModelProperty("开始时间")
+    private String beginDate;
+
+    @ApiModelProperty("结束时间")
+    private String endDate;
+
+    @ApiModelProperty("按周:week,月：month,年：year")
+    private String timeType;
+
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java b/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java
index 6fb1853..24c6a2c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java
@@ -63,9 +63,12 @@
     @TableField("VALID")
     private String valid;
 
-    @ApiModelProperty("时间")
+    @ApiModelProperty("最新时间")
     @TableField("TS")
-    private LocalDateTime ts;
+    private String ts;
 
+    @ApiModelProperty("车载云台型号")
+    @TableField(exist = false)
+    private String deviceModel;
 
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
index 2a645d3..3366498 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "耦合关联分析管理")
 @RestController
 @RequestMapping("/system/analysisCoupling")
 public class AnalysisCouplingController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
index dc25430..6648e88 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "地下空洞基本信息接口")
 @RestController
 @RequestMapping("/system/busHole")
 public class BusHoleController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
index 32d8a36..a90f0bc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
@@ -1,9 +1,24 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.dto.TimeRequest;
+import com.casic.missiles.modular.system.entity.BusPatrolCar;
+import com.casic.missiles.modular.system.service.IBusPatrolCarService;
+import com.casic.missiles.modular.system.service.IBusPatrolTaskService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * 首页 前端控制器
@@ -12,9 +27,36 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "首页显示信息接口")
 @RestController
 @RequestMapping("/system/busOverView")
 public class BusOverViewController {
 
+    @Resource
+    private IBusPatrolCarService iBusPatrolCarService;
+    @Resource
+    private IBusPatrolTaskService iBusPatrolTaskService;
+
+    @ApiOperation("巡检车信息")
+    @PostMapping("/carList")
+    public ReturnDTO carList() {
+        return ReturnUtil.success(iBusPatrolCarService.getCarList());
+    }
+
+
+    @ApiOperation("根据时间获取巡检任务和公里数")
+    @PostMapping("/taskCount")
+    public ReturnDTO taskCount(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskCount(timeRequest.getBeginDate(),timeRequest.getEndDate()));
+    }
+
+
+    @ApiOperation("巡检任务趋势")
+    @PostMapping("/taskTime")
+    public ReturnDTO taskTime(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskTime(timeRequest.getTimeType()));
+    }
+
+
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
index dce5046..065a164 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
@@ -46,5 +46,14 @@
         Page<BusPatrolCar> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iBusPatrolCarService.page(page, queryWrapper)));
     }
+
+
+    @ApiOperation("更新车辆位置、在线离线状态及最新时间")
+    @PostMapping("/updateStatus")
+    public ReturnDTO updateStatus(@RequestBody BusPatrolCar busPatrolCar) {
+
+        return ReturnUtil.success(iBusPatrolCarService.updateById(busPatrolCar));
+
+    }
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
index aaced3a..7e74e41 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "管线占压基本信息接口")
 @RestController
 @RequestMapping("/system/busPipeOverstock")
 public class BusPipeOverstockController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
index 47f03ee..980b879 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.modular.system.entity.BusPatrolCar;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检车辆基本信息表 Mapper 接口
@@ -15,4 +17,6 @@
 @Mapper
 public interface BusPatrolCarMapper extends BaseMapper<BusPatrolCar> {
 
+    List<BusPatrolCar> getCarList();
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
index edcf5e6..0027fef 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
@@ -18,7 +18,19 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, CAR_NAME, CAR_PLATE, DESCRIPTION, DEPT_ID, LONGITUDE, LATITUDE, `STATUS`, VALID, TS
+        pc.*
+        <!--ID, CAR_NAME, CAR_PLATE, DESCRIPTION, DEPT_ID, LONGITUDE, LATITUDE, `STATUS`, VALID, TS -->
     </sql>
 
+
+    <select id="getCarList" resultType="com.casic.missiles.modular.system.entity.BusPatrolCar">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        bd.DEVICE_MODEL AS deviceModel
+        FROM bus_patrol_car pc
+        LEFT JOIN bus_device_info bd ON bd.CAR_ID = pc.ID
+        WHERE  pc.VALID=0 AND bd.VALID=0
+    </select>
+
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
index da1c687..99a99fe 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
@@ -5,7 +5,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 
 @Data
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TimeRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TimeRequest.java
new file mode 100644
index 0000000..18609b8
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TimeRequest.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TimeRequest {
+
+    @ApiModelProperty("开始时间")
+    private String beginDate;
+
+    @ApiModelProperty("结束时间")
+    private String endDate;
+
+    @ApiModelProperty("按周:week,月：month,年：year")
+    private String timeType;
+
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java b/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java
index 6fb1853..24c6a2c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java
@@ -63,9 +63,12 @@
     @TableField("VALID")
     private String valid;
 
-    @ApiModelProperty("时间")
+    @ApiModelProperty("最新时间")
     @TableField("TS")
-    private LocalDateTime ts;
+    private String ts;
 
+    @ApiModelProperty("车载云台型号")
+    @TableField(exist = false)
+    private String deviceModel;
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
index 6519750..cdc35a0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
@@ -23,7 +23,7 @@
 
     String VALID_DELETE = "1";
     //未报警
-    String ALARM_ON = "0";
+    String ALARM_OFF = "0";
     //报警
     String ALARM_NO= "1";
     //投票支持
@@ -38,4 +38,9 @@
     String RECOGNITION_PREFIX = "XJSB";
 
     String TASK_STATUS = "inspectionStatus";
+
+    //离线
+    String CAR_OFF = "0";
+    //在线
+    String CAR_NO= "1";
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
index 2a645d3..3366498 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "耦合关联分析管理")
 @RestController
 @RequestMapping("/system/analysisCoupling")
 public class AnalysisCouplingController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
index dc25430..6648e88 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "地下空洞基本信息接口")
 @RestController
 @RequestMapping("/system/busHole")
 public class BusHoleController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
index 32d8a36..a90f0bc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
@@ -1,9 +1,24 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.dto.TimeRequest;
+import com.casic.missiles.modular.system.entity.BusPatrolCar;
+import com.casic.missiles.modular.system.service.IBusPatrolCarService;
+import com.casic.missiles.modular.system.service.IBusPatrolTaskService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * 首页 前端控制器
@@ -12,9 +27,36 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "首页显示信息接口")
 @RestController
 @RequestMapping("/system/busOverView")
 public class BusOverViewController {
 
+    @Resource
+    private IBusPatrolCarService iBusPatrolCarService;
+    @Resource
+    private IBusPatrolTaskService iBusPatrolTaskService;
+
+    @ApiOperation("巡检车信息")
+    @PostMapping("/carList")
+    public ReturnDTO carList() {
+        return ReturnUtil.success(iBusPatrolCarService.getCarList());
+    }
+
+
+    @ApiOperation("根据时间获取巡检任务和公里数")
+    @PostMapping("/taskCount")
+    public ReturnDTO taskCount(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskCount(timeRequest.getBeginDate(),timeRequest.getEndDate()));
+    }
+
+
+    @ApiOperation("巡检任务趋势")
+    @PostMapping("/taskTime")
+    public ReturnDTO taskTime(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskTime(timeRequest.getTimeType()));
+    }
+
+
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
index dce5046..065a164 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
@@ -46,5 +46,14 @@
         Page<BusPatrolCar> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iBusPatrolCarService.page(page, queryWrapper)));
     }
+
+
+    @ApiOperation("更新车辆位置、在线离线状态及最新时间")
+    @PostMapping("/updateStatus")
+    public ReturnDTO updateStatus(@RequestBody BusPatrolCar busPatrolCar) {
+
+        return ReturnUtil.success(iBusPatrolCarService.updateById(busPatrolCar));
+
+    }
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
index aaced3a..7e74e41 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "管线占压基本信息接口")
 @RestController
 @RequestMapping("/system/busPipeOverstock")
 public class BusPipeOverstockController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
index 47f03ee..980b879 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.modular.system.entity.BusPatrolCar;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检车辆基本信息表 Mapper 接口
@@ -15,4 +17,6 @@
 @Mapper
 public interface BusPatrolCarMapper extends BaseMapper<BusPatrolCar> {
 
+    List<BusPatrolCar> getCarList();
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
index edcf5e6..0027fef 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
@@ -18,7 +18,19 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, CAR_NAME, CAR_PLATE, DESCRIPTION, DEPT_ID, LONGITUDE, LATITUDE, `STATUS`, VALID, TS
+        pc.*
+        <!--ID, CAR_NAME, CAR_PLATE, DESCRIPTION, DEPT_ID, LONGITUDE, LATITUDE, `STATUS`, VALID, TS -->
     </sql>
 
+
+    <select id="getCarList" resultType="com.casic.missiles.modular.system.entity.BusPatrolCar">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        bd.DEVICE_MODEL AS deviceModel
+        FROM bus_patrol_car pc
+        LEFT JOIN bus_device_info bd ON bd.CAR_ID = pc.ID
+        WHERE  pc.VALID=0 AND bd.VALID=0
+    </select>
+
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
index da1c687..99a99fe 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
@@ -5,7 +5,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 
 @Data
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TimeRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TimeRequest.java
new file mode 100644
index 0000000..18609b8
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TimeRequest.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TimeRequest {
+
+    @ApiModelProperty("开始时间")
+    private String beginDate;
+
+    @ApiModelProperty("结束时间")
+    private String endDate;
+
+    @ApiModelProperty("按周:week,月：month,年：year")
+    private String timeType;
+
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java b/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java
index 6fb1853..24c6a2c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java
@@ -63,9 +63,12 @@
     @TableField("VALID")
     private String valid;
 
-    @ApiModelProperty("时间")
+    @ApiModelProperty("最新时间")
     @TableField("TS")
-    private LocalDateTime ts;
+    private String ts;
 
+    @ApiModelProperty("车载云台型号")
+    @TableField(exist = false)
+    private String deviceModel;
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
index 6519750..cdc35a0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
@@ -23,7 +23,7 @@
 
     String VALID_DELETE = "1";
     //未报警
-    String ALARM_ON = "0";
+    String ALARM_OFF = "0";
     //报警
     String ALARM_NO= "1";
     //投票支持
@@ -38,4 +38,9 @@
     String RECOGNITION_PREFIX = "XJSB";
 
     String TASK_STATUS = "inspectionStatus";
+
+    //离线
+    String CAR_OFF = "0";
+    //在线
+    String CAR_NO= "1";
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolCarService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolCarService.java
index 1a2b8cb..e1b0370 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolCarService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolCarService.java
@@ -3,6 +3,8 @@
 import com.casic.missiles.modular.system.entity.BusPatrolCar;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检车辆基本信息表 服务类
@@ -13,4 +15,6 @@
  */
 public interface IBusPatrolCarService extends IService<BusPatrolCar> {
 
+    List<BusPatrolCar> getCarList();
+
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
index 2a645d3..3366498 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "耦合关联分析管理")
 @RestController
 @RequestMapping("/system/analysisCoupling")
 public class AnalysisCouplingController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
index dc25430..6648e88 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "地下空洞基本信息接口")
 @RestController
 @RequestMapping("/system/busHole")
 public class BusHoleController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
index 32d8a36..a90f0bc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
@@ -1,9 +1,24 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.dto.TimeRequest;
+import com.casic.missiles.modular.system.entity.BusPatrolCar;
+import com.casic.missiles.modular.system.service.IBusPatrolCarService;
+import com.casic.missiles.modular.system.service.IBusPatrolTaskService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * 首页 前端控制器
@@ -12,9 +27,36 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "首页显示信息接口")
 @RestController
 @RequestMapping("/system/busOverView")
 public class BusOverViewController {
 
+    @Resource
+    private IBusPatrolCarService iBusPatrolCarService;
+    @Resource
+    private IBusPatrolTaskService iBusPatrolTaskService;
+
+    @ApiOperation("巡检车信息")
+    @PostMapping("/carList")
+    public ReturnDTO carList() {
+        return ReturnUtil.success(iBusPatrolCarService.getCarList());
+    }
+
+
+    @ApiOperation("根据时间获取巡检任务和公里数")
+    @PostMapping("/taskCount")
+    public ReturnDTO taskCount(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskCount(timeRequest.getBeginDate(),timeRequest.getEndDate()));
+    }
+
+
+    @ApiOperation("巡检任务趋势")
+    @PostMapping("/taskTime")
+    public ReturnDTO taskTime(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskTime(timeRequest.getTimeType()));
+    }
+
+
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
index dce5046..065a164 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
@@ -46,5 +46,14 @@
         Page<BusPatrolCar> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iBusPatrolCarService.page(page, queryWrapper)));
     }
+
+
+    @ApiOperation("更新车辆位置、在线离线状态及最新时间")
+    @PostMapping("/updateStatus")
+    public ReturnDTO updateStatus(@RequestBody BusPatrolCar busPatrolCar) {
+
+        return ReturnUtil.success(iBusPatrolCarService.updateById(busPatrolCar));
+
+    }
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
index aaced3a..7e74e41 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "管线占压基本信息接口")
 @RestController
 @RequestMapping("/system/busPipeOverstock")
 public class BusPipeOverstockController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
index 47f03ee..980b879 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.modular.system.entity.BusPatrolCar;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检车辆基本信息表 Mapper 接口
@@ -15,4 +17,6 @@
 @Mapper
 public interface BusPatrolCarMapper extends BaseMapper<BusPatrolCar> {
 
+    List<BusPatrolCar> getCarList();
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
index edcf5e6..0027fef 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
@@ -18,7 +18,19 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, CAR_NAME, CAR_PLATE, DESCRIPTION, DEPT_ID, LONGITUDE, LATITUDE, `STATUS`, VALID, TS
+        pc.*
+        <!--ID, CAR_NAME, CAR_PLATE, DESCRIPTION, DEPT_ID, LONGITUDE, LATITUDE, `STATUS`, VALID, TS -->
     </sql>
 
+
+    <select id="getCarList" resultType="com.casic.missiles.modular.system.entity.BusPatrolCar">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        bd.DEVICE_MODEL AS deviceModel
+        FROM bus_patrol_car pc
+        LEFT JOIN bus_device_info bd ON bd.CAR_ID = pc.ID
+        WHERE  pc.VALID=0 AND bd.VALID=0
+    </select>
+
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
index da1c687..99a99fe 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
@@ -5,7 +5,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 
 @Data
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TimeRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TimeRequest.java
new file mode 100644
index 0000000..18609b8
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TimeRequest.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TimeRequest {
+
+    @ApiModelProperty("开始时间")
+    private String beginDate;
+
+    @ApiModelProperty("结束时间")
+    private String endDate;
+
+    @ApiModelProperty("按周:week,月：month,年：year")
+    private String timeType;
+
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java b/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java
index 6fb1853..24c6a2c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java
@@ -63,9 +63,12 @@
     @TableField("VALID")
     private String valid;
 
-    @ApiModelProperty("时间")
+    @ApiModelProperty("最新时间")
     @TableField("TS")
-    private LocalDateTime ts;
+    private String ts;
 
+    @ApiModelProperty("车载云台型号")
+    @TableField(exist = false)
+    private String deviceModel;
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
index 6519750..cdc35a0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
@@ -23,7 +23,7 @@
 
     String VALID_DELETE = "1";
     //未报警
-    String ALARM_ON = "0";
+    String ALARM_OFF = "0";
     //报警
     String ALARM_NO= "1";
     //投票支持
@@ -38,4 +38,9 @@
     String RECOGNITION_PREFIX = "XJSB";
 
     String TASK_STATUS = "inspectionStatus";
+
+    //离线
+    String CAR_OFF = "0";
+    //在线
+    String CAR_NO= "1";
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolCarService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolCarService.java
index 1a2b8cb..e1b0370 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolCarService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolCarService.java
@@ -3,6 +3,8 @@
 import com.casic.missiles.modular.system.entity.BusPatrolCar;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检车辆基本信息表 服务类
@@ -13,4 +15,6 @@
  */
 public interface IBusPatrolCarService extends IService<BusPatrolCar> {
 
+    List<BusPatrolCar> getCarList();
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolTaskService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolTaskService.java
index 5c0bc9f..0be8c95 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolTaskService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolTaskService.java
@@ -9,6 +9,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,4 +30,8 @@
     void exportUsersToExcel(List<BusPatrolTrackDTO> list, HttpServletResponse response);
 
     Long getTaskByTime(String taskTime);
+
+    Map<String,Object> taskCount(String begTime, String endTime);
+
+    List<Map<String, Object>> taskTime(String timeType);
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
index 2a645d3..3366498 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "耦合关联分析管理")
 @RestController
 @RequestMapping("/system/analysisCoupling")
 public class AnalysisCouplingController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
index dc25430..6648e88 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "地下空洞基本信息接口")
 @RestController
 @RequestMapping("/system/busHole")
 public class BusHoleController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
index 32d8a36..a90f0bc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
@@ -1,9 +1,24 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.dto.TimeRequest;
+import com.casic.missiles.modular.system.entity.BusPatrolCar;
+import com.casic.missiles.modular.system.service.IBusPatrolCarService;
+import com.casic.missiles.modular.system.service.IBusPatrolTaskService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * 首页 前端控制器
@@ -12,9 +27,36 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "首页显示信息接口")
 @RestController
 @RequestMapping("/system/busOverView")
 public class BusOverViewController {
 
+    @Resource
+    private IBusPatrolCarService iBusPatrolCarService;
+    @Resource
+    private IBusPatrolTaskService iBusPatrolTaskService;
+
+    @ApiOperation("巡检车信息")
+    @PostMapping("/carList")
+    public ReturnDTO carList() {
+        return ReturnUtil.success(iBusPatrolCarService.getCarList());
+    }
+
+
+    @ApiOperation("根据时间获取巡检任务和公里数")
+    @PostMapping("/taskCount")
+    public ReturnDTO taskCount(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskCount(timeRequest.getBeginDate(),timeRequest.getEndDate()));
+    }
+
+
+    @ApiOperation("巡检任务趋势")
+    @PostMapping("/taskTime")
+    public ReturnDTO taskTime(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskTime(timeRequest.getTimeType()));
+    }
+
+
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
index dce5046..065a164 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
@@ -46,5 +46,14 @@
         Page<BusPatrolCar> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iBusPatrolCarService.page(page, queryWrapper)));
     }
+
+
+    @ApiOperation("更新车辆位置、在线离线状态及最新时间")
+    @PostMapping("/updateStatus")
+    public ReturnDTO updateStatus(@RequestBody BusPatrolCar busPatrolCar) {
+
+        return ReturnUtil.success(iBusPatrolCarService.updateById(busPatrolCar));
+
+    }
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
index aaced3a..7e74e41 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "管线占压基本信息接口")
 @RestController
 @RequestMapping("/system/busPipeOverstock")
 public class BusPipeOverstockController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
index 47f03ee..980b879 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.modular.system.entity.BusPatrolCar;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检车辆基本信息表 Mapper 接口
@@ -15,4 +17,6 @@
 @Mapper
 public interface BusPatrolCarMapper extends BaseMapper<BusPatrolCar> {
 
+    List<BusPatrolCar> getCarList();
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
index edcf5e6..0027fef 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
@@ -18,7 +18,19 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, CAR_NAME, CAR_PLATE, DESCRIPTION, DEPT_ID, LONGITUDE, LATITUDE, `STATUS`, VALID, TS
+        pc.*
+        <!--ID, CAR_NAME, CAR_PLATE, DESCRIPTION, DEPT_ID, LONGITUDE, LATITUDE, `STATUS`, VALID, TS -->
     </sql>
 
+
+    <select id="getCarList" resultType="com.casic.missiles.modular.system.entity.BusPatrolCar">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        bd.DEVICE_MODEL AS deviceModel
+        FROM bus_patrol_car pc
+        LEFT JOIN bus_device_info bd ON bd.CAR_ID = pc.ID
+        WHERE  pc.VALID=0 AND bd.VALID=0
+    </select>
+
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
index da1c687..99a99fe 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
@@ -5,7 +5,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 
 @Data
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TimeRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TimeRequest.java
new file mode 100644
index 0000000..18609b8
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TimeRequest.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TimeRequest {
+
+    @ApiModelProperty("开始时间")
+    private String beginDate;
+
+    @ApiModelProperty("结束时间")
+    private String endDate;
+
+    @ApiModelProperty("按周:week,月：month,年：year")
+    private String timeType;
+
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java b/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java
index 6fb1853..24c6a2c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java
@@ -63,9 +63,12 @@
     @TableField("VALID")
     private String valid;
 
-    @ApiModelProperty("时间")
+    @ApiModelProperty("最新时间")
     @TableField("TS")
-    private LocalDateTime ts;
+    private String ts;
 
+    @ApiModelProperty("车载云台型号")
+    @TableField(exist = false)
+    private String deviceModel;
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
index 6519750..cdc35a0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
@@ -23,7 +23,7 @@
 
     String VALID_DELETE = "1";
     //未报警
-    String ALARM_ON = "0";
+    String ALARM_OFF = "0";
     //报警
     String ALARM_NO= "1";
     //投票支持
@@ -38,4 +38,9 @@
     String RECOGNITION_PREFIX = "XJSB";
 
     String TASK_STATUS = "inspectionStatus";
+
+    //离线
+    String CAR_OFF = "0";
+    //在线
+    String CAR_NO= "1";
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolCarService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolCarService.java
index 1a2b8cb..e1b0370 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolCarService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolCarService.java
@@ -3,6 +3,8 @@
 import com.casic.missiles.modular.system.entity.BusPatrolCar;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检车辆基本信息表 服务类
@@ -13,4 +15,6 @@
  */
 public interface IBusPatrolCarService extends IService<BusPatrolCar> {
 
+    List<BusPatrolCar> getCarList();
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolTaskService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolTaskService.java
index 5c0bc9f..0be8c95 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolTaskService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolTaskService.java
@@ -9,6 +9,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,4 +30,8 @@
     void exportUsersToExcel(List<BusPatrolTrackDTO> list, HttpServletResponse response);
 
     Long getTaskByTime(String taskTime);
+
+    Map<String,Object> taskCount(String begTime, String endTime);
+
+    List<Map<String, Object>> taskTime(String timeType);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolCarServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolCarServiceImpl.java
index a30726f..00f6ac6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolCarServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolCarServiceImpl.java
@@ -1,12 +1,16 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.casic.missiles.modular.system.dao.BusPatrolCarMapper;
 import com.casic.missiles.modular.system.entity.BusPatrolCar;
 
+import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.service.IBusPatrolCarService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检车辆基本信息表 服务实现类
@@ -18,4 +22,13 @@
 @Service
 public class BusPatrolCarServiceImpl extends ServiceImpl<BusPatrolCarMapper, BusPatrolCar> implements IBusPatrolCarService {
 
+    @Override
+    public List<BusPatrolCar> getCarList() {
+        List<BusPatrolCar> busPatrolCarList = this.baseMapper.getCarList();
+        busPatrolCarList.forEach(busPatrolCar -> {
+            busPatrolCar.setStatus(ObjectUtil.isNotEmpty(busPatrolCar.getStatus()) && DictEnum.CAR_NO.equals(busPatrolCar.getStatus()) ?
+                    "在线" : "离线");
+        });
+        return busPatrolCarList;
+    }
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
index 2a645d3..3366498 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AnalysisCouplingController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "耦合关联分析管理")
 @RestController
 @RequestMapping("/system/analysisCoupling")
 public class AnalysisCouplingController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
index dc25430..6648e88 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "地下空洞基本信息接口")
 @RestController
 @RequestMapping("/system/busHole")
 public class BusHoleController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
index 32d8a36..a90f0bc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusOverViewController.java
@@ -1,9 +1,24 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.dto.TimeRequest;
+import com.casic.missiles.modular.system.entity.BusPatrolCar;
+import com.casic.missiles.modular.system.service.IBusPatrolCarService;
+import com.casic.missiles.modular.system.service.IBusPatrolTaskService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * 首页 前端控制器
@@ -12,9 +27,36 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "首页显示信息接口")
 @RestController
 @RequestMapping("/system/busOverView")
 public class BusOverViewController {
 
+    @Resource
+    private IBusPatrolCarService iBusPatrolCarService;
+    @Resource
+    private IBusPatrolTaskService iBusPatrolTaskService;
+
+    @ApiOperation("巡检车信息")
+    @PostMapping("/carList")
+    public ReturnDTO carList() {
+        return ReturnUtil.success(iBusPatrolCarService.getCarList());
+    }
+
+
+    @ApiOperation("根据时间获取巡检任务和公里数")
+    @PostMapping("/taskCount")
+    public ReturnDTO taskCount(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskCount(timeRequest.getBeginDate(),timeRequest.getEndDate()));
+    }
+
+
+    @ApiOperation("巡检任务趋势")
+    @PostMapping("/taskTime")
+    public ReturnDTO taskTime(@RequestBody TimeRequest timeRequest) {
+        return ReturnUtil.success(iBusPatrolTaskService.taskTime(timeRequest.getTimeType()));
+    }
+
+
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
index dce5046..065a164 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolCarController.java
@@ -46,5 +46,14 @@
         Page<BusPatrolCar> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iBusPatrolCarService.page(page, queryWrapper)));
     }
+
+
+    @ApiOperation("更新车辆位置、在线离线状态及最新时间")
+    @PostMapping("/updateStatus")
+    public ReturnDTO updateStatus(@RequestBody BusPatrolCar busPatrolCar) {
+
+        return ReturnUtil.success(iBusPatrolCarService.updateById(busPatrolCar));
+
+    }
 }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
index aaced3a..7e74e41 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPipeOverstockController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,6 +13,7 @@
  * @author zt
  * @since 2023-07-20
  */
+@Api(tags = "管线占压基本信息接口")
 @RestController
 @RequestMapping("/system/busPipeOverstock")
 public class BusPipeOverstockController {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
index 47f03ee..980b879 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPatrolCarMapper.java
@@ -4,6 +4,8 @@
 import com.casic.missiles.modular.system.entity.BusPatrolCar;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检车辆基本信息表 Mapper 接口
@@ -15,4 +17,6 @@
 @Mapper
 public interface BusPatrolCarMapper extends BaseMapper<BusPatrolCar> {
 
+    List<BusPatrolCar> getCarList();
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
index edcf5e6..0027fef 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPatrolCarMapper.xml
@@ -18,7 +18,19 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, CAR_NAME, CAR_PLATE, DESCRIPTION, DEPT_ID, LONGITUDE, LATITUDE, `STATUS`, VALID, TS
+        pc.*
+        <!--ID, CAR_NAME, CAR_PLATE, DESCRIPTION, DEPT_ID, LONGITUDE, LATITUDE, `STATUS`, VALID, TS -->
     </sql>
 
+
+    <select id="getCarList" resultType="com.casic.missiles.modular.system.entity.BusPatrolCar">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        bd.DEVICE_MODEL AS deviceModel
+        FROM bus_patrol_car pc
+        LEFT JOIN bus_device_info bd ON bd.CAR_ID = pc.ID
+        WHERE  pc.VALID=0 AND bd.VALID=0
+    </select>
+
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
index da1c687..99a99fe 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordDTO.java
@@ -5,7 +5,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 
 @Data
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TimeRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TimeRequest.java
new file mode 100644
index 0000000..18609b8
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TimeRequest.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TimeRequest {
+
+    @ApiModelProperty("开始时间")
+    private String beginDate;
+
+    @ApiModelProperty("结束时间")
+    private String endDate;
+
+    @ApiModelProperty("按周:week,月：month,年：year")
+    private String timeType;
+
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java b/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java
index 6fb1853..24c6a2c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/entity/BusPatrolCar.java
@@ -63,9 +63,12 @@
     @TableField("VALID")
     private String valid;
 
-    @ApiModelProperty("时间")
+    @ApiModelProperty("最新时间")
     @TableField("TS")
-    private LocalDateTime ts;
+    private String ts;
 
+    @ApiModelProperty("车载云台型号")
+    @TableField(exist = false)
+    private String deviceModel;
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
index 6519750..cdc35a0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
@@ -23,7 +23,7 @@
 
     String VALID_DELETE = "1";
     //未报警
-    String ALARM_ON = "0";
+    String ALARM_OFF = "0";
     //报警
     String ALARM_NO= "1";
     //投票支持
@@ -38,4 +38,9 @@
     String RECOGNITION_PREFIX = "XJSB";
 
     String TASK_STATUS = "inspectionStatus";
+
+    //离线
+    String CAR_OFF = "0";
+    //在线
+    String CAR_NO= "1";
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolCarService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolCarService.java
index 1a2b8cb..e1b0370 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolCarService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolCarService.java
@@ -3,6 +3,8 @@
 import com.casic.missiles.modular.system.entity.BusPatrolCar;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检车辆基本信息表 服务类
@@ -13,4 +15,6 @@
  */
 public interface IBusPatrolCarService extends IService<BusPatrolCar> {
 
+    List<BusPatrolCar> getCarList();
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolTaskService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolTaskService.java
index 5c0bc9f..0be8c95 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolTaskService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolTaskService.java
@@ -9,6 +9,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,4 +30,8 @@
     void exportUsersToExcel(List<BusPatrolTrackDTO> list, HttpServletResponse response);
 
     Long getTaskByTime(String taskTime);
+
+    Map<String,Object> taskCount(String begTime, String endTime);
+
+    List<Map<String, Object>> taskTime(String timeType);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolCarServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolCarServiceImpl.java
index a30726f..00f6ac6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolCarServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolCarServiceImpl.java
@@ -1,12 +1,16 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.casic.missiles.modular.system.dao.BusPatrolCarMapper;
 import com.casic.missiles.modular.system.entity.BusPatrolCar;
 
+import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.service.IBusPatrolCarService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡检车辆基本信息表 服务实现类
@@ -18,4 +22,13 @@
 @Service
 public class BusPatrolCarServiceImpl extends ServiceImpl<BusPatrolCarMapper, BusPatrolCar> implements IBusPatrolCarService {
 
+    @Override
+    public List<BusPatrolCar> getCarList() {
+        List<BusPatrolCar> busPatrolCarList = this.baseMapper.getCarList();
+        busPatrolCarList.forEach(busPatrolCar -> {
+            busPatrolCar.setStatus(ObjectUtil.isNotEmpty(busPatrolCar.getStatus()) && DictEnum.CAR_NO.equals(busPatrolCar.getStatus()) ?
+                    "在线" : "离线");
+        });
+        return busPatrolCarList;
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolTaskServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolTaskServiceImpl.java
index f9321db..7bc3180 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolTaskServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolTaskServiceImpl.java
@@ -1,5 +1,8 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,7 +20,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -54,14 +57,14 @@
     @Override
     public Long getTaskByTime(String taskTime) {
         QueryWrapper<BusPatrolTask> queryWrapper = new QueryWrapper<>();
-        queryWrapper.le("BEGIN_DATE",taskTime);
+        queryWrapper.le("BEGIN_DATE", taskTime);
         List<BusPatrolTask> busPatrolTaskList = this.list(queryWrapper);
-        for(BusPatrolTask busPatrolTask: busPatrolTaskList){
-            if(ObjectUtil.isNotEmpty(busPatrolTask.getEndDate())){
-                if(busPatrolTask.getEndDate().compareTo(taskTime)>=0){
+        for (BusPatrolTask busPatrolTask : busPatrolTaskList) {
+            if (ObjectUtil.isNotEmpty(busPatrolTask.getEndDate())) {
+                if (busPatrolTask.getEndDate().compareTo(taskTime) >= 0) {
                     return busPatrolTask.getId();
                 }
-            }else {
+            } else {
                 return busPatrolTask.getId();
             }
         }
@@ -81,4 +84,48 @@
     public List<BusPatrolTrackDTO> selectLists(List<Long> ids) {
         return this.baseMapper.selectLists(ids);
     }
+
+    @Override
+    public Map<String, Object> taskCount(String begTime, String endTime) {
+        Map<String, Object> resultMap = new HashMap<>();
+        resultMap.put("taskCount", 0);
+        resultMap.put("km", 0);
+        QueryWrapper<BusPatrolTask> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ge(ObjectUtil.isNotEmpty(begTime), "BEGIN_DATE", begTime);
+        List<BusPatrolTask> taskList = this.list(queryWrapper);
+        if (ObjectUtil.isNotEmpty(taskList) && taskList.size() > 0) {
+            resultMap.put("taskCount", taskList.size());
+            double km = 0;
+            for (BusPatrolTask busPatrolTask : taskList) {
+                if (ObjectUtil.isNotEmpty(busPatrolTask.getKm())) {
+                    km = km + Double.valueOf(busPatrolTask.getKm());
+                }
+            }
+            resultMap.put("km", km);
+        }
+        return resultMap;
+    }
+
+    @Override
+    public  List<Map<String, Object>> taskTime(String timeType) {
+
+        QueryWrapper<BusPatrolTask> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ge("BEGIN_DATE", DateUtil.offsetDay(new Date(), -6));
+        List<BusPatrolTask> taskList = this.list(queryWrapper);
+        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR);
+        List<Map<String, Object>> mapList = new ArrayList<>();
+        dateTimeList.forEach(dateTime -> {
+            Map<String, Object> dayMap = new HashMap<>();
+            int taskCount = 0;
+            for (BusPatrolTask busPatrolTask : taskList) {
+                if (DateUtil.isSameDay(DateUtil.parseDate(busPatrolTask.getBeginDate()), dateTime)) {
+                    taskCount ++;
+                }
+            }
+            dayMap.put(DateUtil.formatDate(dateTime),taskCount);
+            mapList.add(dayMap);
+        });
+
+        return mapList;
+    }
 }