diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacBoxTransformerController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacBoxTransformerController.java
index b9512965..f127445c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacBoxTransformerController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacBoxTransformerController.java
@@ -15,10 +15,10 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.facility.domain.req.boxtransformer.BoxTransformerCreateReq;
-import org.dromara.facility.domain.req.boxtransformer.BoxTransformerQueryReq;
-import org.dromara.facility.domain.req.boxtransformer.BoxTransformerUpdateReq;
-import org.dromara.facility.domain.vo.FacBoxTransformerVo;
+import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerCreateReq;
+import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerQueryReq;
+import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerUpdateReq;
+import org.dromara.facility.domain.vo.boxtransformer.FacBoxTransformerVo;
 import org.dromara.facility.service.IFacBoxTransformerService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -44,7 +44,7 @@ public class FacBoxTransformerController extends BaseController {
      */
     @SaCheckPermission("facility:boxTransformer:list")
     @GetMapping("/list")
-    public TableDataInfo<FacBoxTransformerVo> list(BoxTransformerQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<FacBoxTransformerVo> list(FacBoxTransformerQueryReq req, PageQuery pageQuery) {
         return facBoxTransformerService.queryPageList(req, pageQuery);
     }
 
@@ -54,7 +54,7 @@ public class FacBoxTransformerController extends BaseController {
     @SaCheckPermission("facility:boxTransformer:export")
     @Log(title = "设施-箱变", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(BoxTransformerQueryReq req, HttpServletResponse response) {
+    public void export(FacBoxTransformerQueryReq req, HttpServletResponse response) {
         List<FacBoxTransformerVo> list = facBoxTransformerService.queryList(req);
         ExcelUtil.exportExcel(list, "设施-箱变", FacBoxTransformerVo.class, response);
     }
@@ -78,7 +78,7 @@ public class FacBoxTransformerController extends BaseController {
     @Log(title = "设施-箱变", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody BoxTransformerCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody FacBoxTransformerCreateReq req) {
         return R.ok(facBoxTransformerService.insertByBo(req));
     }
 
@@ -89,7 +89,7 @@ public class FacBoxTransformerController extends BaseController {
     @Log(title = "设施-箱变", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody BoxTransformerUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody FacBoxTransformerUpdateReq req) {
         return toAjax(facBoxTransformerService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacInverterController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacInverterController.java
index a762bb63..4800520b 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacInverterController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacInverterController.java
@@ -15,10 +15,10 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.facility.domain.req.inverter.InverterCreateReq;
-import org.dromara.facility.domain.req.inverter.InverterQueryReq;
-import org.dromara.facility.domain.req.inverter.InverterUpdateReq;
-import org.dromara.facility.domain.vo.FacInverterVo;
+import org.dromara.facility.domain.req.inverter.FacInverterCreateReq;
+import org.dromara.facility.domain.req.inverter.FacInverterQueryReq;
+import org.dromara.facility.domain.req.inverter.FacInverterUpdateReq;
+import org.dromara.facility.domain.vo.inverter.FacInverterVo;
 import org.dromara.facility.service.IFacInverterService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -44,7 +44,7 @@ public class FacInverterController extends BaseController {
      */
     @SaCheckPermission("facility:inverter:list")
     @GetMapping("/list")
-    public TableDataInfo<FacInverterVo> list(InverterQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<FacInverterVo> list(FacInverterQueryReq req, PageQuery pageQuery) {
         return facInverterService.queryPageList(req, pageQuery);
     }
 
@@ -54,7 +54,7 @@ public class FacInverterController extends BaseController {
     @SaCheckPermission("facility:inverter:export")
     @Log(title = "设施-逆变器", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(InverterQueryReq req, HttpServletResponse response) {
+    public void export(FacInverterQueryReq req, HttpServletResponse response) {
         List<FacInverterVo> list = facInverterService.queryList(req);
         ExcelUtil.exportExcel(list, "设施-逆变器", FacInverterVo.class, response);
     }
@@ -78,7 +78,7 @@ public class FacInverterController extends BaseController {
     @Log(title = "设施-逆变器", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody InverterCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody FacInverterCreateReq req) {
         return R.ok(facInverterService.insertByBo(req));
     }
 
@@ -89,7 +89,7 @@ public class FacInverterController extends BaseController {
     @Log(title = "设施-逆变器", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody InverterUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody FacInverterUpdateReq req) {
         return toAjax(facInverterService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacMatrixController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacMatrixController.java
index 271fe36d..0a77625f 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacMatrixController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacMatrixController.java
@@ -17,7 +17,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.facility.domain.req.matrix.*;
 import org.dromara.facility.domain.vo.matrix.FacMatrixVo;
-import org.dromara.facility.domain.vo.matrix.MatrixDetailGisVo;
+import org.dromara.facility.domain.vo.matrix.FacMatrixDetailGisVo;
 import org.dromara.facility.service.IFacMatrixService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -43,7 +43,7 @@ public class FacMatrixController extends BaseController {
      */
     @SaCheckPermission("facility:matrix:list")
     @GetMapping("/list")
-    public TableDataInfo<FacMatrixVo> list(MatrixQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<FacMatrixVo> list(FacMatrixQueryReq req, PageQuery pageQuery) {
         return facMatrixService.queryPageList(req, pageQuery);
     }
 
@@ -53,7 +53,7 @@ public class FacMatrixController extends BaseController {
     @SaCheckPermission("facility:matrix:export")
     @Log(title = "设施-方阵", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(MatrixQueryReq req, HttpServletResponse response) {
+    public void export(FacMatrixQueryReq req, HttpServletResponse response) {
         List<FacMatrixVo> list = facMatrixService.queryList(req);
         ExcelUtil.exportExcel(list, "设施-方阵", FacMatrixVo.class, response);
     }
@@ -75,7 +75,7 @@ public class FacMatrixController extends BaseController {
      */
     @SaCheckPermission("facility:matrix:query")
     @GetMapping("/gis")
-    public R<MatrixDetailGisVo> getMatrixDetailGis(MatrixDetailGisReq req) {
+    public R<FacMatrixDetailGisVo> getMatrixDetailGis(FacMatrixDetailGisReq req) {
         return R.ok(facMatrixService.getMatrixDetailGis(req));
     }
 
@@ -86,7 +86,7 @@ public class FacMatrixController extends BaseController {
     @Log(title = "设施-方阵", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/geoJson")
-    public R<Void> insertByGeoJson(@RequestBody MatrixCreateByGeoJsonReq req) {
+    public R<Void> insertByGeoJson(@RequestBody FacMatrixCreateByGeoJsonReq req) {
         return toAjax(facMatrixService.insertByGeoJson(req));
     }
 
@@ -97,7 +97,7 @@ public class FacMatrixController extends BaseController {
     @Log(title = "设施-方阵", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody MatrixCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody FacMatrixCreateReq req) {
         return R.ok(facMatrixService.insertByBo(req));
     }
 
@@ -108,7 +108,7 @@ public class FacMatrixController extends BaseController {
     @Log(title = "设施-方阵", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody MatrixUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody FacMatrixUpdateReq req) {
         return toAjax(facMatrixService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelColumnController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelColumnController.java
index 4a64e916..5556f9b3 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelColumnController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelColumnController.java
@@ -15,10 +15,10 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.facility.domain.req.photovoltaicpanelcolumn.PhotovoltaicPanelColumnCreateReq;
-import org.dromara.facility.domain.req.photovoltaicpanelcolumn.PhotovoltaicPanelColumnQueryReq;
-import org.dromara.facility.domain.req.photovoltaicpanelcolumn.PhotovoltaicPanelColumnUpdateReq;
-import org.dromara.facility.domain.vo.FacPhotovoltaicPanelColumnVo;
+import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnCreateReq;
+import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnQueryReq;
+import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnUpdateReq;
+import org.dromara.facility.domain.vo.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnVo;
 import org.dromara.facility.service.IFacPhotovoltaicPanelColumnService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -44,7 +44,7 @@ public class FacPhotovoltaicPanelColumnController extends BaseController {
      */
     @SaCheckPermission("facility:photovoltaicPanelColumn:list")
     @GetMapping("/list")
-    public TableDataInfo<FacPhotovoltaicPanelColumnVo> list(PhotovoltaicPanelColumnQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<FacPhotovoltaicPanelColumnVo> list(FacPhotovoltaicPanelColumnQueryReq req, PageQuery pageQuery) {
         return facPhotovoltaicPanelColumnService.queryPageList(req, pageQuery);
     }
 
@@ -54,7 +54,7 @@ public class FacPhotovoltaicPanelColumnController extends BaseController {
     @SaCheckPermission("facility:photovoltaicPanelColumn:export")
     @Log(title = "设施-光伏板立柱", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(PhotovoltaicPanelColumnQueryReq req, HttpServletResponse response) {
+    public void export(FacPhotovoltaicPanelColumnQueryReq req, HttpServletResponse response) {
         List<FacPhotovoltaicPanelColumnVo> list = facPhotovoltaicPanelColumnService.queryList(req);
         ExcelUtil.exportExcel(list, "设施-光伏板立柱", FacPhotovoltaicPanelColumnVo.class, response);
     }
@@ -78,7 +78,7 @@ public class FacPhotovoltaicPanelColumnController extends BaseController {
     @Log(title = "设施-光伏板立柱", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody PhotovoltaicPanelColumnCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody FacPhotovoltaicPanelColumnCreateReq req) {
         return R.ok(facPhotovoltaicPanelColumnService.insertByBo(req));
     }
 
@@ -89,7 +89,7 @@ public class FacPhotovoltaicPanelColumnController extends BaseController {
     @Log(title = "设施-光伏板立柱", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody PhotovoltaicPanelColumnUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody FacPhotovoltaicPanelColumnUpdateReq req) {
         return toAjax(facPhotovoltaicPanelColumnService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelController.java
index 0b86850c..c96878f0 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelController.java
@@ -15,11 +15,11 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelCreateByGeoJsonReq;
-import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelCreateReq;
-import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelQueryReq;
-import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelUpdateReq;
-import org.dromara.facility.domain.vo.FacPhotovoltaicPanelVo;
+import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelCreateByGeoJsonReq;
+import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelCreateReq;
+import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelQueryReq;
+import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelUpdateReq;
+import org.dromara.facility.domain.vo.photovoltaicpanel.FacPhotovoltaicPanelVo;
 import org.dromara.facility.service.IFacPhotovoltaicPanelService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -45,7 +45,7 @@ public class FacPhotovoltaicPanelController extends BaseController {
      */
     @SaCheckPermission("facility:photovoltaicPanel:list")
     @GetMapping("/list")
-    public TableDataInfo<FacPhotovoltaicPanelVo> list(PhotovoltaicPanelQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<FacPhotovoltaicPanelVo> list(FacPhotovoltaicPanelQueryReq req, PageQuery pageQuery) {
         return facPhotovoltaicPanelService.queryPageList(req, pageQuery);
     }
 
@@ -55,7 +55,7 @@ public class FacPhotovoltaicPanelController extends BaseController {
     @SaCheckPermission("facility:photovoltaicPanel:export")
     @Log(title = "设施-光伏板", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(PhotovoltaicPanelQueryReq req, HttpServletResponse response) {
+    public void export(FacPhotovoltaicPanelQueryReq req, HttpServletResponse response) {
         List<FacPhotovoltaicPanelVo> list = facPhotovoltaicPanelService.queryList(req);
         ExcelUtil.exportExcel(list, "设施-光伏板", FacPhotovoltaicPanelVo.class, response);
     }
@@ -79,7 +79,7 @@ public class FacPhotovoltaicPanelController extends BaseController {
     @Log(title = "设施-光伏板", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody PhotovoltaicPanelCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody FacPhotovoltaicPanelCreateReq req) {
         return R.ok(facPhotovoltaicPanelService.insertByBo(req));
     }
 
@@ -90,7 +90,7 @@ public class FacPhotovoltaicPanelController extends BaseController {
     @Log(title = "设施-光伏板", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/geoJson")
-    public R<Void> insertByGeoJson(@RequestBody PhotovoltaicPanelCreateByGeoJsonReq geoJson) {
+    public R<Void> insertByGeoJson(@RequestBody FacPhotovoltaicPanelCreateByGeoJsonReq geoJson) {
         return toAjax(facPhotovoltaicPanelService.insertByGeoJson(geoJson));
     }
 
@@ -101,7 +101,7 @@ public class FacPhotovoltaicPanelController extends BaseController {
     @Log(title = "设施-光伏板", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody PhotovoltaicPanelUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody FacPhotovoltaicPanelUpdateReq req) {
         return toAjax(facPhotovoltaicPanelService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelPartsController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelPartsController.java
index 9e4eb5e4..4017f0b0 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelPartsController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelPartsController.java
@@ -6,8 +6,8 @@ import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.facility.domain.req.photovoltaicpanelparts.PhotovoltaicPanelPartsCreateByGeoJsonReq;
-import org.dromara.facility.domain.req.photovoltaicpanelparts.PhotovoltaicPanelPartsCreateReq;
+import org.dromara.facility.domain.req.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateByGeoJsonReq;
+import org.dromara.facility.domain.req.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateReq;
 import org.dromara.facility.service.IFacPhotovoltaicPanelPartsService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -35,7 +35,7 @@ public class FacPhotovoltaicPanelPartsController extends BaseController {
     @Log(title = "设施-光伏板（桩点、立柱、支架）", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/geoJson")
-    public R<Void> insertPartsByGeoJson(@RequestBody PhotovoltaicPanelPartsCreateByGeoJsonReq req) {
+    public R<Void> insertPartsByGeoJson(@RequestBody FacPhotovoltaicPanelPartsCreateByGeoJsonReq req) {
         return toAjax(photovoltaicPanelPartsService.insertPartsByGeoJson(req));
     }
 
@@ -45,7 +45,7 @@ public class FacPhotovoltaicPanelPartsController extends BaseController {
     @Log(title = "设施-光伏板（桩点、立柱、支架）", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Boolean> insertPartsByBatch(PhotovoltaicPanelPartsCreateReq req) {
+    public R<Boolean> insertPartsByBatch(FacPhotovoltaicPanelPartsCreateReq req) {
         return R.ok(photovoltaicPanelPartsService.insertPartsByBatch(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelPointController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelPointController.java
index e7686f4f..ce780e45 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelPointController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelPointController.java
@@ -15,10 +15,10 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.facility.domain.req.photovoltaicpanelpoint.PhotovoltaicPanelPointCreateReq;
-import org.dromara.facility.domain.req.photovoltaicpanelpoint.PhotovoltaicPanelPointQueryReq;
-import org.dromara.facility.domain.req.photovoltaicpanelpoint.PhotovoltaicPanelPointUpdateReq;
-import org.dromara.facility.domain.vo.FacPhotovoltaicPanelPointVo;
+import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointCreateReq;
+import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointQueryReq;
+import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointUpdateReq;
+import org.dromara.facility.domain.vo.photovoltaicpanelpoint.FacPhotovoltaicPanelPointVo;
 import org.dromara.facility.service.IFacPhotovoltaicPanelPointService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -44,7 +44,7 @@ public class FacPhotovoltaicPanelPointController extends BaseController {
      */
     @SaCheckPermission("facility:photovoltaicPanelPoint:list")
     @GetMapping("/list")
-    public TableDataInfo<FacPhotovoltaicPanelPointVo> list(PhotovoltaicPanelPointQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<FacPhotovoltaicPanelPointVo> list(FacPhotovoltaicPanelPointQueryReq req, PageQuery pageQuery) {
         return facPhotovoltaicPanelPointService.queryPageList(req, pageQuery);
     }
 
@@ -54,7 +54,7 @@ public class FacPhotovoltaicPanelPointController extends BaseController {
     @SaCheckPermission("facility:photovoltaicPanelPoint:export")
     @Log(title = "设施-光伏板桩点", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(PhotovoltaicPanelPointQueryReq req, HttpServletResponse response) {
+    public void export(FacPhotovoltaicPanelPointQueryReq req, HttpServletResponse response) {
         List<FacPhotovoltaicPanelPointVo> list = facPhotovoltaicPanelPointService.queryList(req);
         ExcelUtil.exportExcel(list, "设施-光伏板桩点", FacPhotovoltaicPanelPointVo.class, response);
     }
@@ -78,7 +78,7 @@ public class FacPhotovoltaicPanelPointController extends BaseController {
     @Log(title = "设施-光伏板桩点", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody PhotovoltaicPanelPointCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody FacPhotovoltaicPanelPointCreateReq req) {
         return R.ok(facPhotovoltaicPanelPointService.insertByBo(req));
     }
 
@@ -89,7 +89,7 @@ public class FacPhotovoltaicPanelPointController extends BaseController {
     @Log(title = "设施-光伏板桩点", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody PhotovoltaicPanelPointUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody FacPhotovoltaicPanelPointUpdateReq req) {
         return toAjax(facPhotovoltaicPanelPointService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelSupportController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelSupportController.java
index ca159764..c07b600a 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelSupportController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelSupportController.java
@@ -15,10 +15,10 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.facility.domain.req.photovoltaicpanelsupport.PhotovoltaicPanelSupportCreateReq;
-import org.dromara.facility.domain.req.photovoltaicpanelsupport.PhotovoltaicPanelSupportQueryReq;
-import org.dromara.facility.domain.req.photovoltaicpanelsupport.PhotovoltaicPanelSupportUpdateReq;
-import org.dromara.facility.domain.vo.FacPhotovoltaicPanelSupportVo;
+import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportCreateReq;
+import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportQueryReq;
+import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportUpdateReq;
+import org.dromara.facility.domain.vo.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportVo;
 import org.dromara.facility.service.IFacPhotovoltaicPanelSupportService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -44,7 +44,7 @@ public class FacPhotovoltaicPanelSupportController extends BaseController {
      */
     @SaCheckPermission("facility:photovoltaicPanelSupport:list")
     @GetMapping("/list")
-    public TableDataInfo<FacPhotovoltaicPanelSupportVo> list(PhotovoltaicPanelSupportQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<FacPhotovoltaicPanelSupportVo> list(FacPhotovoltaicPanelSupportQueryReq req, PageQuery pageQuery) {
         return facPhotovoltaicPanelSupportService.queryPageList(req, pageQuery);
     }
 
@@ -54,7 +54,7 @@ public class FacPhotovoltaicPanelSupportController extends BaseController {
     @SaCheckPermission("facility:photovoltaicPanelSupport:export")
     @Log(title = "设施-光伏板支架", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(PhotovoltaicPanelSupportQueryReq req, HttpServletResponse response) {
+    public void export(FacPhotovoltaicPanelSupportQueryReq req, HttpServletResponse response) {
         List<FacPhotovoltaicPanelSupportVo> list = facPhotovoltaicPanelSupportService.queryList(req);
         ExcelUtil.exportExcel(list, "设施-光伏板支架", FacPhotovoltaicPanelSupportVo.class, response);
     }
@@ -78,7 +78,7 @@ public class FacPhotovoltaicPanelSupportController extends BaseController {
     @Log(title = "设施-光伏板支架", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody PhotovoltaicPanelSupportCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody FacPhotovoltaicPanelSupportCreateReq req) {
         return R.ok(facPhotovoltaicPanelSupportService.insertByBo(req));
     }
 
@@ -89,7 +89,7 @@ public class FacPhotovoltaicPanelSupportController extends BaseController {
     @Log(title = "设施-光伏板支架", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody PhotovoltaicPanelSupportUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody FacPhotovoltaicPanelSupportUpdateReq req) {
         return toAjax(facPhotovoltaicPanelSupportService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/enums/FinishStatusEnum.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/enums/FacFinishStatusEnum.java
similarity index 78%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/enums/FinishStatusEnum.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/enums/FacFinishStatusEnum.java
index b8be729d..90af9c07 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/enums/FinishStatusEnum.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/enums/FacFinishStatusEnum.java
@@ -7,7 +7,7 @@ import lombok.Getter;
  * @date 2025/4/28 16:34
  */
 @Getter
-public enum FinishStatusEnum {
+public enum FacFinishStatusEnum {
 
     UNFINISH("未完成", "0"),
     FINISH("已完成", "1");
@@ -16,7 +16,7 @@ public enum FinishStatusEnum {
 
     private final String value;
 
-    FinishStatusEnum(String text, String value) {
+    FacFinishStatusEnum(String text, String value) {
         this.text = text;
         this.value = value;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/BoxTransformerCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/FacBoxTransformerCreateReq.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/BoxTransformerCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/FacBoxTransformerCreateReq.java
index 9cda70da..8b3141a2 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/BoxTransformerCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/FacBoxTransformerCreateReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/4/21 16:54
  */
 @Data
-public class BoxTransformerCreateReq implements Serializable {
+public class FacBoxTransformerCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 4380175902468104569L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/BoxTransformerQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/FacBoxTransformerQueryReq.java
similarity index 90%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/BoxTransformerQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/FacBoxTransformerQueryReq.java
index fc78a0db..c6f992c5 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/BoxTransformerQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/FacBoxTransformerQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/21 17:20
  */
 @Data
-public class BoxTransformerQueryReq implements Serializable {
+public class FacBoxTransformerQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -1963080752094759008L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/BoxTransformerUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/FacBoxTransformerUpdateReq.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/BoxTransformerUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/FacBoxTransformerUpdateReq.java
index 46bbde12..321096dc 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/BoxTransformerUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/FacBoxTransformerUpdateReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/4/21 17:20
  */
 @Data
-public class BoxTransformerUpdateReq implements Serializable {
+public class FacBoxTransformerUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -7030781044685790507L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/Feature.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeature.java
similarity index 72%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/Feature.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeature.java
index 05602534..c2dc9df1 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/Feature.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeature.java
@@ -11,12 +11,12 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class Feature {
+public class FacFeature {
 
     private String type;
 
-    private Geometry geometry;
+    private FacGeometry geometry;
 
-    private Properties properties;
+    private FacProperties properties;
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FeatureByPoint.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeatureByLine.java
similarity index 70%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FeatureByPoint.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeatureByLine.java
index 59e9e64c..3b8960b4 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FeatureByPoint.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeatureByLine.java
@@ -11,12 +11,12 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class FeatureByPoint {
+public class FacFeatureByLine {
 
     private String type;
 
-    private GeometryByPoint geometry;
+    private FacGeometryByLine geometry;
 
-    private Properties properties;
+    private FacProperties properties;
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FeatureByPlane.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeatureByPlane.java
similarity index 70%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FeatureByPlane.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeatureByPlane.java
index 9dee3724..306401ce 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FeatureByPlane.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeatureByPlane.java
@@ -11,12 +11,12 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class FeatureByPlane {
+public class FacFeatureByPlane {
 
     private String type;
 
-    private GeometryByPlane geometry;
+    private FacGeometryByPlane geometry;
 
-    private Properties properties;
+    private FacProperties properties;
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FeatureByLine.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeatureByPoint.java
similarity index 70%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FeatureByLine.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeatureByPoint.java
index beaa7604..c4721b94 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FeatureByLine.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeatureByPoint.java
@@ -11,12 +11,12 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class FeatureByLine {
+public class FacFeatureByPoint {
 
     private String type;
 
-    private GeometryByLine geometry;
+    private FacGeometryByPoint geometry;
 
-    private Properties properties;
+    private FacProperties properties;
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/GeoJson.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJson.java
similarity index 82%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/GeoJson.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJson.java
index e6117815..3a6aa81a 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/GeoJson.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJson.java
@@ -13,12 +13,12 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class GeoJson {
+public class FacGeoJson {
 
     private String name;
 
     private String type;
 
-    private List<Feature> features;
+    private List<FacFeature> features;
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/GeoJsonByLine.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJsonByLine.java
similarity index 77%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/GeoJsonByLine.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJsonByLine.java
index 470385eb..61bb7382 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/GeoJsonByLine.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJsonByLine.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/4/24 10:38
  */
 @Data
-public class GeoJsonByLine implements Serializable {
+public class FacGeoJsonByLine implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -1019429627483913266L;
@@ -20,6 +20,6 @@ public class GeoJsonByLine implements Serializable {
 
     private String type;
 
-    private List<FeatureByLine> features;
+    private List<FacFeatureByLine> features;
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/GeoJsonByPlane.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJsonByPlane.java
similarity index 76%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/GeoJsonByPlane.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJsonByPlane.java
index 508635d8..950436e2 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/GeoJsonByPlane.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJsonByPlane.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/4/24 10:32
  */
 @Data
-public class GeoJsonByPlane implements Serializable {
+public class FacGeoJsonByPlane implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 7407176569611285023L;
@@ -20,6 +20,6 @@ public class GeoJsonByPlane implements Serializable {
 
     private String type;
 
-    private List<FeatureByPlane> features;
+    private List<FacFeatureByPlane> features;
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/GeoJsonByPoint.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJsonByPoint.java
similarity index 76%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/GeoJsonByPoint.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJsonByPoint.java
index d63a391c..6ebadd26 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/GeoJsonByPoint.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJsonByPoint.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/4/24 10:38
  */
 @Data
-public class GeoJsonByPoint implements Serializable {
+public class FacGeoJsonByPoint implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3829419654737988678L;
@@ -20,6 +20,6 @@ public class GeoJsonByPoint implements Serializable {
 
     private String type;
 
-    private List<FeatureByPoint> features;
+    private List<FacFeatureByPoint> features;
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/Geometry.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometry.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/Geometry.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometry.java
index fbd5558c..94da8896 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/Geometry.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometry.java
@@ -13,7 +13,7 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class Geometry {
+public class FacGeometry {
 
     private String type;
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/GeometryByLine.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometryByLine.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/GeometryByLine.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometryByLine.java
index 840c2fa6..d3235db3 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/GeometryByLine.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometryByLine.java
@@ -13,7 +13,7 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class GeometryByLine {
+public class FacGeometryByLine {
 
     private String type;
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/GeometryByPlane.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometryByPlane.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/GeometryByPlane.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometryByPlane.java
index 60ce2d28..640369f2 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/GeometryByPlane.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometryByPlane.java
@@ -13,7 +13,7 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class GeometryByPlane {
+public class FacGeometryByPlane {
 
     private String type;
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/GeometryByPoint.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometryByPoint.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/GeometryByPoint.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometryByPoint.java
index fe022bb7..e4256095 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/GeometryByPoint.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometryByPoint.java
@@ -13,7 +13,7 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class GeometryByPoint {
+public class FacGeometryByPoint {
 
     private String type;
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/Properties.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacProperties.java
similarity index 90%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/Properties.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacProperties.java
index 88d278fb..d2700561 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/Properties.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacProperties.java
@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class Properties {
+public class FacProperties {
 
     private String type;
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/InverterCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/FacInverterCreateReq.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/InverterCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/FacInverterCreateReq.java
index 2a19943c..942a25e4 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/InverterCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/FacInverterCreateReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/4/21 17:57
  */
 @Data
-public class InverterCreateReq implements Serializable {
+public class FacInverterCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1722660769314535318L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/InverterQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/FacInverterQueryReq.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/InverterQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/FacInverterQueryReq.java
index eb1a2582..d4f3692b 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/InverterQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/FacInverterQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/21 17:57
  */
 @Data
-public class InverterQueryReq implements Serializable {
+public class FacInverterQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 6022414407700545902L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/InverterUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/FacInverterUpdateReq.java
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/InverterUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/FacInverterUpdateReq.java
index 4d89308c..6c7b20c8 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/InverterUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/FacInverterUpdateReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/4/21 17:58
  */
 @Data
-public class InverterUpdateReq implements Serializable {
+public class FacInverterUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 8042273364046693533L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/MatrixCreateByGeoJsonReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixCreateByGeoJsonReq.java
similarity index 58%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/MatrixCreateByGeoJsonReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixCreateByGeoJsonReq.java
index 64b30ddd..014164b7 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/MatrixCreateByGeoJsonReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixCreateByGeoJsonReq.java
@@ -1,8 +1,8 @@
 package org.dromara.facility.domain.req.matrix;
 
 import lombok.Data;
-import org.dromara.facility.domain.req.geojson.GeoJson;
-import org.dromara.facility.domain.req.geojson.GeoJsonByPoint;
+import org.dromara.facility.domain.req.geojson.FacGeoJson;
+import org.dromara.facility.domain.req.geojson.FacGeoJsonByPoint;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -12,7 +12,7 @@ import java.io.Serializable;
  * @date 2025/4/24 11:03
  */
 @Data
-public class MatrixCreateByGeoJsonReq implements Serializable {
+public class FacMatrixCreateByGeoJsonReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -3636617370172414549L;
@@ -25,11 +25,11 @@ public class MatrixCreateByGeoJsonReq implements Serializable {
     /**
      * 地理位置
      */
-    private GeoJson locationGeoJson;
+    private FacGeoJson locationGeoJson;
 
     /**
      * 名称
      */
-    private GeoJsonByPoint nameGeoJson;
+    private FacGeoJsonByPoint nameGeoJson;
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/MatrixCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixCreateReq.java
similarity index 90%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/MatrixCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixCreateReq.java
index 82c14712..2315a1e8 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/MatrixCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixCreateReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/4/21 14:55
  */
 @Data
-public class MatrixCreateReq implements Serializable {
+public class FacMatrixCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -9094117932741747339L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/MatrixDetailGisReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixDetailGisReq.java
similarity index 86%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/MatrixDetailGisReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixDetailGisReq.java
index 0b26d145..81416192 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/MatrixDetailGisReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixDetailGisReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/28 16:27
  */
 @Data
-public class MatrixDetailGisReq implements Serializable {
+public class FacMatrixDetailGisReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 6514291289474982208L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/MatrixQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixQueryReq.java
similarity index 87%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/MatrixQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixQueryReq.java
index f7d6154e..75c52f78 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/MatrixQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/21 14:58
  */
 @Data
-public class MatrixQueryReq implements Serializable {
+public class FacMatrixQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -6595145503602439606L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/MatrixUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixUpdateReq.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/MatrixUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixUpdateReq.java
index 97960199..26facae0 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/MatrixUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixUpdateReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/4/21 14:57
  */
 @Data
-public class MatrixUpdateReq implements Serializable {
+public class FacMatrixUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 384644288316208875L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/PhotovoltaicPanelCreateByGeoJsonReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelCreateByGeoJsonReq.java
similarity index 57%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/PhotovoltaicPanelCreateByGeoJsonReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelCreateByGeoJsonReq.java
index ea04039d..472c241e 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/PhotovoltaicPanelCreateByGeoJsonReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelCreateByGeoJsonReq.java
@@ -1,8 +1,8 @@
 package org.dromara.facility.domain.req.photovoltaicpanel;
 
 import lombok.Data;
-import org.dromara.facility.domain.req.geojson.GeoJsonByPlane;
-import org.dromara.facility.domain.req.geojson.GeoJsonByPoint;
+import org.dromara.facility.domain.req.geojson.FacGeoJsonByPlane;
+import org.dromara.facility.domain.req.geojson.FacGeoJsonByPoint;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -12,7 +12,7 @@ import java.io.Serializable;
  * @date 2025/4/24 9:53
  */
 @Data
-public class PhotovoltaicPanelCreateByGeoJsonReq implements Serializable {
+public class FacPhotovoltaicPanelCreateByGeoJsonReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -14887945592031533L;
@@ -25,11 +25,11 @@ public class PhotovoltaicPanelCreateByGeoJsonReq implements Serializable {
     /**
      * 地理位置
      */
-    private GeoJsonByPlane locationGeoJson;
+    private FacGeoJsonByPlane locationGeoJson;
 
     /**
      * 名称
      */
-    private GeoJsonByPoint nameGeoJson;
+    private FacGeoJsonByPoint nameGeoJson;
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/PhotovoltaicPanelCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelCreateReq.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/PhotovoltaicPanelCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelCreateReq.java
index c56b8e8c..11dccac2 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/PhotovoltaicPanelCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelCreateReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/4/21 14:00
  */
 @Data
-public class PhotovoltaicPanelCreateReq implements Serializable {
+public class FacPhotovoltaicPanelCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -6155515510030793296L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/PhotovoltaicPanelQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelQueryReq.java
similarity index 90%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/PhotovoltaicPanelQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelQueryReq.java
index 8f7b98c7..f5e829cd 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/PhotovoltaicPanelQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/21 14:02
  */
 @Data
-public class PhotovoltaicPanelQueryReq implements Serializable {
+public class FacPhotovoltaicPanelQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 4450293360698837635L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/PhotovoltaicPanelUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelUpdateReq.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/PhotovoltaicPanelUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelUpdateReq.java
index ae9a1d80..37fa7962 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/PhotovoltaicPanelUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelUpdateReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/4/21 14:03
  */
 @Data
-public class PhotovoltaicPanelUpdateReq implements Serializable {
+public class FacPhotovoltaicPanelUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -7179168647795418115L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/PhotovoltaicPanelColumnCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnCreateReq.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/PhotovoltaicPanelColumnCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnCreateReq.java
index db93cb3b..f07175a7 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/PhotovoltaicPanelColumnCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnCreateReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/4/22 9:50
  */
 @Data
-public class PhotovoltaicPanelColumnCreateReq implements Serializable {
+public class FacPhotovoltaicPanelColumnCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 5783638527565322237L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/PhotovoltaicPanelColumnQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnQueryReq.java
similarity index 89%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/PhotovoltaicPanelColumnQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnQueryReq.java
index 7d54bcac..9420cb34 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/PhotovoltaicPanelColumnQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/22 9:51
  */
 @Data
-public class PhotovoltaicPanelColumnQueryReq implements Serializable {
+public class FacPhotovoltaicPanelColumnQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -4288306372664325906L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/PhotovoltaicPanelColumnUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnUpdateReq.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/PhotovoltaicPanelColumnUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnUpdateReq.java
index e0e1ed5a..fff4c4a1 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/PhotovoltaicPanelColumnUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnUpdateReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/4/22 9:50
  */
 @Data
-public class PhotovoltaicPanelColumnUpdateReq implements Serializable {
+public class FacPhotovoltaicPanelColumnUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 6489049981734037038L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelparts/PhotovoltaicPanelPartsCreateByGeoJsonReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateByGeoJsonReq.java
similarity index 67%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelparts/PhotovoltaicPanelPartsCreateByGeoJsonReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateByGeoJsonReq.java
index 777a302f..8c7f3b2c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelparts/PhotovoltaicPanelPartsCreateByGeoJsonReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateByGeoJsonReq.java
@@ -1,7 +1,7 @@
 package org.dromara.facility.domain.req.photovoltaicpanelparts;
 
 import lombok.Data;
-import org.dromara.facility.domain.req.geojson.GeoJsonByPoint;
+import org.dromara.facility.domain.req.geojson.FacGeoJsonByPoint;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 2025/4/24 11:01
  */
 @Data
-public class PhotovoltaicPanelPartsCreateByGeoJsonReq implements Serializable {
+public class FacPhotovoltaicPanelPartsCreateByGeoJsonReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 5682597792623228174L;
@@ -24,6 +24,6 @@ public class PhotovoltaicPanelPartsCreateByGeoJsonReq implements Serializable {
     /**
      * 桩点、立柱、支架 GeoJson
      */
-    private GeoJsonByPoint pointGeoJson;
+    private FacGeoJsonByPoint pointGeoJson;
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelparts/PhotovoltaicPanelPartsCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateReq.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelparts/PhotovoltaicPanelPartsCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateReq.java
index 523aff35..beaf48ec 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelparts/PhotovoltaicPanelPartsCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/4/21 15:45
  */
 @Data
-public class PhotovoltaicPanelPartsCreateReq implements Serializable {
+public class FacPhotovoltaicPanelPartsCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -584396159753737769L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/PhotovoltaicPanelPointCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/FacPhotovoltaicPanelPointCreateReq.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/PhotovoltaicPanelPointCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/FacPhotovoltaicPanelPointCreateReq.java
index 13ff6e81..7a288860 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/PhotovoltaicPanelPointCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/FacPhotovoltaicPanelPointCreateReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/4/22 9:48
  */
 @Data
-public class PhotovoltaicPanelPointCreateReq implements Serializable {
+public class FacPhotovoltaicPanelPointCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -8316395563268976925L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/PhotovoltaicPanelPointQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/FacPhotovoltaicPanelPointQueryReq.java
similarity index 89%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/PhotovoltaicPanelPointQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/FacPhotovoltaicPanelPointQueryReq.java
index 0d2fba65..e3442d9b 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/PhotovoltaicPanelPointQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/FacPhotovoltaicPanelPointQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/22 9:48
  */
 @Data
-public class PhotovoltaicPanelPointQueryReq implements Serializable {
+public class FacPhotovoltaicPanelPointQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 5325875051802738981L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/PhotovoltaicPanelPointUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/FacPhotovoltaicPanelPointUpdateReq.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/PhotovoltaicPanelPointUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/FacPhotovoltaicPanelPointUpdateReq.java
index 4b432678..2d2844f1 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/PhotovoltaicPanelPointUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/FacPhotovoltaicPanelPointUpdateReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/4/22 9:48
  */
 @Data
-public class PhotovoltaicPanelPointUpdateReq implements Serializable {
+public class FacPhotovoltaicPanelPointUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -6060380651961899938L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/PhotovoltaicPanelSupportCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportCreateReq.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/PhotovoltaicPanelSupportCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportCreateReq.java
index 54ba230a..e06493ee 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/PhotovoltaicPanelSupportCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportCreateReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/4/22 9:40
  */
 @Data
-public class PhotovoltaicPanelSupportCreateReq implements Serializable {
+public class FacPhotovoltaicPanelSupportCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 2859712819532622700L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/PhotovoltaicPanelSupportQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportQueryReq.java
similarity index 89%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/PhotovoltaicPanelSupportQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportQueryReq.java
index c0ee9cf3..f832ed55 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/PhotovoltaicPanelSupportQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/22 9:43
  */
 @Data
-public class PhotovoltaicPanelSupportQueryReq implements Serializable {
+public class FacPhotovoltaicPanelSupportQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 6204782404060432065L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/PhotovoltaicPanelSupportUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportUpdateReq.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/PhotovoltaicPanelSupportUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportUpdateReq.java
index db9997e8..eed66117 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/PhotovoltaicPanelSupportUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportUpdateReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/4/22 9:40
  */
 @Data
-public class PhotovoltaicPanelSupportUpdateReq implements Serializable {
+public class FacPhotovoltaicPanelSupportUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 2466440719288904185L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/FacBoxTransformerVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/boxtransformer/FacBoxTransformerVo.java
similarity index 97%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/FacBoxTransformerVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/boxtransformer/FacBoxTransformerVo.java
index 37b7625e..831ef3fa 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/FacBoxTransformerVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/boxtransformer/FacBoxTransformerVo.java
@@ -1,4 +1,4 @@
-package org.dromara.facility.domain.vo;
+package org.dromara.facility.domain.vo.boxtransformer;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/FacInverterVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/inverter/FacInverterVo.java
similarity index 97%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/FacInverterVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/inverter/FacInverterVo.java
index 99ca98e0..7669ef63 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/FacInverterVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/inverter/FacInverterVo.java
@@ -1,4 +1,4 @@
-package org.dromara.facility.domain.vo;
+package org.dromara.facility.domain.vo.inverter;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/matrix/MatrixDetailGisVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/matrix/FacMatrixDetailGisVo.java
similarity index 95%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/matrix/MatrixDetailGisVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/matrix/FacMatrixDetailGisVo.java
index ca470984..bf0d8285 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/matrix/MatrixDetailGisVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/matrix/FacMatrixDetailGisVo.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/28 16:19
  */
 @Data
-public class MatrixDetailGisVo implements Serializable {
+public class FacMatrixDetailGisVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 138750225601876373L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/FacPhotovoltaicPanelVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanel/FacPhotovoltaicPanelVo.java
similarity index 97%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/FacPhotovoltaicPanelVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanel/FacPhotovoltaicPanelVo.java
index b9bd6136..07727013 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/FacPhotovoltaicPanelVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanel/FacPhotovoltaicPanelVo.java
@@ -1,4 +1,4 @@
-package org.dromara.facility.domain.vo;
+package org.dromara.facility.domain.vo.photovoltaicpanel;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/FacPhotovoltaicPanelColumnVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnVo.java
similarity index 96%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/FacPhotovoltaicPanelColumnVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnVo.java
index eb0b84c2..1384b1cd 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/FacPhotovoltaicPanelColumnVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnVo.java
@@ -1,4 +1,4 @@
-package org.dromara.facility.domain.vo;
+package org.dromara.facility.domain.vo.photovoltaicpanelcolumn;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/FacPhotovoltaicPanelPointVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelpoint/FacPhotovoltaicPanelPointVo.java
similarity index 96%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/FacPhotovoltaicPanelPointVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelpoint/FacPhotovoltaicPanelPointVo.java
index 565628b6..af55e2d0 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/FacPhotovoltaicPanelPointVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelpoint/FacPhotovoltaicPanelPointVo.java
@@ -1,4 +1,4 @@
-package org.dromara.facility.domain.vo;
+package org.dromara.facility.domain.vo.photovoltaicpanelpoint;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/FacPhotovoltaicPanelSupportVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportVo.java
similarity index 96%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/FacPhotovoltaicPanelSupportVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportVo.java
index 4873a0b1..af892bcc 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/FacPhotovoltaicPanelSupportVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportVo.java
@@ -1,4 +1,4 @@
-package org.dromara.facility.domain.vo;
+package org.dromara.facility.domain.vo.photovoltaicpanelsupport;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacBoxTransformerMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacBoxTransformerMapper.java
index 4702464a..aef91804 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacBoxTransformerMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacBoxTransformerMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.facility.mapper;
 
 import org.dromara.facility.domain.FacBoxTransformer;
-import org.dromara.facility.domain.vo.FacBoxTransformerVo;
+import org.dromara.facility.domain.vo.boxtransformer.FacBoxTransformerVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacInverterMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacInverterMapper.java
index e0f0bb12..8bb5b5a1 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacInverterMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacInverterMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.facility.mapper;
 
 import org.dromara.facility.domain.FacInverter;
-import org.dromara.facility.domain.vo.FacInverterVo;
+import org.dromara.facility.domain.vo.inverter.FacInverterVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacPhotovoltaicPanelColumnMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacPhotovoltaicPanelColumnMapper.java
index dd358fa7..b218e7ad 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacPhotovoltaicPanelColumnMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacPhotovoltaicPanelColumnMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.facility.mapper;
 
 import org.dromara.facility.domain.FacPhotovoltaicPanelColumn;
-import org.dromara.facility.domain.vo.FacPhotovoltaicPanelColumnVo;
+import org.dromara.facility.domain.vo.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacPhotovoltaicPanelMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacPhotovoltaicPanelMapper.java
index cdfb0711..bc9d3b1b 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacPhotovoltaicPanelMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacPhotovoltaicPanelMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.facility.mapper;
 
 import org.dromara.facility.domain.FacPhotovoltaicPanel;
-import org.dromara.facility.domain.vo.FacPhotovoltaicPanelVo;
+import org.dromara.facility.domain.vo.photovoltaicpanel.FacPhotovoltaicPanelVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacPhotovoltaicPanelPointMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacPhotovoltaicPanelPointMapper.java
index 72476092..c5582e04 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacPhotovoltaicPanelPointMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacPhotovoltaicPanelPointMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.facility.mapper;
 
 import org.dromara.facility.domain.FacPhotovoltaicPanelPoint;
-import org.dromara.facility.domain.vo.FacPhotovoltaicPanelPointVo;
+import org.dromara.facility.domain.vo.photovoltaicpanelpoint.FacPhotovoltaicPanelPointVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacPhotovoltaicPanelSupportMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacPhotovoltaicPanelSupportMapper.java
index 48605c1f..2f204764 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacPhotovoltaicPanelSupportMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacPhotovoltaicPanelSupportMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.facility.mapper;
 
 import org.dromara.facility.domain.FacPhotovoltaicPanelSupport;
-import org.dromara.facility.domain.vo.FacPhotovoltaicPanelSupportVo;
+import org.dromara.facility.domain.vo.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacBoxTransformerService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacBoxTransformerService.java
index bc0c960e..b9341913 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacBoxTransformerService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacBoxTransformerService.java
@@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.facility.domain.FacBoxTransformer;
-import org.dromara.facility.domain.req.boxtransformer.BoxTransformerCreateReq;
-import org.dromara.facility.domain.req.boxtransformer.BoxTransformerQueryReq;
-import org.dromara.facility.domain.req.boxtransformer.BoxTransformerUpdateReq;
-import org.dromara.facility.domain.vo.FacBoxTransformerVo;
+import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerCreateReq;
+import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerQueryReq;
+import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerUpdateReq;
+import org.dromara.facility.domain.vo.boxtransformer.FacBoxTransformerVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -37,7 +37,7 @@ public interface IFacBoxTransformerService extends IService<FacBoxTransformer> {
      * @param pageQuery 分页参数
      * @return 设施-箱变分页列表
      */
-    TableDataInfo<FacBoxTransformerVo> queryPageList(BoxTransformerQueryReq req, PageQuery pageQuery);
+    TableDataInfo<FacBoxTransformerVo> queryPageList(FacBoxTransformerQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的设施-箱变列表
@@ -45,7 +45,7 @@ public interface IFacBoxTransformerService extends IService<FacBoxTransformer> {
      * @param req 查询条件
      * @return 设施-箱变列表
      */
-    List<FacBoxTransformerVo> queryList(BoxTransformerQueryReq req);
+    List<FacBoxTransformerVo> queryList(FacBoxTransformerQueryReq req);
 
     /**
      * 新增设施-箱变
@@ -53,7 +53,7 @@ public interface IFacBoxTransformerService extends IService<FacBoxTransformer> {
      * @param req 设施-箱变
      * @return 新增箱变id
      */
-    Long insertByBo(BoxTransformerCreateReq req);
+    Long insertByBo(FacBoxTransformerCreateReq req);
 
     /**
      * 修改设施-箱变
@@ -61,7 +61,7 @@ public interface IFacBoxTransformerService extends IService<FacBoxTransformer> {
      * @param req 设施-箱变
      * @return 是否修改成功
      */
-    Boolean updateByBo(BoxTransformerUpdateReq req);
+    Boolean updateByBo(FacBoxTransformerUpdateReq req);
 
     /**
      * 校验并批量删除设施-箱变信息
@@ -86,7 +86,7 @@ public interface IFacBoxTransformerService extends IService<FacBoxTransformer> {
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<FacBoxTransformer> buildQueryWrapper(BoxTransformerQueryReq req);
+    LambdaQueryWrapper<FacBoxTransformer> buildQueryWrapper(FacBoxTransformerQueryReq req);
 
     /**
      * 获取设施-箱变分页对象视图
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacInverterService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacInverterService.java
index adf8b41b..8bba4637 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacInverterService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacInverterService.java
@@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.facility.domain.FacInverter;
-import org.dromara.facility.domain.req.inverter.InverterCreateReq;
-import org.dromara.facility.domain.req.inverter.InverterQueryReq;
-import org.dromara.facility.domain.req.inverter.InverterUpdateReq;
-import org.dromara.facility.domain.vo.FacInverterVo;
+import org.dromara.facility.domain.req.inverter.FacInverterCreateReq;
+import org.dromara.facility.domain.req.inverter.FacInverterQueryReq;
+import org.dromara.facility.domain.req.inverter.FacInverterUpdateReq;
+import org.dromara.facility.domain.vo.inverter.FacInverterVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -37,7 +37,7 @@ public interface IFacInverterService extends IService<FacInverter> {
      * @param pageQuery 分页参数
      * @return 设施-逆变器分页列表
      */
-    TableDataInfo<FacInverterVo> queryPageList(InverterQueryReq req, PageQuery pageQuery);
+    TableDataInfo<FacInverterVo> queryPageList(FacInverterQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的设施-逆变器列表
@@ -45,7 +45,7 @@ public interface IFacInverterService extends IService<FacInverter> {
      * @param req 查询条件
      * @return 设施-逆变器列表
      */
-    List<FacInverterVo> queryList(InverterQueryReq req);
+    List<FacInverterVo> queryList(FacInverterQueryReq req);
 
     /**
      * 新增设施-逆变器
@@ -53,7 +53,7 @@ public interface IFacInverterService extends IService<FacInverter> {
      * @param req 设施-逆变器
      * @return 新增逆变器id
      */
-    Long insertByBo(InverterCreateReq req);
+    Long insertByBo(FacInverterCreateReq req);
 
     /**
      * 修改设施-逆变器
@@ -61,7 +61,7 @@ public interface IFacInverterService extends IService<FacInverter> {
      * @param req 设施-逆变器
      * @return 是否修改成功
      */
-    Boolean updateByBo(InverterUpdateReq req);
+    Boolean updateByBo(FacInverterUpdateReq req);
 
     /**
      * 校验并批量删除设施-逆变器信息
@@ -86,7 +86,7 @@ public interface IFacInverterService extends IService<FacInverter> {
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<FacInverter> buildQueryWrapper(InverterQueryReq req);
+    LambdaQueryWrapper<FacInverter> buildQueryWrapper(FacInverterQueryReq req);
 
     /**
      * 获取设施-逆变器分页对象视图
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacMatrixService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacMatrixService.java
index eac43339..6c91c020 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacMatrixService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacMatrixService.java
@@ -8,7 +8,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.facility.domain.FacMatrix;
 import org.dromara.facility.domain.req.matrix.*;
 import org.dromara.facility.domain.vo.matrix.FacMatrixVo;
-import org.dromara.facility.domain.vo.matrix.MatrixDetailGisVo;
+import org.dromara.facility.domain.vo.matrix.FacMatrixDetailGisVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -36,7 +36,7 @@ public interface IFacMatrixService extends IService<FacMatrix> {
      * @param pageQuery 分页参数
      * @return 设施-方阵分页列表
      */
-    TableDataInfo<FacMatrixVo> queryPageList(MatrixQueryReq req, PageQuery pageQuery);
+    TableDataInfo<FacMatrixVo> queryPageList(FacMatrixQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的设施-方阵列表
@@ -44,7 +44,7 @@ public interface IFacMatrixService extends IService<FacMatrix> {
      * @param req 查询条件
      * @return 设施-方阵列表
      */
-    List<FacMatrixVo> queryList(MatrixQueryReq req);
+    List<FacMatrixVo> queryList(FacMatrixQueryReq req);
 
     /**
      * 获取大屏方阵详情信息
@@ -52,7 +52,7 @@ public interface IFacMatrixService extends IService<FacMatrix> {
      * @param req 获取大屏方阵详情信息参数
      * @return 大屏方阵详情信息
      */
-    MatrixDetailGisVo getMatrixDetailGis(MatrixDetailGisReq req);
+    FacMatrixDetailGisVo getMatrixDetailGis(FacMatrixDetailGisReq req);
 
     /**
      * 新增设施-方阵
@@ -60,7 +60,7 @@ public interface IFacMatrixService extends IService<FacMatrix> {
      * @param req 设施-方阵
      * @return 新增方阵id
      */
-    Long insertByBo(MatrixCreateReq req);
+    Long insertByBo(FacMatrixCreateReq req);
 
     /**
      * 新增设施-方阵
@@ -68,7 +68,7 @@ public interface IFacMatrixService extends IService<FacMatrix> {
      * @param geoJson GeoJson格式
      * @return 新增方阵id
      */
-    Boolean insertByGeoJson(MatrixCreateByGeoJsonReq geoJson);
+    Boolean insertByGeoJson(FacMatrixCreateByGeoJsonReq geoJson);
 
     /**
      * 修改设施-方阵
@@ -76,7 +76,7 @@ public interface IFacMatrixService extends IService<FacMatrix> {
      * @param req 设施-方阵
      * @return 是否修改成功
      */
-    Boolean updateByBo(MatrixUpdateReq req);
+    Boolean updateByBo(FacMatrixUpdateReq req);
 
     /**
      * 校验并批量删除设施-方阵信息
@@ -101,7 +101,7 @@ public interface IFacMatrixService extends IService<FacMatrix> {
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<FacMatrix> buildQueryWrapper(MatrixQueryReq req);
+    LambdaQueryWrapper<FacMatrix> buildQueryWrapper(FacMatrixQueryReq req);
 
     /**
      * 获取设施-方阵分页对象视图
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelColumnService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelColumnService.java
index e3f5615e..3b37c503 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelColumnService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelColumnService.java
@@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.facility.domain.FacPhotovoltaicPanelColumn;
-import org.dromara.facility.domain.req.photovoltaicpanelcolumn.PhotovoltaicPanelColumnCreateReq;
-import org.dromara.facility.domain.req.photovoltaicpanelcolumn.PhotovoltaicPanelColumnQueryReq;
-import org.dromara.facility.domain.req.photovoltaicpanelcolumn.PhotovoltaicPanelColumnUpdateReq;
-import org.dromara.facility.domain.vo.FacPhotovoltaicPanelColumnVo;
+import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnCreateReq;
+import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnQueryReq;
+import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnUpdateReq;
+import org.dromara.facility.domain.vo.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -37,7 +37,7 @@ public interface IFacPhotovoltaicPanelColumnService extends IService<FacPhotovol
      * @param pageQuery 分页参数
      * @return 设施-光伏板立柱分页列表
      */
-    TableDataInfo<FacPhotovoltaicPanelColumnVo> queryPageList(PhotovoltaicPanelColumnQueryReq req, PageQuery pageQuery);
+    TableDataInfo<FacPhotovoltaicPanelColumnVo> queryPageList(FacPhotovoltaicPanelColumnQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的设施-光伏板立柱列表
@@ -45,7 +45,7 @@ public interface IFacPhotovoltaicPanelColumnService extends IService<FacPhotovol
      * @param req 查询条件
      * @return 设施-光伏板立柱列表
      */
-    List<FacPhotovoltaicPanelColumnVo> queryList(PhotovoltaicPanelColumnQueryReq req);
+    List<FacPhotovoltaicPanelColumnVo> queryList(FacPhotovoltaicPanelColumnQueryReq req);
 
     /**
      * 新增设施-光伏板立柱
@@ -53,7 +53,7 @@ public interface IFacPhotovoltaicPanelColumnService extends IService<FacPhotovol
      * @param req 设施-光伏板立柱
      * @return 新增光伏板立柱id
      */
-    Long insertByBo(PhotovoltaicPanelColumnCreateReq req);
+    Long insertByBo(FacPhotovoltaicPanelColumnCreateReq req);
 
     /**
      * 修改设施-光伏板立柱
@@ -61,7 +61,7 @@ public interface IFacPhotovoltaicPanelColumnService extends IService<FacPhotovol
      * @param req 设施-光伏板立柱
      * @return 是否修改成功
      */
-    Boolean updateByBo(PhotovoltaicPanelColumnUpdateReq req);
+    Boolean updateByBo(FacPhotovoltaicPanelColumnUpdateReq req);
 
     /**
      * 校验并批量删除设施-光伏板立柱信息
@@ -86,7 +86,7 @@ public interface IFacPhotovoltaicPanelColumnService extends IService<FacPhotovol
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<FacPhotovoltaicPanelColumn> buildQueryWrapper(PhotovoltaicPanelColumnQueryReq req);
+    LambdaQueryWrapper<FacPhotovoltaicPanelColumn> buildQueryWrapper(FacPhotovoltaicPanelColumnQueryReq req);
 
     /**
      * 获取设施-光伏板立柱分页对象视图
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelPartsService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelPartsService.java
index 4576651a..d8af4446 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelPartsService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelPartsService.java
@@ -3,8 +3,8 @@ package org.dromara.facility.service;
 import org.dromara.facility.domain.FacPhotovoltaicPanelColumn;
 import org.dromara.facility.domain.FacPhotovoltaicPanelPoint;
 import org.dromara.facility.domain.FacPhotovoltaicPanelSupport;
-import org.dromara.facility.domain.req.photovoltaicpanelparts.PhotovoltaicPanelPartsCreateByGeoJsonReq;
-import org.dromara.facility.domain.req.photovoltaicpanelparts.PhotovoltaicPanelPartsCreateReq;
+import org.dromara.facility.domain.req.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateByGeoJsonReq;
+import org.dromara.facility.domain.req.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateReq;
 
 import java.util.Collection;
 import java.util.List;
@@ -23,7 +23,7 @@ public interface IFacPhotovoltaicPanelPartsService {
      * @param geoJson GeoJson格式
      * @return 是否新增成功
      */
-    Boolean insertPartsByGeoJson(PhotovoltaicPanelPartsCreateByGeoJsonReq geoJson);
+    Boolean insertPartsByGeoJson(FacPhotovoltaicPanelPartsCreateByGeoJsonReq geoJson);
 
     /**
      * 批量新增设施-光伏板（桩点、立柱、支架）内部方法
@@ -53,7 +53,7 @@ public interface IFacPhotovoltaicPanelPartsService {
      * @param req 设施-光伏板（桩点、立柱、支架）
      * @return 是否新增成功
      */
-    Boolean insertPartsByBatch(PhotovoltaicPanelPartsCreateReq req);
+    Boolean insertPartsByBatch(FacPhotovoltaicPanelPartsCreateReq req);
 
     /**
      * 根据方阵主键判断是否存在光伏板点
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelPointService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelPointService.java
index 10241c05..99b6e482 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelPointService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelPointService.java
@@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.facility.domain.FacPhotovoltaicPanelPoint;
-import org.dromara.facility.domain.req.photovoltaicpanelpoint.PhotovoltaicPanelPointCreateReq;
-import org.dromara.facility.domain.req.photovoltaicpanelpoint.PhotovoltaicPanelPointQueryReq;
-import org.dromara.facility.domain.req.photovoltaicpanelpoint.PhotovoltaicPanelPointUpdateReq;
-import org.dromara.facility.domain.vo.FacPhotovoltaicPanelPointVo;
+import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointCreateReq;
+import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointQueryReq;
+import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointUpdateReq;
+import org.dromara.facility.domain.vo.photovoltaicpanelpoint.FacPhotovoltaicPanelPointVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -37,7 +37,7 @@ public interface IFacPhotovoltaicPanelPointService extends IService<FacPhotovolt
      * @param pageQuery 分页参数
      * @return 设施-光伏板桩点分页列表
      */
-    TableDataInfo<FacPhotovoltaicPanelPointVo> queryPageList(PhotovoltaicPanelPointQueryReq req, PageQuery pageQuery);
+    TableDataInfo<FacPhotovoltaicPanelPointVo> queryPageList(FacPhotovoltaicPanelPointQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的设施-光伏板桩点列表
@@ -45,7 +45,7 @@ public interface IFacPhotovoltaicPanelPointService extends IService<FacPhotovolt
      * @param req 查询条件
      * @return 设施-光伏板桩点列表
      */
-    List<FacPhotovoltaicPanelPointVo> queryList(PhotovoltaicPanelPointQueryReq req);
+    List<FacPhotovoltaicPanelPointVo> queryList(FacPhotovoltaicPanelPointQueryReq req);
 
     /**
      * 新增设施-光伏板桩点
@@ -53,7 +53,7 @@ public interface IFacPhotovoltaicPanelPointService extends IService<FacPhotovolt
      * @param req 设施-光伏板桩点
      * @return 新增光伏板桩点id
      */
-    Long insertByBo(PhotovoltaicPanelPointCreateReq req);
+    Long insertByBo(FacPhotovoltaicPanelPointCreateReq req);
 
     /**
      * 修改设施-光伏板桩点
@@ -61,7 +61,7 @@ public interface IFacPhotovoltaicPanelPointService extends IService<FacPhotovolt
      * @param req 设施-光伏板桩点
      * @return 是否修改成功
      */
-    Boolean updateByBo(PhotovoltaicPanelPointUpdateReq req);
+    Boolean updateByBo(FacPhotovoltaicPanelPointUpdateReq req);
 
     /**
      * 校验并批量删除设施-光伏板桩点信息
@@ -86,7 +86,7 @@ public interface IFacPhotovoltaicPanelPointService extends IService<FacPhotovolt
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<FacPhotovoltaicPanelPoint> buildQueryWrapper(PhotovoltaicPanelPointQueryReq req);
+    LambdaQueryWrapper<FacPhotovoltaicPanelPoint> buildQueryWrapper(FacPhotovoltaicPanelPointQueryReq req);
 
     /**
      * 获取设施-光伏板桩点分页对象视图
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelService.java
index 4aca8564..2c6a5399 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelService.java
@@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.facility.domain.FacPhotovoltaicPanel;
-import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelCreateByGeoJsonReq;
-import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelCreateReq;
-import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelQueryReq;
-import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelUpdateReq;
-import org.dromara.facility.domain.vo.FacPhotovoltaicPanelVo;
+import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelCreateByGeoJsonReq;
+import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelCreateReq;
+import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelQueryReq;
+import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelUpdateReq;
+import org.dromara.facility.domain.vo.photovoltaicpanel.FacPhotovoltaicPanelVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -38,7 +38,7 @@ public interface IFacPhotovoltaicPanelService extends IService<FacPhotovoltaicPa
      * @param pageQuery 分页参数
      * @return 设施-光伏板分页列表
      */
-    TableDataInfo<FacPhotovoltaicPanelVo> queryPageList(PhotovoltaicPanelQueryReq req, PageQuery pageQuery);
+    TableDataInfo<FacPhotovoltaicPanelVo> queryPageList(FacPhotovoltaicPanelQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的设施-光伏板列表
@@ -46,7 +46,7 @@ public interface IFacPhotovoltaicPanelService extends IService<FacPhotovoltaicPa
      * @param req 查询条件
      * @return 设施-光伏板列表
      */
-    List<FacPhotovoltaicPanelVo> queryList(PhotovoltaicPanelQueryReq req);
+    List<FacPhotovoltaicPanelVo> queryList(FacPhotovoltaicPanelQueryReq req);
 
     /**
      * 新增设施-光伏板
@@ -54,7 +54,7 @@ public interface IFacPhotovoltaicPanelService extends IService<FacPhotovoltaicPa
      * @param req 设施-光伏板
      * @return 新增光伏板id
      */
-    Long insertByBo(PhotovoltaicPanelCreateReq req);
+    Long insertByBo(FacPhotovoltaicPanelCreateReq req);
 
     /**
      * 新增光伏板
@@ -62,7 +62,7 @@ public interface IFacPhotovoltaicPanelService extends IService<FacPhotovoltaicPa
      * @param geoJson GeoJson格式
      * @return 是否新增成功
      */
-    Boolean insertByGeoJson(PhotovoltaicPanelCreateByGeoJsonReq geoJson);
+    Boolean insertByGeoJson(FacPhotovoltaicPanelCreateByGeoJsonReq geoJson);
 
     /**
      * 修改设施-光伏板
@@ -70,7 +70,7 @@ public interface IFacPhotovoltaicPanelService extends IService<FacPhotovoltaicPa
      * @param req 设施-光伏板
      * @return 是否修改成功
      */
-    Boolean updateByBo(PhotovoltaicPanelUpdateReq req);
+    Boolean updateByBo(FacPhotovoltaicPanelUpdateReq req);
 
     /**
      * 校验并批量删除设施-光伏板信息
@@ -95,7 +95,7 @@ public interface IFacPhotovoltaicPanelService extends IService<FacPhotovoltaicPa
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<FacPhotovoltaicPanel> buildQueryWrapper(PhotovoltaicPanelQueryReq req);
+    LambdaQueryWrapper<FacPhotovoltaicPanel> buildQueryWrapper(FacPhotovoltaicPanelQueryReq req);
 
     /**
      * 获取设施-光伏板分页对象视图
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelSupportService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelSupportService.java
index 895792a3..ca8bc238 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelSupportService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelSupportService.java
@@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.facility.domain.FacPhotovoltaicPanelSupport;
-import org.dromara.facility.domain.req.photovoltaicpanelsupport.PhotovoltaicPanelSupportCreateReq;
-import org.dromara.facility.domain.req.photovoltaicpanelsupport.PhotovoltaicPanelSupportQueryReq;
-import org.dromara.facility.domain.req.photovoltaicpanelsupport.PhotovoltaicPanelSupportUpdateReq;
-import org.dromara.facility.domain.vo.FacPhotovoltaicPanelSupportVo;
+import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportCreateReq;
+import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportQueryReq;
+import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportUpdateReq;
+import org.dromara.facility.domain.vo.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -37,7 +37,7 @@ public interface IFacPhotovoltaicPanelSupportService extends IService<FacPhotovo
      * @param pageQuery 分页参数
      * @return 设施-光伏板支架分页列表
      */
-    TableDataInfo<FacPhotovoltaicPanelSupportVo> queryPageList(PhotovoltaicPanelSupportQueryReq req, PageQuery pageQuery);
+    TableDataInfo<FacPhotovoltaicPanelSupportVo> queryPageList(FacPhotovoltaicPanelSupportQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的设施-光伏板支架列表
@@ -45,7 +45,7 @@ public interface IFacPhotovoltaicPanelSupportService extends IService<FacPhotovo
      * @param req 查询条件
      * @return 设施-光伏板支架列表
      */
-    List<FacPhotovoltaicPanelSupportVo> queryList(PhotovoltaicPanelSupportQueryReq req);
+    List<FacPhotovoltaicPanelSupportVo> queryList(FacPhotovoltaicPanelSupportQueryReq req);
 
     /**
      * 新增设施-光伏板支架
@@ -53,7 +53,7 @@ public interface IFacPhotovoltaicPanelSupportService extends IService<FacPhotovo
      * @param req 设施-光伏板支架
      * @return 新增光伏板支架id
      */
-    Long insertByBo(PhotovoltaicPanelSupportCreateReq req);
+    Long insertByBo(FacPhotovoltaicPanelSupportCreateReq req);
 
     /**
      * 修改设施-光伏板支架
@@ -61,7 +61,7 @@ public interface IFacPhotovoltaicPanelSupportService extends IService<FacPhotovo
      * @param req 设施-光伏板支架
      * @return 是否修改成功
      */
-    Boolean updateByBo(PhotovoltaicPanelSupportUpdateReq req);
+    Boolean updateByBo(FacPhotovoltaicPanelSupportUpdateReq req);
 
     /**
      * 校验并批量删除设施-光伏板支架信息
@@ -86,7 +86,7 @@ public interface IFacPhotovoltaicPanelSupportService extends IService<FacPhotovo
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<FacPhotovoltaicPanelSupport> buildQueryWrapper(PhotovoltaicPanelSupportQueryReq req);
+    LambdaQueryWrapper<FacPhotovoltaicPanelSupport> buildQueryWrapper(FacPhotovoltaicPanelSupportQueryReq req);
 
     /**
      * 获取设施-光伏板支架分页对象视图
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacBoxTransformerServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacBoxTransformerServiceImpl.java
index 607f9fab..b63d9b8a 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacBoxTransformerServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacBoxTransformerServiceImpl.java
@@ -14,10 +14,10 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.facility.domain.FacBoxTransformer;
-import org.dromara.facility.domain.req.boxtransformer.BoxTransformerCreateReq;
-import org.dromara.facility.domain.req.boxtransformer.BoxTransformerQueryReq;
-import org.dromara.facility.domain.req.boxtransformer.BoxTransformerUpdateReq;
-import org.dromara.facility.domain.vo.FacBoxTransformerVo;
+import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerCreateReq;
+import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerQueryReq;
+import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerUpdateReq;
+import org.dromara.facility.domain.vo.boxtransformer.FacBoxTransformerVo;
 import org.dromara.facility.mapper.FacBoxTransformerMapper;
 import org.dromara.facility.service.IFacBoxTransformerService;
 import org.dromara.facility.service.IFacMatrixService;
@@ -68,7 +68,7 @@ public class FacBoxTransformerServiceImpl extends ServiceImpl<FacBoxTransformerM
      * @return 设施-箱变分页列表
      */
     @Override
-    public TableDataInfo<FacBoxTransformerVo> queryPageList(BoxTransformerQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<FacBoxTransformerVo> queryPageList(FacBoxTransformerQueryReq req, PageQuery pageQuery) {
         Page<FacBoxTransformer> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
@@ -80,7 +80,7 @@ public class FacBoxTransformerServiceImpl extends ServiceImpl<FacBoxTransformerM
      * @return 设施-箱变列表
      */
     @Override
-    public List<FacBoxTransformerVo> queryList(BoxTransformerQueryReq req) {
+    public List<FacBoxTransformerVo> queryList(FacBoxTransformerQueryReq req) {
         List<FacBoxTransformer> boxTransformerList = this.list(this.buildQueryWrapper(req));
         return boxTransformerList.stream().map(this::getVo).toList();
     }
@@ -92,7 +92,7 @@ public class FacBoxTransformerServiceImpl extends ServiceImpl<FacBoxTransformerM
      * @return 新增箱变id
      */
     @Override
-    public Long insertByBo(BoxTransformerCreateReq req) {
+    public Long insertByBo(FacBoxTransformerCreateReq req) {
         // 将实体类和 DTO 进行转换
         FacBoxTransformer boxTransformer = new FacBoxTransformer();
         BeanUtils.copyProperties(req, boxTransformer);
@@ -127,7 +127,7 @@ public class FacBoxTransformerServiceImpl extends ServiceImpl<FacBoxTransformerM
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(BoxTransformerUpdateReq req) {
+    public Boolean updateByBo(FacBoxTransformerUpdateReq req) {
         // 将实体类和 DTO 进行转换
         FacBoxTransformer boxTransformer = new FacBoxTransformer();
         BeanUtils.copyProperties(req, boxTransformer);
@@ -235,7 +235,7 @@ public class FacBoxTransformerServiceImpl extends ServiceImpl<FacBoxTransformerM
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<FacBoxTransformer> buildQueryWrapper(BoxTransformerQueryReq req) {
+    public LambdaQueryWrapper<FacBoxTransformer> buildQueryWrapper(FacBoxTransformerQueryReq req) {
         LambdaQueryWrapper<FacBoxTransformer> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacInverterServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacInverterServiceImpl.java
index 1f8aa6f6..30fb498f 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacInverterServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacInverterServiceImpl.java
@@ -14,10 +14,10 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.facility.domain.FacInverter;
-import org.dromara.facility.domain.req.inverter.InverterCreateReq;
-import org.dromara.facility.domain.req.inverter.InverterQueryReq;
-import org.dromara.facility.domain.req.inverter.InverterUpdateReq;
-import org.dromara.facility.domain.vo.FacInverterVo;
+import org.dromara.facility.domain.req.inverter.FacInverterCreateReq;
+import org.dromara.facility.domain.req.inverter.FacInverterQueryReq;
+import org.dromara.facility.domain.req.inverter.FacInverterUpdateReq;
+import org.dromara.facility.domain.vo.inverter.FacInverterVo;
 import org.dromara.facility.mapper.FacInverterMapper;
 import org.dromara.facility.service.IFacInverterService;
 import org.dromara.facility.service.IFacMatrixService;
@@ -68,7 +68,7 @@ public class FacInverterServiceImpl extends ServiceImpl<FacInverterMapper, FacIn
      * @return 设施-逆变器分页列表
      */
     @Override
-    public TableDataInfo<FacInverterVo> queryPageList(InverterQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<FacInverterVo> queryPageList(FacInverterQueryReq req, PageQuery pageQuery) {
         Page<FacInverter> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
@@ -80,7 +80,7 @@ public class FacInverterServiceImpl extends ServiceImpl<FacInverterMapper, FacIn
      * @return 设施-逆变器列表
      */
     @Override
-    public List<FacInverterVo> queryList(InverterQueryReq req) {
+    public List<FacInverterVo> queryList(FacInverterQueryReq req) {
         List<FacInverter> inverterList = this.list(this.buildQueryWrapper(req));
         return inverterList.stream().map(this::getVo).toList();
     }
@@ -92,7 +92,7 @@ public class FacInverterServiceImpl extends ServiceImpl<FacInverterMapper, FacIn
      * @return 新增逆变器id
      */
     @Override
-    public Long insertByBo(InverterCreateReq req) {
+    public Long insertByBo(FacInverterCreateReq req) {
         // 将实体类和 DTO 进行转换
         FacInverter inverter = new FacInverter();
         BeanUtils.copyProperties(req, inverter);
@@ -127,7 +127,7 @@ public class FacInverterServiceImpl extends ServiceImpl<FacInverterMapper, FacIn
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(InverterUpdateReq req) {
+    public Boolean updateByBo(FacInverterUpdateReq req) {
         // 将实体类和 DTO 进行转换
         FacInverter inverter = new FacInverter();
         BeanUtils.copyProperties(req, inverter);
@@ -235,7 +235,7 @@ public class FacInverterServiceImpl extends ServiceImpl<FacInverterMapper, FacIn
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<FacInverter> buildQueryWrapper(InverterQueryReq req) {
+    public LambdaQueryWrapper<FacInverter> buildQueryWrapper(FacInverterQueryReq req) {
         LambdaQueryWrapper<FacInverter> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacMatrixServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacMatrixServiceImpl.java
index 1712c344..3cbacfd4 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacMatrixServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacMatrixServiceImpl.java
@@ -14,13 +14,13 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.facility.domain.*;
-import org.dromara.facility.domain.enums.FinishStatusEnum;
-import org.dromara.facility.domain.req.geojson.Feature;
-import org.dromara.facility.domain.req.geojson.FeatureByPoint;
-import org.dromara.facility.domain.req.geojson.Geometry;
+import org.dromara.facility.domain.enums.FacFinishStatusEnum;
+import org.dromara.facility.domain.req.geojson.FacFeature;
+import org.dromara.facility.domain.req.geojson.FacFeatureByPoint;
+import org.dromara.facility.domain.req.geojson.FacGeometry;
 import org.dromara.facility.domain.req.matrix.*;
 import org.dromara.facility.domain.vo.matrix.FacMatrixVo;
-import org.dromara.facility.domain.vo.matrix.MatrixDetailGisVo;
+import org.dromara.facility.domain.vo.matrix.FacMatrixDetailGisVo;
 import org.dromara.facility.mapper.FacMatrixMapper;
 import org.dromara.facility.service.*;
 import org.dromara.project.service.IBusProjectService;
@@ -97,7 +97,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
      * @return 设施-方阵分页列表
      */
     @Override
-    public TableDataInfo<FacMatrixVo> queryPageList(MatrixQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<FacMatrixVo> queryPageList(FacMatrixQueryReq req, PageQuery pageQuery) {
         Page<FacMatrix> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
@@ -109,7 +109,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
      * @return 设施-方阵列表
      */
     @Override
-    public List<FacMatrixVo> queryList(MatrixQueryReq req) {
+    public List<FacMatrixVo> queryList(FacMatrixQueryReq req) {
         List<FacMatrix> matrixList = this.list(this.buildQueryWrapper(req));
         return matrixList.stream().map(this::getVo).toList();
     }
@@ -121,13 +121,13 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
      * @return 大屏方阵详情信息
      */
     @Override
-    public MatrixDetailGisVo getMatrixDetailGis(MatrixDetailGisReq req) {
+    public FacMatrixDetailGisVo getMatrixDetailGis(FacMatrixDetailGisReq req) {
         Long projectId = req.getProjectId();
         if (projectId == null || projectService.getById(projectId) == null) {
             throw new ServiceException("项目不存在", HttpStatus.NOT_FOUND);
         }
         Long matrixId = req.getMatrixId();
-        MatrixDetailGisVo matrixDetailGisVo = new MatrixDetailGisVo();
+        FacMatrixDetailGisVo matrixDetailGisVo = new FacMatrixDetailGisVo();
         // 获取箱变数量
         List<FacBoxTransformer> boxTransformerList = boxTransformerService.lambdaQuery()
             .select(FacBoxTransformer::getId, FacBoxTransformer::getStatus)
@@ -138,7 +138,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
             matrixDetailGisVo.setBoxTransformerCount((long) boxTransformerList.size());
             matrixDetailGisVo.setBoxTransformerFinishCount(boxTransformerList.stream()
                 .filter(boxTransformer ->
-                    FinishStatusEnum.FINISH.getValue().equals(boxTransformer.getStatus())).count());
+                    FacFinishStatusEnum.FINISH.getValue().equals(boxTransformer.getStatus())).count());
         }
         // 获取逆变器数量
         List<FacInverter> inverterList = inverterService.lambdaQuery()
@@ -150,7 +150,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
             matrixDetailGisVo.setInverterCount((long) inverterList.size());
             matrixDetailGisVo.setInverterFinishCount(inverterList.stream()
                 .filter(inverter ->
-                    FinishStatusEnum.FINISH.getValue().equals(inverter.getStatus())).count());
+                    FacFinishStatusEnum.FINISH.getValue().equals(inverter.getStatus())).count());
         }
         // 获取光伏板数量
         List<FacPhotovoltaicPanel> photovoltaicPanelList = photovoltaicPanelService.lambdaQuery()
@@ -162,7 +162,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
             matrixDetailGisVo.setPhotovoltaicPanelCount((long) photovoltaicPanelList.size());
             matrixDetailGisVo.setPhotovoltaicPanelFinishCount(photovoltaicPanelList.stream()
                 .filter(photovoltaicPanel ->
-                    FinishStatusEnum.FINISH.getValue().equals(photovoltaicPanel.getStatus())).count());
+                    FacFinishStatusEnum.FINISH.getValue().equals(photovoltaicPanel.getStatus())).count());
         }
         // 获取光伏板点数量
         List<FacPhotovoltaicPanelPoint> photovoltaicPanelPointList = photovoltaicPanelPointService.lambdaQuery()
@@ -174,7 +174,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
             matrixDetailGisVo.setPointCount((long) photovoltaicPanelPointList.size());
             matrixDetailGisVo.setPointFinishCount(photovoltaicPanelPointList.stream()
                 .filter(photovoltaicPanelPoint ->
-                    FinishStatusEnum.FINISH.getValue().equals(photovoltaicPanelPoint.getStatus())).count());
+                    FacFinishStatusEnum.FINISH.getValue().equals(photovoltaicPanelPoint.getStatus())).count());
         }
         // 获取支架数量
         List<FacPhotovoltaicPanelSupport> photovoltaicPanelSupportList = photovoltaicPanelSupportService.lambdaQuery()
@@ -186,7 +186,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
             matrixDetailGisVo.setSupportCount((long) photovoltaicPanelSupportList.size());
             matrixDetailGisVo.setSupportFinishCount(photovoltaicPanelSupportList.stream()
                 .filter(photovoltaicPanelSupport ->
-                    FinishStatusEnum.FINISH.getValue().equals(photovoltaicPanelSupport.getStatus())).count());
+                    FacFinishStatusEnum.FINISH.getValue().equals(photovoltaicPanelSupport.getStatus())).count());
         }
         // 获取立柱数量
         List<FacPhotovoltaicPanelColumn> photovoltaicPanelColumnList = photovoltaicPanelColumnService.lambdaQuery()
@@ -198,7 +198,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
             matrixDetailGisVo.setColumnCount((long) photovoltaicPanelColumnList.size());
             matrixDetailGisVo.setColumnFinishCount(photovoltaicPanelColumnList.stream()
                 .filter(photovoltaicPanelColumn ->
-                    FinishStatusEnum.FINISH.getValue().equals(photovoltaicPanelColumn.getStatus())).count());
+                    FacFinishStatusEnum.FINISH.getValue().equals(photovoltaicPanelColumn.getStatus())).count());
         }
         return matrixDetailGisVo;
     }
@@ -210,7 +210,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
      * @return 新增方阵id
      */
     @Override
-    public Long insertByBo(MatrixCreateReq req) {
+    public Long insertByBo(FacMatrixCreateReq req) {
         // 将实体类和 DTO 进行转换
         FacMatrix matrix = new FacMatrix();
         BeanUtils.copyProperties(req, matrix);
@@ -246,7 +246,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean insertByGeoJson(MatrixCreateByGeoJsonReq geoJson) {
+    public Boolean insertByGeoJson(FacMatrixCreateByGeoJsonReq geoJson) {
         Long projectId = geoJson.getProjectId();
         if (projectService.getById(projectId) == null) {
             throw new ServiceException("项目不存在", HttpStatus.NOT_FOUND);
@@ -255,18 +255,18 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
         List<FacMatrix> oldMatrixList = this.lambdaQuery()
             .eq(FacMatrix::getProjectId, projectId).list();
         List<FacMatrix> matrixList = new ArrayList<>();
-        List<Feature> locationFeatures = geoJson.getLocationGeoJson().getFeatures();
-        List<FeatureByPoint> nameFeatures = geoJson.getNameGeoJson().getFeatures();
+        List<FacFeature> locationFeatures = geoJson.getLocationGeoJson().getFeatures();
+        List<FacFeatureByPoint> nameFeatures = geoJson.getNameGeoJson().getFeatures();
         // 遍历位置信息
-        for (Feature feature : locationFeatures) {
+        for (FacFeature feature : locationFeatures) {
             FacMatrix matrix = new FacMatrix();
             matrix.setProjectId(projectId);
-            Geometry geometry = feature.getGeometry();
+            FacGeometry geometry = feature.getGeometry();
             // 获取坐标信息
             List<List<Double>> coordinatesList = GeoJsonUtils.getTwoDimensionalCoordinates(geometry);
             // 获取方阵名称
             String name = null;
-            for (FeatureByPoint nameFeature : nameFeatures) {
+            for (FacFeatureByPoint nameFeature : nameFeatures) {
                 List<Double> nameCoordinates = nameFeature.getGeometry().getCoordinates();
                 Boolean result = GeoJsonUtils.pointIsWithInPlane(coordinatesList, nameCoordinates);
                 if (result) {
@@ -305,7 +305,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(MatrixUpdateReq req) {
+    public Boolean updateByBo(FacMatrixUpdateReq req) {
         // 将实体类和 DTO 进行转换
         FacMatrix matrix = new FacMatrix();
         BeanUtils.copyProperties(req, matrix);
@@ -440,7 +440,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<FacMatrix> buildQueryWrapper(MatrixQueryReq req) {
+    public LambdaQueryWrapper<FacMatrix> buildQueryWrapper(FacMatrixQueryReq req) {
         LambdaQueryWrapper<FacMatrix> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelColumnServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelColumnServiceImpl.java
index fc153708..df53ffeb 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelColumnServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelColumnServiceImpl.java
@@ -14,10 +14,10 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.facility.domain.FacPhotovoltaicPanelColumn;
-import org.dromara.facility.domain.req.photovoltaicpanelcolumn.PhotovoltaicPanelColumnCreateReq;
-import org.dromara.facility.domain.req.photovoltaicpanelcolumn.PhotovoltaicPanelColumnQueryReq;
-import org.dromara.facility.domain.req.photovoltaicpanelcolumn.PhotovoltaicPanelColumnUpdateReq;
-import org.dromara.facility.domain.vo.FacPhotovoltaicPanelColumnVo;
+import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnCreateReq;
+import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnQueryReq;
+import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnUpdateReq;
+import org.dromara.facility.domain.vo.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnVo;
 import org.dromara.facility.mapper.FacPhotovoltaicPanelColumnMapper;
 import org.dromara.facility.service.IFacMatrixService;
 import org.dromara.facility.service.IFacPhotovoltaicPanelColumnService;
@@ -68,7 +68,7 @@ public class FacPhotovoltaicPanelColumnServiceImpl extends ServiceImpl<FacPhotov
      * @return 设施-光伏板立柱分页列表
      */
     @Override
-    public TableDataInfo<FacPhotovoltaicPanelColumnVo> queryPageList(PhotovoltaicPanelColumnQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<FacPhotovoltaicPanelColumnVo> queryPageList(FacPhotovoltaicPanelColumnQueryReq req, PageQuery pageQuery) {
         Page<FacPhotovoltaicPanelColumn> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
@@ -80,7 +80,7 @@ public class FacPhotovoltaicPanelColumnServiceImpl extends ServiceImpl<FacPhotov
      * @return 设施-光伏板立柱列表
      */
     @Override
-    public List<FacPhotovoltaicPanelColumnVo> queryList(PhotovoltaicPanelColumnQueryReq req) {
+    public List<FacPhotovoltaicPanelColumnVo> queryList(FacPhotovoltaicPanelColumnQueryReq req) {
         List<FacPhotovoltaicPanelColumn> photovoltaicPanelColumnList = this.list(this.buildQueryWrapper(req));
         return photovoltaicPanelColumnList.stream().map(this::getVo).toList();
     }
@@ -92,7 +92,7 @@ public class FacPhotovoltaicPanelColumnServiceImpl extends ServiceImpl<FacPhotov
      * @return 新增光伏板立柱id
      */
     @Override
-    public Long insertByBo(PhotovoltaicPanelColumnCreateReq req) {
+    public Long insertByBo(FacPhotovoltaicPanelColumnCreateReq req) {
         // 将实体类和 DTO 进行转换
         FacPhotovoltaicPanelColumn photovoltaicPanelColumn = new FacPhotovoltaicPanelColumn();
         BeanUtils.copyProperties(req, photovoltaicPanelColumn);
@@ -127,7 +127,7 @@ public class FacPhotovoltaicPanelColumnServiceImpl extends ServiceImpl<FacPhotov
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(PhotovoltaicPanelColumnUpdateReq req) {
+    public Boolean updateByBo(FacPhotovoltaicPanelColumnUpdateReq req) {
         // 将实体类和 DTO 进行转换
         FacPhotovoltaicPanelColumn photovoltaicPanelColumn = new FacPhotovoltaicPanelColumn();
         BeanUtils.copyProperties(req, photovoltaicPanelColumn);
@@ -235,7 +235,7 @@ public class FacPhotovoltaicPanelColumnServiceImpl extends ServiceImpl<FacPhotov
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<FacPhotovoltaicPanelColumn> buildQueryWrapper(PhotovoltaicPanelColumnQueryReq req) {
+    public LambdaQueryWrapper<FacPhotovoltaicPanelColumn> buildQueryWrapper(FacPhotovoltaicPanelColumnQueryReq req) {
         LambdaQueryWrapper<FacPhotovoltaicPanelColumn> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPartsServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPartsServiceImpl.java
index 65f8dddd..55c0abe1 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPartsServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPartsServiceImpl.java
@@ -13,9 +13,9 @@ import org.dromara.facility.domain.FacPhotovoltaicPanel;
 import org.dromara.facility.domain.FacPhotovoltaicPanelColumn;
 import org.dromara.facility.domain.FacPhotovoltaicPanelPoint;
 import org.dromara.facility.domain.FacPhotovoltaicPanelSupport;
-import org.dromara.facility.domain.req.geojson.FeatureByPoint;
-import org.dromara.facility.domain.req.photovoltaicpanelparts.PhotovoltaicPanelPartsCreateByGeoJsonReq;
-import org.dromara.facility.domain.req.photovoltaicpanelparts.PhotovoltaicPanelPartsCreateReq;
+import org.dromara.facility.domain.req.geojson.FacFeatureByPoint;
+import org.dromara.facility.domain.req.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateByGeoJsonReq;
+import org.dromara.facility.domain.req.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateReq;
 import org.dromara.facility.service.*;
 import org.dromara.project.service.IBusProjectService;
 import org.dromara.utils.GeoJsonUtils;
@@ -70,7 +70,7 @@ public class FacPhotovoltaicPanelPartsServiceImpl implements IFacPhotovoltaicPan
      * @return 是否新增成功
      */
     @Override
-    public Boolean insertPartsByGeoJson(PhotovoltaicPanelPartsCreateByGeoJsonReq geoJson) {
+    public Boolean insertPartsByGeoJson(FacPhotovoltaicPanelPartsCreateByGeoJsonReq geoJson) {
         Long projectId = geoJson.getProjectId();
         if (projectService.getById(projectId) == null) {
             throw new ServiceException("项目不存在", HttpStatus.NOT_FOUND);
@@ -81,7 +81,7 @@ public class FacPhotovoltaicPanelPartsServiceImpl implements IFacPhotovoltaicPan
         if (CollUtil.isEmpty(photovoltaicPanelList)) {
             throw new ServiceException("项目下未创建光伏板", HttpStatus.NOT_FOUND);
         }
-        List<FeatureByPoint> features = geoJson.getPointGeoJson().getFeatures();
+        List<FacFeatureByPoint> features = geoJson.getPointGeoJson().getFeatures();
         // 获取数据库中所有点的列表
         List<FacPhotovoltaicPanelPoint> oldPointList = photovoltaicPanelPointService.lambdaQuery()
             .eq(FacPhotovoltaicPanelPoint::getProjectId, projectId).list();
@@ -324,7 +324,7 @@ public class FacPhotovoltaicPanelPartsServiceImpl implements IFacPhotovoltaicPan
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean insertPartsByBatch(PhotovoltaicPanelPartsCreateReq req) {
+    public Boolean insertPartsByBatch(FacPhotovoltaicPanelPartsCreateReq req) {
         // 参数校验
         Long projectId = req.getProjectId();
         if (projectId == null || projectService.getById(projectId) == null) {
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPointServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPointServiceImpl.java
index edd1bfbb..600c1d6b 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPointServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPointServiceImpl.java
@@ -14,10 +14,10 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.facility.domain.FacPhotovoltaicPanelPoint;
-import org.dromara.facility.domain.req.photovoltaicpanelpoint.PhotovoltaicPanelPointCreateReq;
-import org.dromara.facility.domain.req.photovoltaicpanelpoint.PhotovoltaicPanelPointQueryReq;
-import org.dromara.facility.domain.req.photovoltaicpanelpoint.PhotovoltaicPanelPointUpdateReq;
-import org.dromara.facility.domain.vo.FacPhotovoltaicPanelPointVo;
+import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointCreateReq;
+import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointQueryReq;
+import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointUpdateReq;
+import org.dromara.facility.domain.vo.photovoltaicpanelpoint.FacPhotovoltaicPanelPointVo;
 import org.dromara.facility.mapper.FacPhotovoltaicPanelPointMapper;
 import org.dromara.facility.service.IFacMatrixService;
 import org.dromara.facility.service.IFacPhotovoltaicPanelPointService;
@@ -68,7 +68,7 @@ public class FacPhotovoltaicPanelPointServiceImpl extends ServiceImpl<FacPhotovo
      * @return 设施-光伏板桩点分页列表
      */
     @Override
-    public TableDataInfo<FacPhotovoltaicPanelPointVo> queryPageList(PhotovoltaicPanelPointQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<FacPhotovoltaicPanelPointVo> queryPageList(FacPhotovoltaicPanelPointQueryReq req, PageQuery pageQuery) {
         Page<FacPhotovoltaicPanelPoint> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
@@ -80,7 +80,7 @@ public class FacPhotovoltaicPanelPointServiceImpl extends ServiceImpl<FacPhotovo
      * @return 设施-光伏板桩点列表
      */
     @Override
-    public List<FacPhotovoltaicPanelPointVo> queryList(PhotovoltaicPanelPointQueryReq req) {
+    public List<FacPhotovoltaicPanelPointVo> queryList(FacPhotovoltaicPanelPointQueryReq req) {
         List<FacPhotovoltaicPanelPoint> photovoltaicPanelPointList = this.list(this.buildQueryWrapper(req));
         return photovoltaicPanelPointList.stream().map(this::getVo).toList();
     }
@@ -92,7 +92,7 @@ public class FacPhotovoltaicPanelPointServiceImpl extends ServiceImpl<FacPhotovo
      * @return 新增光伏板桩点id
      */
     @Override
-    public Long insertByBo(PhotovoltaicPanelPointCreateReq req) {
+    public Long insertByBo(FacPhotovoltaicPanelPointCreateReq req) {
         // 将实体类和 DTO 进行转换
         FacPhotovoltaicPanelPoint photovoltaicPanelPoint = new FacPhotovoltaicPanelPoint();
         BeanUtils.copyProperties(req, photovoltaicPanelPoint);
@@ -127,7 +127,7 @@ public class FacPhotovoltaicPanelPointServiceImpl extends ServiceImpl<FacPhotovo
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(PhotovoltaicPanelPointUpdateReq req) {
+    public Boolean updateByBo(FacPhotovoltaicPanelPointUpdateReq req) {
         // 将实体类和 DTO 进行转换
         FacPhotovoltaicPanelPoint photovoltaicPanelPoint = new FacPhotovoltaicPanelPoint();
         BeanUtils.copyProperties(req, photovoltaicPanelPoint);
@@ -235,7 +235,7 @@ public class FacPhotovoltaicPanelPointServiceImpl extends ServiceImpl<FacPhotovo
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<FacPhotovoltaicPanelPoint> buildQueryWrapper(PhotovoltaicPanelPointQueryReq req) {
+    public LambdaQueryWrapper<FacPhotovoltaicPanelPoint> buildQueryWrapper(FacPhotovoltaicPanelPointQueryReq req) {
         LambdaQueryWrapper<FacPhotovoltaicPanelPoint> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java
index 4ca1083e..d4678af6 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java
@@ -14,14 +14,14 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.facility.domain.FacPhotovoltaicPanel;
-import org.dromara.facility.domain.req.geojson.FeatureByPlane;
-import org.dromara.facility.domain.req.geojson.FeatureByPoint;
-import org.dromara.facility.domain.req.geojson.GeometryByPlane;
-import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelCreateByGeoJsonReq;
-import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelCreateReq;
-import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelQueryReq;
-import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelUpdateReq;
-import org.dromara.facility.domain.vo.FacPhotovoltaicPanelVo;
+import org.dromara.facility.domain.req.geojson.FacFeatureByPlane;
+import org.dromara.facility.domain.req.geojson.FacFeatureByPoint;
+import org.dromara.facility.domain.req.geojson.FacGeometryByPlane;
+import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelCreateByGeoJsonReq;
+import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelCreateReq;
+import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelQueryReq;
+import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelUpdateReq;
+import org.dromara.facility.domain.vo.photovoltaicpanel.FacPhotovoltaicPanelVo;
 import org.dromara.facility.mapper.FacPhotovoltaicPanelMapper;
 import org.dromara.facility.service.IFacMatrixService;
 import org.dromara.facility.service.IFacPhotovoltaicPanelPartsService;
@@ -83,7 +83,7 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
      * @return 设施-光伏板分页列表
      */
     @Override
-    public TableDataInfo<FacPhotovoltaicPanelVo> queryPageList(PhotovoltaicPanelQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<FacPhotovoltaicPanelVo> queryPageList(FacPhotovoltaicPanelQueryReq req, PageQuery pageQuery) {
         Page<FacPhotovoltaicPanel> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
@@ -95,7 +95,7 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
      * @return 设施-光伏板列表
      */
     @Override
-    public List<FacPhotovoltaicPanelVo> queryList(PhotovoltaicPanelQueryReq req) {
+    public List<FacPhotovoltaicPanelVo> queryList(FacPhotovoltaicPanelQueryReq req) {
         List<FacPhotovoltaicPanel> photovoltaicPanelList = this.list(this.buildQueryWrapper(req));
         return photovoltaicPanelList.stream().map(this::getVo).toList();
     }
@@ -107,7 +107,7 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
      * @return 新增光伏板id
      */
     @Override
-    public Long insertByBo(PhotovoltaicPanelCreateReq req) {
+    public Long insertByBo(FacPhotovoltaicPanelCreateReq req) {
         // 将实体类和 DTO 进行转换
         FacPhotovoltaicPanel photovoltaicPanel = new FacPhotovoltaicPanel();
         BeanUtils.copyProperties(req, photovoltaicPanel);
@@ -143,7 +143,7 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean insertByGeoJson(PhotovoltaicPanelCreateByGeoJsonReq geoJson) {
+    public Boolean insertByGeoJson(FacPhotovoltaicPanelCreateByGeoJsonReq geoJson) {
         Long projectId = geoJson.getProjectId();
         if (projectService.getById(projectId) == null) {
             throw new ServiceException("项目不存在", HttpStatus.NOT_FOUND);
@@ -165,11 +165,11 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
             ));
         // 获取数据库中光伏板信息
         List<FacPhotovoltaicPanel> photovoltaicPanelList = new ArrayList<>();
-        List<FeatureByPlane> locationFeatures = geoJson.getLocationGeoJson().getFeatures();
-        List<FeatureByPoint> nameFeatures = geoJson.getNameGeoJson().getFeatures();
-        for (FeatureByPlane locationFeature : locationFeatures) {
+        List<FacFeatureByPlane> locationFeatures = geoJson.getLocationGeoJson().getFeatures();
+        List<FacFeatureByPoint> nameFeatures = geoJson.getNameGeoJson().getFeatures();
+        for (FacFeatureByPlane locationFeature : locationFeatures) {
             FacPhotovoltaicPanel photovoltaicPanel = new FacPhotovoltaicPanel();
-            GeometryByPlane geometry = locationFeature.getGeometry();
+            FacGeometryByPlane geometry = locationFeature.getGeometry();
             List<List<Double>> coordinates = geometry.getCoordinates().get(0);
             // todo 判断光伏板在哪个方阵里
 /*            Long matrixId = null;
@@ -193,7 +193,7 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
             photovoltaicPanel.setMatrixId(1L);
             // 获取光伏板名称
             String name = null;
-            for (FeatureByPoint nameFeature : nameFeatures) {
+            for (FacFeatureByPoint nameFeature : nameFeatures) {
                 List<Double> nameCoordinates = nameFeature.getGeometry().getCoordinates();
                 Boolean result = GeoJsonUtils.pointIsWithInPlane(coordinates, nameCoordinates);
                 if (result) {
@@ -240,7 +240,7 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(PhotovoltaicPanelUpdateReq req) {
+    public Boolean updateByBo(FacPhotovoltaicPanelUpdateReq req) {
         // 将实体类和 DTO 进行转换
         FacPhotovoltaicPanel photovoltaicPanel = new FacPhotovoltaicPanel();
         BeanUtils.copyProperties(req, photovoltaicPanel);
@@ -362,7 +362,7 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<FacPhotovoltaicPanel> buildQueryWrapper(PhotovoltaicPanelQueryReq req) {
+    public LambdaQueryWrapper<FacPhotovoltaicPanel> buildQueryWrapper(FacPhotovoltaicPanelQueryReq req) {
         LambdaQueryWrapper<FacPhotovoltaicPanel> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelSupportServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelSupportServiceImpl.java
index 8308de25..878113c6 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelSupportServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelSupportServiceImpl.java
@@ -14,10 +14,10 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.facility.domain.FacPhotovoltaicPanelSupport;
-import org.dromara.facility.domain.req.photovoltaicpanelsupport.PhotovoltaicPanelSupportCreateReq;
-import org.dromara.facility.domain.req.photovoltaicpanelsupport.PhotovoltaicPanelSupportQueryReq;
-import org.dromara.facility.domain.req.photovoltaicpanelsupport.PhotovoltaicPanelSupportUpdateReq;
-import org.dromara.facility.domain.vo.FacPhotovoltaicPanelSupportVo;
+import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportCreateReq;
+import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportQueryReq;
+import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportUpdateReq;
+import org.dromara.facility.domain.vo.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportVo;
 import org.dromara.facility.mapper.FacPhotovoltaicPanelSupportMapper;
 import org.dromara.facility.service.IFacMatrixService;
 import org.dromara.facility.service.IFacPhotovoltaicPanelSupportService;
@@ -68,7 +68,7 @@ public class FacPhotovoltaicPanelSupportServiceImpl extends ServiceImpl<FacPhoto
      * @return 设施-光伏板支架分页列表
      */
     @Override
-    public TableDataInfo<FacPhotovoltaicPanelSupportVo> queryPageList(PhotovoltaicPanelSupportQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<FacPhotovoltaicPanelSupportVo> queryPageList(FacPhotovoltaicPanelSupportQueryReq req, PageQuery pageQuery) {
         Page<FacPhotovoltaicPanelSupport> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
@@ -80,7 +80,7 @@ public class FacPhotovoltaicPanelSupportServiceImpl extends ServiceImpl<FacPhoto
      * @return 设施-光伏板支架列表
      */
     @Override
-    public List<FacPhotovoltaicPanelSupportVo> queryList(PhotovoltaicPanelSupportQueryReq req) {
+    public List<FacPhotovoltaicPanelSupportVo> queryList(FacPhotovoltaicPanelSupportQueryReq req) {
         List<FacPhotovoltaicPanelSupport> photovoltaicPanelSupportList = this.list(this.buildQueryWrapper(req));
         return photovoltaicPanelSupportList.stream().map(this::getVo).toList();
     }
@@ -92,7 +92,7 @@ public class FacPhotovoltaicPanelSupportServiceImpl extends ServiceImpl<FacPhoto
      * @return 新增光伏板支架id
      */
     @Override
-    public Long insertByBo(PhotovoltaicPanelSupportCreateReq req) {
+    public Long insertByBo(FacPhotovoltaicPanelSupportCreateReq req) {
         // 将实体类和 DTO 进行转换
         FacPhotovoltaicPanelSupport photovoltaicPanelSupport = new FacPhotovoltaicPanelSupport();
         BeanUtils.copyProperties(req, photovoltaicPanelSupport);
@@ -127,7 +127,7 @@ public class FacPhotovoltaicPanelSupportServiceImpl extends ServiceImpl<FacPhoto
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(PhotovoltaicPanelSupportUpdateReq req) {
+    public Boolean updateByBo(FacPhotovoltaicPanelSupportUpdateReq req) {
         // 将实体类和 DTO 进行转换
         FacPhotovoltaicPanelSupport photovoltaicPanelSupport = new FacPhotovoltaicPanelSupport();
         BeanUtils.copyProperties(req, photovoltaicPanelSupport);
@@ -235,7 +235,7 @@ public class FacPhotovoltaicPanelSupportServiceImpl extends ServiceImpl<FacPhoto
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<FacPhotovoltaicPanelSupport> buildQueryWrapper(PhotovoltaicPanelSupportQueryReq req) {
+    public LambdaQueryWrapper<FacPhotovoltaicPanelSupport> buildQueryWrapper(FacPhotovoltaicPanelSupportQueryReq req) {
         LambdaQueryWrapper<FacPhotovoltaicPanelSupport> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/EqpMachineryController.java
similarity index 71%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryController.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/EqpMachineryController.java
index aaa47441..a7691f9c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/EqpMachineryController.java
@@ -15,13 +15,13 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.machinery.domain.req.machinery.MachineryCreateReq;
-import org.dromara.machinery.domain.req.machinery.MachineryGisReq;
-import org.dromara.machinery.domain.req.machinery.MachineryQueryReq;
-import org.dromara.machinery.domain.req.machinery.MachineryUpdateReq;
-import org.dromara.machinery.domain.vo.BusMachineryVo;
-import org.dromara.machinery.domain.vo.MachineryGisVo;
-import org.dromara.machinery.service.IBusMachineryService;
+import org.dromara.machinery.domain.req.machinery.EqpMachineryCreateReq;
+import org.dromara.machinery.domain.req.machinery.EqpMachineryGisReq;
+import org.dromara.machinery.domain.req.machinery.EqpMachineryQueryReq;
+import org.dromara.machinery.domain.req.machinery.EqpMachineryUpdateReq;
+import org.dromara.machinery.domain.vo.machinery.EqpMachineryVo;
+import org.dromara.machinery.domain.vo.machinery.EqpMachineryGisVo;
+import org.dromara.machinery.service.IEqpMachineryService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,16 +37,16 @@ import java.util.List;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/machinery/machinery")
-public class BusMachineryController extends BaseController {
+public class EqpMachineryController extends BaseController {
 
-    private final IBusMachineryService busMachineryService;
+    private final IEqpMachineryService busMachineryService;
 
     /**
      * 查询机械列表
      */
     @SaCheckPermission("machinery:machinery:list")
     @GetMapping("/list")
-    public TableDataInfo<BusMachineryVo> list(MachineryQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<EqpMachineryVo> list(EqpMachineryQueryReq req, PageQuery pageQuery) {
         return busMachineryService.queryPageList(req, pageQuery);
     }
 
@@ -56,9 +56,9 @@ public class BusMachineryController extends BaseController {
     @SaCheckPermission("machinery:machinery:export")
     @Log(title = "机械", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(MachineryQueryReq req, HttpServletResponse response) {
-        List<BusMachineryVo> list = busMachineryService.queryList(req);
-        ExcelUtil.exportExcel(list, "机械", BusMachineryVo.class, response);
+    public void export(EqpMachineryQueryReq req, HttpServletResponse response) {
+        List<EqpMachineryVo> list = busMachineryService.queryList(req);
+        ExcelUtil.exportExcel(list, "机械", EqpMachineryVo.class, response);
     }
 
     /**
@@ -66,7 +66,7 @@ public class BusMachineryController extends BaseController {
      */
     @SaCheckPermission("machinery:machinery:list")
     @GetMapping("/list/gis")
-    public R<List<MachineryGisVo>> queryGisList(MachineryGisReq req) {
+    public R<List<EqpMachineryGisVo>> queryGisList(EqpMachineryGisReq req) {
         return R.ok(busMachineryService.queryGisList(req));
     }
 
@@ -77,7 +77,7 @@ public class BusMachineryController extends BaseController {
      */
     @SaCheckPermission("machinery:machinery:query")
     @GetMapping("/{id}")
-    public R<BusMachineryVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<EqpMachineryVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(busMachineryService.queryById(id));
     }
@@ -89,7 +89,7 @@ public class BusMachineryController extends BaseController {
     @Log(title = "机械", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody MachineryCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody EqpMachineryCreateReq req) {
         return R.ok(busMachineryService.insertByBo(req));
     }
 
@@ -100,7 +100,7 @@ public class BusMachineryController extends BaseController {
     @Log(title = "机械", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody MachineryUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody EqpMachineryUpdateReq req) {
         return toAjax(busMachineryService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryDetailController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/EqpMachineryDetailController.java
similarity index 74%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryDetailController.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/EqpMachineryDetailController.java
index a39fc8f4..327cb93d 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryDetailController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/EqpMachineryDetailController.java
@@ -15,11 +15,11 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailCreateReq;
-import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailQueryReq;
-import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailUpdateReq;
-import org.dromara.machinery.domain.vo.BusMachineryDetailVo;
-import org.dromara.machinery.service.IBusMachineryDetailService;
+import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailCreateReq;
+import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailQueryReq;
+import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailUpdateReq;
+import org.dromara.machinery.domain.vo.machinerydetail.EqpMachineryDetailVo;
+import org.dromara.machinery.service.IEqpMachineryDetailService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -35,16 +35,16 @@ import java.util.List;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/machinery/machineryDetail")
-public class BusMachineryDetailController extends BaseController {
+public class EqpMachineryDetailController extends BaseController {
 
-    private final IBusMachineryDetailService busMachineryDetailService;
+    private final IEqpMachineryDetailService busMachineryDetailService;
 
     /**
      * 查询机械详情列表
      */
     @SaCheckPermission("machinery:machineryDetail:list")
     @GetMapping("/list")
-    public TableDataInfo<BusMachineryDetailVo> list(MachineryDetailQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<EqpMachineryDetailVo> list(EqpMachineryDetailQueryReq req, PageQuery pageQuery) {
         return busMachineryDetailService.queryPageList(req, pageQuery);
     }
 
@@ -54,9 +54,9 @@ public class BusMachineryDetailController extends BaseController {
     @SaCheckPermission("machinery:machineryDetail:export")
     @Log(title = "机械详情", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(MachineryDetailQueryReq req, HttpServletResponse response) {
-        List<BusMachineryDetailVo> list = busMachineryDetailService.queryList(req);
-        ExcelUtil.exportExcel(list, "机械详情", BusMachineryDetailVo.class, response);
+    public void export(EqpMachineryDetailQueryReq req, HttpServletResponse response) {
+        List<EqpMachineryDetailVo> list = busMachineryDetailService.queryList(req);
+        ExcelUtil.exportExcel(list, "机械详情", EqpMachineryDetailVo.class, response);
     }
 
     /**
@@ -66,7 +66,7 @@ public class BusMachineryDetailController extends BaseController {
      */
     @SaCheckPermission("machinery:machineryDetail:query")
     @GetMapping("/{id}")
-    public R<BusMachineryDetailVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<EqpMachineryDetailVo> getInfo(@NotNull(message = "主键不能为空")
                                            @PathVariable Long id) {
         return R.ok(busMachineryDetailService.queryById(id));
     }
@@ -78,7 +78,7 @@ public class BusMachineryDetailController extends BaseController {
     @Log(title = "机械详情", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody MachineryDetailCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody EqpMachineryDetailCreateReq req) {
         return R.ok(busMachineryDetailService.insertByBo(req));
     }
 
@@ -89,7 +89,7 @@ public class BusMachineryDetailController extends BaseController {
     @Log(title = "机械详情", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody MachineryDetailUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody EqpMachineryDetailUpdateReq req) {
         return toAjax(busMachineryDetailService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/BusMachinery.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/EqpMachinery.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/BusMachinery.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/EqpMachinery.java
index 44921702..a1d04724 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/BusMachinery.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/EqpMachinery.java
@@ -11,15 +11,15 @@ import java.io.Serial;
 import java.util.Date;
 
 /**
- * 机械对象 bus_machinery
+ * 机械对象 eqp_machinery
  *
  * @author lcj
  * @date 2025-03-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("bus_machinery")
-public class BusMachinery extends BaseEntity {
+@TableName("eqp_machinery")
+public class EqpMachinery extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/BusMachineryDetail.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/EqpMachineryDetail.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/BusMachineryDetail.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/EqpMachineryDetail.java
index 25175dc1..a8a9a911 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/BusMachineryDetail.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/EqpMachineryDetail.java
@@ -11,15 +11,15 @@ import java.io.Serial;
 import java.util.Date;
 
 /**
- * 机械详情对象 bus_machinery_detail
+ * 机械详情对象 eqp_machinery_detail
  *
  * @author lcj
  * @date 2025-03-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("bus_machinery_detail")
-public class BusMachineryDetail extends BaseEntity {
+@TableName("eqp_machinery_detail")
+public class EqpMachineryDetail extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/MachineryCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryCreateReq.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/MachineryCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryCreateReq.java
index 9b6d879f..acc20613 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/MachineryCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryCreateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 14:05
  */
 @Data
-public class MachineryCreateReq implements Serializable {
+public class EqpMachineryCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -7603153089205421154L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/MachineryGisReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryGisReq.java
similarity index 88%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/MachineryGisReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryGisReq.java
index cc5533d8..f44a4946 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/MachineryGisReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryGisReq.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 2025/4/28 10:26
  */
 @Data
-public class MachineryGisReq implements Serializable {
+public class EqpMachineryGisReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -5157791260034938544L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/MachineryQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryQueryReq.java
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/MachineryQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryQueryReq.java
index 709660c6..033f2ec3 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/MachineryQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 14:31
  */
 @Data
-public class MachineryQueryReq implements Serializable {
+public class EqpMachineryQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3252651952758479341L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/MachineryUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryUpdateReq.java
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/MachineryUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryUpdateReq.java
index a6d38dbf..c0ca5735 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/MachineryUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryUpdateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 15:04
  */
 @Data
-public class MachineryUpdateReq implements Serializable {
+public class EqpMachineryUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -8022860866890925958L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/EqpMachineryDetailCreateReq.java
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/EqpMachineryDetailCreateReq.java
index f56e725c..ce7f2b92 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/EqpMachineryDetailCreateReq.java
@@ -11,7 +11,7 @@ import java.util.Date;
  * @date 2025/3/5 14:05
  */
 @Data
-public class MachineryDetailCreateReq implements Serializable {
+public class EqpMachineryDetailCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -7603153089205421154L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/EqpMachineryDetailQueryReq.java
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/EqpMachineryDetailQueryReq.java
index e1b93bf7..e4082a26 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/EqpMachineryDetailQueryReq.java
@@ -11,7 +11,7 @@ import java.util.Date;
  * @date 2025/3/5 14:31
  */
 @Data
-public class MachineryDetailQueryReq implements Serializable {
+public class EqpMachineryDetailQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3252651952758479341L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/EqpMachineryDetailUpdateReq.java
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/EqpMachineryDetailUpdateReq.java
index 333addf2..2c086678 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/EqpMachineryDetailUpdateReq.java
@@ -11,7 +11,7 @@ import java.util.Date;
  * @date 2025/3/5 15:04
  */
 @Data
-public class MachineryDetailUpdateReq implements Serializable {
+public class EqpMachineryDetailUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -8022860866890925958L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/MachineryGisVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/machinery/EqpMachineryGisVo.java
similarity index 76%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/MachineryGisVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/machinery/EqpMachineryGisVo.java
index 339d4a4e..842af5a9 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/MachineryGisVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/machinery/EqpMachineryGisVo.java
@@ -1,4 +1,4 @@
-package org.dromara.machinery.domain.vo;
+package org.dromara.machinery.domain.vo.machinery;
 
 import lombok.Data;
 
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/28 10:27
  */
 @Data
-public class MachineryGisVo implements Serializable {
+public class EqpMachineryGisVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -724470814094084721L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/BusMachineryVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/machinery/EqpMachineryVo.java
similarity index 86%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/BusMachineryVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/machinery/EqpMachineryVo.java
index 6e462757..c416cb92 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/BusMachineryVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/machinery/EqpMachineryVo.java
@@ -1,10 +1,10 @@
-package org.dromara.machinery.domain.vo;
+package org.dromara.machinery.domain.vo.machinery;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.machinery.domain.BusMachinery;
+import org.dromara.machinery.domain.EqpMachinery;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -12,15 +12,15 @@ import java.util.Date;
 
 
 /**
- * 机械视图对象 bus_machinery
+ * 机械视图对象 eqp_machinery
  *
  * @author lcj
  * @date 2025-03-07
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = BusMachinery.class)
-public class BusMachineryVo implements Serializable {
+@AutoMapper(target = EqpMachinery.class)
+public class EqpMachineryVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/BusMachineryDetailVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/machinerydetail/EqpMachineryDetailVo.java
similarity index 88%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/BusMachineryDetailVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/machinerydetail/EqpMachineryDetailVo.java
index 79592afe..9b9eee1a 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/BusMachineryDetailVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/machinerydetail/EqpMachineryDetailVo.java
@@ -1,4 +1,4 @@
-package org.dromara.machinery.domain.vo;
+package org.dromara.machinery.domain.vo.machinerydetail;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -6,7 +6,7 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
-import org.dromara.machinery.domain.BusMachineryDetail;
+import org.dromara.machinery.domain.EqpMachineryDetail;
 import org.dromara.system.domain.vo.SysOssVo;
 
 import java.io.Serial;
@@ -16,15 +16,15 @@ import java.util.List;
 
 
 /**
- * 机械详情视图对象 bus_machinery_detail
+ * 机械详情视图对象 eqp_machinery_detail
  *
  * @author lcj
  * @date 2025-03-07
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = BusMachineryDetail.class)
-public class BusMachineryDetailVo implements Serializable {
+@AutoMapper(target = EqpMachineryDetail.class)
+public class EqpMachineryDetailVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/mapper/BusMachineryDetailMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/mapper/BusMachineryDetailMapper.java
deleted file mode 100644
index 1ba12a46..00000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/mapper/BusMachineryDetailMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.dromara.machinery.mapper;
-
-import org.dromara.machinery.domain.BusMachineryDetail;
-import org.dromara.machinery.domain.vo.BusMachineryDetailVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-
-/**
- * 机械详情Mapper接口
- *
- * @author lcj
- * @date 2025-03-07
- */
-public interface BusMachineryDetailMapper extends BaseMapperPlus<BusMachineryDetail, BusMachineryDetailVo> {
-
-}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/mapper/BusMachineryMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/mapper/BusMachineryMapper.java
deleted file mode 100644
index 70b82ebf..00000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/mapper/BusMachineryMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.dromara.machinery.mapper;
-
-import org.dromara.machinery.domain.BusMachinery;
-import org.dromara.machinery.domain.vo.BusMachineryVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-
-/**
- * 机械Mapper接口
- *
- * @author lcj
- * @date 2025-03-07
- */
-public interface BusMachineryMapper extends BaseMapperPlus<BusMachinery, BusMachineryVo> {
-
-}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/mapper/EqpMachineryDetailMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/mapper/EqpMachineryDetailMapper.java
new file mode 100644
index 00000000..a897785e
--- /dev/null
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/mapper/EqpMachineryDetailMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.machinery.mapper;
+
+import org.dromara.machinery.domain.EqpMachineryDetail;
+import org.dromara.machinery.domain.vo.machinerydetail.EqpMachineryDetailVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 机械详情Mapper接口
+ *
+ * @author lcj
+ * @date 2025-03-07
+ */
+public interface EqpMachineryDetailMapper extends BaseMapperPlus<EqpMachineryDetail, EqpMachineryDetailVo> {
+
+}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/mapper/EqpMachineryMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/mapper/EqpMachineryMapper.java
new file mode 100644
index 00000000..8962d2eb
--- /dev/null
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/mapper/EqpMachineryMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.machinery.mapper;
+
+import org.dromara.machinery.domain.EqpMachinery;
+import org.dromara.machinery.domain.vo.machinery.EqpMachineryVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 机械Mapper接口
+ *
+ * @author lcj
+ * @date 2025-03-07
+ */
+public interface EqpMachineryMapper extends BaseMapperPlus<EqpMachinery, EqpMachineryVo> {
+
+}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryDetailService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IEqpMachineryDetailService.java
similarity index 65%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryDetailService.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IEqpMachineryDetailService.java
index 40e6f6c8..91ea9be7 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryDetailService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IEqpMachineryDetailService.java
@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.machinery.domain.BusMachineryDetail;
-import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailCreateReq;
-import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailQueryReq;
-import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailUpdateReq;
-import org.dromara.machinery.domain.vo.BusMachineryDetailVo;
+import org.dromara.machinery.domain.EqpMachineryDetail;
+import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailCreateReq;
+import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailQueryReq;
+import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailUpdateReq;
+import org.dromara.machinery.domain.vo.machinerydetail.EqpMachineryDetailVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -20,7 +20,7 @@ import java.util.List;
  * @author lcj
  * @date 2025-03-07
  */
-public interface IBusMachineryDetailService extends IService<BusMachineryDetail> {
+public interface IEqpMachineryDetailService extends IService<EqpMachineryDetail> {
 
     /**
      * 查询机械详情
@@ -28,7 +28,7 @@ public interface IBusMachineryDetailService extends IService<BusMachineryDetail>
      * @param id 主键
      * @return 机械详情
      */
-    BusMachineryDetailVo queryById(Long id);
+    EqpMachineryDetailVo queryById(Long id);
 
     /**
      * 分页查询机械详情列表
@@ -37,7 +37,7 @@ public interface IBusMachineryDetailService extends IService<BusMachineryDetail>
      * @param pageQuery 分页参数
      * @return 机械详情分页列表
      */
-    TableDataInfo<BusMachineryDetailVo> queryPageList(MachineryDetailQueryReq req, PageQuery pageQuery);
+    TableDataInfo<EqpMachineryDetailVo> queryPageList(EqpMachineryDetailQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的机械详情列表
@@ -45,7 +45,7 @@ public interface IBusMachineryDetailService extends IService<BusMachineryDetail>
      * @param req 查询条件
      * @return 机械详情列表
      */
-    List<BusMachineryDetailVo> queryList(MachineryDetailQueryReq req);
+    List<EqpMachineryDetailVo> queryList(EqpMachineryDetailQueryReq req);
 
     /**
      * 新增机械详情
@@ -53,7 +53,7 @@ public interface IBusMachineryDetailService extends IService<BusMachineryDetail>
      * @param req 机械详情
      * @return 是否新增成功
      */
-    Long insertByBo(MachineryDetailCreateReq req);
+    Long insertByBo(EqpMachineryDetailCreateReq req);
 
     /**
      * 修改机械详情
@@ -61,7 +61,7 @@ public interface IBusMachineryDetailService extends IService<BusMachineryDetail>
      * @param req 机械详情
      * @return 是否修改成功
      */
-    Boolean updateByBo(MachineryDetailUpdateReq req);
+    Boolean updateByBo(EqpMachineryDetailUpdateReq req);
 
     /**
      * 校验并批量删除机械详情信息
@@ -78,7 +78,7 @@ public interface IBusMachineryDetailService extends IService<BusMachineryDetail>
      * @param machineryDetail 机械详情对象
      * @return 机械详情视图对象
      */
-    BusMachineryDetailVo getVo(BusMachineryDetail machineryDetail);
+    EqpMachineryDetailVo getVo(EqpMachineryDetail machineryDetail);
 
     /**
      * 获取机械详情查询条件封装
@@ -86,7 +86,7 @@ public interface IBusMachineryDetailService extends IService<BusMachineryDetail>
      * @param req 机械详情查询条件
      * @return 机械详情查询条件封装
      */
-    LambdaQueryWrapper<BusMachineryDetail> buildQueryWrapper(MachineryDetailQueryReq req);
+    LambdaQueryWrapper<EqpMachineryDetail> buildQueryWrapper(EqpMachineryDetailQueryReq req);
 
     /**
      * 获取机械详情分页对象视图
@@ -94,5 +94,5 @@ public interface IBusMachineryDetailService extends IService<BusMachineryDetail>
      * @param machineryDetailPage 机械详情分页对象
      * @return 机械详情分页对象视图
      */
-    Page<BusMachineryDetailVo> getVoPage(Page<BusMachineryDetail> machineryDetailPage);
+    Page<EqpMachineryDetailVo> getVoPage(Page<EqpMachineryDetail> machineryDetailPage);
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IEqpMachineryService.java
similarity index 63%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryService.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IEqpMachineryService.java
index bbf7623c..0a167e17 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IEqpMachineryService.java
@@ -5,13 +5,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.machinery.domain.BusMachinery;
-import org.dromara.machinery.domain.req.machinery.MachineryCreateReq;
-import org.dromara.machinery.domain.req.machinery.MachineryGisReq;
-import org.dromara.machinery.domain.req.machinery.MachineryQueryReq;
-import org.dromara.machinery.domain.req.machinery.MachineryUpdateReq;
-import org.dromara.machinery.domain.vo.BusMachineryVo;
-import org.dromara.machinery.domain.vo.MachineryGisVo;
+import org.dromara.machinery.domain.EqpMachinery;
+import org.dromara.machinery.domain.req.machinery.EqpMachineryCreateReq;
+import org.dromara.machinery.domain.req.machinery.EqpMachineryGisReq;
+import org.dromara.machinery.domain.req.machinery.EqpMachineryQueryReq;
+import org.dromara.machinery.domain.req.machinery.EqpMachineryUpdateReq;
+import org.dromara.machinery.domain.vo.machinery.EqpMachineryVo;
+import org.dromara.machinery.domain.vo.machinery.EqpMachineryGisVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -22,7 +22,7 @@ import java.util.List;
  * @author lcj
  * @date 2025-03-07
  */
-public interface IBusMachineryService extends IService<BusMachinery> {
+public interface IEqpMachineryService extends IService<EqpMachinery> {
 
     /**
      * 查询机械
@@ -30,7 +30,7 @@ public interface IBusMachineryService extends IService<BusMachinery> {
      * @param id 主键
      * @return 机械
      */
-    BusMachineryVo queryById(Long id);
+    EqpMachineryVo queryById(Long id);
 
     /**
      * 分页查询机械列表
@@ -39,7 +39,7 @@ public interface IBusMachineryService extends IService<BusMachinery> {
      * @param pageQuery 分页条件
      * @return 机械分页列表
      */
-    TableDataInfo<BusMachineryVo> queryPageList(MachineryQueryReq req, PageQuery pageQuery);
+    TableDataInfo<EqpMachineryVo> queryPageList(EqpMachineryQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的机械列表
@@ -47,7 +47,7 @@ public interface IBusMachineryService extends IService<BusMachinery> {
      * @param req 查询条件
      * @return 机械列表
      */
-    List<BusMachineryVo> queryList(MachineryQueryReq req);
+    List<EqpMachineryVo> queryList(EqpMachineryQueryReq req);
 
     /**
      * 查询机械大屏数据列表
@@ -55,7 +55,7 @@ public interface IBusMachineryService extends IService<BusMachinery> {
      * @param req 筛选条件
      * @return 大屏数据列表
      */
-    List<MachineryGisVo> queryGisList(MachineryGisReq req);
+    List<EqpMachineryGisVo> queryGisList(EqpMachineryGisReq req);
 
     /**
      * 新增机械
@@ -63,7 +63,7 @@ public interface IBusMachineryService extends IService<BusMachinery> {
      * @param req 机械
      * @return 新增机械id
      */
-    Long insertByBo(MachineryCreateReq req);
+    Long insertByBo(EqpMachineryCreateReq req);
 
     /**
      * 修改机械
@@ -71,7 +71,7 @@ public interface IBusMachineryService extends IService<BusMachinery> {
      * @param req 机械
      * @return 是否修改成功
      */
-    Boolean updateByBo(MachineryUpdateReq req);
+    Boolean updateByBo(EqpMachineryUpdateReq req);
 
     /**
      * 校验并批量删除机械信息
@@ -88,7 +88,7 @@ public interface IBusMachineryService extends IService<BusMachinery> {
      * @param machinery 机械对象
      * @return 机械视图对象
      */
-    BusMachineryVo getVo(BusMachinery machinery);
+    EqpMachineryVo getVo(EqpMachinery machinery);
 
     /**
      * 获取机械查询条件封装
@@ -96,7 +96,7 @@ public interface IBusMachineryService extends IService<BusMachinery> {
      * @param req 机械查询条件
      * @return 机械查询条件封装
      */
-    LambdaQueryWrapper<BusMachinery> buildQueryWrapper(MachineryQueryReq req);
+    LambdaQueryWrapper<EqpMachinery> buildQueryWrapper(EqpMachineryQueryReq req);
 
     /**
      * 获取机械分页对象视图
@@ -104,5 +104,5 @@ public interface IBusMachineryService extends IService<BusMachinery> {
      * @param machineryPage 机械分页对象
      * @return 机械分页对象视图
      */
-    Page<BusMachineryVo> getVoPage(Page<BusMachinery> machineryPage);
+    Page<EqpMachineryVo> getVoPage(Page<EqpMachinery> machineryPage);
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryDetailServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/EqpMachineryDetailServiceImpl.java
similarity index 71%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryDetailServiceImpl.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/EqpMachineryDetailServiceImpl.java
index 4e608ead..69c6e91f 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryDetailServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/EqpMachineryDetailServiceImpl.java
@@ -12,15 +12,15 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.machinery.domain.BusMachinery;
-import org.dromara.machinery.domain.BusMachineryDetail;
-import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailCreateReq;
-import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailQueryReq;
-import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailUpdateReq;
-import org.dromara.machinery.domain.vo.BusMachineryDetailVo;
-import org.dromara.machinery.mapper.BusMachineryDetailMapper;
-import org.dromara.machinery.service.IBusMachineryDetailService;
-import org.dromara.machinery.service.IBusMachineryService;
+import org.dromara.machinery.domain.EqpMachinery;
+import org.dromara.machinery.domain.EqpMachineryDetail;
+import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailCreateReq;
+import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailQueryReq;
+import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailUpdateReq;
+import org.dromara.machinery.domain.vo.machinerydetail.EqpMachineryDetailVo;
+import org.dromara.machinery.mapper.EqpMachineryDetailMapper;
+import org.dromara.machinery.service.IEqpMachineryDetailService;
+import org.dromara.machinery.service.IEqpMachineryService;
 import org.dromara.project.service.IBusProjectService;
 import org.dromara.system.domain.vo.SysOssVo;
 import org.dromara.system.service.ISysOssService;
@@ -40,11 +40,11 @@ import java.util.List;
  * @date 2025-03-07
  */
 @Service
-public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetailMapper, BusMachineryDetail>
-    implements IBusMachineryDetailService {
+public class EqpMachineryDetailServiceImpl extends ServiceImpl<EqpMachineryDetailMapper, EqpMachineryDetail>
+    implements IEqpMachineryDetailService {
 
     @Resource
-    private IBusMachineryService machineryService;
+    private IEqpMachineryService machineryService;
 
     @Resource
     private IBusProjectService projectService;
@@ -59,8 +59,8 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
      * @return 机械详情
      */
     @Override
-    public BusMachineryDetailVo queryById(Long id) {
-        BusMachineryDetail machineryDetail = this.getById(id);
+    public EqpMachineryDetailVo queryById(Long id) {
+        EqpMachineryDetail machineryDetail = this.getById(id);
         if (machineryDetail == null) {
             throw new ServiceException("机械详情信息不存在", HttpStatus.NOT_FOUND);
         }
@@ -75,9 +75,9 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
      * @return 机械详情分页列表
      */
     @Override
-    public TableDataInfo<BusMachineryDetailVo> queryPageList(MachineryDetailQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<EqpMachineryDetailVo> queryPageList(EqpMachineryDetailQueryReq req, PageQuery pageQuery) {
         // 查询数据库
-        Page<BusMachineryDetail> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
+        Page<EqpMachineryDetail> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
 
@@ -88,9 +88,9 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
      * @return 机械详情列表
      */
     @Override
-    public List<BusMachineryDetailVo> queryList(MachineryDetailQueryReq req) {
-        LambdaQueryWrapper<BusMachineryDetail> lqw = this.buildQueryWrapper(req);
-        List<BusMachineryDetail> list = this.list(lqw);
+    public List<EqpMachineryDetailVo> queryList(EqpMachineryDetailQueryReq req) {
+        LambdaQueryWrapper<EqpMachineryDetail> lqw = this.buildQueryWrapper(req);
+        List<EqpMachineryDetail> list = this.list(lqw);
         return list.stream().map(this::getVo).toList();
     }
 
@@ -101,9 +101,9 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
      * @return 是否新增成功
      */
     @Override
-    public Long insertByBo(MachineryDetailCreateReq req) {
+    public Long insertByBo(EqpMachineryDetailCreateReq req) {
         // 将实体类和 DTO 进行转换
-        BusMachineryDetail machineryDetail = new BusMachineryDetail();
+        EqpMachineryDetail machineryDetail = new EqpMachineryDetail();
         BeanUtils.copyProperties(req, machineryDetail);
         // 数据校验
         validEntityBeforeSave(machineryDetail);
@@ -122,14 +122,14 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(MachineryDetailUpdateReq req) {
+    public Boolean updateByBo(EqpMachineryDetailUpdateReq req) {
         // 将实体类和 DTO 进行转换
-        BusMachineryDetail machineryDetail = new BusMachineryDetail();
+        EqpMachineryDetail machineryDetail = new EqpMachineryDetail();
         BeanUtils.copyProperties(req, machineryDetail);
         // 数据校验
         validEntityBeforeSave(machineryDetail);
         // 判断是否存在
-        BusMachineryDetail oldMachineryDetail = this.getById(machineryDetail.getId());
+        EqpMachineryDetail oldMachineryDetail = this.getById(machineryDetail.getId());
         if (oldMachineryDetail == null) {
             throw new ServiceException("修改机械详情失败，数据不存在", HttpStatus.NOT_FOUND);
         }
@@ -140,7 +140,7 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(BusMachineryDetail entity) {
+    private void validEntityBeforeSave(EqpMachineryDetail entity) {
         // 做一些数据校验,如唯一约束
         Long machineryId = entity.getMachineryId();
         if (machineryId == null) {
@@ -166,14 +166,14 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         Long userId = LoginHelper.getUserId();
-        List<BusMachineryDetail> machineryDetailList = this.listByIds(ids);
+        List<EqpMachineryDetail> machineryDetailList = this.listByIds(ids);
         // 做一些业务上的校验,判断是否需要校验
         if (isValid) {
             // 获取机械id列表
-            List<Long> machineryIdList = machineryDetailList.stream().map(BusMachineryDetail::getMachineryId).toList();
-            List<BusMachinery> machineryList = machineryService.listByIds(machineryIdList);
+            List<Long> machineryIdList = machineryDetailList.stream().map(EqpMachineryDetail::getMachineryId).toList();
+            List<EqpMachinery> machineryList = machineryService.listByIds(machineryIdList);
             // 获取对应项目id列表
-            List<Long> projectIdList = machineryList.stream().map(BusMachinery::getProjectId).toList();
+            List<Long> projectIdList = machineryList.stream().map(EqpMachinery::getProjectId).toList();
             projectService.validAuth(projectIdList, userId);
         }
         if (machineryDetailList.size() != ids.size()) {
@@ -189,8 +189,8 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
      * @return 机械详情视图对象
      */
     @Override
-    public BusMachineryDetailVo getVo(BusMachineryDetail machineryDetail) {// 对象转封装类
-        BusMachineryDetailVo machineryDetailVo = new BusMachineryDetailVo();
+    public EqpMachineryDetailVo getVo(EqpMachineryDetail machineryDetail) {// 对象转封装类
+        EqpMachineryDetailVo machineryDetailVo = new EqpMachineryDetailVo();
         if (machineryDetail == null) {
             return machineryDetailVo;
         }
@@ -214,8 +214,8 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
      * @return 机械详情查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusMachineryDetail> buildQueryWrapper(MachineryDetailQueryReq req) {
-        LambdaQueryWrapper<BusMachineryDetail> lqw = new LambdaQueryWrapper<>();
+    public LambdaQueryWrapper<EqpMachineryDetail> buildQueryWrapper(EqpMachineryDetailQueryReq req) {
+        LambdaQueryWrapper<EqpMachineryDetail> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
         }
@@ -230,16 +230,16 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
         String remark = req.getRemark();
         Long machineryId = req.getMachineryId();
         // 模糊查询
-        lqw.like(StringUtils.isNotBlank(checkoutNumber), BusMachineryDetail::getCheckoutNumber, checkoutNumber);
-        lqw.like(StringUtils.isNotBlank(checkoutUnit), BusMachineryDetail::getCheckoutUnit, checkoutUnit);
-        lqw.like(StringUtils.isNotBlank(checkoutDate), BusMachineryDetail::getCheckoutDate, checkoutDate);
-        lqw.like(StringUtils.isNotBlank(remark), BusMachineryDetail::getRemark, remark);
+        lqw.like(StringUtils.isNotBlank(checkoutNumber), EqpMachineryDetail::getCheckoutNumber, checkoutNumber);
+        lqw.like(StringUtils.isNotBlank(checkoutUnit), EqpMachineryDetail::getCheckoutUnit, checkoutUnit);
+        lqw.like(StringUtils.isNotBlank(checkoutDate), EqpMachineryDetail::getCheckoutDate, checkoutDate);
+        lqw.like(StringUtils.isNotBlank(remark), EqpMachineryDetail::getRemark, remark);
         // 精确查询
-        lqw.eq(ObjectUtils.isNotEmpty(id), BusMachineryDetail::getId, id);
-        lqw.eq(ObjectUtils.isNotEmpty(status), BusMachineryDetail::getStatus, status);
-        lqw.eq(ObjectUtils.isNotEmpty(type), BusMachineryDetail::getType, type);
-        lqw.eq(ObjectUtils.isNotEmpty(entryTime), BusMachineryDetail::getEntryTime, entryTime);
-        lqw.eq(ObjectUtils.isNotEmpty(machineryId), BusMachineryDetail::getMachineryId, machineryId);
+        lqw.eq(ObjectUtils.isNotEmpty(id), EqpMachineryDetail::getId, id);
+        lqw.eq(ObjectUtils.isNotEmpty(status), EqpMachineryDetail::getStatus, status);
+        lqw.eq(ObjectUtils.isNotEmpty(type), EqpMachineryDetail::getType, type);
+        lqw.eq(ObjectUtils.isNotEmpty(entryTime), EqpMachineryDetail::getEntryTime, entryTime);
+        lqw.eq(ObjectUtils.isNotEmpty(machineryId), EqpMachineryDetail::getMachineryId, machineryId);
         return lqw;
     }
 
@@ -250,16 +250,16 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
      * @return 机械详情分页对象视图
      */
     @Override
-    public Page<BusMachineryDetailVo> getVoPage(Page<BusMachineryDetail> machineryDetailPage) {
-        List<BusMachineryDetail> machineryDetailList = machineryDetailPage.getRecords();
-        Page<BusMachineryDetailVo> machineryDetailVoPage = new Page<>(
+    public Page<EqpMachineryDetailVo> getVoPage(Page<EqpMachineryDetail> machineryDetailPage) {
+        List<EqpMachineryDetail> machineryDetailList = machineryDetailPage.getRecords();
+        Page<EqpMachineryDetailVo> machineryDetailVoPage = new Page<>(
             machineryDetailPage.getCurrent(),
             machineryDetailPage.getSize(),
             machineryDetailPage.getTotal());
         if (CollUtil.isEmpty(machineryDetailList)) {
             return machineryDetailVoPage;
         }
-        List<BusMachineryDetailVo> machineryDetailVoList = machineryDetailList.stream().map(this::getVo).toList();
+        List<EqpMachineryDetailVo> machineryDetailVoList = machineryDetailList.stream().map(this::getVo).toList();
         machineryDetailVoPage.setRecords(machineryDetailVoList);
         return machineryDetailVoPage;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/EqpMachineryServiceImpl.java
similarity index 72%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryServiceImpl.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/EqpMachineryServiceImpl.java
index 96dab2e2..fb9b559f 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/EqpMachineryServiceImpl.java
@@ -15,17 +15,17 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.machinery.domain.BusMachinery;
-import org.dromara.machinery.domain.BusMachineryDetail;
-import org.dromara.machinery.domain.req.machinery.MachineryCreateReq;
-import org.dromara.machinery.domain.req.machinery.MachineryGisReq;
-import org.dromara.machinery.domain.req.machinery.MachineryQueryReq;
-import org.dromara.machinery.domain.req.machinery.MachineryUpdateReq;
-import org.dromara.machinery.domain.vo.BusMachineryVo;
-import org.dromara.machinery.domain.vo.MachineryGisVo;
-import org.dromara.machinery.mapper.BusMachineryMapper;
-import org.dromara.machinery.service.IBusMachineryDetailService;
-import org.dromara.machinery.service.IBusMachineryService;
+import org.dromara.machinery.domain.EqpMachinery;
+import org.dromara.machinery.domain.EqpMachineryDetail;
+import org.dromara.machinery.domain.req.machinery.EqpMachineryCreateReq;
+import org.dromara.machinery.domain.req.machinery.EqpMachineryGisReq;
+import org.dromara.machinery.domain.req.machinery.EqpMachineryQueryReq;
+import org.dromara.machinery.domain.req.machinery.EqpMachineryUpdateReq;
+import org.dromara.machinery.domain.vo.machinery.EqpMachineryVo;
+import org.dromara.machinery.domain.vo.machinery.EqpMachineryGisVo;
+import org.dromara.machinery.mapper.EqpMachineryMapper;
+import org.dromara.machinery.service.IEqpMachineryDetailService;
+import org.dromara.machinery.service.IEqpMachineryService;
 import org.dromara.project.domain.BusProject;
 import org.dromara.project.service.IBusProjectService;
 import org.springframework.beans.BeanUtils;
@@ -43,15 +43,15 @@ import java.util.List;
  * @date 2025-03-07
  */
 @Service
-public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, BusMachinery>
-    implements IBusMachineryService {
+public class EqpMachineryServiceImpl extends ServiceImpl<EqpMachineryMapper, EqpMachinery>
+    implements IEqpMachineryService {
 
     @Resource
     private IBusProjectService projectService;
 
     @Lazy
     @Resource
-    private IBusMachineryDetailService machineryDetailService;
+    private IEqpMachineryDetailService machineryDetailService;
 
     /**
      * 查询机械
@@ -60,8 +60,8 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
      * @return 机械
      */
     @Override
-    public BusMachineryVo queryById(Long id) {
-        BusMachinery machinery = this.getById(id);
+    public EqpMachineryVo queryById(Long id) {
+        EqpMachinery machinery = this.getById(id);
         if (machinery == null) {
             throw new ServiceException("机械信息不存在", HttpStatus.NOT_FOUND);
         }
@@ -76,9 +76,9 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
      * @return 机械分页列表
      */
     @Override
-    public TableDataInfo<BusMachineryVo> queryPageList(MachineryQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<EqpMachineryVo> queryPageList(EqpMachineryQueryReq req, PageQuery pageQuery) {
         // 查询数据库
-        Page<BusMachinery> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
+        Page<EqpMachinery> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
 
@@ -89,9 +89,9 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
      * @return 机械列表
      */
     @Override
-    public List<BusMachineryVo> queryList(MachineryQueryReq req) {
-        LambdaQueryWrapper<BusMachinery> lqw = this.buildQueryWrapper(req);
-        List<BusMachinery> list = this.list(lqw);
+    public List<EqpMachineryVo> queryList(EqpMachineryQueryReq req) {
+        LambdaQueryWrapper<EqpMachinery> lqw = this.buildQueryWrapper(req);
+        List<EqpMachinery> list = this.list(lqw);
         return list.stream().map(this::getVo).toList();
     }
 
@@ -102,16 +102,16 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
      * @return 大屏数据列表
      */
     @Override
-    public List<MachineryGisVo> queryGisList(MachineryGisReq req) {
+    public List<EqpMachineryGisVo> queryGisList(EqpMachineryGisReq req) {
         Long projectId = req.getProjectId();
         BusProject project = projectService.getById(projectId);
         if (project == null) {
             throw new ServiceException("项目信息不存在", HttpStatus.NOT_FOUND);
         }
-        List<BusMachinery> list = this.lambdaQuery()
-            .eq(BusMachinery::getProjectId, projectId).list();
+        List<EqpMachinery> list = this.lambdaQuery()
+            .eq(EqpMachinery::getProjectId, projectId).list();
         return list.stream().map(machinery -> {
-            MachineryGisVo machineryGisVo = new MachineryGisVo();
+            EqpMachineryGisVo machineryGisVo = new EqpMachineryGisVo();
             machineryGisVo.setMachineryName(machinery.getMachineryName());
             machineryGisVo.setMachineryCount(machinery.getNumber());
             return machineryGisVo;
@@ -125,9 +125,9 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
      * @return 是否新增成功
      */
     @Override
-    public Long insertByBo(MachineryCreateReq req) {
+    public Long insertByBo(EqpMachineryCreateReq req) {
         // 将实体类和 DTO 进行转换
-        BusMachinery machinery = new BusMachinery();
+        EqpMachinery machinery = new EqpMachinery();
         BeanUtils.copyProperties(req, machinery);
         // 数据校验
         validEntityBeforeSave(machinery, true);
@@ -146,14 +146,14 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(MachineryUpdateReq req) {
+    public Boolean updateByBo(EqpMachineryUpdateReq req) {
         // 将实体类和 DTO 进行转换
-        BusMachinery machinery = new BusMachinery();
+        EqpMachinery machinery = new EqpMachinery();
         BeanUtils.copyProperties(req, machinery);
         // 数据校验
         validEntityBeforeSave(machinery, false);
         // 判断是否存在
-        BusMachinery oldMachinery = this.getById(machinery.getId());
+        EqpMachinery oldMachinery = this.getById(machinery.getId());
         if (oldMachinery == null) {
             throw new ServiceException("修改机械失败，数据不存在", HttpStatus.NOT_FOUND);
         }
@@ -164,7 +164,7 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(BusMachinery entity, Boolean create) {
+    private void validEntityBeforeSave(EqpMachinery entity, Boolean create) {
         // 做一些数据校验,如唯一约束
         Long projectId = entity.getProjectId();
         String machineryName = entity.getMachineryName();
@@ -206,15 +206,15 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         Long userId = LoginHelper.getUserId();
-        List<BusMachinery> machineryList = this.listByIds(ids);
+        List<EqpMachinery> machineryList = this.listByIds(ids);
         if (isValid) {
             // 做一些业务上的校验,判断是否需要校验
             // 获取项目id列表
-            List<Long> projectIdList = machineryList.stream().map(BusMachinery::getProjectId).toList();
+            List<Long> projectIdList = machineryList.stream().map(EqpMachinery::getProjectId).toList();
             // 判断是否有权限操作对应项目下的内容
             projectService.validAuth(projectIdList, userId);
             // 判断是否还存在机械详情信息
-            QueryWrapper<BusMachineryDetail> queryWrapper = new QueryWrapper<>();
+            QueryWrapper<EqpMachineryDetail> queryWrapper = new QueryWrapper<>();
             queryWrapper.in("machinery_id", ids);
             if (machineryDetailService.count(queryWrapper) > 0) {
                 throw new ServiceException("删除机械失败，机械存在机械详情信息", HttpStatus.BAD_REQUEST);
@@ -233,9 +233,9 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
      * @return 机械视图对象
      */
     @Override
-    public BusMachineryVo getVo(BusMachinery machinery) {
+    public EqpMachineryVo getVo(EqpMachinery machinery) {
         // 对象转封装类
-        BusMachineryVo machineryVo = new BusMachineryVo();
+        EqpMachineryVo machineryVo = new EqpMachineryVo();
         if (machinery == null) {
             return machineryVo;
         }
@@ -250,8 +250,8 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
      * @return 机械查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusMachinery> buildQueryWrapper(MachineryQueryReq req) {
-        LambdaQueryWrapper<BusMachinery> lqw = new LambdaQueryWrapper<>();
+    public LambdaQueryWrapper<EqpMachinery> buildQueryWrapper(EqpMachineryQueryReq req) {
+        LambdaQueryWrapper<EqpMachinery> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
         }
@@ -266,16 +266,16 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
         String provider = req.getProvider();
         String remark = req.getRemark();
         // 模糊查询
-        lqw.like(StringUtils.isNotBlank(machineryName), BusMachinery::getMachineryName, machineryName);
-        lqw.like(StringUtils.isNotBlank(principal), BusMachinery::getPrincipal, principal);
-        lqw.like(StringUtils.isNotBlank(principalPhone), BusMachinery::getPrincipalPhone, principalPhone);
-        lqw.like(StringUtils.isNotBlank(provider), BusMachinery::getProvider, provider);
-        lqw.like(StringUtils.isNotBlank(machineryNumber), BusMachinery::getMachineryNumber, machineryNumber);
-        lqw.like(StringUtils.isNotBlank(remark), BusMachinery::getRemark, remark);
+        lqw.like(StringUtils.isNotBlank(machineryName), EqpMachinery::getMachineryName, machineryName);
+        lqw.like(StringUtils.isNotBlank(principal), EqpMachinery::getPrincipal, principal);
+        lqw.like(StringUtils.isNotBlank(principalPhone), EqpMachinery::getPrincipalPhone, principalPhone);
+        lqw.like(StringUtils.isNotBlank(provider), EqpMachinery::getProvider, provider);
+        lqw.like(StringUtils.isNotBlank(machineryNumber), EqpMachinery::getMachineryNumber, machineryNumber);
+        lqw.like(StringUtils.isNotBlank(remark), EqpMachinery::getRemark, remark);
         // 精确查询
-        lqw.eq(ObjectUtils.isNotEmpty(id), BusMachinery::getId, id);
-        lqw.eq(ObjectUtils.isNotEmpty(projectId), BusMachinery::getProjectId, projectId);
-        lqw.eq(ObjectUtils.isNotEmpty(number), BusMachinery::getNumber, number);
+        lqw.eq(ObjectUtils.isNotEmpty(id), EqpMachinery::getId, id);
+        lqw.eq(ObjectUtils.isNotEmpty(projectId), EqpMachinery::getProjectId, projectId);
+        lqw.eq(ObjectUtils.isNotEmpty(number), EqpMachinery::getNumber, number);
         return lqw;
     }
 
@@ -286,16 +286,16 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
      * @return 机械分页对象视图
      */
     @Override
-    public Page<BusMachineryVo> getVoPage(Page<BusMachinery> machineryPage) {
-        List<BusMachinery> machineryList = machineryPage.getRecords();
-        Page<BusMachineryVo> machineryVoPage = new Page<>(
+    public Page<EqpMachineryVo> getVoPage(Page<EqpMachinery> machineryPage) {
+        List<EqpMachinery> machineryList = machineryPage.getRecords();
+        Page<EqpMachineryVo> machineryVoPage = new Page<>(
             machineryPage.getCurrent(),
             machineryPage.getSize(),
             machineryPage.getTotal());
         if (CollUtil.isEmpty(machineryList)) {
             return machineryVoPage;
         }
-        List<BusMachineryVo> machineryVoList = machineryList.stream().map(this::getVo).toList();
+        List<EqpMachineryVo> machineryVoList = machineryList.stream().map(this::getVo).toList();
         machineryVoPage.setRecords(machineryVoList);
         return machineryVoPage;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusCompanyController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatCompanyController.java
similarity index 76%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusCompanyController.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatCompanyController.java
index fdda9e9b..28d34253 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusCompanyController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatCompanyController.java
@@ -17,11 +17,11 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.materials.domain.req.company.CompanyCreateReq;
-import org.dromara.materials.domain.req.company.CompanyQueryReq;
-import org.dromara.materials.domain.req.company.CompanyUpdateReq;
-import org.dromara.materials.domain.vo.BusCompanyVo;
-import org.dromara.materials.service.IBusCompanyService;
+import org.dromara.materials.domain.req.company.MatCompanyCreateReq;
+import org.dromara.materials.domain.req.company.MatCompanyQueryReq;
+import org.dromara.materials.domain.req.company.MatCompanyUpdateReq;
+import org.dromara.materials.domain.vo.company.MatCompanyVo;
+import org.dromara.materials.service.IMatCompanyService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,16 +37,16 @@ import java.util.List;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/materials/company")
-public class BusCompanyController extends BaseController {
+public class MatCompanyController extends BaseController {
 
-    private final IBusCompanyService busCompanyService;
+    private final IMatCompanyService busCompanyService;
 
     /**
      * 查询公司列表
      */
     @SaCheckPermission("materials:company:list")
     @GetMapping("/list")
-    public TableDataInfo<BusCompanyVo> list(CompanyQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<MatCompanyVo> list(MatCompanyQueryReq req, PageQuery pageQuery) {
         return busCompanyService.queryPageList(req, pageQuery);
     }
 
@@ -56,9 +56,9 @@ public class BusCompanyController extends BaseController {
     @SaCheckPermission("materials:company:export")
     @Log(title = "公司", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(CompanyQueryReq req, HttpServletResponse response) {
-        List<BusCompanyVo> list = busCompanyService.queryList(req);
-        ExcelUtil.exportExcel(list, "公司", BusCompanyVo.class, response);
+    public void export(MatCompanyQueryReq req, HttpServletResponse response) {
+        List<MatCompanyVo> list = busCompanyService.queryList(req);
+        ExcelUtil.exportExcel(list, "公司", MatCompanyVo.class, response);
     }
 
     /**
@@ -68,7 +68,7 @@ public class BusCompanyController extends BaseController {
      */
     @SaCheckPermission("materials:company:query")
     @GetMapping("/{id}")
-    public R<BusCompanyVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<MatCompanyVo> getInfo(@NotNull(message = "主键不能为空")
                                    @PathVariable Long id) {
         return R.ok(busCompanyService.queryById(id));
     }
@@ -80,7 +80,7 @@ public class BusCompanyController extends BaseController {
     @Log(title = "公司", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody CompanyCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody MatCompanyCreateReq req) {
         if (req == null) {
             throw new ServiceException("参数不能为空", HttpStatus.BAD_REQUEST);
         }
@@ -94,7 +94,7 @@ public class BusCompanyController extends BaseController {
     @Log(title = "公司", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CompanyUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody MatCompanyUpdateReq req) {
         return toAjax(busCompanyService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsController.java
similarity index 73%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsController.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsController.java
index 88c2d845..4e69d299 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsController.java
@@ -15,13 +15,13 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.materials.domain.req.materials.MaterialsCreateReq;
-import org.dromara.materials.domain.req.materials.MaterialsGisReq;
-import org.dromara.materials.domain.req.materials.MaterialsQueryReq;
-import org.dromara.materials.domain.req.materials.MaterialsUpdateReq;
-import org.dromara.materials.domain.vo.BusMaterialsVo;
-import org.dromara.materials.domain.vo.MaterialsGisVo;
-import org.dromara.materials.service.IBusMaterialsService;
+import org.dromara.materials.domain.req.materials.MatMaterialsCreateReq;
+import org.dromara.materials.domain.req.materials.MatMaterialsGisReq;
+import org.dromara.materials.domain.req.materials.MatMaterialsQueryReq;
+import org.dromara.materials.domain.req.materials.MatMaterialsUpdateReq;
+import org.dromara.materials.domain.vo.materials.MatMaterialsVo;
+import org.dromara.materials.domain.vo.materials.MatMaterialsGisVo;
+import org.dromara.materials.service.IMatMaterialsService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,16 +37,16 @@ import java.util.List;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/materials/materials")
-public class BusMaterialsController extends BaseController {
+public class MatMaterialsController extends BaseController {
 
-    private final IBusMaterialsService busMaterialsService;
+    private final IMatMaterialsService busMaterialsService;
 
     /**
      * 查询材料列表
      */
     @SaCheckPermission("materials:materials:list")
     @GetMapping("/list")
-    public TableDataInfo<BusMaterialsVo> list(MaterialsQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<MatMaterialsVo> list(MatMaterialsQueryReq req, PageQuery pageQuery) {
         return busMaterialsService.queryPageList(req, pageQuery);
     }
 
@@ -56,9 +56,9 @@ public class BusMaterialsController extends BaseController {
     @SaCheckPermission("materials:materials:export")
     @Log(title = "材料", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(MaterialsQueryReq req, HttpServletResponse response) {
-        List<BusMaterialsVo> list = busMaterialsService.queryList(req);
-        ExcelUtil.exportExcel(list, "材料名称", BusMaterialsVo.class, response);
+    public void export(MatMaterialsQueryReq req, HttpServletResponse response) {
+        List<MatMaterialsVo> list = busMaterialsService.queryList(req);
+        ExcelUtil.exportExcel(list, "材料名称", MatMaterialsVo.class, response);
     }
 
     /**
@@ -66,7 +66,7 @@ public class BusMaterialsController extends BaseController {
      */
     @SaCheckPermission("materials:materials:list")
     @GetMapping("/list/gis")
-    public R<List<MaterialsGisVo>> queryGisList(MaterialsGisReq req) {
+    public R<List<MatMaterialsGisVo>> queryGisList(MatMaterialsGisReq req) {
         return R.ok(busMaterialsService.queryGisList(req));
     }
 
@@ -77,7 +77,7 @@ public class BusMaterialsController extends BaseController {
      */
     @SaCheckPermission("materials:materials:query")
     @GetMapping("/{id}")
-    public R<BusMaterialsVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<MatMaterialsVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(busMaterialsService.queryById(id));
     }
@@ -89,7 +89,7 @@ public class BusMaterialsController extends BaseController {
     @Log(title = "材料", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody MaterialsCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody MatMaterialsCreateReq req) {
         return R.ok(busMaterialsService.insertByBo(req));
     }
 
@@ -100,7 +100,7 @@ public class BusMaterialsController extends BaseController {
     @Log(title = "材料", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody MaterialsUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody MatMaterialsUpdateReq req) {
         return toAjax(busMaterialsService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsInventoryController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsInventoryController.java
similarity index 75%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsInventoryController.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsInventoryController.java
index 0c5dba28..4a5263a3 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsInventoryController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsInventoryController.java
@@ -15,11 +15,11 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.materials.domain.req.materialsinventory.MaterialsInventoryCreateReq;
-import org.dromara.materials.domain.req.materialsinventory.MaterialsInventoryQueryReq;
-import org.dromara.materials.domain.req.materialsinventory.MaterialsInventoryUpdateReq;
-import org.dromara.materials.domain.vo.BusMaterialsInventoryVo;
-import org.dromara.materials.service.IBusMaterialsInventoryService;
+import org.dromara.materials.domain.req.materialsinventory.MatMaterialsInventoryCreateReq;
+import org.dromara.materials.domain.req.materialsinventory.MatMaterialsInventoryQueryReq;
+import org.dromara.materials.domain.req.materialsinventory.MatMaterialsInventoryUpdateReq;
+import org.dromara.materials.domain.vo.materialsinventory.MatMaterialsInventoryVo;
+import org.dromara.materials.service.IMatMaterialsInventoryService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -35,16 +35,16 @@ import java.util.List;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/materials/materialsInventory")
-public class BusMaterialsInventoryController extends BaseController {
+public class MatMaterialsInventoryController extends BaseController {
 
-    private final IBusMaterialsInventoryService busMaterialsInventoryService;
+    private final IMatMaterialsInventoryService busMaterialsInventoryService;
 
     /**
      * 查询材料出/入库列表
      */
     @SaCheckPermission("materials:materialsInventory:list")
     @GetMapping("/list")
-    public TableDataInfo<BusMaterialsInventoryVo> list(MaterialsInventoryQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<MatMaterialsInventoryVo> list(MatMaterialsInventoryQueryReq req, PageQuery pageQuery) {
         return busMaterialsInventoryService.queryPageList(req, pageQuery);
     }
 
@@ -54,9 +54,9 @@ public class BusMaterialsInventoryController extends BaseController {
     @SaCheckPermission("materials:materialsInventory:export")
     @Log(title = "材料出/入库", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(MaterialsInventoryQueryReq req, HttpServletResponse response) {
-        List<BusMaterialsInventoryVo> list = busMaterialsInventoryService.queryList(req);
-        ExcelUtil.exportExcel(list, "材料出入库", BusMaterialsInventoryVo.class, response);
+    public void export(MatMaterialsInventoryQueryReq req, HttpServletResponse response) {
+        List<MatMaterialsInventoryVo> list = busMaterialsInventoryService.queryList(req);
+        ExcelUtil.exportExcel(list, "材料出入库", MatMaterialsInventoryVo.class, response);
     }
 
     /**
@@ -66,7 +66,7 @@ public class BusMaterialsInventoryController extends BaseController {
      */
     @SaCheckPermission("materials:materialsInventory:query")
     @GetMapping("/{id}")
-    public R<BusMaterialsInventoryVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<MatMaterialsInventoryVo> getInfo(@NotNull(message = "主键不能为空")
                                               @PathVariable Long id) {
         return R.ok(busMaterialsInventoryService.queryById(id));
     }
@@ -78,7 +78,7 @@ public class BusMaterialsInventoryController extends BaseController {
     @Log(title = "材料出/入库", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody MaterialsInventoryCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody MatMaterialsInventoryCreateReq req) {
         return R.ok(busMaterialsInventoryService.insertByBo(req));
     }
 
@@ -89,7 +89,7 @@ public class BusMaterialsInventoryController extends BaseController {
     @Log(title = "材料出/入库", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody MaterialsInventoryUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody MatMaterialsInventoryUpdateReq req) {
         return toAjax(busMaterialsInventoryService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusCompany.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatCompany.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusCompany.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatCompany.java
index 1103f902..b6afe5a9 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusCompany.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatCompany.java
@@ -11,15 +11,15 @@ import java.io.Serial;
 import java.util.Date;
 
 /**
- * 公司对象 bus_company
+ * 公司对象 mat_company
  *
  * @author lcj
  * @date 2025-03-06
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("bus_company")
-public class BusCompany extends BaseEntity {
+@TableName("mat_company")
+public class MatCompany extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusMaterials.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatMaterials.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusMaterials.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatMaterials.java
index 049a9066..e788cfd5 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusMaterials.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatMaterials.java
@@ -11,15 +11,15 @@ import java.io.Serial;
 import java.util.Date;
 
 /**
- * 材料名称对象 bus_materials
+ * 材料名称对象 mat_materials
  *
  * @author lcj
  * @date 2025-03-06
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("bus_materials")
-public class BusMaterials extends BaseEntity {
+@TableName("mat_materials")
+public class MatMaterials extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusMaterialsInventory.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatMaterialsInventory.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusMaterialsInventory.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatMaterialsInventory.java
index 2bbf5145..b1f1e73e 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusMaterialsInventory.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatMaterialsInventory.java
@@ -11,15 +11,15 @@ import java.io.Serial;
 import java.util.Date;
 
 /**
- * 材料出/入库对象 bus_materials_inventory
+ * 材料出/入库对象 mat_materials_inventory
  *
  * @author lcj
  * @date 2025-03-06
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("bus_materials_inventory")
-public class BusMaterialsInventory extends BaseEntity {
+@TableName("mat_materials_inventory")
+public class MatMaterialsInventory extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/enums/MaterialsInventoryOutPutEnum.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/enums/MatMaterialsInventoryOutPutEnum.java
similarity index 73%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/enums/MaterialsInventoryOutPutEnum.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/enums/MatMaterialsInventoryOutPutEnum.java
index 45897fbf..5b5ecf9e 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/enums/MaterialsInventoryOutPutEnum.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/enums/MatMaterialsInventoryOutPutEnum.java
@@ -7,7 +7,7 @@ import lombok.Getter;
  * @date 2025/4/28 11:00
  */
 @Getter
-public enum MaterialsInventoryOutPutEnum {
+public enum MatMaterialsInventoryOutPutEnum {
 
     PUT("入库", "0"),
     OUT("出库", "1");
@@ -16,7 +16,7 @@ public enum MaterialsInventoryOutPutEnum {
 
     private final String value;
 
-    MaterialsInventoryOutPutEnum(String text, String value) {
+    MatMaterialsInventoryOutPutEnum(String text, String value) {
         this.text = text;
         this.value = value;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/MatCompanyCreateReq.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/MatCompanyCreateReq.java
index e80badc4..aae25d3f 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/MatCompanyCreateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 14:05
  */
 @Data
-public class CompanyCreateReq implements Serializable {
+public class MatCompanyCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -7603153089205421154L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/MatCompanyQueryReq.java
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/MatCompanyQueryReq.java
index 66d55891..bfdbdc9d 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/MatCompanyQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 14:31
  */
 @Data
-public class CompanyQueryReq implements Serializable {
+public class MatCompanyQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 5563677643070664671L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/MatCompanyUpdateReq.java
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/MatCompanyUpdateReq.java
index f5ad0e2d..6a39ffbe 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/MatCompanyUpdateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 15:04
  */
 @Data
-public class CompanyUpdateReq implements Serializable {
+public class MatCompanyUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3431952359907567659L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsCreateReq.java
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsCreateReq.java
index 10f6bd96..0f99f86b 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsCreateReq.java
@@ -11,7 +11,7 @@ import java.util.Map;
  * @date 2025/3/5 14:05
  */
 @Data
-public class MaterialsCreateReq implements Serializable {
+public class MatMaterialsCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -7603153089205421154L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsGisReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsGisReq.java
similarity index 88%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsGisReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsGisReq.java
index 37825394..e2af5a9f 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsGisReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsGisReq.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 2025/4/28 10:38
  */
 @Data
-public class MaterialsGisReq implements Serializable {
+public class MatMaterialsGisReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -7069030786285421399L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsQueryReq.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsQueryReq.java
index 82f9cedd..a9ace79b 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsQueryReq.java
@@ -11,7 +11,7 @@ import java.util.Map;
  * @date 2025/3/5 14:31
  */
 @Data
-public class MaterialsQueryReq implements Serializable {
+public class MatMaterialsQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 5563677643070664671L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsUpdateReq.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsUpdateReq.java
index 370e4537..0bddc03f 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsUpdateReq.java
@@ -11,7 +11,7 @@ import java.util.Map;
  * @date 2025/3/5 15:04
  */
 @Data
-public class MaterialsUpdateReq implements Serializable {
+public class MatMaterialsUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3431952359907567659L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MatMaterialsInventoryCreateReq.java
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MatMaterialsInventoryCreateReq.java
index 04933c86..76a71512 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MatMaterialsInventoryCreateReq.java
@@ -11,7 +11,7 @@ import java.util.Date;
  * @date 2025/3/5 14:05
  */
 @Data
-public class MaterialsInventoryCreateReq implements Serializable {
+public class MatMaterialsInventoryCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -7603153089205421154L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MatMaterialsInventoryQueryReq.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MatMaterialsInventoryQueryReq.java
index afe82625..c7fa4188 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MatMaterialsInventoryQueryReq.java
@@ -11,7 +11,7 @@ import java.util.Date;
  * @date 2025/3/5 14:31
  */
 @Data
-public class MaterialsInventoryQueryReq implements Serializable {
+public class MatMaterialsInventoryQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 5563677643070664671L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MatMaterialsInventoryUpdateReq.java
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MatMaterialsInventoryUpdateReq.java
index 62081b93..61c8aef0 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MatMaterialsInventoryUpdateReq.java
@@ -11,7 +11,7 @@ import java.util.Date;
  * @date 2025/3/5 15:04
  */
 @Data
-public class MaterialsInventoryUpdateReq implements Serializable {
+public class MatMaterialsInventoryUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3431952359907567659L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusCompanyVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/company/MatCompanyVo.java
similarity index 87%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusCompanyVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/company/MatCompanyVo.java
index 51794ac5..9bd513da 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusCompanyVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/company/MatCompanyVo.java
@@ -1,4 +1,4 @@
-package org.dromara.materials.domain.vo;
+package org.dromara.materials.domain.vo.company;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -6,7 +6,7 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
-import org.dromara.materials.domain.BusCompany;
+import org.dromara.materials.domain.MatCompany;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -14,15 +14,15 @@ import java.util.Date;
 
 
 /**
- * 公司视图对象 bus_company
+ * 公司视图对象 mat_company
  *
  * @author lcj
  * @date 2025-03-06
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = BusCompany.class)
-public class BusCompanyVo implements Serializable {
+@AutoMapper(target = MatCompany.class)
+public class MatCompanyVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/MaterialsGisVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/materials/MatMaterialsGisVo.java
similarity index 83%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/MaterialsGisVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/materials/MatMaterialsGisVo.java
index 8de7d779..4817429a 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/MaterialsGisVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/materials/MatMaterialsGisVo.java
@@ -1,4 +1,4 @@
-package org.dromara.materials.domain.vo;
+package org.dromara.materials.domain.vo.materials;
 
 import lombok.Data;
 
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/28 10:39
  */
 @Data
-public class MaterialsGisVo implements Serializable {
+public class MatMaterialsGisVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 871786102998065916L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/materials/MatMaterialsVo.java
similarity index 85%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/materials/MatMaterialsVo.java
index 2be1c9af..fd3cdc9d 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/materials/MatMaterialsVo.java
@@ -1,4 +1,4 @@
-package org.dromara.materials.domain.vo;
+package org.dromara.materials.domain.vo.materials;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -6,7 +6,8 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
-import org.dromara.materials.domain.BusMaterials;
+import org.dromara.materials.domain.MatMaterials;
+import org.dromara.materials.domain.vo.company.MatCompanyVo;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -15,15 +16,15 @@ import java.util.Map;
 
 
 /**
- * 材料名称视图对象 bus_materials
+ * 材料名称视图对象 mat_materials
  *
  * @author lcj
  * @date 2025-03-06
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = BusMaterials.class)
-public class BusMaterialsVo implements Serializable {
+@AutoMapper(target = MatMaterials.class)
+public class MatMaterialsVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -50,7 +51,7 @@ public class BusMaterialsVo implements Serializable {
      * 公司信息
      */
     @ExcelProperty(value = "公司信息")
-    private BusCompanyVo companyVo;
+    private MatCompanyVo companyVo;
 
     /**
      * 项目id
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsInventoryVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/materialsinventory/MatMaterialsInventoryVo.java
similarity index 87%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsInventoryVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/materialsinventory/MatMaterialsInventoryVo.java
index b36e1134..07517cad 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsInventoryVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/materialsinventory/MatMaterialsInventoryVo.java
@@ -1,10 +1,10 @@
-package org.dromara.materials.domain.vo;
+package org.dromara.materials.domain.vo.materialsinventory;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.materials.domain.BusMaterialsInventory;
+import org.dromara.materials.domain.MatMaterialsInventory;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -12,15 +12,15 @@ import java.util.Date;
 
 
 /**
- * 材料出/入库视图对象 bus_materials_inventory
+ * 材料出/入库视图对象 mat_materials_inventory
  *
  * @author lcj
  * @date 2025-03-06
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = BusMaterialsInventory.class)
-public class BusMaterialsInventoryVo implements Serializable {
+@AutoMapper(target = MatMaterialsInventory.class)
+public class MatMaterialsInventoryVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/BusCompanyMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/BusCompanyMapper.java
deleted file mode 100644
index e5d1107f..00000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/BusCompanyMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.dromara.materials.mapper;
-
-import org.dromara.materials.domain.BusCompany;
-import org.dromara.materials.domain.vo.BusCompanyVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-
-/**
- * 公司Mapper接口
- *
- * @author lcj
- * @date 2025-03-06
- */
-public interface BusCompanyMapper extends BaseMapperPlus<BusCompany, BusCompanyVo> {
-
-}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/BusMaterialsInventoryMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/BusMaterialsInventoryMapper.java
deleted file mode 100644
index 1a927e00..00000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/BusMaterialsInventoryMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.dromara.materials.mapper;
-
-import org.dromara.materials.domain.BusMaterialsInventory;
-import org.dromara.materials.domain.vo.BusMaterialsInventoryVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-
-/**
- * 材料出/入库Mapper接口
- *
- * @author lcj
- * @date 2025-03-06
- */
-public interface BusMaterialsInventoryMapper extends BaseMapperPlus<BusMaterialsInventory, BusMaterialsInventoryVo> {
-
-}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/BusMaterialsMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/BusMaterialsMapper.java
deleted file mode 100644
index 44063dcc..00000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/BusMaterialsMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.dromara.materials.mapper;
-
-import org.dromara.materials.domain.BusMaterials;
-import org.dromara.materials.domain.vo.BusMaterialsVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-
-/**
- * 材料名称Mapper接口
- *
- * @author lcj
- * @date 2025-03-06
- */
-public interface BusMaterialsMapper extends BaseMapperPlus<BusMaterials, BusMaterialsVo> {
-
-}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/MatCompanyMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/MatCompanyMapper.java
new file mode 100644
index 00000000..9c82f35b
--- /dev/null
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/MatCompanyMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.materials.mapper;
+
+import org.dromara.materials.domain.MatCompany;
+import org.dromara.materials.domain.vo.company.MatCompanyVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 公司Mapper接口
+ *
+ * @author lcj
+ * @date 2025-03-06
+ */
+public interface MatCompanyMapper extends BaseMapperPlus<MatCompany, MatCompanyVo> {
+
+}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/MatMaterialsInventoryMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/MatMaterialsInventoryMapper.java
new file mode 100644
index 00000000..af3c161d
--- /dev/null
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/MatMaterialsInventoryMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.materials.mapper;
+
+import org.dromara.materials.domain.MatMaterialsInventory;
+import org.dromara.materials.domain.vo.materialsinventory.MatMaterialsInventoryVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 材料出/入库Mapper接口
+ *
+ * @author lcj
+ * @date 2025-03-06
+ */
+public interface MatMaterialsInventoryMapper extends BaseMapperPlus<MatMaterialsInventory, MatMaterialsInventoryVo> {
+
+}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/MatMaterialsMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/MatMaterialsMapper.java
new file mode 100644
index 00000000..b1756a61
--- /dev/null
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/MatMaterialsMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.materials.mapper;
+
+import org.dromara.materials.domain.MatMaterials;
+import org.dromara.materials.domain.vo.materials.MatMaterialsVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 材料名称Mapper接口
+ *
+ * @author lcj
+ * @date 2025-03-06
+ */
+public interface MatMaterialsMapper extends BaseMapperPlus<MatMaterials, MatMaterialsVo> {
+
+}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusCompanyService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatCompanyService.java
similarity index 67%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusCompanyService.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatCompanyService.java
index 724ede9a..9cd7bbd9 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusCompanyService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatCompanyService.java
@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.materials.domain.BusCompany;
-import org.dromara.materials.domain.req.company.CompanyCreateReq;
-import org.dromara.materials.domain.req.company.CompanyQueryReq;
-import org.dromara.materials.domain.req.company.CompanyUpdateReq;
-import org.dromara.materials.domain.vo.BusCompanyVo;
+import org.dromara.materials.domain.MatCompany;
+import org.dromara.materials.domain.req.company.MatCompanyCreateReq;
+import org.dromara.materials.domain.req.company.MatCompanyQueryReq;
+import org.dromara.materials.domain.req.company.MatCompanyUpdateReq;
+import org.dromara.materials.domain.vo.company.MatCompanyVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -20,7 +20,7 @@ import java.util.List;
  * @author lcj
  * @date 2025-03-06
  */
-public interface IBusCompanyService extends IService<BusCompany> {
+public interface IMatCompanyService extends IService<MatCompany> {
 
     /**
      * 查询公司
@@ -28,7 +28,7 @@ public interface IBusCompanyService extends IService<BusCompany> {
      * @param id 主键
      * @return 公司
      */
-    BusCompanyVo queryById(Long id);
+    MatCompanyVo queryById(Long id);
 
     /**
      * 分页查询公司列表
@@ -37,7 +37,7 @@ public interface IBusCompanyService extends IService<BusCompany> {
      * @param pageQuery 分页条件
      * @return 公司分页列表
      */
-    TableDataInfo<BusCompanyVo> queryPageList(CompanyQueryReq req, PageQuery pageQuery);
+    TableDataInfo<MatCompanyVo> queryPageList(MatCompanyQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的公司列表
@@ -45,7 +45,7 @@ public interface IBusCompanyService extends IService<BusCompany> {
      * @param req 查询条件
      * @return 公司列表
      */
-    List<BusCompanyVo> queryList(CompanyQueryReq req);
+    List<MatCompanyVo> queryList(MatCompanyQueryReq req);
 
     /**
      * 新增公司
@@ -53,7 +53,7 @@ public interface IBusCompanyService extends IService<BusCompany> {
      * @param req 公司
      * @return 新增公司id
      */
-    Long insertByBo(CompanyCreateReq req);
+    Long insertByBo(MatCompanyCreateReq req);
 
     /**
      * 修改公司
@@ -61,7 +61,7 @@ public interface IBusCompanyService extends IService<BusCompany> {
      * @param req 公司
      * @return 是否修改成功
      */
-    Boolean updateByBo(CompanyUpdateReq req);
+    Boolean updateByBo(MatCompanyUpdateReq req);
 
     /**
      * 校验并批量删除公司信息
@@ -78,7 +78,7 @@ public interface IBusCompanyService extends IService<BusCompany> {
      * @param company 实体对象
      * @return 封装视图对象
      */
-    BusCompanyVo getVo(BusCompany company);
+    MatCompanyVo getVo(MatCompany company);
 
     /**
      * 构建查询条件封装
@@ -86,7 +86,7 @@ public interface IBusCompanyService extends IService<BusCompany> {
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<BusCompany> buildQueryWrapper(CompanyQueryReq req);
+    LambdaQueryWrapper<MatCompany> buildQueryWrapper(MatCompanyQueryReq req);
 
     /**
      * 获取公司分页对象视图
@@ -94,5 +94,5 @@ public interface IBusCompanyService extends IService<BusCompany> {
      * @param companyPage 公司分页对象
      * @return 公司分页对象视图
      */
-    Page<BusCompanyVo> getCompanyVoPage(Page<BusCompany> companyPage);
+    Page<MatCompanyVo> getCompanyVoPage(Page<MatCompany> companyPage);
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsInventoryService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatMaterialsInventoryService.java
similarity index 64%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsInventoryService.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatMaterialsInventoryService.java
index e05b838b..fd85c8eb 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsInventoryService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatMaterialsInventoryService.java
@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.materials.domain.BusMaterialsInventory;
-import org.dromara.materials.domain.req.materialsinventory.MaterialsInventoryCreateReq;
-import org.dromara.materials.domain.req.materialsinventory.MaterialsInventoryQueryReq;
-import org.dromara.materials.domain.req.materialsinventory.MaterialsInventoryUpdateReq;
-import org.dromara.materials.domain.vo.BusMaterialsInventoryVo;
+import org.dromara.materials.domain.MatMaterialsInventory;
+import org.dromara.materials.domain.req.materialsinventory.MatMaterialsInventoryCreateReq;
+import org.dromara.materials.domain.req.materialsinventory.MatMaterialsInventoryQueryReq;
+import org.dromara.materials.domain.req.materialsinventory.MatMaterialsInventoryUpdateReq;
+import org.dromara.materials.domain.vo.materialsinventory.MatMaterialsInventoryVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -20,7 +20,7 @@ import java.util.List;
  * @author lcj
  * @date 2025-03-06
  */
-public interface IBusMaterialsInventoryService extends IService<BusMaterialsInventory> {
+public interface IMatMaterialsInventoryService extends IService<MatMaterialsInventory> {
 
     /**
      * 查询材料出/入库
@@ -28,7 +28,7 @@ public interface IBusMaterialsInventoryService extends IService<BusMaterialsInve
      * @param id 主键
      * @return 材料出/入库
      */
-    BusMaterialsInventoryVo queryById(Long id);
+    MatMaterialsInventoryVo queryById(Long id);
 
     /**
      * 分页查询材料出/入库列表
@@ -37,7 +37,7 @@ public interface IBusMaterialsInventoryService extends IService<BusMaterialsInve
      * @param pageQuery 分页参数
      * @return 材料出/入库分页列表
      */
-    TableDataInfo<BusMaterialsInventoryVo> queryPageList(MaterialsInventoryQueryReq req, PageQuery pageQuery);
+    TableDataInfo<MatMaterialsInventoryVo> queryPageList(MatMaterialsInventoryQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的材料出/入库列表
@@ -45,7 +45,7 @@ public interface IBusMaterialsInventoryService extends IService<BusMaterialsInve
      * @param req 查询条件
      * @return 材料出/入库列表
      */
-    List<BusMaterialsInventoryVo> queryList(MaterialsInventoryQueryReq req);
+    List<MatMaterialsInventoryVo> queryList(MatMaterialsInventoryQueryReq req);
 
     /**
      * 新增材料出/入库
@@ -53,7 +53,7 @@ public interface IBusMaterialsInventoryService extends IService<BusMaterialsInve
      * @param req 材料出/入库
      * @return 是否新增成功
      */
-    Long insertByBo(MaterialsInventoryCreateReq req);
+    Long insertByBo(MatMaterialsInventoryCreateReq req);
 
     /**
      * 修改材料出/入库
@@ -61,7 +61,7 @@ public interface IBusMaterialsInventoryService extends IService<BusMaterialsInve
      * @param req 材料出/入库
      * @return 是否修改成功
      */
-    Boolean updateByBo(MaterialsInventoryUpdateReq req);
+    Boolean updateByBo(MatMaterialsInventoryUpdateReq req);
 
     /**
      * 校验并批量删除材料出/入库信息
@@ -78,7 +78,7 @@ public interface IBusMaterialsInventoryService extends IService<BusMaterialsInve
      * @param MaterialsInventory 材料出/入库对象
      * @return 材料出/入库视图对象
      */
-    BusMaterialsInventoryVo getVo(BusMaterialsInventory MaterialsInventory);
+    MatMaterialsInventoryVo getVo(MatMaterialsInventory MaterialsInventory);
 
     /**
      * 构建查询条件封装
@@ -86,7 +86,7 @@ public interface IBusMaterialsInventoryService extends IService<BusMaterialsInve
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<BusMaterialsInventory> buildQueryWrapper(MaterialsInventoryQueryReq req);
+    LambdaQueryWrapper<MatMaterialsInventory> buildQueryWrapper(MatMaterialsInventoryQueryReq req);
 
     /**
      * 获取材料出/入库分页对象视图
@@ -94,6 +94,6 @@ public interface IBusMaterialsInventoryService extends IService<BusMaterialsInve
      * @param materialsInventoryPage 材料出/入库分页对象
      * @return 材料出/入库分页对象视图
      */
-    Page<BusMaterialsInventoryVo> getVoPage(Page<BusMaterialsInventory> materialsInventoryPage);
+    Page<MatMaterialsInventoryVo> getVoPage(Page<MatMaterialsInventory> materialsInventoryPage);
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatMaterialsService.java
similarity index 63%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsService.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatMaterialsService.java
index 86badc8c..d555e7d3 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatMaterialsService.java
@@ -5,13 +5,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.materials.domain.BusMaterials;
-import org.dromara.materials.domain.req.materials.MaterialsCreateReq;
-import org.dromara.materials.domain.req.materials.MaterialsGisReq;
-import org.dromara.materials.domain.req.materials.MaterialsQueryReq;
-import org.dromara.materials.domain.req.materials.MaterialsUpdateReq;
-import org.dromara.materials.domain.vo.BusMaterialsVo;
-import org.dromara.materials.domain.vo.MaterialsGisVo;
+import org.dromara.materials.domain.MatMaterials;
+import org.dromara.materials.domain.req.materials.MatMaterialsCreateReq;
+import org.dromara.materials.domain.req.materials.MatMaterialsGisReq;
+import org.dromara.materials.domain.req.materials.MatMaterialsQueryReq;
+import org.dromara.materials.domain.req.materials.MatMaterialsUpdateReq;
+import org.dromara.materials.domain.vo.materials.MatMaterialsVo;
+import org.dromara.materials.domain.vo.materials.MatMaterialsGisVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -22,7 +22,7 @@ import java.util.List;
  * @author lcj
  * @date 2025-03-06
  */
-public interface IBusMaterialsService extends IService<BusMaterials> {
+public interface IMatMaterialsService extends IService<MatMaterials> {
 
     /**
      * 查询材料名称
@@ -30,7 +30,7 @@ public interface IBusMaterialsService extends IService<BusMaterials> {
      * @param id 主键
      * @return 材料名称
      */
-    BusMaterialsVo queryById(Long id);
+    MatMaterialsVo queryById(Long id);
 
     /**
      * 分页查询材料名称列表
@@ -39,7 +39,7 @@ public interface IBusMaterialsService extends IService<BusMaterials> {
      * @param pageQuery 分页条件
      * @return 材料名称分页列表
      */
-    TableDataInfo<BusMaterialsVo> queryPageList(MaterialsQueryReq req, PageQuery pageQuery);
+    TableDataInfo<MatMaterialsVo> queryPageList(MatMaterialsQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的材料名称列表
@@ -47,7 +47,7 @@ public interface IBusMaterialsService extends IService<BusMaterials> {
      * @param req 查询条件
      * @return 材料名称列表
      */
-    List<BusMaterialsVo> queryList(MaterialsQueryReq req);
+    List<MatMaterialsVo> queryList(MatMaterialsQueryReq req);
 
     /**
      * 查询材料大屏信息列表
@@ -55,7 +55,7 @@ public interface IBusMaterialsService extends IService<BusMaterials> {
      * @param req 查询条件
      * @return 材料大屏信息列表
      */
-    List<MaterialsGisVo> queryGisList(MaterialsGisReq req);
+    List<MatMaterialsGisVo> queryGisList(MatMaterialsGisReq req);
 
     /**
      * 新增材料名称
@@ -63,7 +63,7 @@ public interface IBusMaterialsService extends IService<BusMaterials> {
      * @param req 材料名称
      * @return 是否新增成功
      */
-    Long insertByBo(MaterialsCreateReq req);
+    Long insertByBo(MatMaterialsCreateReq req);
 
     /**
      * 修改材料名称
@@ -71,7 +71,7 @@ public interface IBusMaterialsService extends IService<BusMaterials> {
      * @param req 材料名称
      * @return 是否修改成功
      */
-    Boolean updateByBo(MaterialsUpdateReq req);
+    Boolean updateByBo(MatMaterialsUpdateReq req);
 
     /**
      * 校验并批量删除材料名称信息
@@ -88,7 +88,7 @@ public interface IBusMaterialsService extends IService<BusMaterials> {
      * @param materials 材料
      * @return 材料视图
      */
-    BusMaterialsVo getBusMaterialsVo(BusMaterials materials);
+    MatMaterialsVo getBusMaterialsVo(MatMaterials materials);
 
     /**
      * 构建查询条件封装
@@ -96,7 +96,7 @@ public interface IBusMaterialsService extends IService<BusMaterials> {
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<BusMaterials> buildQueryWrapper(MaterialsQueryReq req);
+    LambdaQueryWrapper<MatMaterials> buildQueryWrapper(MatMaterialsQueryReq req);
 
     /**
      * 获取材料分页对象视图
@@ -104,5 +104,5 @@ public interface IBusMaterialsService extends IService<BusMaterials> {
      * @param materialsPage 材料分页对象
      * @return 材料分页对象视图
      */
-    Page<BusMaterialsVo> getMaterialsVoPage(Page<BusMaterials> materialsPage);
+    Page<MatMaterialsVo> getMaterialsVoPage(Page<MatMaterials> materialsPage);
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusCompanyServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatCompanyServiceImpl.java
similarity index 74%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusCompanyServiceImpl.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatCompanyServiceImpl.java
index b559cdce..e011073d 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusCompanyServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatCompanyServiceImpl.java
@@ -14,14 +14,14 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.materials.domain.BusCompany;
-import org.dromara.materials.domain.BusMaterials;
-import org.dromara.materials.domain.req.company.CompanyCreateReq;
-import org.dromara.materials.domain.req.company.CompanyQueryReq;
-import org.dromara.materials.domain.req.company.CompanyUpdateReq;
-import org.dromara.materials.domain.vo.BusCompanyVo;
-import org.dromara.materials.mapper.BusCompanyMapper;
-import org.dromara.materials.service.IBusCompanyService;
+import org.dromara.materials.domain.MatCompany;
+import org.dromara.materials.domain.MatMaterials;
+import org.dromara.materials.domain.req.company.MatCompanyCreateReq;
+import org.dromara.materials.domain.req.company.MatCompanyQueryReq;
+import org.dromara.materials.domain.req.company.MatCompanyUpdateReq;
+import org.dromara.materials.domain.vo.company.MatCompanyVo;
+import org.dromara.materials.mapper.MatCompanyMapper;
+import org.dromara.materials.service.IMatCompanyService;
 import org.dromara.project.service.IBusProjectService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
@@ -38,15 +38,15 @@ import java.util.List;
  * @date 2025-03-06
  */
 @Service
-public class BusCompanyServiceImpl extends ServiceImpl<BusCompanyMapper, BusCompany>
-    implements IBusCompanyService {
+public class MatCompanyServiceImpl extends ServiceImpl<MatCompanyMapper, MatCompany>
+    implements IMatCompanyService {
 
     @Resource
     private IBusProjectService projectService;
 
     @Lazy
     @Resource
-    private BusMaterialsServiceImpl materialService;
+    private MatMaterialsServiceImpl materialService;
 
     /**
      * 查询公司
@@ -55,8 +55,8 @@ public class BusCompanyServiceImpl extends ServiceImpl<BusCompanyMapper, BusComp
      * @return 公司
      */
     @Override
-    public BusCompanyVo queryById(Long id) {
-        BusCompany company = this.getById(id);
+    public MatCompanyVo queryById(Long id) {
+        MatCompany company = this.getById(id);
         if (company == null) {
             throw new ServiceException("对应材料提供商不存在", HttpStatus.NOT_FOUND);
         }
@@ -71,9 +71,9 @@ public class BusCompanyServiceImpl extends ServiceImpl<BusCompanyMapper, BusComp
      * @return 公司分页列表
      */
     @Override
-    public TableDataInfo<BusCompanyVo> queryPageList(CompanyQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<MatCompanyVo> queryPageList(MatCompanyQueryReq req, PageQuery pageQuery) {
         // 查询数据库
-        Page<BusCompany> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
+        Page<MatCompany> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getCompanyVoPage(result));
     }
 
@@ -84,8 +84,8 @@ public class BusCompanyServiceImpl extends ServiceImpl<BusCompanyMapper, BusComp
      * @return 公司列表
      */
     @Override
-    public List<BusCompanyVo> queryList(CompanyQueryReq req) {
-        LambdaQueryWrapper<BusCompany> lqw = this.buildQueryWrapper(req);
+    public List<MatCompanyVo> queryList(MatCompanyQueryReq req) {
+        LambdaQueryWrapper<MatCompany> lqw = this.buildQueryWrapper(req);
         return this.list(lqw).stream().map(this::getVo).toList();
     }
 
@@ -96,14 +96,14 @@ public class BusCompanyServiceImpl extends ServiceImpl<BusCompanyMapper, BusComp
      * @return 新增公司id
      */
     @Override
-    public Long insertByBo(CompanyCreateReq req) {
+    public Long insertByBo(MatCompanyCreateReq req) {
         // 将实体类和 DTO 进行转换
-        BusCompany company = new BusCompany();
+        MatCompany company = new MatCompany();
         BeanUtils.copyProperties(req, company);
         // 数据校验
         validEntityBeforeSave(company, true);
         // 公司名不能重复
-        Long count = this.lambdaQuery().eq(BusCompany::getCompanyName, req.getCompanyName()).count();
+        Long count = this.lambdaQuery().eq(MatCompany::getCompanyName, req.getCompanyName()).count();
         if (count > 0) {
             throw new ServiceException("公司名重复", HttpStatus.BAD_REQUEST);
         }
@@ -122,19 +122,19 @@ public class BusCompanyServiceImpl extends ServiceImpl<BusCompanyMapper, BusComp
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(CompanyUpdateReq req) {
+    public Boolean updateByBo(MatCompanyUpdateReq req) {
         // 将实体类和 DTO 进行转换
-        BusCompany company = new BusCompany();
+        MatCompany company = new MatCompany();
         BeanUtils.copyProperties(req, company);
         // 数据校验
         validEntityBeforeSave(company, false);
         // 判断是否存在
-        BusCompany oldCompany = this.getById(company.getId());
+        MatCompany oldCompany = this.getById(company.getId());
         if (oldCompany == null) {
             throw new ServiceException("修改公司失败，数据不存在", HttpStatus.NOT_FOUND);
         }
         if (!req.getCompanyName().equals(oldCompany.getCompanyName())) {
-            Long count = this.lambdaQuery().eq(BusCompany::getCompanyName, oldCompany.getCompanyName()).count();
+            Long count = this.lambdaQuery().eq(MatCompany::getCompanyName, oldCompany.getCompanyName()).count();
             if (count > 0) {
                 throw new ServiceException("公司名重复", HttpStatus.BAD_REQUEST);
             }
@@ -146,7 +146,7 @@ public class BusCompanyServiceImpl extends ServiceImpl<BusCompanyMapper, BusComp
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(BusCompany entity, Boolean create) {
+    private void validEntityBeforeSave(MatCompany entity, Boolean create) {
         // 做一些数据校验,如唯一约束
         String companyName = entity.getCompanyName();
         Long projectId = entity.getProjectId();
@@ -187,15 +187,15 @@ public class BusCompanyServiceImpl extends ServiceImpl<BusCompanyMapper, BusComp
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         // 获取当前登录用户
         Long userId = LoginHelper.getUserId();
-        List<BusCompany> companyList = this.listByIds(ids);
+        List<MatCompany> companyList = this.listByIds(ids);
         if (isValid) {
             // 做一些业务上的校验,判断是否需要校验
             // 获取项目id列表
-            List<Long> projectIdList = companyList.stream().map(BusCompany::getProjectId).toList();
+            List<Long> projectIdList = companyList.stream().map(MatCompany::getProjectId).toList();
             // 判断是否有权限操作对应项目下的内容
             projectService.validAuth(projectIdList, userId);
             // 判断公司中是否还存在材料信息
-            QueryWrapper<BusMaterials> queryWrapper = new QueryWrapper<>();
+            QueryWrapper<MatMaterials> queryWrapper = new QueryWrapper<>();
             queryWrapper.in("company_id", ids);
             if (materialService.count(queryWrapper) > 0) {
                 throw new ServiceException("删除公司失败，公司中存在材料信息", HttpStatus.BAD_REQUEST);
@@ -215,9 +215,9 @@ public class BusCompanyServiceImpl extends ServiceImpl<BusCompanyMapper, BusComp
      * @return 封装视图对象
      */
     @Override
-    public BusCompanyVo getVo(BusCompany company) {
+    public MatCompanyVo getVo(MatCompany company) {
         // 对象转封装类
-        BusCompanyVo companyVo = new BusCompanyVo();
+        MatCompanyVo companyVo = new MatCompanyVo();
         if (company == null) {
             return companyVo;
         }
@@ -232,8 +232,8 @@ public class BusCompanyServiceImpl extends ServiceImpl<BusCompanyMapper, BusComp
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusCompany> buildQueryWrapper(CompanyQueryReq req) {
-        LambdaQueryWrapper<BusCompany> lqw = new LambdaQueryWrapper<>();
+    public LambdaQueryWrapper<MatCompany> buildQueryWrapper(MatCompanyQueryReq req) {
+        LambdaQueryWrapper<MatCompany> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
         }
@@ -247,15 +247,15 @@ public class BusCompanyServiceImpl extends ServiceImpl<BusCompanyMapper, BusComp
         String remark = req.getRemark();
         String qualification = req.getQualification();
         // 模糊查询
-        lqw.like(StringUtils.isNotBlank(companyName), BusCompany::getCompanyName, companyName);
-        lqw.like(StringUtils.isNotBlank(principal), BusCompany::getPrincipal, principal);
-        lqw.like(StringUtils.isNotBlank(principalPhone), BusCompany::getPrincipalPhone, principalPhone);
-        lqw.like(StringUtils.isNotBlank(qualification), BusCompany::getQualification, qualification);
-        lqw.like(StringUtils.isNotBlank(remark), BusCompany::getRemark, remark);
+        lqw.like(StringUtils.isNotBlank(companyName), MatCompany::getCompanyName, companyName);
+        lqw.like(StringUtils.isNotBlank(principal), MatCompany::getPrincipal, principal);
+        lqw.like(StringUtils.isNotBlank(principalPhone), MatCompany::getPrincipalPhone, principalPhone);
+        lqw.like(StringUtils.isNotBlank(qualification), MatCompany::getQualification, qualification);
+        lqw.like(StringUtils.isNotBlank(remark), MatCompany::getRemark, remark);
         // 精确查询
-        lqw.eq(ObjectUtils.isNotEmpty(status), BusCompany::getStatus, status);
-        lqw.eq(ObjectUtils.isNotEmpty(id), BusCompany::getId, id);
-        lqw.eq(ObjectUtils.isNotEmpty(projectId), BusCompany::getProjectId, projectId);
+        lqw.eq(ObjectUtils.isNotEmpty(status), MatCompany::getStatus, status);
+        lqw.eq(ObjectUtils.isNotEmpty(id), MatCompany::getId, id);
+        lqw.eq(ObjectUtils.isNotEmpty(projectId), MatCompany::getProjectId, projectId);
         return lqw;
     }
 
@@ -266,15 +266,15 @@ public class BusCompanyServiceImpl extends ServiceImpl<BusCompanyMapper, BusComp
      * @return 公司分页对象视图
      */
     @Override
-    public Page<BusCompanyVo> getCompanyVoPage(Page<BusCompany> companyPage) {
-        List<BusCompany> companyList = companyPage.getRecords();
-        Page<BusCompanyVo> companyVoPage = new Page<>(companyPage.getCurrent(), companyPage.getSize(), companyPage.getTotal());
+    public Page<MatCompanyVo> getCompanyVoPage(Page<MatCompany> companyPage) {
+        List<MatCompany> companyList = companyPage.getRecords();
+        Page<MatCompanyVo> companyVoPage = new Page<>(companyPage.getCurrent(), companyPage.getSize(), companyPage.getTotal());
         if (CollUtil.isEmpty(companyList)) {
             return companyVoPage;
         }
         // 对象列表 => 封装对象列表
-        List<BusCompanyVo> companyVoList = companyList.stream().map(company -> {
-            BusCompanyVo companyVo = new BusCompanyVo();
+        List<MatCompanyVo> companyVoList = companyList.stream().map(company -> {
+            MatCompanyVo companyVo = new MatCompanyVo();
             BeanUtils.copyProperties(company, companyVo);
             return companyVo;
         }).toList();
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsInventoryServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsInventoryServiceImpl.java
similarity index 69%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsInventoryServiceImpl.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsInventoryServiceImpl.java
index 45e9bf89..455a8ba7 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsInventoryServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsInventoryServiceImpl.java
@@ -13,16 +13,16 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.materials.domain.BusMaterials;
-import org.dromara.materials.domain.BusMaterialsInventory;
-import org.dromara.materials.domain.enums.MaterialsInventoryOutPutEnum;
-import org.dromara.materials.domain.req.materialsinventory.MaterialsInventoryCreateReq;
-import org.dromara.materials.domain.req.materialsinventory.MaterialsInventoryQueryReq;
-import org.dromara.materials.domain.req.materialsinventory.MaterialsInventoryUpdateReq;
-import org.dromara.materials.domain.vo.BusMaterialsInventoryVo;
-import org.dromara.materials.mapper.BusMaterialsInventoryMapper;
-import org.dromara.materials.service.IBusMaterialsInventoryService;
-import org.dromara.materials.service.IBusMaterialsService;
+import org.dromara.materials.domain.MatMaterials;
+import org.dromara.materials.domain.MatMaterialsInventory;
+import org.dromara.materials.domain.enums.MatMaterialsInventoryOutPutEnum;
+import org.dromara.materials.domain.req.materialsinventory.MatMaterialsInventoryCreateReq;
+import org.dromara.materials.domain.req.materialsinventory.MatMaterialsInventoryQueryReq;
+import org.dromara.materials.domain.req.materialsinventory.MatMaterialsInventoryUpdateReq;
+import org.dromara.materials.domain.vo.materialsinventory.MatMaterialsInventoryVo;
+import org.dromara.materials.mapper.MatMaterialsInventoryMapper;
+import org.dromara.materials.service.IMatMaterialsInventoryService;
+import org.dromara.materials.service.IMatMaterialsService;
 import org.dromara.project.service.IBusProjectService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -38,11 +38,11 @@ import java.util.stream.Collectors;
  * @date 2025-03-06
  */
 @Service
-public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsInventoryMapper, BusMaterialsInventory>
-    implements IBusMaterialsInventoryService {
+public class MatMaterialsInventoryServiceImpl extends ServiceImpl<MatMaterialsInventoryMapper, MatMaterialsInventory>
+    implements IMatMaterialsInventoryService {
 
     @Resource
-    private IBusMaterialsService materialsService;
+    private IMatMaterialsService materialsService;
 
     @Resource
     private IBusProjectService projectService;
@@ -54,8 +54,8 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsIn
      * @return 材料出/入库
      */
     @Override
-    public BusMaterialsInventoryVo queryById(Long id) {
-        BusMaterialsInventory materialsInventory = this.getById(id);
+    public MatMaterialsInventoryVo queryById(Long id) {
+        MatMaterialsInventory materialsInventory = this.getById(id);
         if (materialsInventory == null) {
             throw new ServiceException("材料出/入库信息不存在", HttpStatus.NOT_FOUND);
         }
@@ -69,9 +69,9 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsIn
      * @return 材料出/入库分页列表
      */
     @Override
-    public TableDataInfo<BusMaterialsInventoryVo> queryPageList(MaterialsInventoryQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<MatMaterialsInventoryVo> queryPageList(MatMaterialsInventoryQueryReq req, PageQuery pageQuery) {
         // 查询数据库
-        Page<BusMaterialsInventory> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
+        Page<MatMaterialsInventory> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
 
@@ -82,9 +82,9 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsIn
      * @return 材料出/入库列表
      */
     @Override
-    public List<BusMaterialsInventoryVo> queryList(MaterialsInventoryQueryReq req) {
-        LambdaQueryWrapper<BusMaterialsInventory> lqw = this.buildQueryWrapper(req);
-        List<BusMaterialsInventory> list = this.list(lqw);
+    public List<MatMaterialsInventoryVo> queryList(MatMaterialsInventoryQueryReq req) {
+        LambdaQueryWrapper<MatMaterialsInventory> lqw = this.buildQueryWrapper(req);
+        List<MatMaterialsInventory> list = this.list(lqw);
         return list.stream().map(this::getVo).toList();
     }
 
@@ -95,20 +95,20 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsIn
      * @return 是否新增成功
      */
     @Override
-    public Long insertByBo(MaterialsInventoryCreateReq req) {
+    public Long insertByBo(MatMaterialsInventoryCreateReq req) {
         // 将实体类和 DTO 进行转换
-        BusMaterialsInventory materialsInventory = new BusMaterialsInventory();
+        MatMaterialsInventory materialsInventory = new MatMaterialsInventory();
         BeanUtils.copyProperties(req, materialsInventory);
         // 数据校验
         validEntityBeforeSave(materialsInventory, true);
         // 获取最后一次库存数量
-        BusMaterialsInventory lastMaterialsInventory = this.getOne(Wrappers.<BusMaterialsInventory>lambdaQuery()
-            .eq(BusMaterialsInventory::getMaterialsId, req.getMaterialsId())
-            .eq(BusMaterialsInventory::getProjectId, req.getProjectId())
-            .orderByDesc(BusMaterialsInventory::getCreateTime)
+        MatMaterialsInventory lastMaterialsInventory = this.getOne(Wrappers.<MatMaterialsInventory>lambdaQuery()
+            .eq(MatMaterialsInventory::getMaterialsId, req.getMaterialsId())
+            .eq(MatMaterialsInventory::getProjectId, req.getProjectId())
+            .orderByDesc(MatMaterialsInventory::getCreateTime)
             .last("limit 1"));
         if (lastMaterialsInventory != null) {
-            if (MaterialsInventoryOutPutEnum.OUT.getValue().equals(req.getOutPut())) {
+            if (MatMaterialsInventoryOutPutEnum.OUT.getValue().equals(req.getOutPut())) {
                 long left = lastMaterialsInventory.getResidue() - req.getNumber();
                 if (left < 0) {
                     throw new ServiceException("库存不足", HttpStatus.BAD_REQUEST);
@@ -135,14 +135,14 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsIn
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(MaterialsInventoryUpdateReq req) {
+    public Boolean updateByBo(MatMaterialsInventoryUpdateReq req) {
         // 将实体类和 DTO 进行转换
-        BusMaterialsInventory materialsInventory = new BusMaterialsInventory();
+        MatMaterialsInventory materialsInventory = new MatMaterialsInventory();
         BeanUtils.copyProperties(req, materialsInventory);
         // 数据校验
         validEntityBeforeSave(materialsInventory, false);
         // 判断是否存在
-        BusMaterialsInventory oldBusMaterialsInventory = this.getById(materialsInventory.getId());
+        MatMaterialsInventory oldBusMaterialsInventory = this.getById(materialsInventory.getId());
         if (oldBusMaterialsInventory == null) {
             throw new ServiceException("修改材料出/入库失败，数据不存在", HttpStatus.NOT_FOUND);
         }
@@ -153,7 +153,7 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsIn
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(BusMaterialsInventory entity, Boolean create) {
+    private void validEntityBeforeSave(MatMaterialsInventory entity, Boolean create) {
         Long materialsId = entity.getMaterialsId();
         Long projectId = entity.getProjectId();
         String outPut = entity.getOutPut();
@@ -192,11 +192,11 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsIn
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         // 获取当前登录用户
         Long userId = LoginHelper.getUserId();
-        List<BusMaterialsInventory> materialsInventoryList = this.listByIds(ids);
+        List<MatMaterialsInventory> materialsInventoryList = this.listByIds(ids);
         if (isValid) {
             // 做一些业务上的校验,判断是否需要校验
             // 获取项目id列表
-            List<Long> projectIdList = materialsInventoryList.stream().map(BusMaterialsInventory::getProjectId).toList();
+            List<Long> projectIdList = materialsInventoryList.stream().map(MatMaterialsInventory::getProjectId).toList();
             // 判断是否有权限操作对应项目下的内容
             projectService.validAuth(projectIdList, userId);
         }
@@ -214,9 +214,9 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsIn
      * @return 材料出/入库视图对象
      */
     @Override
-    public BusMaterialsInventoryVo getVo(BusMaterialsInventory materialsInventory) {
+    public MatMaterialsInventoryVo getVo(MatMaterialsInventory materialsInventory) {
         // 对象转封装类
-        BusMaterialsInventoryVo materialsInventoryVo = new BusMaterialsInventoryVo();
+        MatMaterialsInventoryVo materialsInventoryVo = new MatMaterialsInventoryVo();
         if (materialsInventory == null) {
             return materialsInventoryVo;
         }
@@ -236,8 +236,8 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsIn
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusMaterialsInventory> buildQueryWrapper(MaterialsInventoryQueryReq req) {
-        LambdaQueryWrapper<BusMaterialsInventory> lqw = new LambdaQueryWrapper<>();
+    public LambdaQueryWrapper<MatMaterialsInventory> buildQueryWrapper(MatMaterialsInventoryQueryReq req) {
+        LambdaQueryWrapper<MatMaterialsInventory> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
         }
@@ -257,28 +257,28 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsIn
         String remark = req.getRemark();
         // 联表查询
         if (StringUtils.isNotBlank(materialsName)) {
-            LambdaQueryWrapper<BusMaterials> materialsQueryWrapper = Wrappers.lambdaQuery(BusMaterials.class)
-                .select(BusMaterials::getId)
-                .like(BusMaterials::getMaterialsName, materialsName);
+            LambdaQueryWrapper<MatMaterials> materialsQueryWrapper = Wrappers.lambdaQuery(MatMaterials.class)
+                .select(MatMaterials::getId)
+                .like(MatMaterials::getMaterialsName, materialsName);
             List<Long> materialsIdList = materialsService.listObjs(materialsQueryWrapper, obj -> (Long) obj);
-            lqw.in(BusMaterialsInventory::getMaterialsId, materialsIdList);
+            lqw.in(MatMaterialsInventory::getMaterialsId, materialsIdList);
         }
         // 模糊查询
-        lqw.like(StringUtils.isNotBlank(operator), BusMaterialsInventory::getOperator, operator);
-        lqw.like(StringUtils.isNotBlank(remark), BusMaterialsInventory::getRemark, remark);
-        lqw.like(StringUtils.isNotBlank(disposition), BusMaterialsInventory::getDisposition, disposition);
-        lqw.like(StringUtils.isNotBlank(recipient), BusMaterialsInventory::getRecipient, recipient);
-        lqw.like(StringUtils.isNotBlank(shipper), BusMaterialsInventory::getShipper, shipper);
+        lqw.like(StringUtils.isNotBlank(operator), MatMaterialsInventory::getOperator, operator);
+        lqw.like(StringUtils.isNotBlank(remark), MatMaterialsInventory::getRemark, remark);
+        lqw.like(StringUtils.isNotBlank(disposition), MatMaterialsInventory::getDisposition, disposition);
+        lqw.like(StringUtils.isNotBlank(recipient), MatMaterialsInventory::getRecipient, recipient);
+        lqw.like(StringUtils.isNotBlank(shipper), MatMaterialsInventory::getShipper, shipper);
         // 精确查询
-        lqw.eq(ObjectUtils.isNotEmpty(id), BusMaterialsInventory::getId, id);
-        lqw.eq(ObjectUtils.isNotEmpty(projectId), BusMaterialsInventory::getProjectId, projectId);
-        lqw.eq(ObjectUtils.isNotEmpty(materialsId), BusMaterialsInventory::getMaterialsId, materialsId);
-        lqw.eq(ObjectUtils.isNotEmpty(number), BusMaterialsInventory::getNumber, number);
-        lqw.eq(ObjectUtils.isNotEmpty(outPutTime), BusMaterialsInventory::getOutPutTime, outPutTime);
-        lqw.eq(ObjectUtils.isNotEmpty(residue), BusMaterialsInventory::getResidue, residue);
-        lqw.eq(ObjectUtils.isNotEmpty(outPut), BusMaterialsInventory::getOutPut, outPut);
+        lqw.eq(ObjectUtils.isNotEmpty(id), MatMaterialsInventory::getId, id);
+        lqw.eq(ObjectUtils.isNotEmpty(projectId), MatMaterialsInventory::getProjectId, projectId);
+        lqw.eq(ObjectUtils.isNotEmpty(materialsId), MatMaterialsInventory::getMaterialsId, materialsId);
+        lqw.eq(ObjectUtils.isNotEmpty(number), MatMaterialsInventory::getNumber, number);
+        lqw.eq(ObjectUtils.isNotEmpty(outPutTime), MatMaterialsInventory::getOutPutTime, outPutTime);
+        lqw.eq(ObjectUtils.isNotEmpty(residue), MatMaterialsInventory::getResidue, residue);
+        lqw.eq(ObjectUtils.isNotEmpty(outPut), MatMaterialsInventory::getOutPut, outPut);
         // 排序
-        lqw.orderByDesc(BusMaterialsInventory::getCreateTime);
+        lqw.orderByDesc(MatMaterialsInventory::getCreateTime);
         return lqw;
     }
 
@@ -289,9 +289,9 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsIn
      * @return 材料出/入库分页对象视图
      */
     @Override
-    public Page<BusMaterialsInventoryVo> getVoPage(Page<BusMaterialsInventory> materialsInventoryPage) {
-        List<BusMaterialsInventory> materialsInventoryList = materialsInventoryPage.getRecords();
-        Page<BusMaterialsInventoryVo> materialsInventoryVoPage = new Page<>(
+    public Page<MatMaterialsInventoryVo> getVoPage(Page<MatMaterialsInventory> materialsInventoryPage) {
+        List<MatMaterialsInventory> materialsInventoryList = materialsInventoryPage.getRecords();
+        Page<MatMaterialsInventoryVo> materialsInventoryVoPage = new Page<>(
             materialsInventoryPage.getCurrent(),
             materialsInventoryPage.getSize(),
             materialsInventoryPage.getTotal());
@@ -299,12 +299,12 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsIn
             return materialsInventoryVoPage;
         }
         // 获取材料id列表
-        Set<Long> materialsIdList = materialsInventoryList.stream().map(BusMaterialsInventory::getMaterialsId).collect(Collectors.toSet());
-        Map<Long, List<BusMaterials>> materialsIdBusMaterialsMap = materialsService.listByIds(materialsIdList).stream()
-            .collect(Collectors.groupingBy(BusMaterials::getId));
+        Set<Long> materialsIdList = materialsInventoryList.stream().map(MatMaterialsInventory::getMaterialsId).collect(Collectors.toSet());
+        Map<Long, List<MatMaterials>> materialsIdBusMaterialsMap = materialsService.listByIds(materialsIdList).stream()
+            .collect(Collectors.groupingBy(MatMaterials::getId));
         // 对象列表 => 封装对象列表
-        List<BusMaterialsInventoryVo> materialsInventoryVoList = materialsInventoryList.stream().map(materialsInventory -> {
-            BusMaterialsInventoryVo materialsInventoryVo = new BusMaterialsInventoryVo();
+        List<MatMaterialsInventoryVo> materialsInventoryVoList = materialsInventoryList.stream().map(materialsInventory -> {
+            MatMaterialsInventoryVo materialsInventoryVo = new MatMaterialsInventoryVo();
             BeanUtils.copyProperties(materialsInventory, materialsInventoryVo);
             // 关联查询材料信息
             Long materialsId = materialsInventory.getMaterialsId();
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsServiceImpl.java
similarity index 71%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsServiceImpl.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsServiceImpl.java
index 53fefef0..e806e4a1 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsServiceImpl.java
@@ -16,19 +16,19 @@ import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.materials.domain.BusMaterials;
-import org.dromara.materials.domain.BusMaterialsInventory;
-import org.dromara.materials.domain.enums.MaterialsInventoryOutPutEnum;
-import org.dromara.materials.domain.req.materials.MaterialsCreateReq;
-import org.dromara.materials.domain.req.materials.MaterialsGisReq;
-import org.dromara.materials.domain.req.materials.MaterialsQueryReq;
-import org.dromara.materials.domain.req.materials.MaterialsUpdateReq;
-import org.dromara.materials.domain.vo.BusMaterialsVo;
-import org.dromara.materials.domain.vo.MaterialsGisVo;
-import org.dromara.materials.mapper.BusMaterialsMapper;
-import org.dromara.materials.service.IBusCompanyService;
-import org.dromara.materials.service.IBusMaterialsInventoryService;
-import org.dromara.materials.service.IBusMaterialsService;
+import org.dromara.materials.domain.MatMaterials;
+import org.dromara.materials.domain.MatMaterialsInventory;
+import org.dromara.materials.domain.enums.MatMaterialsInventoryOutPutEnum;
+import org.dromara.materials.domain.req.materials.MatMaterialsCreateReq;
+import org.dromara.materials.domain.req.materials.MatMaterialsGisReq;
+import org.dromara.materials.domain.req.materials.MatMaterialsQueryReq;
+import org.dromara.materials.domain.req.materials.MatMaterialsUpdateReq;
+import org.dromara.materials.domain.vo.materials.MatMaterialsVo;
+import org.dromara.materials.domain.vo.materials.MatMaterialsGisVo;
+import org.dromara.materials.mapper.MatMaterialsMapper;
+import org.dromara.materials.service.IMatCompanyService;
+import org.dromara.materials.service.IMatMaterialsInventoryService;
+import org.dromara.materials.service.IMatMaterialsService;
 import org.dromara.project.domain.BusProject;
 import org.dromara.project.service.IBusProjectService;
 import org.springframework.beans.BeanUtils;
@@ -48,18 +48,18 @@ import java.util.stream.Collectors;
  * @date 2025-03-06
  */
 @Service
-public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, BusMaterials>
-    implements IBusMaterialsService {
+public class MatMaterialsServiceImpl extends ServiceImpl<MatMaterialsMapper, MatMaterials>
+    implements IMatMaterialsService {
 
     @Resource
-    private IBusCompanyService companyService;
+    private IMatCompanyService companyService;
 
     @Resource
     private IBusProjectService projectService;
 
     @Lazy
     @Resource
-    private IBusMaterialsInventoryService materialsInventoryService;
+    private IMatMaterialsInventoryService materialsInventoryService;
 
     /**
      * 查询材料名称
@@ -68,8 +68,8 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
      * @return 材料名称
      */
     @Override
-    public BusMaterialsVo queryById(Long id) {
-        BusMaterials materials = this.getById(id);
+    public MatMaterialsVo queryById(Long id) {
+        MatMaterials materials = this.getById(id);
         if (materials == null) {
             throw new ServiceException("材料名称信息不存在", HttpStatus.NOT_FOUND);
         }
@@ -84,9 +84,9 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
      * @return 材料名称分页列表
      */
     @Override
-    public TableDataInfo<BusMaterialsVo> queryPageList(MaterialsQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<MatMaterialsVo> queryPageList(MatMaterialsQueryReq req, PageQuery pageQuery) {
         // 查询数据库
-        Page<BusMaterials> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
+        Page<MatMaterials> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getMaterialsVoPage(result));
     }
 
@@ -97,8 +97,8 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
      * @return 材料名称列表
      */
     @Override
-    public List<BusMaterialsVo> queryList(MaterialsQueryReq req) {
-        LambdaQueryWrapper<BusMaterials> lqw = this.buildQueryWrapper(req);
+    public List<MatMaterialsVo> queryList(MatMaterialsQueryReq req) {
+        LambdaQueryWrapper<MatMaterials> lqw = this.buildQueryWrapper(req);
         return baseMapper.selectVoList(lqw);
     }
 
@@ -109,33 +109,33 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
      * @return 材料大屏信息列表
      */
     @Override
-    public List<MaterialsGisVo> queryGisList(MaterialsGisReq req) {
+    public List<MatMaterialsGisVo> queryGisList(MatMaterialsGisReq req) {
         Long projectId = req.getProjectId();
         BusProject project = projectService.getById(projectId);
         if (project == null) {
             throw new ServiceException("项目信息不存在", HttpStatus.NOT_FOUND);
         }
-        List<BusMaterials> materialsList = this.lambdaQuery()
-            .eq(BusMaterials::getProjectId, projectId).list();
+        List<MatMaterials> materialsList = this.lambdaQuery()
+            .eq(MatMaterials::getProjectId, projectId).list();
         if (CollUtil.isEmpty(materialsList)) {
             return List.of();
         }
-        List<BusMaterialsInventory> materialsInventoryList = materialsInventoryService.lambdaQuery()
-            .eq(BusMaterialsInventory::getProjectId, projectId).list();
-        Map<Long, List<BusMaterialsInventory>> inventoryMap = materialsInventoryList.stream()
-            .collect(Collectors.groupingBy(BusMaterialsInventory::getMaterialsId));
+        List<MatMaterialsInventory> materialsInventoryList = materialsInventoryService.lambdaQuery()
+            .eq(MatMaterialsInventory::getProjectId, projectId).list();
+        Map<Long, List<MatMaterialsInventory>> inventoryMap = materialsInventoryList.stream()
+            .collect(Collectors.groupingBy(MatMaterialsInventory::getMaterialsId));
         return materialsList.stream().map(materials -> {
-            MaterialsGisVo materialsGisVo = new MaterialsGisVo();
+            MatMaterialsGisVo materialsGisVo = new MatMaterialsGisVo();
             BeanUtils.copyProperties(materials, materialsGisVo);
             Long id = materials.getId();
             long putCount = 0L;
             long outCount = 0L;
             if (CollUtil.isNotEmpty(inventoryMap) && inventoryMap.containsKey(id)) {
-                List<BusMaterialsInventory> inventoryList = inventoryMap.get(id);
-                for (BusMaterialsInventory record : inventoryList) {
-                    if (MaterialsInventoryOutPutEnum.PUT.getValue().equals(record.getOutPut())) {
+                List<MatMaterialsInventory> inventoryList = inventoryMap.get(id);
+                for (MatMaterialsInventory record : inventoryList) {
+                    if (MatMaterialsInventoryOutPutEnum.PUT.getValue().equals(record.getOutPut())) {
                         putCount += record.getNumber() != null ? record.getNumber() : 0;
-                    } else if (MaterialsInventoryOutPutEnum.OUT.getValue().equals(record.getOutPut())) {
+                    } else if (MatMaterialsInventoryOutPutEnum.OUT.getValue().equals(record.getOutPut())) {
                         outCount += record.getNumber() != null ? record.getNumber() : 0;
                     }
                 }
@@ -153,9 +153,9 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
      * @return 新增材料信息id
      */
     @Override
-    public Long insertByBo(MaterialsCreateReq req) {
+    public Long insertByBo(MatMaterialsCreateReq req) {
         // 将实体类和 DTO 进行转换
-        BusMaterials materials = new BusMaterials();
+        MatMaterials materials = new MatMaterials();
         BeanUtils.copyProperties(req, materials);
         // 数据转换
         Map<String, Long> fileOssIdList = req.getFileOssIdMap();
@@ -179,9 +179,9 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(MaterialsUpdateReq req) {
+    public Boolean updateByBo(MatMaterialsUpdateReq req) {
         // 将实体类和 DTO 进行转换
-        BusMaterials materials = new BusMaterials();
+        MatMaterials materials = new MatMaterials();
         BeanUtils.copyProperties(req, materials);
         // 数据转换
         Map<String, Long> fileOssIdList = req.getFileOssIdMap();
@@ -190,7 +190,7 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
         // 数据校验
         validEntityBeforeSave(materials);
         // 判断是否存在
-        BusMaterials oldMaterials = this.getById(materials.getId());
+        MatMaterials oldMaterials = this.getById(materials.getId());
         if (oldMaterials == null) {
             throw new ServiceException("修改材料信息失败，数据不存在", HttpStatus.NOT_FOUND);
         }
@@ -201,7 +201,7 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(BusMaterials entity) {
+    private void validEntityBeforeSave(MatMaterials entity) {
         // 做一些数据校验,如唯一约束
         String materialsName = entity.getMaterialsName();
         Long companyId = entity.getCompanyId();
@@ -233,15 +233,15 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         Long userId = LoginHelper.getUserId();
-        List<BusMaterials> materialsList = this.listByIds(ids);
+        List<MatMaterials> materialsList = this.listByIds(ids);
         if (isValid) {
             // 做一些业务上的校验,判断是否需要校验
             // 获取项目id列表
-            List<Long> projectIdList = materialsList.stream().map(BusMaterials::getProjectId).toList();
+            List<Long> projectIdList = materialsList.stream().map(MatMaterials::getProjectId).toList();
             // 判断是否有权限操作对应项目下的内容
             projectService.validAuth(projectIdList, userId);
             // 判断公司中是否还存在材料信息
-            QueryWrapper<BusMaterialsInventory> queryWrapper = new QueryWrapper<>();
+            QueryWrapper<MatMaterialsInventory> queryWrapper = new QueryWrapper<>();
             queryWrapper.in("materials", ids);
             if (materialsInventoryService.count(queryWrapper) > 0) {
                 throw new ServiceException("删除材料失败，材料存在库存信息", HttpStatus.BAD_REQUEST);
@@ -260,9 +260,9 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
      * @return 材料视图
      */
     @Override
-    public BusMaterialsVo getBusMaterialsVo(BusMaterials materials) {
+    public MatMaterialsVo getBusMaterialsVo(MatMaterials materials) {
         // 对象转封装类
-        BusMaterialsVo materialsVo = new BusMaterialsVo();
+        MatMaterialsVo materialsVo = new MatMaterialsVo();
         if (materials == null) {
             return materialsVo;
         }
@@ -291,8 +291,8 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusMaterials> buildQueryWrapper(MaterialsQueryReq req) {
-        LambdaQueryWrapper<BusMaterials> lqw = new LambdaQueryWrapper<>();
+    public LambdaQueryWrapper<MatMaterials> buildQueryWrapper(MatMaterialsQueryReq req) {
+        LambdaQueryWrapper<MatMaterials> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
         }
@@ -308,17 +308,17 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
         String quantityCount = req.getQuantityCount();
         String status = req.getStatus();
         // 模糊查询
-        lqw.like(StringUtils.isNotBlank(materialsName), BusMaterials::getMaterialsName, materialsName);
-        lqw.like(StringUtils.isNotBlank(typeSpecificationName), BusMaterials::getTypeSpecificationName, typeSpecificationName);
-        lqw.like(StringUtils.isNotBlank(usePart), BusMaterials::getUsePart, usePart);
-        lqw.like(StringUtils.isNotBlank(remark), BusMaterials::getRemark, remark);
-        lqw.like(StringUtils.isNotBlank(weightId), BusMaterials::getWeightId, weightId);
-        lqw.like(StringUtils.isNotBlank(quantityCount), BusMaterials::getQuantityCount, quantityCount);
+        lqw.like(StringUtils.isNotBlank(materialsName), MatMaterials::getMaterialsName, materialsName);
+        lqw.like(StringUtils.isNotBlank(typeSpecificationName), MatMaterials::getTypeSpecificationName, typeSpecificationName);
+        lqw.like(StringUtils.isNotBlank(usePart), MatMaterials::getUsePart, usePart);
+        lqw.like(StringUtils.isNotBlank(remark), MatMaterials::getRemark, remark);
+        lqw.like(StringUtils.isNotBlank(weightId), MatMaterials::getWeightId, weightId);
+        lqw.like(StringUtils.isNotBlank(quantityCount), MatMaterials::getQuantityCount, quantityCount);
         // 精确查询
-        lqw.eq(ObjectUtils.isNotEmpty(status), BusMaterials::getStatus, status);
-        lqw.eq(ObjectUtils.isNotEmpty(id), BusMaterials::getId, id);
-        lqw.eq(ObjectUtils.isNotEmpty(projectId), BusMaterials::getProjectId, projectId);
-        lqw.eq(ObjectUtils.isNotEmpty(companyId), BusMaterials::getCompanyId, companyId);
+        lqw.eq(ObjectUtils.isNotEmpty(status), MatMaterials::getStatus, status);
+        lqw.eq(ObjectUtils.isNotEmpty(id), MatMaterials::getId, id);
+        lqw.eq(ObjectUtils.isNotEmpty(projectId), MatMaterials::getProjectId, projectId);
+        lqw.eq(ObjectUtils.isNotEmpty(companyId), MatMaterials::getCompanyId, companyId);
         return lqw;
     }
 
@@ -329,16 +329,16 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
      * @return 材料分页对象视图
      */
     @Override
-    public Page<BusMaterialsVo> getMaterialsVoPage(Page<BusMaterials> materialsPage) {
+    public Page<MatMaterialsVo> getMaterialsVoPage(Page<MatMaterials> materialsPage) {
         // 获取材料数据
-        List<BusMaterials> materialsList = materialsPage.getRecords();
+        List<MatMaterials> materialsList = materialsPage.getRecords();
         // 添加分页信息
-        Page<BusMaterialsVo> materialsVoPage = new Page<>(materialsPage.getCurrent(), materialsPage.getSize(), materialsPage.getTotal());
+        Page<MatMaterialsVo> materialsVoPage = new Page<>(materialsPage.getCurrent(), materialsPage.getSize(), materialsPage.getTotal());
         if (CollUtil.isEmpty(materialsList)) {
             return materialsVoPage;
         }
         // 对象列表 => 封装对象列表
-        List<BusMaterialsVo> materialsVoList = materialsList.stream().map(this::getBusMaterialsVo).toList();
+        List<MatMaterialsVo> materialsVoList = materialsList.stream().map(this::getBusMaterialsVo).toList();
         materialsVoPage.setRecords(materialsVoList);
         return materialsVoPage;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/constant/ConstructionUserConstant.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/constant/BusConstructionUserConstant.java
similarity index 80%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/constant/ConstructionUserConstant.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/constant/BusConstructionUserConstant.java
index d59140ce..4db5159b 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/constant/ConstructionUserConstant.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/constant/BusConstructionUserConstant.java
@@ -4,7 +4,7 @@ package org.dromara.project.constant;
  * @author lcj
  * @date 2025/4/2 17:18
  */
-public interface ConstructionUserConstant {
+public interface BusConstructionUserConstant {
 
     /**
      * 施工人员文件类型字典
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceController.java
index d0457b9a..6542b79c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceController.java
@@ -11,12 +11,12 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.project.domain.req.attendance.AttendanceMonthByUserIdReq;
-import org.dromara.project.domain.req.attendance.AttendanceQueryReq;
-import org.dromara.project.domain.req.attendance.AttendanceQueryTwoWeekReq;
-import org.dromara.project.domain.resp.attendance.AttendanceClockDateForTwoWeekResp;
-import org.dromara.project.domain.resp.attendance.AttendanceMonthByUserIdResp;
-import org.dromara.project.domain.vo.BusAttendanceVo;
+import org.dromara.project.domain.req.attendance.BusAttendanceMonthByUserIdReq;
+import org.dromara.project.domain.req.attendance.BusAttendanceQueryReq;
+import org.dromara.project.domain.req.attendance.BusAttendanceQueryTwoWeekReq;
+import org.dromara.project.domain.vo.attendance.BusAttendanceClockDateForTwoWeekVo;
+import org.dromara.project.domain.vo.attendance.BusAttendanceMonthByUserIdVo;
+import org.dromara.project.domain.vo.attendance.BusAttendanceVo;
 import org.dromara.project.service.IBusAttendanceService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -42,7 +42,7 @@ public class BusAttendanceController extends BaseController {
      */
     @SaCheckPermission("project:attendance:list")
     @GetMapping("/list")
-    public TableDataInfo<BusAttendanceVo> list(AttendanceQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusAttendanceVo> list(BusAttendanceQueryReq req, PageQuery pageQuery) {
         return busAttendanceService.queryPageList(req, pageQuery);
     }
 
@@ -51,7 +51,7 @@ public class BusAttendanceController extends BaseController {
      */
     @SaCheckPermission("project:attendance:list")
     @GetMapping("/list/clockDate/twoWeek")
-    public R<List<AttendanceClockDateForTwoWeekResp>> listClockDateForTwoWeek(AttendanceQueryTwoWeekReq req) {
+    public R<List<BusAttendanceClockDateForTwoWeekVo>> listClockDateForTwoWeek(BusAttendanceQueryTwoWeekReq req) {
         return R.ok(busAttendanceService.listClockDateForTwoWeek(req));
     }
 
@@ -60,7 +60,7 @@ public class BusAttendanceController extends BaseController {
      */
     @SaCheckPermission("project:attendance:list")
     @GetMapping("/list/month/byUserId")
-    public R<List<AttendanceMonthByUserIdResp>> listAttendanceMonthListByUserId(AttendanceMonthByUserIdReq req) {
+    public R<List<BusAttendanceMonthByUserIdVo>> listAttendanceMonthListByUserId(BusAttendanceMonthByUserIdReq req) {
         return R.ok(busAttendanceService.listAttendanceMonthListByUserId(req));
     }
 
@@ -70,7 +70,7 @@ public class BusAttendanceController extends BaseController {
     @SaCheckPermission("project:attendance:export")
     @Log(title = "考勤", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(AttendanceQueryReq req, HttpServletResponse response) {
+    public void export(BusAttendanceQueryReq req, HttpServletResponse response) {
         List<BusAttendanceVo> list = busAttendanceService.queryList(req);
         ExcelUtil.exportExcel(list, "考勤", BusAttendanceVo.class, response);
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionBlacklistController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionBlacklistController.java
index 23a674a4..efa90df9 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionBlacklistController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionBlacklistController.java
@@ -14,9 +14,9 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.project.domain.req.constructionblacklist.ConstructionBlacklistCreateReq;
-import org.dromara.project.domain.req.constructionblacklist.ConstructionBlacklistQueryReq;
-import org.dromara.project.domain.vo.BusConstructionBlacklistVo;
+import org.dromara.project.domain.req.constructionblacklist.BusConstructionBlacklistCreateReq;
+import org.dromara.project.domain.req.constructionblacklist.BusConstructionBlacklistQueryReq;
+import org.dromara.project.domain.vo.constructionblacklist.BusConstructionBlacklistVo;
 import org.dromara.project.service.IBusConstructionBlacklistService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -42,7 +42,7 @@ public class BusConstructionBlacklistController extends BaseController {
      */
     @SaCheckPermission("project:constructionBlacklist:list")
     @GetMapping("/list")
-    public TableDataInfo<BusConstructionBlacklistVo> list(ConstructionBlacklistQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusConstructionBlacklistVo> list(BusConstructionBlacklistQueryReq req, PageQuery pageQuery) {
         return busConstructionBlacklistService.queryPageList(req, pageQuery);
     }
 
@@ -52,7 +52,7 @@ public class BusConstructionBlacklistController extends BaseController {
     @SaCheckPermission("project:constructionBlacklist:export")
     @Log(title = "黑名单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(ConstructionBlacklistQueryReq req, HttpServletResponse response) {
+    public void export(BusConstructionBlacklistQueryReq req, HttpServletResponse response) {
         List<BusConstructionBlacklistVo> list = busConstructionBlacklistService.queryList(req);
         ExcelUtil.exportExcel(list, "黑名单", BusConstructionBlacklistVo.class, response);
     }
@@ -76,7 +76,7 @@ public class BusConstructionBlacklistController extends BaseController {
     @Log(title = "黑名单", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody ConstructionBlacklistCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody BusConstructionBlacklistCreateReq req) {
         return R.ok(busConstructionBlacklistService.insertByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserController.java
index b09818d9..49a463e8 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserController.java
@@ -17,10 +17,10 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.project.domain.exportvo.BusConstructionUserExportVo;
 import org.dromara.project.domain.req.constructionuser.*;
-import org.dromara.project.domain.resp.constructionuser.ConstructionUserAttendanceMonthResp;
-import org.dromara.project.domain.resp.constructionuser.ConstructionUserAttendanceTotalResp;
-import org.dromara.project.domain.resp.constructionuser.ConstructionUserGisResp;
-import org.dromara.project.domain.vo.BusConstructionUserVo;
+import org.dromara.project.domain.vo.constructionuser.BusConstructionUserAttendanceMonthVo;
+import org.dromara.project.domain.vo.constructionuser.BusConstructionUserAttendanceTotalVo;
+import org.dromara.project.domain.vo.constructionuser.BusConstructionUserGisVo;
+import org.dromara.project.domain.vo.constructionuser.BusConstructionUserVo;
 import org.dromara.project.service.IBusConstructionUserService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -46,7 +46,7 @@ public class BusConstructionUserController extends BaseController {
      */
     @SaCheckPermission("project:constructionUser:list")
     @GetMapping("/list")
-    public TableDataInfo<BusConstructionUserVo> list(ConstructionUserQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusConstructionUserVo> list(BusConstructionUserQueryReq req, PageQuery pageQuery) {
         return busConstructionUserService.queryPageList(req, pageQuery);
     }
 
@@ -55,8 +55,8 @@ public class BusConstructionUserController extends BaseController {
      */
     @SaCheckPermission("project:attendance:list")
     @GetMapping("/list/attendance/total")
-    public TableDataInfo<ConstructionUserAttendanceTotalResp> listAttendanceTotal(ConstructionUserAttendanceQueryReq req,
-                                                                                  PageQuery pageQuery) {
+    public TableDataInfo<BusConstructionUserAttendanceTotalVo> listAttendanceTotal(BusConstructionUserAttendanceQueryReq req,
+                                                                                   PageQuery pageQuery) {
         return busConstructionUserService.queryPageAttendanceList(req, pageQuery);
     }
 
@@ -65,7 +65,7 @@ public class BusConstructionUserController extends BaseController {
      */
     @SaCheckPermission("project:constructionUser:list")
     @GetMapping("/list/attendance/month")
-    public R<List<ConstructionUserAttendanceMonthResp>> listAttendanceMonth(ConstructionUserAttendanceMonthReq req) {
+    public R<List<BusConstructionUserAttendanceMonthVo>> listAttendanceMonth(BusConstructionUserAttendanceMonthReq req) {
         return R.ok(busConstructionUserService.queryAttendanceMonthList(req));
     }
 
@@ -75,7 +75,7 @@ public class BusConstructionUserController extends BaseController {
     @SaCheckPermission("project:constructionUser:export")
     @Log(title = "施工人员", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(ConstructionUserQueryReq req, HttpServletResponse response) {
+    public void export(BusConstructionUserQueryReq req, HttpServletResponse response) {
         List<BusConstructionUserExportVo> list = busConstructionUserService.queryList(req);
         ExcelUtil.exportExcel(list, "施工人员", BusConstructionUserExportVo.class, response);
     }
@@ -97,7 +97,7 @@ public class BusConstructionUserController extends BaseController {
      */
     @SaCheckPermission("project:constructionUser:query")
     @GetMapping("/gis")
-    public R<ConstructionUserGisResp> getGisData(ConstructionUserGisReq req) {
+    public R<BusConstructionUserGisVo> getGisData(BusConstructionUserGisReq req) {
         return R.ok(busConstructionUserService.getGisData(req));
     }
 
@@ -108,7 +108,7 @@ public class BusConstructionUserController extends BaseController {
     @Log(title = "施工人员", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody ConstructionUserCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody BusConstructionUserCreateReq req) {
         return R.ok(busConstructionUserService.insertByBo(req));
     }
 
@@ -119,7 +119,7 @@ public class BusConstructionUserController extends BaseController {
     @Log(title = "施工人员", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ConstructionUserUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody BusConstructionUserUpdateReq req) {
         return toAjax(busConstructionUserService.updateByBo(req));
     }
 
@@ -130,7 +130,7 @@ public class BusConstructionUserController extends BaseController {
     @Log(title = "施工人员", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/salary")
-    public R<Void> editSalary(@Validated(EditGroup.class) @RequestBody ConstructionUserUpdateSalaryReq req) {
+    public R<Void> editSalary(@Validated(EditGroup.class) @RequestBody BusConstructionUserUpdateSalaryReq req) {
         return toAjax(busConstructionUserService.updateSalary(req));
     }
 
@@ -141,7 +141,7 @@ public class BusConstructionUserController extends BaseController {
     @Log(title = "施工人员", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/clock")
-    public R<Void> editClock(@Validated(EditGroup.class) @RequestBody ConstructionUserUpdateClockReq req) {
+    public R<Void> editClock(@Validated(EditGroup.class) @RequestBody BusConstructionUserUpdateClockReq req) {
         return toAjax(busConstructionUserService.updateClock(req));
     }
 
@@ -152,7 +152,7 @@ public class BusConstructionUserController extends BaseController {
     @Log(title = "施工人员", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/batch/status")
-    public R<Void> batchUpdateStatus(@Validated(EditGroup.class) @RequestBody ConstructionUserBatchUpdateStatusReq req) {
+    public R<Void> batchUpdateStatus(@Validated(EditGroup.class) @RequestBody BusConstructionUserBatchUpdateStatusReq req) {
         return toAjax(busConstructionUserService.batchUpdateStatus(req));
     }
 
@@ -163,7 +163,7 @@ public class BusConstructionUserController extends BaseController {
     @Log(title = "施工人员", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/batch/clock")
-    public R<Void> batchUpdateClock(@Validated(EditGroup.class) @RequestBody ConstructionUserBatchUpdateClockReq req) {
+    public R<Void> batchUpdateClock(@Validated(EditGroup.class) @RequestBody BusConstructionUserBatchUpdateClockReq req) {
         return toAjax(busConstructionUserService.batchUpdateClockByProjectId(req));
     }
 
@@ -174,7 +174,7 @@ public class BusConstructionUserController extends BaseController {
     @Log(title = "施工人员", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/change/project")
-    public R<Void> changeUserProject(@Validated(EditGroup.class) @RequestBody ConstructionUserChangeProjectReq req) {
+    public R<Void> changeUserProject(@Validated(EditGroup.class) @RequestBody BusConstructionUserChangeProjectReq req) {
         return toAjax(busConstructionUserService.changeUserProject(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserExitController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserExitController.java
index 08151121..c104f0e2 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserExitController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserExitController.java
@@ -11,8 +11,8 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.project.domain.req.constructionuserexit.ConstructionUserExitQueryReq;
-import org.dromara.project.domain.vo.BusConstructionUserExitVo;
+import org.dromara.project.domain.req.constructionuserexit.BusConstructionUserExitQueryReq;
+import org.dromara.project.domain.vo.constructionuserexit.BusConstructionUserExitVo;
 import org.dromara.project.service.IBusConstructionUserExitService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -38,7 +38,7 @@ public class BusConstructionUserExitController extends BaseController {
      */
     @SaCheckPermission("project:constructionUserExit:list")
     @GetMapping("/list")
-    public TableDataInfo<BusConstructionUserExitVo> list(ConstructionUserExitQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusConstructionUserExitVo> list(BusConstructionUserExitQueryReq req, PageQuery pageQuery) {
         return busConstructionUserExitService.queryPageList(req, pageQuery);
     }
 
@@ -48,7 +48,7 @@ public class BusConstructionUserExitController extends BaseController {
     @SaCheckPermission("project:constructionUserExit:export")
     @Log(title = "施工人员入场退场记录信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(ConstructionUserExitQueryReq req, HttpServletResponse response) {
+    public void export(BusConstructionUserExitQueryReq req, HttpServletResponse response) {
         List<BusConstructionUserExitVo> list = busConstructionUserExitService.queryList(req);
         ExcelUtil.exportExcel(list, "施工人员入场退场记录信息", BusConstructionUserExitVo.class, response);
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserFileController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserFileController.java
index 1c424a53..1d2d8402 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserFileController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserFileController.java
@@ -10,10 +10,10 @@ import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.project.domain.req.constructionuserfile.ConstructionUserFileQueryReq;
-import org.dromara.project.domain.req.constructionuserfile.ConstructionUserFileSaveReq;
-import org.dromara.project.domain.req.constructionuserfile.ConstructionUserFileTemplateReq;
-import org.dromara.project.domain.vo.BusConstructionUserFileVo;
+import org.dromara.project.domain.req.constructionuserfile.BusConstructionUserFileQueryReq;
+import org.dromara.project.domain.req.constructionuserfile.BusConstructionUserFileSaveReq;
+import org.dromara.project.domain.req.constructionuserfile.BusConstructionUserFileTemplateReq;
+import org.dromara.project.domain.vo.constructionuserfile.BusConstructionUserFileVo;
 import org.dromara.project.service.IBusConstructionUserFileService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -40,7 +40,7 @@ public class BusConstructionUserFileController extends BaseController {
      */
     @SaCheckPermission("project:constructionUserFile:list")
     @GetMapping("/list")
-    public R<List<BusConstructionUserFileVo>> list(ConstructionUserFileQueryReq req) {
+    public R<List<BusConstructionUserFileVo>> list(BusConstructionUserFileQueryReq req) {
         return R.ok(busConstructionUserFileService.queryList(req));
     }
 
@@ -50,7 +50,7 @@ public class BusConstructionUserFileController extends BaseController {
     @SaCheckPermission("project:constructionUserFile:export")
     @Log(title = "施工人员文件存储", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(ConstructionUserFileQueryReq req, HttpServletResponse response) {
+    public void export(BusConstructionUserFileQueryReq req, HttpServletResponse response) {
         List<BusConstructionUserFileVo> list = busConstructionUserFileService.queryList(req);
         ExcelUtil.exportExcel(list, "施工人员文件存储", BusConstructionUserFileVo.class, response);
     }
@@ -62,7 +62,7 @@ public class BusConstructionUserFileController extends BaseController {
     @Log(title = "施工人员文件存储", businessType = BusinessType.EXPORT)
     @RepeatSubmit()
     @PostMapping("/exportFileTemplate")
-    public void exportFileTemplate(ConstructionUserFileTemplateReq req, HttpServletResponse response) {
+    public void exportFileTemplate(BusConstructionUserFileTemplateReq req, HttpServletResponse response) {
         busConstructionUserFileService.downloadFileTemplate(req, response);
     }
 
@@ -96,7 +96,7 @@ public class BusConstructionUserFileController extends BaseController {
     @SaCheckPermission("project:constructionUserFile:edit")
     @Log(title = "施工人员文件存储", businessType = BusinessType.INSERT)
     @PostMapping("/save")
-    public R<Boolean> save(@RequestBody ConstructionUserFileSaveReq req) {
+    public R<Boolean> save(@RequestBody BusConstructionUserFileSaveReq req) {
         return R.ok(busConstructionUserFileService.saveFileList(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorController.java
index a22f58f0..9c3cf5eb 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorController.java
@@ -15,10 +15,10 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.project.domain.req.contractor.ContractorCreateReq;
-import org.dromara.project.domain.req.contractor.ContractorQueryReq;
-import org.dromara.project.domain.req.contractor.ContractorUpdateReq;
-import org.dromara.project.domain.vo.BusContractorVo;
+import org.dromara.project.domain.req.contractor.BusContractorCreateReq;
+import org.dromara.project.domain.req.contractor.BusContractorQueryReq;
+import org.dromara.project.domain.req.contractor.BusContractorUpdateReq;
+import org.dromara.project.domain.vo.contractor.BusContractorVo;
 import org.dromara.project.service.IBusContractorService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -44,7 +44,7 @@ public class BusContractorController extends BaseController {
      */
     @SaCheckPermission("project:contractor:list")
     @GetMapping("/list")
-    public TableDataInfo<BusContractorVo> list(ContractorQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusContractorVo> list(BusContractorQueryReq req, PageQuery pageQuery) {
         return busContractorService.queryPageList(req, pageQuery);
     }
 
@@ -54,7 +54,7 @@ public class BusContractorController extends BaseController {
     @SaCheckPermission("project:contractor:export")
     @Log(title = "分包单位", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(ContractorQueryReq req, HttpServletResponse response) {
+    public void export(BusContractorQueryReq req, HttpServletResponse response) {
         List<BusContractorVo> list = busContractorService.queryList(req);
         ExcelUtil.exportExcel(list, "分包单位", BusContractorVo.class, response);
     }
@@ -78,7 +78,7 @@ public class BusContractorController extends BaseController {
     @Log(title = "分包单位", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody ContractorCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody BusContractorCreateReq req) {
         return R.ok(busContractorService.insertByBo(req));
     }
 
@@ -89,7 +89,7 @@ public class BusContractorController extends BaseController {
     @Log(title = "分包单位", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ContractorUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody BusContractorUpdateReq req) {
         return toAjax(busContractorService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusLeaveController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusLeaveController.java
index 12fd9f6c..669e616e 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusLeaveController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusLeaveController.java
@@ -13,9 +13,9 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.project.domain.req.leave.LeaveManagerReviewReq;
-import org.dromara.project.domain.req.leave.LeaveQueryReq;
-import org.dromara.project.domain.vo.BusLeaveVo;
+import org.dromara.project.domain.req.leave.BusLeaveManagerReviewReq;
+import org.dromara.project.domain.req.leave.BusLeaveQueryReq;
+import org.dromara.project.domain.vo.leave.BusLeaveVo;
 import org.dromara.project.service.IBusLeaveService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -41,7 +41,7 @@ public class BusLeaveController extends BaseController {
      */
     @SaCheckPermission("project:leave:list")
     @GetMapping("/list")
-    public TableDataInfo<BusLeaveVo> list(LeaveQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusLeaveVo> list(BusLeaveQueryReq req, PageQuery pageQuery) {
         return busLeaveService.queryPageList(req, pageQuery);
     }
 
@@ -51,7 +51,7 @@ public class BusLeaveController extends BaseController {
     @SaCheckPermission("project:leave:export")
     @Log(title = "施工人员请假申请", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(LeaveQueryReq req, HttpServletResponse response) {
+    public void export(BusLeaveQueryReq req, HttpServletResponse response) {
         List<BusLeaveVo> list = busLeaveService.queryList(req);
         ExcelUtil.exportExcel(list, "施工人员请假申请", BusLeaveVo.class, response);
     }
@@ -75,7 +75,7 @@ public class BusLeaveController extends BaseController {
     @Log(title = "施工人员请假申请", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/review/manager")
-    public R<Void> managerReview(@Validated @RequestBody LeaveManagerReviewReq req) {
+    public R<Void> managerReview(@Validated @RequestBody BusLeaveManagerReviewReq req) {
         return toAjax(busLeaveService.managerReview(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java
index 51965a73..82d4cab3 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java
@@ -17,11 +17,11 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.project.domain.req.project.ProjectCreateReq;
-import org.dromara.project.domain.req.project.ProjectQueryReq;
-import org.dromara.project.domain.req.project.ProjectUpdateReq;
-import org.dromara.project.domain.resp.project.ProjectContractorListResp;
-import org.dromara.project.domain.vo.BusProjectVo;
+import org.dromara.project.domain.req.project.BusProjectCreateReq;
+import org.dromara.project.domain.req.project.BusProjectQueryReq;
+import org.dromara.project.domain.req.project.BusProjectUpdateReq;
+import org.dromara.project.domain.vo.project.BusProjectContractorListVo;
+import org.dromara.project.domain.vo.project.BusProjectVo;
 import org.dromara.project.service.IBusProjectService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -47,7 +47,7 @@ public class BusProjectController extends BaseController {
      */
     @SaCheckPermission("project:project:list")
     @GetMapping("/list")
-    public TableDataInfo<BusProjectVo> list(ProjectQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusProjectVo> list(BusProjectQueryReq req, PageQuery pageQuery) {
         return projectService.queryPageList(req, pageQuery);
     }
 
@@ -57,7 +57,7 @@ public class BusProjectController extends BaseController {
     @SaCheckPermission("project:project:export")
     @Log(title = "项目", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(ProjectQueryReq req, HttpServletResponse response) {
+    public void export(BusProjectQueryReq req, HttpServletResponse response) {
         List<BusProjectVo> list = projectService.queryList(req);
         ExcelUtil.exportExcel(list, "项目", BusProjectVo.class, response);
     }
@@ -79,7 +79,7 @@ public class BusProjectController extends BaseController {
      */
     @SaCheckPermission("project:project:query")
     @GetMapping("/list/project/contractorList")
-    public R<List<ProjectContractorListResp>> listProjectContractorList() {
+    public R<List<BusProjectContractorListVo>> listProjectContractorList() {
         return R.ok(projectService.queryProjectContractorList());
     }
 
@@ -90,7 +90,7 @@ public class BusProjectController extends BaseController {
     @Log(title = "项目", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody ProjectCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody BusProjectCreateReq req) {
         if (req == null) {
             throw new ServiceException("参数不能为空", HttpStatus.BAD_REQUEST);
         }
@@ -104,7 +104,7 @@ public class BusProjectController extends BaseController {
     @Log(title = "项目", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProjectUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody BusProjectUpdateReq req) {
         return toAjax(projectService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectFileController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectFileController.java
index 7ae55440..f7b8ca97 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectFileController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectFileController.java
@@ -15,10 +15,10 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.project.domain.req.projectfile.ProjectFileQueryReq;
-import org.dromara.project.domain.req.projectfile.ProjectFileUpdateReq;
-import org.dromara.project.domain.req.projectfile.ProjectFileUploadDxfReq;
-import org.dromara.project.domain.vo.BusProjectFileVo;
+import org.dromara.project.domain.req.projectfile.BusProjectFileQueryReq;
+import org.dromara.project.domain.req.projectfile.BusProjectFileUpdateReq;
+import org.dromara.project.domain.req.projectfile.BusProjectFileUploadDxfReq;
+import org.dromara.project.domain.vo.projectfile.BusProjectFileVo;
 import org.dromara.project.service.IBusProjectFileService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -45,7 +45,7 @@ public class BusProjectFileController extends BaseController {
      */
     @SaCheckPermission("project:projectFile:list")
     @GetMapping("/list")
-    public TableDataInfo<BusProjectFileVo> list(ProjectFileQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusProjectFileVo> list(BusProjectFileQueryReq req, PageQuery pageQuery) {
         return busProjectFileService.queryPageList(req, pageQuery);
     }
 
@@ -55,7 +55,7 @@ public class BusProjectFileController extends BaseController {
     @SaCheckPermission("project:projectFile:export")
     @Log(title = "项目文件存储", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(ProjectFileQueryReq req, HttpServletResponse response) {
+    public void export(BusProjectFileQueryReq req, HttpServletResponse response) {
         List<BusProjectFileVo> list = busProjectFileService.queryList(req);
         ExcelUtil.exportExcel(list, "项目文件存储", BusProjectFileVo.class, response);
     }
@@ -79,7 +79,7 @@ public class BusProjectFileController extends BaseController {
     @Log(title = "项目文件存储", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProjectFileUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody BusProjectFileUpdateReq req) {
         return toAjax(busProjectFileService.updateByBo(req));
     }
 
@@ -101,7 +101,7 @@ public class BusProjectFileController extends BaseController {
      */
     @Log(title = "项目文件存储", businessType = BusinessType.IMPORT)
     @PostMapping("/upload/dxf")
-    public R<Long> uploadDxf2Json(@RequestParam("file") MultipartFile file, ProjectFileUploadDxfReq req) {
+    public R<Long> uploadDxf2Json(@RequestParam("file") MultipartFile file, BusProjectFileUploadDxfReq req) {
         return R.ok(busProjectFileService.uploadDxf2Json(file, req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectNewsController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectNewsController.java
index 3743a6c8..4bde7baf 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectNewsController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectNewsController.java
@@ -15,12 +15,12 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.project.domain.req.projectnews.ProjectNewsCreateReq;
-import org.dromara.project.domain.req.projectnews.ProjectNewsGisReq;
-import org.dromara.project.domain.req.projectnews.ProjectNewsQueryReq;
-import org.dromara.project.domain.req.projectnews.ProjectNewsUpdateReq;
-import org.dromara.project.domain.resp.projectnews.ProjectNewsGisResp;
-import org.dromara.project.domain.vo.BusProjectNewsVo;
+import org.dromara.project.domain.req.projectnews.BusProjectNewsCreateReq;
+import org.dromara.project.domain.req.projectnews.BusProjectNewsGisReq;
+import org.dromara.project.domain.req.projectnews.BusProjectNewsQueryReq;
+import org.dromara.project.domain.req.projectnews.BusProjectNewsUpdateReq;
+import org.dromara.project.domain.vo.projectnews.BusProjectNewsGisVo;
+import org.dromara.project.domain.vo.projectnews.BusProjectNewsVo;
 import org.dromara.project.service.IBusProjectNewsService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -46,7 +46,7 @@ public class BusProjectNewsController extends BaseController {
      */
     @SaCheckPermission("project:projectNews:list")
     @GetMapping("/list")
-    public TableDataInfo<BusProjectNewsVo> list(ProjectNewsQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusProjectNewsVo> list(BusProjectNewsQueryReq req, PageQuery pageQuery) {
         return busProjectNewsService.queryPageList(req, pageQuery);
     }
 
@@ -56,7 +56,7 @@ public class BusProjectNewsController extends BaseController {
     @SaCheckPermission("project:projectNews:export")
     @Log(title = "项目新闻", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(ProjectNewsQueryReq req, HttpServletResponse response) {
+    public void export(BusProjectNewsQueryReq req, HttpServletResponse response) {
         List<BusProjectNewsVo> list = busProjectNewsService.queryList(req);
         ExcelUtil.exportExcel(list, "项目新闻", BusProjectNewsVo.class, response);
     }
@@ -65,7 +65,7 @@ public class BusProjectNewsController extends BaseController {
      * 查询大屏项目新闻列表
      */
     @GetMapping("/list/gis")
-    public R<List<ProjectNewsGisResp>> listGis(ProjectNewsGisReq req) {
+    public R<List<BusProjectNewsGisVo>> listGis(BusProjectNewsGisReq req) {
         return R.ok(busProjectNewsService.queryGisList(req));
     }
 
@@ -88,7 +88,7 @@ public class BusProjectNewsController extends BaseController {
     @Log(title = "项目新闻", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody ProjectNewsCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody BusProjectNewsCreateReq req) {
         return R.ok(busProjectNewsService.insertByBo(req));
     }
 
@@ -99,7 +99,7 @@ public class BusProjectNewsController extends BaseController {
     @Log(title = "项目新闻", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProjectNewsUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody BusProjectNewsUpdateReq req) {
         return toAjax(busProjectNewsService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamController.java
index 99031ddc..16ad097d 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamController.java
@@ -15,11 +15,11 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.project.domain.req.projectteam.ProjectTeamCreateReq;
-import org.dromara.project.domain.req.projectteam.ProjectTeamQueryReq;
-import org.dromara.project.domain.req.projectteam.ProjectTeamUpdateReq;
-import org.dromara.project.domain.resp.projectteam.ProjectTeamForemanResp;
-import org.dromara.project.domain.vo.BusProjectTeamVo;
+import org.dromara.project.domain.req.projectteam.BusProjectTeamCreateReq;
+import org.dromara.project.domain.req.projectteam.BusProjectTeamQueryReq;
+import org.dromara.project.domain.req.projectteam.BusProjectTeamUpdateReq;
+import org.dromara.project.domain.vo.projectteam.BusProjectTeamForemanVo;
+import org.dromara.project.domain.vo.projectteam.BusProjectTeamVo;
 import org.dromara.project.service.IBusProjectTeamService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -45,7 +45,7 @@ public class BusProjectTeamController extends BaseController {
      */
     @SaCheckPermission("project:projectTeam:list")
     @GetMapping("/list")
-    public TableDataInfo<BusProjectTeamVo> list(ProjectTeamQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusProjectTeamVo> list(BusProjectTeamQueryReq req, PageQuery pageQuery) {
         return busProjectTeamService.queryPageList(req, pageQuery);
     }
 
@@ -54,7 +54,7 @@ public class BusProjectTeamController extends BaseController {
      */
     @SaCheckPermission("project:projectTeam:list")
     @GetMapping("/listForeman/{projectId}")
-    public R<List<ProjectTeamForemanResp>> listForeman(@NotNull(message = "项目id不能为空")
+    public R<List<BusProjectTeamForemanVo>> listForeman(@NotNull(message = "项目id不能为空")
                                                        @PathVariable Long projectId) {
         return R.ok(busProjectTeamService.queryForemanList(projectId));
     }
@@ -65,7 +65,7 @@ public class BusProjectTeamController extends BaseController {
     @SaCheckPermission("project:projectTeam:export")
     @Log(title = "项目班组", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(ProjectTeamQueryReq req, HttpServletResponse response) {
+    public void export(BusProjectTeamQueryReq req, HttpServletResponse response) {
         List<BusProjectTeamVo> list = busProjectTeamService.queryList(req);
         ExcelUtil.exportExcel(list, "项目班组", BusProjectTeamVo.class, response);
     }
@@ -89,7 +89,7 @@ public class BusProjectTeamController extends BaseController {
     @Log(title = "项目班组", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody ProjectTeamCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody BusProjectTeamCreateReq req) {
         return R.ok(busProjectTeamService.insertByBo(req));
     }
 
@@ -100,7 +100,7 @@ public class BusProjectTeamController extends BaseController {
     @Log(title = "项目班组", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProjectTeamUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody BusProjectTeamUpdateReq req) {
         return toAjax(busProjectTeamService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamMemberController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamMemberController.java
index 836a9b61..53fb23f6 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamMemberController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamMemberController.java
@@ -14,11 +14,11 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.project.domain.req.projectteammember.ProjectTeamMemberCreateReq;
-import org.dromara.project.domain.req.projectteammember.ProjectTeamMemberExitReq;
-import org.dromara.project.domain.req.projectteammember.ProjectTeamMemberQueryReq;
-import org.dromara.project.domain.req.projectteammember.ProjectTeamMemberUpdateReq;
-import org.dromara.project.domain.vo.BusProjectTeamMemberVo;
+import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberCreateReq;
+import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberExitReq;
+import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberQueryReq;
+import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberUpdateReq;
+import org.dromara.project.domain.vo.projectteammember.BusProjectTeamMemberVo;
 import org.dromara.project.service.IBusProjectTeamMemberService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -44,7 +44,7 @@ public class BusProjectTeamMemberController extends BaseController {
      */
     @SaCheckPermission("project:projectTeamMember:list")
     @GetMapping("/list")
-    public TableDataInfo<BusProjectTeamMemberVo> list(ProjectTeamMemberQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusProjectTeamMemberVo> list(BusProjectTeamMemberQueryReq req, PageQuery pageQuery) {
         return busProjectTeamMemberService.queryPageList(req, pageQuery);
     }
 
@@ -54,7 +54,7 @@ public class BusProjectTeamMemberController extends BaseController {
     @SaCheckPermission("project:projectTeamMember:export")
     @Log(title = "项目班组下的成员", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(ProjectTeamMemberQueryReq req, HttpServletResponse response) {
+    public void export(BusProjectTeamMemberQueryReq req, HttpServletResponse response) {
         List<BusProjectTeamMemberVo> list = busProjectTeamMemberService.queryList(req);
         ExcelUtil.exportExcel(list, "项目班组下的成员", BusProjectTeamMemberVo.class, response);
     }
@@ -78,7 +78,7 @@ public class BusProjectTeamMemberController extends BaseController {
     @Log(title = "项目班组下的成员", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody ProjectTeamMemberCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody BusProjectTeamMemberCreateReq req) {
         return R.ok(busProjectTeamMemberService.insertByBo(req));
     }
 
@@ -89,7 +89,7 @@ public class BusProjectTeamMemberController extends BaseController {
     @Log(title = "项目班组下的成员", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProjectTeamMemberUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody BusProjectTeamMemberUpdateReq req) {
         return toAjax(busProjectTeamMemberService.updateByBo(req));
     }
 
@@ -99,7 +99,7 @@ public class BusProjectTeamMemberController extends BaseController {
     @SaCheckPermission("project:projectTeamMember:remove")
     @Log(title = "项目班组下的成员", businessType = BusinessType.DELETE)
     @DeleteMapping("/")
-    public R<Void> remove(@RequestBody ProjectTeamMemberExitReq req) {
+    public R<Void> remove(@RequestBody BusProjectTeamMemberExitReq req) {
         return toAjax(busProjectTeamMemberService.deleteById(req));
     }
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusReissueCardController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusReissueCardController.java
index b5e1878f..d225e639 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusReissueCardController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusReissueCardController.java
@@ -13,9 +13,9 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.project.domain.req.reissuecard.ReissueCardManagerReviewReq;
-import org.dromara.project.domain.req.reissuecard.ReissueCardQueryReq;
-import org.dromara.project.domain.vo.BusReissueCardVo;
+import org.dromara.project.domain.req.reissuecard.BusReissueCardManagerReviewReq;
+import org.dromara.project.domain.req.reissuecard.BusReissueCardQueryReq;
+import org.dromara.project.domain.vo.reissuecard.BusReissueCardVo;
 import org.dromara.project.service.IBusReissueCardService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -41,7 +41,7 @@ public class BusReissueCardController extends BaseController {
      */
     @SaCheckPermission("project:reissueCard:list")
     @GetMapping("/list")
-    public TableDataInfo<BusReissueCardVo> list(ReissueCardQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusReissueCardVo> list(BusReissueCardQueryReq req, PageQuery pageQuery) {
         return busReissueCardService.queryPageList(req, pageQuery);
     }
 
@@ -51,7 +51,7 @@ public class BusReissueCardController extends BaseController {
     @SaCheckPermission("project:reissueCard:export")
     @Log(title = "施工人员补卡申请", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(ReissueCardQueryReq req, HttpServletResponse response) {
+    public void export(BusReissueCardQueryReq req, HttpServletResponse response) {
         List<BusReissueCardVo> list = busReissueCardService.queryList(req);
         ExcelUtil.exportExcel(list, "施工人员补卡申请", BusReissueCardVo.class, response);
     }
@@ -75,7 +75,7 @@ public class BusReissueCardController extends BaseController {
     @Log(title = "施工人员补卡申请", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/review/manager")
-    public R<Void> managerReview(@RequestBody ReissueCardManagerReviewReq req) {
+    public R<Void> managerReview(@RequestBody BusReissueCardManagerReviewReq req) {
         return toAjax(busReissueCardService.managerReview(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java
index fb0e4a99..f34cc09b 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java
@@ -18,12 +18,12 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.project.domain.BusUserProjectRelevancy;
-import org.dromara.project.domain.req.project.ProjectBatchByProjectListReq;
-import org.dromara.project.domain.req.userprojectrelevancy.UserProjectRelevancyCreateReq;
-import org.dromara.project.domain.req.userprojectrelevancy.UserProjectRelevancyQueryReq;
-import org.dromara.project.domain.req.userprojectrelevancy.UserProjectRelevancyUpdateReq;
-import org.dromara.project.domain.resp.userprojectrelevancy.LoginUserProjectRelevancyResp;
-import org.dromara.project.domain.vo.BusUserProjectRelevancyVo;
+import org.dromara.project.domain.req.project.BusProjectBatchByProjectListReq;
+import org.dromara.project.domain.req.userprojectrelevancy.BusUserProjectRelevancyCreateReq;
+import org.dromara.project.domain.req.userprojectrelevancy.BusUserProjectRelevancyQueryReq;
+import org.dromara.project.domain.req.userprojectrelevancy.BusUserProjectRelevancyUpdateReq;
+import org.dromara.project.domain.vo.userprojectrelevancy.BusLoginUserProjectRelevancyVo;
+import org.dromara.project.domain.vo.userprojectrelevancy.BusUserProjectRelevancyVo;
 import org.dromara.project.service.IBusUserProjectRelevancyService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -49,7 +49,7 @@ public class BusUserProjectRelevancyController extends BaseController {
      */
     @SaCheckPermission("project:projectRelevancy:list")
     @GetMapping("/list")
-    public TableDataInfo<BusUserProjectRelevancyVo> list(UserProjectRelevancyQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusUserProjectRelevancyVo> list(BusUserProjectRelevancyQueryReq req, PageQuery pageQuery) {
         return userProjectRelevancyService.queryPageList(req, pageQuery);
     }
 
@@ -58,7 +58,7 @@ public class BusUserProjectRelevancyController extends BaseController {
      */
     @SaCheckPermission("project:projectRelevancy:list")
     @GetMapping("/login/list")
-    public R<List<LoginUserProjectRelevancyResp>> listByLoginUser() {
+    public R<List<BusLoginUserProjectRelevancyVo>> listByLoginUser() {
         Long userId = LoginHelper.getUserId();
         return R.ok(userProjectRelevancyService.queryListByUserId(userId));
     }
@@ -68,7 +68,7 @@ public class BusUserProjectRelevancyController extends BaseController {
      */
     @SaCheckPermission("project:projectRelevancy:list")
     @GetMapping("/login/page")
-    public TableDataInfo<BusUserProjectRelevancyVo> pageByLoginUser(UserProjectRelevancyQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusUserProjectRelevancyVo> pageByLoginUser(BusUserProjectRelevancyQueryReq req, PageQuery pageQuery) {
         Long userId = LoginHelper.getUserId();
         return userProjectRelevancyService.queryPageByUserId(userId, req, pageQuery);
     }
@@ -79,7 +79,7 @@ public class BusUserProjectRelevancyController extends BaseController {
     @SaCheckPermission("project:projectRelevancy:export")
     @Log(title = "系统用户与项目关联", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(UserProjectRelevancyQueryReq req, HttpServletResponse response) {
+    public void export(BusUserProjectRelevancyQueryReq req, HttpServletResponse response) {
         List<BusUserProjectRelevancyVo> list = userProjectRelevancyService.queryList(req);
         ExcelUtil.exportExcel(list, "系统用户与项目关联", BusUserProjectRelevancyVo.class, response);
     }
@@ -103,7 +103,7 @@ public class BusUserProjectRelevancyController extends BaseController {
     @Log(title = "系统用户与项目关联", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody UserProjectRelevancyCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody BusUserProjectRelevancyCreateReq req) {
         return R.ok(userProjectRelevancyService.insertByBo(req));
     }
 
@@ -114,7 +114,7 @@ public class BusUserProjectRelevancyController extends BaseController {
     @Log(title = "系统用户与项目关联", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/add/project/list")
-    public R<Boolean> addBatchByProjectList(@RequestBody ProjectBatchByProjectListReq req) {
+    public R<Boolean> addBatchByProjectList(@RequestBody BusProjectBatchByProjectListReq req) {
         Boolean result = userProjectRelevancyService.insertBatchByProjectList(req);
         return R.ok(result);
     }
@@ -126,7 +126,7 @@ public class BusUserProjectRelevancyController extends BaseController {
     @Log(title = "系统用户与项目关联", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @DeleteMapping("/remove/project/list")
-    public R<Boolean> removeBatchByProjectList(@RequestBody ProjectBatchByProjectListReq req) {
+    public R<Boolean> removeBatchByProjectList(@RequestBody BusProjectBatchByProjectListReq req) {
         Long userId = req.getUserId();
         Long[] projectIdList = req.getProjectIdList();
         QueryWrapper<BusUserProjectRelevancy> wrapper = new QueryWrapper<>();
@@ -150,7 +150,7 @@ public class BusUserProjectRelevancyController extends BaseController {
     @Log(title = "系统用户与项目关联", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserProjectRelevancyUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody BusUserProjectRelevancyUpdateReq req) {
         return toAjax(userProjectRelevancyService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusWorkWageController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusWorkWageController.java
index 7a4a9e78..4edb0478 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusWorkWageController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusWorkWageController.java
@@ -15,10 +15,10 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.project.domain.req.workwage.WorkWageCreateReq;
-import org.dromara.project.domain.req.workwage.WorkWageQueryReq;
-import org.dromara.project.domain.req.workwage.WorkWageUpdateReq;
-import org.dromara.project.domain.vo.BusWorkWageVo;
+import org.dromara.project.domain.req.workwage.BusWorkWageCreateReq;
+import org.dromara.project.domain.req.workwage.BusWorkWageQueryReq;
+import org.dromara.project.domain.req.workwage.BusWorkWageUpdateReq;
+import org.dromara.project.domain.vo.workwage.BusWorkWageVo;
 import org.dromara.project.service.IBusWorkWageService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -44,7 +44,7 @@ public class BusWorkWageController extends BaseController {
      */
     @SaCheckPermission("project:workWage:list")
     @GetMapping("/list")
-    public TableDataInfo<BusWorkWageVo> list(WorkWageQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusWorkWageVo> list(BusWorkWageQueryReq req, PageQuery pageQuery) {
         return busWorkWageService.queryPageList(req, pageQuery);
     }
 
@@ -54,7 +54,7 @@ public class BusWorkWageController extends BaseController {
     @SaCheckPermission("project:workWage:export")
     @Log(title = "工种薪水", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(WorkWageQueryReq req, HttpServletResponse response) {
+    public void export(BusWorkWageQueryReq req, HttpServletResponse response) {
         List<BusWorkWageVo> list = busWorkWageService.queryList(req);
         ExcelUtil.exportExcel(list, "工种薪水", BusWorkWageVo.class, response);
     }
@@ -78,7 +78,7 @@ public class BusWorkWageController extends BaseController {
     @Log(title = "工种薪水", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody WorkWageCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody BusWorkWageCreateReq req) {
         return R.ok(busWorkWageService.insertByBo(req));
     }
 
@@ -89,7 +89,7 @@ public class BusWorkWageController extends BaseController {
     @Log(title = "工种薪水", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody WorkWageUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody BusWorkWageUpdateReq req) {
         return toAjax(busWorkWageService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusWorkerDailyReportController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusWorkerDailyReportController.java
index 5642f28e..6e976363 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusWorkerDailyReportController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusWorkerDailyReportController.java
@@ -12,8 +12,8 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.project.domain.req.workerdailyreport.WorkerDailyReportQueryReq;
-import org.dromara.project.domain.vo.BusWorkerDailyReportVo;
+import org.dromara.project.domain.req.workerdailyreport.BusWorkerDailyReportQueryReq;
+import org.dromara.project.domain.vo.workerdailyreport.BusWorkerDailyReportVo;
 import org.dromara.project.service.IBusWorkerDailyReportService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -39,7 +39,7 @@ public class BusWorkerDailyReportController extends BaseController {
      */
     @SaCheckPermission("project:workerDailyReport:list")
     @GetMapping("/list")
-    public TableDataInfo<BusWorkerDailyReportVo> list(WorkerDailyReportQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusWorkerDailyReportVo> list(BusWorkerDailyReportQueryReq req, PageQuery pageQuery) {
         return busWorkerDailyReportService.queryPageList(req, pageQuery);
     }
 
@@ -49,7 +49,7 @@ public class BusWorkerDailyReportController extends BaseController {
     @SaCheckPermission("project:workerDailyReport:export")
     @Log(title = "施工人员日报", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(WorkerDailyReportQueryReq req, HttpServletResponse response) {
+    public void export(BusWorkerDailyReportQueryReq req, HttpServletResponse response) {
         List<BusWorkerDailyReportVo> list = busWorkerDailyReportService.queryList(req);
         ExcelUtil.exportExcel(list, "施工人员日报", BusWorkerDailyReportVo.class, response);
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/AttendanceClockStatusEnum.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusAttendanceClockStatusEnum.java
similarity index 79%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/AttendanceClockStatusEnum.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusAttendanceClockStatusEnum.java
index 154d9a7a..e5aab22d 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/AttendanceClockStatusEnum.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusAttendanceClockStatusEnum.java
@@ -7,7 +7,7 @@ import lombok.Getter;
  * @date 2025/4/7 11:31
  */
 @Getter
-public enum AttendanceClockStatusEnum {
+public enum BusAttendanceClockStatusEnum {
 
     NORMAL("正常", "1"),
     LATE("迟到", "2"),
@@ -20,7 +20,7 @@ public enum AttendanceClockStatusEnum {
 
     private final String value;
 
-    AttendanceClockStatusEnum(String text, String value) {
+    BusAttendanceClockStatusEnum(String text, String value) {
         this.text = text;
         this.value = value;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/AttendanceCommuterEnum.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusAttendanceCommuterEnum.java
similarity index 77%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/AttendanceCommuterEnum.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusAttendanceCommuterEnum.java
index 2601b288..cdf92fb7 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/AttendanceCommuterEnum.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusAttendanceCommuterEnum.java
@@ -7,7 +7,7 @@ import lombok.Getter;
  * @date 2025/4/7 12:29
  */
 @Getter
-public enum AttendanceCommuterEnum {
+public enum BusAttendanceCommuterEnum {
 
     CLOCKIN("上班", "1"),
     CLOCKOUT("下班", "2"),
@@ -17,7 +17,7 @@ public enum AttendanceCommuterEnum {
 
     private final String value;
 
-    AttendanceCommuterEnum(String text, String value) {
+    BusAttendanceCommuterEnum(String text, String value) {
         this.text = text;
         this.value = value;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/AttendanceStatusEnum.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusAttendanceStatusEnum.java
similarity index 82%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/AttendanceStatusEnum.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusAttendanceStatusEnum.java
index b4dd6ff0..af7c4610 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/AttendanceStatusEnum.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusAttendanceStatusEnum.java
@@ -7,7 +7,7 @@ import lombok.Getter;
  * @date 2025/4/7 15:38
  */
 @Getter
-public enum AttendanceStatusEnum {
+public enum BusAttendanceStatusEnum {
 
     NORMAL("全天考勤正常", "1"),
     ERROR("当天存在异常迟到、早退、缺卡", "2"),
@@ -18,7 +18,7 @@ public enum AttendanceStatusEnum {
 
     private final String value;
 
-    AttendanceStatusEnum(String text, String value) {
+    BusAttendanceStatusEnum(String text, String value) {
         this.text = text;
         this.value = value;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/ConstructionUserAttendanceStatusEnum.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusConstructionUserAttendanceStatusEnum.java
similarity index 76%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/ConstructionUserAttendanceStatusEnum.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusConstructionUserAttendanceStatusEnum.java
index f2707fae..40a135c2 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/ConstructionUserAttendanceStatusEnum.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusConstructionUserAttendanceStatusEnum.java
@@ -7,7 +7,7 @@ import lombok.Getter;
  * @date 2025/4/9 14:10
  */
 @Getter
-public enum ConstructionUserAttendanceStatusEnum {
+public enum BusConstructionUserAttendanceStatusEnum {
 
     NORMAL("全天考勤正常", "1"),
     ONECLOCK("当天只打了一次卡", "2"),
@@ -18,7 +18,7 @@ public enum ConstructionUserAttendanceStatusEnum {
 
     private final String value;
 
-    ConstructionUserAttendanceStatusEnum(String text, String value) {
+    BusConstructionUserAttendanceStatusEnum(String text, String value) {
         this.text = text;
         this.value = value;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/ConstructionUserFileStatusEnum.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusConstructionUserFileStatusEnum.java
similarity index 75%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/ConstructionUserFileStatusEnum.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusConstructionUserFileStatusEnum.java
index bbb06c51..21de91cb 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/ConstructionUserFileStatusEnum.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusConstructionUserFileStatusEnum.java
@@ -7,7 +7,7 @@ import lombok.Getter;
  * @date 2025/4/3 17:47
  */
 @Getter
-public enum ConstructionUserFileStatusEnum {
+public enum BusConstructionUserFileStatusEnum {
 
     NOUPLOAD("未上传", "1"),
     PARTUPLOAD("部分上传", "2"),
@@ -17,7 +17,7 @@ public enum ConstructionUserFileStatusEnum {
 
     private final String value;
 
-    ConstructionUserFileStatusEnum(String text, String value) {
+    BusConstructionUserFileStatusEnum(String text, String value) {
         this.text = text;
         this.value = value;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/OpinionStatusEnum.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusOpinionStatusEnum.java
similarity index 78%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/OpinionStatusEnum.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusOpinionStatusEnum.java
index 5240ed3a..dfed638b 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/OpinionStatusEnum.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusOpinionStatusEnum.java
@@ -7,7 +7,7 @@ import lombok.Getter;
  * @date 2025/4/8 10:55
  */
 @Getter
-public enum OpinionStatusEnum {
+public enum BusOpinionStatusEnum {
 
     UNREAD("未读", "1"),
     PASS("同意", "2"),
@@ -17,7 +17,7 @@ public enum OpinionStatusEnum {
 
     private final String value;
 
-    OpinionStatusEnum(String text, String value) {
+    BusOpinionStatusEnum(String text, String value) {
         this.text = text;
         this.value = value;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/ProjectTeamMemberPostEnum.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusProjectTeamMemberPostEnum.java
similarity index 73%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/ProjectTeamMemberPostEnum.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusProjectTeamMemberPostEnum.java
index 783ca6e4..31a5c913 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/ProjectTeamMemberPostEnum.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusProjectTeamMemberPostEnum.java
@@ -10,7 +10,7 @@ import org.dromara.common.core.utils.ObjectUtils;
  * @date 2025/3/21 13:36
  */
 @Getter
-public enum ProjectTeamMemberPostEnum {
+public enum BusProjectTeamMemberPostEnum {
 
     MEMBER("普通成员", "0"),
     FOREMAN("班组长", "1");
@@ -19,7 +19,7 @@ public enum ProjectTeamMemberPostEnum {
 
     private final String value;
 
-    ProjectTeamMemberPostEnum(String text, String value) {
+    BusProjectTeamMemberPostEnum(String text, String value) {
         this.text = text;
         this.value = value;
     }
@@ -30,11 +30,11 @@ public enum ProjectTeamMemberPostEnum {
      * @param value 项目成员岗位枚举值
      * @return 项目成员岗位枚举
      */
-    public static ProjectTeamMemberPostEnum getEnumByValue(String value) {
+    public static BusProjectTeamMemberPostEnum getEnumByValue(String value) {
         if (ObjectUtils.isEmpty(value)) {
             return null;
         }
-        for (ProjectTeamMemberPostEnum anEnum : ProjectTeamMemberPostEnum.values()) {
+        for (BusProjectTeamMemberPostEnum anEnum : BusProjectTeamMemberPostEnum.values()) {
             if (anEnum.value.equals(value)) {
                 return anEnum;
             }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/ReviewStatusEnum.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusReviewStatusEnum.java
similarity index 64%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/ReviewStatusEnum.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusReviewStatusEnum.java
index f1b90f99..35c3e338 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/ReviewStatusEnum.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusReviewStatusEnum.java
@@ -7,7 +7,7 @@ import lombok.Getter;
  * @date 2025/4/8 16:13
  */
 @Getter
-public enum ReviewStatusEnum {
+public enum BusReviewStatusEnum {
 
     UNREVIEW("待审核", "1"),
     INREVIEW("审核中", "2"),
@@ -18,7 +18,7 @@ public enum ReviewStatusEnum {
 
     private final String value;
 
-    ReviewStatusEnum(String text, String value) {
+    BusReviewStatusEnum(String text, String value) {
         this.text = text;
         this.value = value;
     }
@@ -32,23 +32,23 @@ public enum ReviewStatusEnum {
      */
     public static String getEnumByOpinionStatus(String gangerStatus, String managerStatus) {
         // 如果其中一个拒绝，返回 DECLINED("已拒绝", "4")
-        if (OpinionStatusEnum.REFUSE.getValue().equals(gangerStatus)
-            || OpinionStatusEnum.REFUSE.getValue().equals(managerStatus)) {
+        if (BusOpinionStatusEnum.REFUSE.getValue().equals(gangerStatus)
+            || BusOpinionStatusEnum.REFUSE.getValue().equals(managerStatus)) {
             return DECLINED.getValue();
         }
         // 当两个状态都未读，返回 UNREVIEW("待审核", "1")
-        if (OpinionStatusEnum.UNREAD.getValue().equals(gangerStatus)
-            && OpinionStatusEnum.UNREAD.getValue().equals(managerStatus)) {
+        if (BusOpinionStatusEnum.UNREAD.getValue().equals(gangerStatus)
+            && BusOpinionStatusEnum.UNREAD.getValue().equals(managerStatus)) {
             return UNREVIEW.getValue();
         }
         // 当两个状态都同意，返回 AGREED("已同意", "3")
-        if (OpinionStatusEnum.PASS.getValue().equals(gangerStatus)
-            && OpinionStatusEnum.PASS.getValue().equals(managerStatus)) {
+        if (BusOpinionStatusEnum.PASS.getValue().equals(gangerStatus)
+            && BusOpinionStatusEnum.PASS.getValue().equals(managerStatus)) {
             return AGREED.getValue();
         }
         // 当班组长状态不为未读 且管理员状态为未读，返回 INREVIEW("审核中", "2")
-        if (!OpinionStatusEnum.UNREAD.getValue().equals(gangerStatus)
-            && OpinionStatusEnum.UNREAD.getValue().equals(managerStatus)) {
+        if (!BusOpinionStatusEnum.UNREAD.getValue().equals(gangerStatus)
+            && BusOpinionStatusEnum.UNREAD.getValue().equals(managerStatus)) {
             return INREVIEW.getValue();
         }
         return null;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/WageMeasureUnitEnum.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusWageMeasureUnitEnum.java
similarity index 77%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/WageMeasureUnitEnum.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusWageMeasureUnitEnum.java
index 55769f5d..84a07d0f 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/WageMeasureUnitEnum.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/enums/BusWageMeasureUnitEnum.java
@@ -7,7 +7,7 @@ import lombok.Getter;
  * @date 2025/4/10 11:16
  */
 @Getter
-public enum WageMeasureUnitEnum {
+public enum BusWageMeasureUnitEnum {
 
     TIME("计时：元/每天", "1"),
     PIECE("计件：元/每个", "2");
@@ -16,7 +16,7 @@ public enum WageMeasureUnitEnum {
 
     private final String value;
 
-    WageMeasureUnitEnum(String text, String value) {
+    BusWageMeasureUnitEnum(String text, String value) {
         this.text = text;
         this.value = value;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/AttendanceMonthByUserIdReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/BusAttendanceMonthByUserIdReq.java
similarity index 87%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/AttendanceMonthByUserIdReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/BusAttendanceMonthByUserIdReq.java
index 62992b30..2ae20fd8 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/AttendanceMonthByUserIdReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/BusAttendanceMonthByUserIdReq.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 2025/4/8 17:13
  */
 @Data
-public class AttendanceMonthByUserIdReq implements Serializable {
+public class BusAttendanceMonthByUserIdReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -1295339038112604001L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/AttendanceQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/BusAttendanceQueryReq.java
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/AttendanceQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/BusAttendanceQueryReq.java
index 11e3fd91..437bd1b8 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/AttendanceQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/BusAttendanceQueryReq.java
@@ -13,7 +13,7 @@ import java.util.Date;
  * @date 2025/3/26 9:47
  */
 @Data
-public class AttendanceQueryReq implements Serializable {
+public class BusAttendanceQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -7188085233824968862L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/AttendanceQueryTwoWeekReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/BusAttendanceQueryTwoWeekReq.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/AttendanceQueryTwoWeekReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/BusAttendanceQueryTwoWeekReq.java
index 50e0b037..9476f9bc 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/AttendanceQueryTwoWeekReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/BusAttendanceQueryTwoWeekReq.java
@@ -13,7 +13,7 @@ import java.util.Date;
  * @date 2025/4/7 9:53
  */
 @Data
-public class AttendanceQueryTwoWeekReq implements Serializable {
+public class BusAttendanceQueryTwoWeekReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3193787736889938829L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionblacklist/ConstructionBlacklistCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionblacklist/BusConstructionBlacklistCreateReq.java
similarity index 84%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionblacklist/ConstructionBlacklistCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionblacklist/BusConstructionBlacklistCreateReq.java
index 671af011..86b25093 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionblacklist/ConstructionBlacklistCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionblacklist/BusConstructionBlacklistCreateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/27 9:30
  */
 @Data
-public class ConstructionBlacklistCreateReq implements Serializable {
+public class BusConstructionBlacklistCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -1095123147028743165L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionblacklist/ConstructionBlacklistQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionblacklist/BusConstructionBlacklistQueryReq.java
similarity index 88%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionblacklist/ConstructionBlacklistQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionblacklist/BusConstructionBlacklistQueryReq.java
index 94b81c82..0ce2e2c6 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionblacklist/ConstructionBlacklistQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionblacklist/BusConstructionBlacklistQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/27 9:30
  */
 @Data
-public class ConstructionBlacklistQueryReq implements Serializable {
+public class BusConstructionBlacklistQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 5638694783769399209L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserAttendanceMonthReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserAttendanceMonthReq.java
similarity index 86%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserAttendanceMonthReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserAttendanceMonthReq.java
index 21fe3a15..910641cd 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserAttendanceMonthReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserAttendanceMonthReq.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 2025/4/7 15:04
  */
 @Data
-public class ConstructionUserAttendanceMonthReq implements Serializable {
+public class BusConstructionUserAttendanceMonthReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -1496942176392426636L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserAttendanceQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserAttendanceQueryReq.java
similarity index 89%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserAttendanceQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserAttendanceQueryReq.java
index 0a9d2d58..b3472807 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserAttendanceQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserAttendanceQueryReq.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 2025/4/7 10:52
  */
 @Data
-public class ConstructionUserAttendanceQueryReq implements Serializable {
+public class BusConstructionUserAttendanceQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -6634291825924626633L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserBatchUpdateClockReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserBatchUpdateClockReq.java
similarity index 88%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserBatchUpdateClockReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserBatchUpdateClockReq.java
index 8a4dc60a..ef4d4ae3 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserBatchUpdateClockReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserBatchUpdateClockReq.java
@@ -13,7 +13,7 @@ import java.io.Serializable;
  * @date 2025/4/2 9:14
  */
 @Data
-public class ConstructionUserBatchUpdateClockReq implements Serializable {
+public class BusConstructionUserBatchUpdateClockReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -5803749609177642435L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserBatchUpdateStatusReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserBatchUpdateStatusReq.java
similarity index 88%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserBatchUpdateStatusReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserBatchUpdateStatusReq.java
index ed0fd542..10fb1a6c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserBatchUpdateStatusReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserBatchUpdateStatusReq.java
@@ -14,7 +14,7 @@ import java.util.List;
  * @date 2025/4/1 17:11
  */
 @Data
-public class ConstructionUserBatchUpdateStatusReq implements Serializable {
+public class BusConstructionUserBatchUpdateStatusReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -3756685899069233313L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserChangeProjectReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserChangeProjectReq.java
similarity index 90%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserChangeProjectReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserChangeProjectReq.java
index 04b2672e..9c488620 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserChangeProjectReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserChangeProjectReq.java
@@ -13,7 +13,7 @@ import java.io.Serializable;
  * @date 2025/3/31 14:50
  */
 @Data
-public class ConstructionUserChangeProjectReq implements Serializable {
+public class BusConstructionUserChangeProjectReq implements Serializable {
     @Serial
     private static final long serialVersionUID = -2638471692809830501L;
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserCreateReq.java
similarity index 96%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserCreateReq.java
index 5d84393a..56df44ae 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserCreateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 14:05
  */
 @Data
-public class ConstructionUserCreateReq implements Serializable {
+public class BusConstructionUserCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -7603153089205421154L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserGisReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserGisReq.java
similarity index 86%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserGisReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserGisReq.java
index 60788406..824cb22d 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserGisReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserGisReq.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 2025/4/28 9:40
  */
 @Data
-public class ConstructionUserGisReq implements Serializable {
+public class BusConstructionUserGisReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 2487357135566518535L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserQueryReq.java
similarity index 96%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserQueryReq.java
index 76970104..7aeef1d4 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 14:31
  */
 @Data
-public class ConstructionUserQueryReq implements Serializable {
+public class BusConstructionUserQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3252651952758479341L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserUpdateClockReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserUpdateClockReq.java
similarity index 89%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserUpdateClockReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserUpdateClockReq.java
index 7ca7b5b2..223442f7 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserUpdateClockReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserUpdateClockReq.java
@@ -13,7 +13,7 @@ import java.io.Serializable;
  * @date 2025/4/2 9:14
  */
 @Data
-public class ConstructionUserUpdateClockReq implements Serializable {
+public class BusConstructionUserUpdateClockReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -5803749609177642435L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserUpdateReq.java
similarity index 97%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserUpdateReq.java
index 37f95097..6d23efcc 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserUpdateReq.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 2025/3/5 15:04
  */
 @Data
-public class ConstructionUserUpdateReq implements Serializable {
+public class BusConstructionUserUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -8022860866890925958L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserUpdateSalaryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserUpdateSalaryReq.java
similarity index 86%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserUpdateSalaryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserUpdateSalaryReq.java
index 3492165a..e676f794 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserUpdateSalaryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserUpdateSalaryReq.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 2025/4/2 11:35
  */
 @Data
-public class ConstructionUserUpdateSalaryReq implements Serializable {
+public class BusConstructionUserUpdateSalaryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -1300674086812422523L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserexit/ConstructionUserExitQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserexit/BusConstructionUserExitQueryReq.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserexit/ConstructionUserExitQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserexit/BusConstructionUserExitQueryReq.java
index 99c50160..0ff3d5cd 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserexit/ConstructionUserExitQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserexit/BusConstructionUserExitQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/31 15:13
  */
 @Data
-public class ConstructionUserExitQueryReq implements Serializable {
+public class BusConstructionUserExitQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1108809723013529990L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/ConstructionUserFileQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileQueryReq.java
similarity index 87%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/ConstructionUserFileQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileQueryReq.java
index b2300b8f..435b5c39 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/ConstructionUserFileQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/1 10:06
  */
 @Data
-public class ConstructionUserFileQueryReq implements Serializable {
+public class BusConstructionUserFileQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 552027602186820020L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/ConstructionUserFileReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileReq.java
similarity index 89%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/ConstructionUserFileReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileReq.java
index df05dc32..dbb52d59 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/ConstructionUserFileReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileReq.java
@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class ConstructionUserFileReq{
+public class BusConstructionUserFileReq {
 
     /**
      * 文件类型
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/ConstructionUserFileSaveReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileSaveReq.java
similarity index 75%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/ConstructionUserFileSaveReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileSaveReq.java
index 4dbb3fd4..5f2673d7 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/ConstructionUserFileSaveReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileSaveReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/4/1 10:01
  */
 @Data
-public class ConstructionUserFileSaveReq implements Serializable {
+public class BusConstructionUserFileSaveReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 4319620202781413796L;
@@ -24,6 +24,6 @@ public class ConstructionUserFileSaveReq implements Serializable {
     /**
      * 文件列表
      */
-    private List<ConstructionUserFileReq> fileList;
+    private List<BusConstructionUserFileReq> fileList;
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/ConstructionUserFileTemplateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileTemplateReq.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/ConstructionUserFileTemplateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileTemplateReq.java
index af33b186..7778e676 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/ConstructionUserFileTemplateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileTemplateReq.java
@@ -12,7 +12,7 @@ import java.util.List;
  * @date 2025/4/9 9:25
  */
 @Data
-public class ConstructionUserFileTemplateReq implements Serializable {
+public class BusConstructionUserFileTemplateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -6895109153171403950L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/BusContractorCreateReq.java
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/BusContractorCreateReq.java
index 60bc385d..6b0dba95 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/BusContractorCreateReq.java
@@ -11,7 +11,7 @@ import java.util.Map;
  * @date 2025/3/5 14:05
  */
 @Data
-public class ContractorCreateReq implements Serializable {
+public class BusContractorCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -7603153089205421154L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/BusContractorQueryReq.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/BusContractorQueryReq.java
index addd3a55..681869db 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/BusContractorQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 14:31
  */
 @Data
-public class ContractorQueryReq implements Serializable {
+public class BusContractorQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3252651952758479341L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/BusContractorUpdateReq.java
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/BusContractorUpdateReq.java
index 0d7f24e6..fa393c57 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/BusContractorUpdateReq.java
@@ -11,7 +11,7 @@ import java.util.Map;
  * @date 2025/3/5 15:04
  */
 @Data
-public class ContractorUpdateReq implements Serializable {
+public class BusContractorUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -8022860866890925958L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/leave/LeaveManagerReviewReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/leave/BusLeaveManagerReviewReq.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/leave/LeaveManagerReviewReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/leave/BusLeaveManagerReviewReq.java
index c0e4bfa0..d685f311 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/leave/LeaveManagerReviewReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/leave/BusLeaveManagerReviewReq.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 2025/4/8 11:43
  */
 @Data
-public class LeaveManagerReviewReq implements Serializable {
+public class BusLeaveManagerReviewReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3902793123554028126L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/leave/LeaveQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/leave/BusLeaveQueryReq.java
similarity index 95%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/leave/LeaveQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/leave/BusLeaveQueryReq.java
index 2593c054..4f5e468d 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/leave/LeaveQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/leave/BusLeaveQueryReq.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 2025/4/8 11:44
  */
 @Data
-public class LeaveQueryReq implements Serializable {
+public class BusLeaveQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 43795533290515099L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectBatchByProjectListReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectBatchByProjectListReq.java
similarity index 84%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectBatchByProjectListReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectBatchByProjectListReq.java
index 263471bb..51cf7bc8 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectBatchByProjectListReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectBatchByProjectListReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 17:16
  */
 @Data
-public class ProjectBatchByProjectListReq implements Serializable {
+public class BusProjectBatchByProjectListReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -3366498681076059844L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectCreateReq.java
similarity index 96%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectCreateReq.java
index 6c2b1bdc..a8699bdd 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectCreateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 14:05
  */
 @Data
-public class ProjectCreateReq implements Serializable {
+public class BusProjectCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -7603153089205421154L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectQueryReq.java
similarity index 96%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectQueryReq.java
index d7134be1..3a416c3b 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 14:31
  */
 @Data
-public class ProjectQueryReq implements Serializable {
+public class BusProjectQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 5563677643070664671L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectUpdateReq.java
similarity index 96%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectUpdateReq.java
index cf815024..f0047710 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectUpdateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 15:04
  */
 @Data
-public class ProjectUpdateReq implements Serializable {
+public class BusProjectUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3431952359907567659L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/ProjectFileQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/BusProjectFileQueryReq.java
similarity index 88%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/ProjectFileQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/BusProjectFileQueryReq.java
index 60e3f587..b6bbfaec 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/ProjectFileQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/BusProjectFileQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/23 14:16
  */
 @Data
-public class ProjectFileQueryReq implements Serializable {
+public class BusProjectFileQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 399401709402729491L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/ProjectFileUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/BusProjectFileUpdateReq.java
similarity index 88%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/ProjectFileUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/BusProjectFileUpdateReq.java
index 7dfe888c..fe371daf 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/ProjectFileUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/BusProjectFileUpdateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/23 14:18
  */
 @Data
-public class ProjectFileUpdateReq implements Serializable {
+public class BusProjectFileUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -5620479296452749930L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/ProjectFileUploadDxfReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/BusProjectFileUploadDxfReq.java
similarity index 83%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/ProjectFileUploadDxfReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/BusProjectFileUploadDxfReq.java
index 1d5e6654..5e40a5b7 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/ProjectFileUploadDxfReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/BusProjectFileUploadDxfReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/23 11:43
  */
 @Data
-public class ProjectFileUploadDxfReq implements Serializable {
+public class BusProjectFileUploadDxfReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -7096688035548954702L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/ProjectNewsCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsCreateReq.java
similarity index 88%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/ProjectNewsCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsCreateReq.java
index caeca900..21108c42 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/ProjectNewsCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsCreateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/28 11:52
  */
 @Data
-public class ProjectNewsCreateReq implements Serializable {
+public class BusProjectNewsCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 7116830397516873096L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/ProjectNewsGisReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsGisReq.java
similarity index 87%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/ProjectNewsGisReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsGisReq.java
index 1f95329a..72e1d23a 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/ProjectNewsGisReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsGisReq.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 2025/4/28 14:07
  */
 @Data
-public class ProjectNewsGisReq implements Serializable {
+public class BusProjectNewsGisReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -291705026028532102L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/ProjectNewsQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsQueryReq.java
similarity index 84%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/ProjectNewsQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsQueryReq.java
index fe061531..a5ce0be6 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/ProjectNewsQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/28 11:52
  */
 @Data
-public class ProjectNewsQueryReq implements Serializable {
+public class BusProjectNewsQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1453496535743326174L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/ProjectNewsUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsUpdateReq.java
similarity index 88%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/ProjectNewsUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsUpdateReq.java
index 8474c01b..7cb98923 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/ProjectNewsUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsUpdateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/28 11:53
  */
 @Data
-public class ProjectNewsUpdateReq implements Serializable {
+public class BusProjectNewsUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -5988430319051945969L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/BusProjectTeamCreateReq.java
similarity index 90%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/BusProjectTeamCreateReq.java
index b70fa61b..4b2044b3 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/BusProjectTeamCreateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 14:05
  */
 @Data
-public class ProjectTeamCreateReq implements Serializable {
+public class BusProjectTeamCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -7603153089205421154L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/BusProjectTeamQueryReq.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/BusProjectTeamQueryReq.java
index 6b866f1e..5f73783e 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/BusProjectTeamQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 14:31
  */
 @Data
-public class ProjectTeamQueryReq implements Serializable {
+public class BusProjectTeamQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3252651952758479341L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/BusProjectTeamUpdateReq.java
similarity index 90%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/BusProjectTeamUpdateReq.java
index bd2bd816..d8977d89 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/BusProjectTeamUpdateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 15:04
  */
 @Data
-public class ProjectTeamUpdateReq implements Serializable {
+public class BusProjectTeamUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -8022860866890925958L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberCreateReq.java
similarity index 89%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberCreateReq.java
index a63149dd..b62e1852 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberCreateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 14:05
  */
 @Data
-public class ProjectTeamMemberCreateReq implements Serializable {
+public class BusProjectTeamMemberCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -7603153089205421154L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberExitReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberExitReq.java
similarity index 87%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberExitReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberExitReq.java
index a8dc29a6..7c5c9a43 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberExitReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberExitReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/31 10:54
  */
 @Data
-public class ProjectTeamMemberExitReq implements Serializable {
+public class BusProjectTeamMemberExitReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 6911310088122710744L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberQueryReq.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberQueryReq.java
index 44f8d186..8513f1e3 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 14:31
  */
 @Data
-public class ProjectTeamMemberQueryReq implements Serializable {
+public class BusProjectTeamMemberQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3252651952758479341L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberUpdateReq.java
similarity index 90%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberUpdateReq.java
index 16cb3980..004acbba 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberUpdateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 15:04
  */
 @Data
-public class ProjectTeamMemberUpdateReq implements Serializable {
+public class BusProjectTeamMemberUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -8022860866890925958L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/reissuecard/ReissueCardManagerReviewReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/reissuecard/BusReissueCardManagerReviewReq.java
similarity index 90%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/reissuecard/ReissueCardManagerReviewReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/reissuecard/BusReissueCardManagerReviewReq.java
index 789dfa7a..c2c3f213 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/reissuecard/ReissueCardManagerReviewReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/reissuecard/BusReissueCardManagerReviewReq.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 2025/4/8 10:27
  */
 @Data
-public class ReissueCardManagerReviewReq implements Serializable {
+public class BusReissueCardManagerReviewReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 5249263232892725923L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/reissuecard/ReissueCardQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/reissuecard/BusReissueCardQueryReq.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/reissuecard/ReissueCardQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/reissuecard/BusReissueCardQueryReq.java
index 777c40dd..9aae37f1 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/reissuecard/ReissueCardQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/reissuecard/BusReissueCardQueryReq.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 2025/4/8 9:58
  */
 @Data
-public class ReissueCardQueryReq implements Serializable {
+public class BusReissueCardQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -3708280254564807491L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/UserProjectRelevancyCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/BusUserProjectRelevancyCreateReq.java
similarity index 84%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/UserProjectRelevancyCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/BusUserProjectRelevancyCreateReq.java
index 91d73da0..f55a2a15 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/UserProjectRelevancyCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/BusUserProjectRelevancyCreateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 14:05
  */
 @Data
-public class UserProjectRelevancyCreateReq implements Serializable {
+public class BusUserProjectRelevancyCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -7603153089205421154L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/UserProjectRelevancyQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/BusUserProjectRelevancyQueryReq.java
similarity index 86%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/UserProjectRelevancyQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/BusUserProjectRelevancyQueryReq.java
index 3f0b81fc..a7ba6943 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/UserProjectRelevancyQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/BusUserProjectRelevancyQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 14:31
  */
 @Data
-public class UserProjectRelevancyQueryReq implements Serializable {
+public class BusUserProjectRelevancyQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3252651952758479341L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/UserProjectRelevancyUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/BusUserProjectRelevancyUpdateReq.java
similarity index 86%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/UserProjectRelevancyUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/BusUserProjectRelevancyUpdateReq.java
index 8b8e8e60..53f45031 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/UserProjectRelevancyUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/BusUserProjectRelevancyUpdateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 15:04
  */
 @Data
-public class UserProjectRelevancyUpdateReq implements Serializable {
+public class BusUserProjectRelevancyUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -8022860866890925958L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workerdailyreport/WorkerDailyReportQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workerdailyreport/BusWorkerDailyReportQueryReq.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workerdailyreport/WorkerDailyReportQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workerdailyreport/BusWorkerDailyReportQueryReq.java
index 6804f05d..033d18ec 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workerdailyreport/WorkerDailyReportQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workerdailyreport/BusWorkerDailyReportQueryReq.java
@@ -12,7 +12,7 @@ import java.util.Date;
  * @date 2025/4/9 15:44
  */
 @Data
-public class WorkerDailyReportQueryReq implements Serializable {
+public class BusWorkerDailyReportQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -8919309843260665154L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/WorkWageCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/BusWorkWageCreateReq.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/WorkWageCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/BusWorkWageCreateReq.java
index a8353df0..7972c059 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/WorkWageCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/BusWorkWageCreateReq.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 2025/3/26 14:30
  */
 @Data
-public class WorkWageCreateReq implements Serializable {
+public class BusWorkWageCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1099295506349661143L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/WorkWageQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/BusWorkWageQueryReq.java
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/WorkWageQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/BusWorkWageQueryReq.java
index ba54840b..b003d62c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/WorkWageQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/BusWorkWageQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/26 14:30
  */
 @Data
-public class WorkWageQueryReq implements Serializable {
+public class BusWorkWageQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -2259122917361079910L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/WorkWageUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/BusWorkWageUpdateReq.java
similarity index 90%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/WorkWageUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/BusWorkWageUpdateReq.java
index d37ec93d..2700724c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/WorkWageUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/BusWorkWageUpdateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/26 14:30
  */
 @Data
-public class WorkWageUpdateReq implements Serializable {
+public class BusWorkWageUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 2367543567493554848L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/workerdailyreport/WorkerDailyReportReissueResp.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/workerdailyreport/WorkerDailyReportReissueResp.java
deleted file mode 100644
index 93330131..00000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/workerdailyreport/WorkerDailyReportReissueResp.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.dromara.project.domain.resp.workerdailyreport;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import org.dromara.project.domain.vo.BusDailyPieceItemVo;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author lcj
- * @date 2025/4/9 17:10
- */
-@Data
-public class WorkerDailyReportReissueResp implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = -7808587129621015440L;
-
-    /**
-     * 主键id
-     */
-    private Long id;
-
-    /**
-     * 班组id
-     */
-    private Long teamId;
-
-    /**
-     * 班组名字
-     */
-    private String teamName;
-
-    /**
-     * 申请人id
-     */
-    private Long userId;
-
-    /**
-     * 申请人名字
-     */
-    private String userName;
-
-    /**
-     * 今日完成工作
-     */
-    private String todayCompletedWork;
-
-    /**
-     * 未完成工作
-     */
-    private String unfinishedWork;
-
-    /**
-     * 补交理由
-     */
-    private String resubmitReason;
-
-    /**
-     * 日报日期
-     */
-    @JsonFormat(shape = JsonFormat.Shape.STRING,
-            pattern = "yyyy-MM-dd",
-            timezone = "GMT+8")
-    private Date reportDate;
-
-    /**
-     * 附件
-     */
-    private String file;
-
-    /**
-     * 日报明细
-     */
-    private List<BusDailyPieceItemVo> dailyPieceItemVoList;
-}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/attendance/AttendanceClockDateForTwoWeekResp.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/attendance/BusAttendanceClockDateForTwoWeekVo.java
similarity index 85%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/attendance/AttendanceClockDateForTwoWeekResp.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/attendance/BusAttendanceClockDateForTwoWeekVo.java
index 4a9819be..e32c858a 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/attendance/AttendanceClockDateForTwoWeekResp.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/attendance/BusAttendanceClockDateForTwoWeekVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.resp.attendance;
+package org.dromara.project.domain.vo.attendance;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -12,7 +12,7 @@ import java.util.Date;
  * @date 2025/4/7 9:55
  */
 @Data
-public class AttendanceClockDateForTwoWeekResp implements Serializable {
+public class BusAttendanceClockDateForTwoWeekVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -2762312533060742243L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/attendance/AttendanceListByDay.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/attendance/BusAttendanceListByDay.java
similarity index 77%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/attendance/AttendanceListByDay.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/attendance/BusAttendanceListByDay.java
index 75de790c..e58ce11f 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/attendance/AttendanceListByDay.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/attendance/BusAttendanceListByDay.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.resp.attendance;
+package org.dromara.project.domain.vo.attendance;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -14,7 +14,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class AttendanceListByDay {
+public class BusAttendanceListByDay {
 
     /**
      * 上下班（1上班,2下班）
@@ -31,11 +31,11 @@ public class AttendanceListByDay {
      */
     private String clockStatus;
 
-    public static AttendanceListByDay build(BusAttendance attendance) {
+    public static BusAttendanceListByDay build(BusAttendance attendance) {
         if (attendance == null) {
             return null;
         }
-        AttendanceListByDay attendanceListByDay = new AttendanceListByDay();
+        BusAttendanceListByDay attendanceListByDay = new BusAttendanceListByDay();
         attendanceListByDay.setCommuter(attendance.getCommuter());
         attendanceListByDay.setClockTime(attendance.getClockTime());
         attendanceListByDay.setClockStatus(attendance.getClockStatus());
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/attendance/AttendanceMonthByUserIdResp.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/attendance/BusAttendanceMonthByUserIdVo.java
similarity index 78%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/attendance/AttendanceMonthByUserIdResp.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/attendance/BusAttendanceMonthByUserIdVo.java
index 42550171..d9db6885 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/attendance/AttendanceMonthByUserIdResp.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/attendance/BusAttendanceMonthByUserIdVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.resp.attendance;
+package org.dromara.project.domain.vo.attendance;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2025/4/8 16:58
  */
 @Data
-public class AttendanceMonthByUserIdResp implements Serializable {
+public class BusAttendanceMonthByUserIdVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -6172238396618801431L;
@@ -39,6 +39,6 @@ public class AttendanceMonthByUserIdResp implements Serializable {
     /**
      * 当天打卡记录
      */
-    private List<AttendanceListByDay> attendanceList;
+    private List<BusAttendanceListByDay> attendanceList;
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusAttendanceVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/attendance/BusAttendanceVo.java
similarity index 98%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusAttendanceVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/attendance/BusAttendanceVo.java
index 6227ed66..7c5056d9 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusAttendanceVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/attendance/BusAttendanceVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.vo;
+package org.dromara.project.domain.vo.attendance;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionBlacklistVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionblacklist/BusConstructionBlacklistVo.java
similarity index 95%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionBlacklistVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionblacklist/BusConstructionBlacklistVo.java
index 5a8fdd74..d5887dfa 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionBlacklistVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionblacklist/BusConstructionBlacklistVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.vo;
+package org.dromara.project.domain.vo.constructionblacklist;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/constructionuser/ConstructionUserAttendanceByDay.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserAttendanceByDay.java
similarity index 71%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/constructionuser/ConstructionUserAttendanceByDay.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserAttendanceByDay.java
index bdd49aa9..bdbcda66 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/constructionuser/ConstructionUserAttendanceByDay.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserAttendanceByDay.java
@@ -1,10 +1,10 @@
-package org.dromara.project.domain.resp.constructionuser;
+package org.dromara.project.domain.vo.constructionuser;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.dromara.project.domain.BusAttendance;
-import org.dromara.project.domain.enums.AttendanceCommuterEnum;
+import org.dromara.project.domain.enums.BusAttendanceCommuterEnum;
 
 import java.util.Date;
 import java.util.List;
@@ -16,7 +16,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class ConstructionUserAttendanceByDay {
+public class BusConstructionUserAttendanceByDay {
 
     /**
      * 上班打卡时间
@@ -47,18 +47,18 @@ public class ConstructionUserAttendanceByDay {
      */
     private Date downClockTime;
 
-    public static ConstructionUserAttendanceByDay build(List<BusAttendance> attendanceList) {
+    public static BusConstructionUserAttendanceByDay build(List<BusAttendance> attendanceList) {
         if (attendanceList == null) {
             return null;
         }
-        ConstructionUserAttendanceByDay constructionUserAttendanceByDay = new ConstructionUserAttendanceByDay();
+        BusConstructionUserAttendanceByDay constructionUserAttendanceByDay = new BusConstructionUserAttendanceByDay();
         for (BusAttendance attendance : attendanceList) {
-            if (attendance.getCommuter().equals(AttendanceCommuterEnum.CLOCKIN.getValue())) {
+            if (attendance.getCommuter().equals(BusAttendanceCommuterEnum.CLOCKIN.getValue())) {
                 constructionUserAttendanceByDay.setUpClockTime(attendance.getClockTime());
                 if (attendance.getFacePic() != null) {
                     constructionUserAttendanceByDay.setUpClockPicId(Long.valueOf(attendance.getFacePic()));
                 }
-            } else if (attendance.getCommuter().equals(AttendanceCommuterEnum.CLOCKOUT.getValue())) {
+            } else if (attendance.getCommuter().equals(BusAttendanceCommuterEnum.CLOCKOUT.getValue())) {
                 constructionUserAttendanceByDay.setDownClockTime(attendance.getClockTime());
                 if (attendance.getFacePic() != null) {
                     constructionUserAttendanceByDay.setDownClockPicId(Long.valueOf(attendance.getFacePic()));
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/constructionuser/ConstructionUserAttendanceMonthResp.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserAttendanceMonthVo.java
similarity index 76%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/constructionuser/ConstructionUserAttendanceMonthResp.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserAttendanceMonthVo.java
index 54c416f8..37ff7dc0 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/constructionuser/ConstructionUserAttendanceMonthResp.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserAttendanceMonthVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.resp.constructionuser;
+package org.dromara.project.domain.vo.constructionuser;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -12,7 +12,7 @@ import java.util.Date;
  * @date 2025/4/7 15:06
  */
 @Data
-public class ConstructionUserAttendanceMonthResp implements Serializable {
+public class BusConstructionUserAttendanceMonthVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -413447291128760025L;
@@ -38,6 +38,6 @@ public class ConstructionUserAttendanceMonthResp implements Serializable {
     /**
      * 当天打卡记录
      */
-    private ConstructionUserAttendanceByDay clockList;
+    private BusConstructionUserAttendanceByDay clockList;
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/constructionuser/ConstructionUserAttendanceTotalResp.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserAttendanceTotalVo.java
similarity index 86%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/constructionuser/ConstructionUserAttendanceTotalResp.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserAttendanceTotalVo.java
index 3f1a5592..416cf386 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/constructionuser/ConstructionUserAttendanceTotalResp.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserAttendanceTotalVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.resp.constructionuser;
+package org.dromara.project.domain.vo.constructionuser;
 
 import lombok.Data;
 
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 2025/4/7 10:16
  */
 @Data
-public class ConstructionUserAttendanceTotalResp implements Serializable {
+public class BusConstructionUserAttendanceTotalVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1335094839733429171L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/constructionuser/ConstructionUserGisResp.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserGisVo.java
similarity index 78%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/constructionuser/ConstructionUserGisResp.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserGisVo.java
index 9fc70989..016fc6d1 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/constructionuser/ConstructionUserGisResp.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserGisVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.resp.constructionuser;
+package org.dromara.project.domain.vo.constructionuser;
 
 import lombok.Data;
 
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/28 9:33
  */
 @Data
-public class ConstructionUserGisResp implements Serializable {
+public class BusConstructionUserGisVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -3496633845665259321L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserVo.java
similarity index 97%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserVo.java
index fd182bde..2a196596 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuser/BusConstructionUserVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.vo;
+package org.dromara.project.domain.vo.constructionuser;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -7,6 +7,7 @@ import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.project.domain.BusConstructionUser;
+import org.dromara.project.domain.vo.contractor.BusContractorVo;
 
 import java.io.Serial;
 import java.io.Serializable;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserExitVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuserexit/BusConstructionUserExitVo.java
similarity index 96%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserExitVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuserexit/BusConstructionUserExitVo.java
index 612805bd..b6b09784 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserExitVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuserexit/BusConstructionUserExitVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.vo;
+package org.dromara.project.domain.vo.constructionuserexit;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserFileVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuserfile/BusConstructionUserFileVo.java
similarity index 95%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserFileVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuserfile/BusConstructionUserFileVo.java
index db4d86f6..ab68b3d0 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserFileVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/constructionuserfile/BusConstructionUserFileVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.vo;
+package org.dromara.project.domain.vo.constructionuserfile;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusContractorVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/contractor/BusContractorVo.java
similarity index 97%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusContractorVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/contractor/BusContractorVo.java
index be83c797..1a113ede 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusContractorVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/contractor/BusContractorVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.vo;
+package org.dromara.project.domain.vo.contractor;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusDailyPieceItemVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/dailypieceitem/BusDailyPieceItemVo.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusDailyPieceItemVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/dailypieceitem/BusDailyPieceItemVo.java
index e6d51fb9..a0e3de2c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusDailyPieceItemVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/dailypieceitem/BusDailyPieceItemVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.vo;
+package org.dromara.project.domain.vo.dailypieceitem;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import io.github.linpeilie.annotations.AutoMapper;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusLeaveVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/leave/BusLeaveVo.java
similarity index 98%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusLeaveVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/leave/BusLeaveVo.java
index bb0f716e..4fdf1190 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusLeaveVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/leave/BusLeaveVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.vo;
+package org.dromara.project.domain.vo.leave;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/project/ProjectContractorListResp.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectContractorListVo.java
similarity index 81%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/project/ProjectContractorListResp.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectContractorListVo.java
index 79190719..28209e07 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/project/ProjectContractorListResp.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectContractorListVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.resp.project;
+package org.dromara.project.domain.vo.project;
 
 import lombok.Data;
 import org.dromara.common.core.domain.vo.IdAndNameVO;
@@ -12,7 +12,7 @@ import java.util.List;
  * @date 2025/3/31 16:16
  */
 @Data
-public class ProjectContractorListResp implements Serializable {
+public class BusProjectContractorListVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3089953733712392942L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectVo.java
similarity index 98%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectVo.java
index ad2f29e7..36cfbbd7 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.vo;
+package org.dromara.project.domain.vo.project;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectFileVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectfile/BusProjectFileVo.java
similarity index 83%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectFileVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectfile/BusProjectFileVo.java
index 4f4cb935..397f4a4d 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectFileVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectfile/BusProjectFileVo.java
@@ -1,17 +1,13 @@
-package org.dromara.project.domain.vo;
+package org.dromara.project.domain.vo.projectfile;
 
 import org.dromara.project.domain.BusProjectFile;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
-
 
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/projectnews/ProjectNewsGisResp.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectnews/BusProjectNewsGisVo.java
similarity index 74%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/projectnews/ProjectNewsGisResp.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectnews/BusProjectNewsGisVo.java
index 42399cbf..59f27595 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/projectnews/ProjectNewsGisResp.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectnews/BusProjectNewsGisVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.resp.projectnews;
+package org.dromara.project.domain.vo.projectnews;
 
 import lombok.Data;
 
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/28 14:11
  */
 @Data
-public class ProjectNewsGisResp implements Serializable {
+public class BusProjectNewsGisVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -751096185387401970L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectNewsVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectnews/BusProjectNewsVo.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectNewsVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectnews/BusProjectNewsVo.java
index 0ea6a8aa..ad25429f 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectNewsVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectnews/BusProjectNewsVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.vo;
+package org.dromara.project.domain.vo.projectnews;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/projectteam/ForemanVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectteam/BusForemanVo.java
similarity index 80%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/projectteam/ForemanVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectteam/BusForemanVo.java
index 5d8664cc..428359f4 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/projectteam/ForemanVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectteam/BusForemanVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.resp.projectteam;
+package org.dromara.project.domain.vo.projectteam;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class ForemanVo {
+public class BusForemanVo {
 
     /**
      * 班组长id
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/projectteam/ProjectTeamForemanResp.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectteam/BusProjectTeamForemanVo.java
similarity index 74%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/projectteam/ProjectTeamForemanResp.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectteam/BusProjectTeamForemanVo.java
index 6378f89e..d3a4c5ff 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/projectteam/ProjectTeamForemanResp.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectteam/BusProjectTeamForemanVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.resp.projectteam;
+package org.dromara.project.domain.vo.projectteam;
 
 import lombok.Data;
 
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/3/21 13:49
  */
 @Data
-public class ProjectTeamForemanResp implements Serializable {
+public class BusProjectTeamForemanVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -5655849857614630436L;
@@ -34,6 +34,6 @@ public class ProjectTeamForemanResp implements Serializable {
     /**
      * 班组长列表
      */
-    private List<ForemanVo> foremanList;
+    private List<BusForemanVo> foremanList;
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectTeamVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectteam/BusProjectTeamVo.java
similarity index 96%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectTeamVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectteam/BusProjectTeamVo.java
index fcb94dad..f73e11fc 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectTeamVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectteam/BusProjectTeamVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.vo;
+package org.dromara.project.domain.vo.projectteam;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectTeamMemberVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectteammember/BusProjectTeamMemberVo.java
similarity index 96%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectTeamMemberVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectteammember/BusProjectTeamMemberVo.java
index 0f983133..aea606db 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectTeamMemberVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectteammember/BusProjectTeamMemberVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.vo;
+package org.dromara.project.domain.vo.projectteammember;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusReissueCardVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/reissuecard/BusReissueCardVo.java
similarity index 98%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusReissueCardVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/reissuecard/BusReissueCardVo.java
index b7aca971..f8a7de62 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusReissueCardVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/reissuecard/BusReissueCardVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.vo;
+package org.dromara.project.domain.vo.reissuecard;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/userprojectrelevancy/LoginUserProjectRelevancyResp.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/userprojectrelevancy/BusLoginUserProjectRelevancyVo.java
similarity index 80%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/userprojectrelevancy/LoginUserProjectRelevancyResp.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/userprojectrelevancy/BusLoginUserProjectRelevancyVo.java
index cd6b8963..c722accc 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/resp/userprojectrelevancy/LoginUserProjectRelevancyResp.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/userprojectrelevancy/BusLoginUserProjectRelevancyVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.resp.userprojectrelevancy;
+package org.dromara.project.domain.vo.userprojectrelevancy;
 
 import lombok.Data;
 
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/5 15:30
  */
 @Data
-public class LoginUserProjectRelevancyResp implements Serializable {
+public class BusLoginUserProjectRelevancyVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -2056438621566236671L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusUserProjectRelevancyVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/userprojectrelevancy/BusUserProjectRelevancyVo.java
similarity index 90%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusUserProjectRelevancyVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/userprojectrelevancy/BusUserProjectRelevancyVo.java
index 6857114f..7154b219 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusUserProjectRelevancyVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/userprojectrelevancy/BusUserProjectRelevancyVo.java
@@ -1,10 +1,11 @@
-package org.dromara.project.domain.vo;
+package org.dromara.project.domain.vo.userprojectrelevancy;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.project.domain.BusUserProjectRelevancy;
+import org.dromara.project.domain.vo.project.BusProjectVo;
 
 import java.io.Serial;
 import java.io.Serializable;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusWorkerDailyReportVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/workerdailyreport/BusWorkerDailyReportVo.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusWorkerDailyReportVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/workerdailyreport/BusWorkerDailyReportVo.java
index db98f14d..2850cd5a 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusWorkerDailyReportVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/workerdailyreport/BusWorkerDailyReportVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.vo;
+package org.dromara.project.domain.vo.workerdailyreport;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.project.domain.BusWorkerDailyReport;
+import org.dromara.project.domain.vo.dailypieceitem.BusDailyPieceItemVo;
 
 import java.io.Serial;
 import java.io.Serializable;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusWorkWageVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/workwage/BusWorkWageVo.java
similarity index 97%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusWorkWageVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/workwage/BusWorkWageVo.java
index 57094fee..6f29abfe 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusWorkWageVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/workwage/BusWorkWageVo.java
@@ -1,4 +1,4 @@
-package org.dromara.project.domain.vo;
+package org.dromara.project.domain.vo.workwage;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusAttendanceMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusAttendanceMapper.java
index 9a21b156..f60b442e 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusAttendanceMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusAttendanceMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.project.mapper;
 
 import org.dromara.project.domain.BusAttendance;
-import org.dromara.project.domain.vo.BusAttendanceVo;
+import org.dromara.project.domain.vo.attendance.BusAttendanceVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionBlacklistMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionBlacklistMapper.java
index ba9d79b4..de0a2529 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionBlacklistMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionBlacklistMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.project.mapper;
 
 import org.dromara.project.domain.BusConstructionBlacklist;
-import org.dromara.project.domain.vo.BusConstructionBlacklistVo;
+import org.dromara.project.domain.vo.constructionblacklist.BusConstructionBlacklistVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionUserExitMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionUserExitMapper.java
index 3ddc9313..7700dadc 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionUserExitMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionUserExitMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.project.mapper;
 
 import org.dromara.project.domain.BusConstructionUserExit;
-import org.dromara.project.domain.vo.BusConstructionUserExitVo;
+import org.dromara.project.domain.vo.constructionuserexit.BusConstructionUserExitVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionUserFileMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionUserFileMapper.java
index 0edf1fdb..1da5002c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionUserFileMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionUserFileMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.project.mapper;
 
 import org.dromara.project.domain.BusConstructionUserFile;
-import org.dromara.project.domain.vo.BusConstructionUserFileVo;
+import org.dromara.project.domain.vo.constructionuserfile.BusConstructionUserFileVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionUserMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionUserMapper.java
index 98670a24..94f7230c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionUserMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusConstructionUserMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.project.mapper;
 
 import org.dromara.project.domain.BusConstructionUser;
-import org.dromara.project.domain.vo.BusConstructionUserVo;
+import org.dromara.project.domain.vo.constructionuser.BusConstructionUserVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusContractorMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusContractorMapper.java
index b4759be2..423f081e 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusContractorMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusContractorMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.project.mapper;
 
 import org.dromara.project.domain.BusContractor;
-import org.dromara.project.domain.vo.BusContractorVo;
+import org.dromara.project.domain.vo.contractor.BusContractorVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusDailyPieceItemMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusDailyPieceItemMapper.java
index d50fdaee..ece80ccd 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusDailyPieceItemMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusDailyPieceItemMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.project.mapper;
 
 import org.dromara.project.domain.BusDailyPieceItem;
-import org.dromara.project.domain.vo.BusDailyPieceItemVo;
+import org.dromara.project.domain.vo.dailypieceitem.BusDailyPieceItemVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusLeaveMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusLeaveMapper.java
index 4d402e21..9f869f5f 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusLeaveMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusLeaveMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.project.mapper;
 
 import org.dromara.project.domain.BusLeave;
-import org.dromara.project.domain.vo.BusLeaveVo;
+import org.dromara.project.domain.vo.leave.BusLeaveVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusProjectFileMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusProjectFileMapper.java
index 56aa7bd1..0a67ea2d 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusProjectFileMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusProjectFileMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.project.mapper;
 
 import org.dromara.project.domain.BusProjectFile;
-import org.dromara.project.domain.vo.BusProjectFileVo;
+import org.dromara.project.domain.vo.projectfile.BusProjectFileVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusProjectMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusProjectMapper.java
index 9c108acd..4b35dbf8 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusProjectMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusProjectMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.project.mapper;
 
 import org.dromara.project.domain.BusProject;
-import org.dromara.project.domain.vo.BusProjectVo;
+import org.dromara.project.domain.vo.project.BusProjectVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusProjectNewsMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusProjectNewsMapper.java
index acf0a00f..777d1382 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusProjectNewsMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusProjectNewsMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.project.mapper;
 
 import org.dromara.project.domain.BusProjectNews;
-import org.dromara.project.domain.vo.BusProjectNewsVo;
+import org.dromara.project.domain.vo.projectnews.BusProjectNewsVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusProjectTeamMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusProjectTeamMapper.java
index ac786ba2..2115bf43 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusProjectTeamMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusProjectTeamMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.project.mapper;
 
 import org.dromara.project.domain.BusProjectTeam;
-import org.dromara.project.domain.vo.BusProjectTeamVo;
+import org.dromara.project.domain.vo.projectteam.BusProjectTeamVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusProjectTeamMemberMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusProjectTeamMemberMapper.java
index e19b031b..680182c7 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusProjectTeamMemberMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusProjectTeamMemberMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.project.mapper;
 
 import org.dromara.project.domain.BusProjectTeamMember;
-import org.dromara.project.domain.vo.BusProjectTeamMemberVo;
+import org.dromara.project.domain.vo.projectteammember.BusProjectTeamMemberVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusReissueCardMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusReissueCardMapper.java
index c4be497c..d554935e 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusReissueCardMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusReissueCardMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.project.mapper;
 
 import org.dromara.project.domain.BusReissueCard;
-import org.dromara.project.domain.vo.BusReissueCardVo;
+import org.dromara.project.domain.vo.reissuecard.BusReissueCardVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusUserProjectRelevancyMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusUserProjectRelevancyMapper.java
index cdfa6243..6ebeb4dc 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusUserProjectRelevancyMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusUserProjectRelevancyMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.project.mapper;
 
 import org.dromara.project.domain.BusUserProjectRelevancy;
-import org.dromara.project.domain.vo.BusUserProjectRelevancyVo;
+import org.dromara.project.domain.vo.userprojectrelevancy.BusUserProjectRelevancyVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusWorkWageMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusWorkWageMapper.java
index 08078ea9..af1ccc68 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusWorkWageMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusWorkWageMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.project.mapper;
 
 import org.dromara.project.domain.BusWorkWage;
-import org.dromara.project.domain.vo.BusWorkWageVo;
+import org.dromara.project.domain.vo.workwage.BusWorkWageVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusWorkerDailyReportMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusWorkerDailyReportMapper.java
index 4d6e6956..62b6e948 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusWorkerDailyReportMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/mapper/BusWorkerDailyReportMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.project.mapper;
 
 import org.dromara.project.domain.BusWorkerDailyReport;
-import org.dromara.project.domain.vo.BusWorkerDailyReportVo;
+import org.dromara.project.domain.vo.workerdailyreport.BusWorkerDailyReportVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusAttendanceService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusAttendanceService.java
index 452e663c..3dd5e756 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusAttendanceService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusAttendanceService.java
@@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusAttendance;
-import org.dromara.project.domain.req.attendance.AttendanceMonthByUserIdReq;
-import org.dromara.project.domain.req.attendance.AttendanceQueryReq;
-import org.dromara.project.domain.req.attendance.AttendanceQueryTwoWeekReq;
-import org.dromara.project.domain.resp.attendance.AttendanceClockDateForTwoWeekResp;
-import org.dromara.project.domain.resp.attendance.AttendanceMonthByUserIdResp;
-import org.dromara.project.domain.vo.BusAttendanceVo;
+import org.dromara.project.domain.req.attendance.BusAttendanceMonthByUserIdReq;
+import org.dromara.project.domain.req.attendance.BusAttendanceQueryReq;
+import org.dromara.project.domain.req.attendance.BusAttendanceQueryTwoWeekReq;
+import org.dromara.project.domain.vo.attendance.BusAttendanceClockDateForTwoWeekVo;
+import org.dromara.project.domain.vo.attendance.BusAttendanceMonthByUserIdVo;
+import org.dromara.project.domain.vo.attendance.BusAttendanceVo;
 
 import java.util.List;
 
@@ -38,7 +38,7 @@ public interface IBusAttendanceService extends IService<BusAttendance> {
      * @param pageQuery 分页参数
      * @return 考勤分页列表
      */
-    TableDataInfo<BusAttendanceVo> queryPageList(AttendanceQueryReq req, PageQuery pageQuery);
+    TableDataInfo<BusAttendanceVo> queryPageList(BusAttendanceQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询两周内的考勤列表
@@ -46,7 +46,7 @@ public interface IBusAttendanceService extends IService<BusAttendance> {
      * @param req 查询条件
      * @return 考勤列表
      */
-    List<AttendanceClockDateForTwoWeekResp> listClockDateForTwoWeek(AttendanceQueryTwoWeekReq req);
+    List<BusAttendanceClockDateForTwoWeekVo> listClockDateForTwoWeek(BusAttendanceQueryTwoWeekReq req);
 
     /**
      * 查询用户每月考勤列表
@@ -54,7 +54,7 @@ public interface IBusAttendanceService extends IService<BusAttendance> {
      * @param req 查询条件
      * @return 考勤列表
      */
-    List<AttendanceMonthByUserIdResp> listAttendanceMonthListByUserId(AttendanceMonthByUserIdReq req);
+    List<BusAttendanceMonthByUserIdVo> listAttendanceMonthListByUserId(BusAttendanceMonthByUserIdReq req);
 
     /**
      * 查询符合条件的考勤列表
@@ -62,7 +62,7 @@ public interface IBusAttendanceService extends IService<BusAttendance> {
      * @param req 查询条件
      * @return 考勤列表
      */
-    List<BusAttendanceVo> queryList(AttendanceQueryReq req);
+    List<BusAttendanceVo> queryList(BusAttendanceQueryReq req);
 
     /**
      * 根据项目id查询出勤人列表
@@ -86,7 +86,7 @@ public interface IBusAttendanceService extends IService<BusAttendance> {
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<BusAttendance> buildQueryWrapper(AttendanceQueryReq req);
+    LambdaQueryWrapper<BusAttendance> buildQueryWrapper(BusAttendanceQueryReq req);
 
     /**
      * 获取考勤分页对象视图
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionBlacklistService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionBlacklistService.java
index b43bc759..a73a4701 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionBlacklistService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionBlacklistService.java
@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusConstructionBlacklist;
-import org.dromara.project.domain.req.constructionblacklist.ConstructionBlacklistCreateReq;
-import org.dromara.project.domain.req.constructionblacklist.ConstructionBlacklistQueryReq;
-import org.dromara.project.domain.vo.BusConstructionBlacklistVo;
+import org.dromara.project.domain.req.constructionblacklist.BusConstructionBlacklistCreateReq;
+import org.dromara.project.domain.req.constructionblacklist.BusConstructionBlacklistQueryReq;
+import org.dromara.project.domain.vo.constructionblacklist.BusConstructionBlacklistVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -35,7 +35,7 @@ public interface IBusConstructionBlacklistService extends IService<BusConstructi
      * @param pageQuery 分页参数
      * @return 黑名单分页列表
      */
-    TableDataInfo<BusConstructionBlacklistVo> queryPageList(ConstructionBlacklistQueryReq req, PageQuery pageQuery);
+    TableDataInfo<BusConstructionBlacklistVo> queryPageList(BusConstructionBlacklistQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的黑名单列表
@@ -43,7 +43,7 @@ public interface IBusConstructionBlacklistService extends IService<BusConstructi
      * @param req 查询条件
      * @return 黑名单列表
      */
-    List<BusConstructionBlacklistVo> queryList(ConstructionBlacklistQueryReq req);
+    List<BusConstructionBlacklistVo> queryList(BusConstructionBlacklistQueryReq req);
 
     /**
      * 根据项目id查询黑名单用户id列表
@@ -59,7 +59,7 @@ public interface IBusConstructionBlacklistService extends IService<BusConstructi
      * @param req 黑名单
      * @return 是否新增成功
      */
-    Long insertByBo(ConstructionBlacklistCreateReq req);
+    Long insertByBo(BusConstructionBlacklistCreateReq req);
 
     /**
      * 校验并批量删除黑名单信息
@@ -84,5 +84,5 @@ public interface IBusConstructionBlacklistService extends IService<BusConstructi
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<BusConstructionBlacklist> buildQueryWrapper(ConstructionBlacklistQueryReq req);
+    LambdaQueryWrapper<BusConstructionBlacklist> buildQueryWrapper(BusConstructionBlacklistQueryReq req);
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserExitService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserExitService.java
index 1cc6e6b1..95f9dc1b 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserExitService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserExitService.java
@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusConstructionUserExit;
-import org.dromara.project.domain.req.constructionuserexit.ConstructionUserExitQueryReq;
-import org.dromara.project.domain.vo.BusConstructionUserExitVo;
+import org.dromara.project.domain.req.constructionuserexit.BusConstructionUserExitQueryReq;
+import org.dromara.project.domain.vo.constructionuserexit.BusConstructionUserExitVo;
 
 import java.util.List;
 
@@ -34,7 +34,7 @@ public interface IBusConstructionUserExitService extends IService<BusConstructio
      * @param pageQuery 分页参数
      * @return 施工人员入场退场记录信息分页列表
      */
-    TableDataInfo<BusConstructionUserExitVo> queryPageList(ConstructionUserExitQueryReq req, PageQuery pageQuery);
+    TableDataInfo<BusConstructionUserExitVo> queryPageList(BusConstructionUserExitQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的施工人员入场退场记录信息列表
@@ -42,7 +42,7 @@ public interface IBusConstructionUserExitService extends IService<BusConstructio
      * @param req 查询条件
      * @return 施工人员入场退场记录信息列表
      */
-    List<BusConstructionUserExitVo> queryList(ConstructionUserExitQueryReq req);
+    List<BusConstructionUserExitVo> queryList(BusConstructionUserExitQueryReq req);
 
     /**
      * 获取施工人员入场退场记录视图对象
@@ -58,7 +58,7 @@ public interface IBusConstructionUserExitService extends IService<BusConstructio
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<BusConstructionUserExit> buildQueryWrapper(ConstructionUserExitQueryReq req);
+    LambdaQueryWrapper<BusConstructionUserExit> buildQueryWrapper(BusConstructionUserExitQueryReq req);
 
     /**
      * 获取施工人员入场退场记录分页对象视图
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserFileService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserFileService.java
index 2273aa6c..67dfdc95 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserFileService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserFileService.java
@@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import jakarta.servlet.http.HttpServletResponse;
 import org.dromara.project.domain.BusConstructionUser;
 import org.dromara.project.domain.BusConstructionUserFile;
-import org.dromara.project.domain.req.constructionuserfile.ConstructionUserFileQueryReq;
-import org.dromara.project.domain.req.constructionuserfile.ConstructionUserFileSaveReq;
-import org.dromara.project.domain.req.constructionuserfile.ConstructionUserFileTemplateReq;
-import org.dromara.project.domain.vo.BusConstructionUserFileVo;
+import org.dromara.project.domain.req.constructionuserfile.BusConstructionUserFileQueryReq;
+import org.dromara.project.domain.req.constructionuserfile.BusConstructionUserFileSaveReq;
+import org.dromara.project.domain.req.constructionuserfile.BusConstructionUserFileTemplateReq;
+import org.dromara.project.domain.vo.constructionuserfile.BusConstructionUserFileVo;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -35,7 +35,7 @@ public interface IBusConstructionUserFileService extends IService<BusConstructio
      * @param req 查询条件
      * @return 施工人员文件存储列表
      */
-    List<BusConstructionUserFileVo> queryList(ConstructionUserFileQueryReq req);
+    List<BusConstructionUserFileVo> queryList(BusConstructionUserFileQueryReq req);
 
     /**
      * 导出施工人员文件模版zip
@@ -43,7 +43,7 @@ public interface IBusConstructionUserFileService extends IService<BusConstructio
      * @param req      查询条件
      * @param response 响应对象
      */
-    void downloadFileTemplate(ConstructionUserFileTemplateReq req, HttpServletResponse response);
+    void downloadFileTemplate(BusConstructionUserFileTemplateReq req, HttpServletResponse response);
 
     /**
      * 通过zip文件批量上传施工人员文件
@@ -59,7 +59,7 @@ public interface IBusConstructionUserFileService extends IService<BusConstructio
      * @param req 保存参数
      * @return 是否保存成功
      */
-    Boolean saveFileList(ConstructionUserFileSaveReq req);
+    Boolean saveFileList(BusConstructionUserFileSaveReq req);
 
     /**
      * 获取施工人员文件存储查询条件封装
@@ -67,7 +67,7 @@ public interface IBusConstructionUserFileService extends IService<BusConstructio
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<BusConstructionUserFile> buildQueryWrapper(ConstructionUserFileQueryReq req);
+    LambdaQueryWrapper<BusConstructionUserFile> buildQueryWrapper(BusConstructionUserFileQueryReq req);
 
     /**
      * 获取施工人员查询条件封装
@@ -75,6 +75,6 @@ public interface IBusConstructionUserFileService extends IService<BusConstructio
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<BusConstructionUser> buildTemplateQueryWrapper(ConstructionUserFileTemplateReq req);
+    LambdaQueryWrapper<BusConstructionUser> buildTemplateQueryWrapper(BusConstructionUserFileTemplateReq req);
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserService.java
index 4e2ead83..f0b14597 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserService.java
@@ -8,10 +8,10 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusConstructionUser;
 import org.dromara.project.domain.exportvo.BusConstructionUserExportVo;
 import org.dromara.project.domain.req.constructionuser.*;
-import org.dromara.project.domain.resp.constructionuser.ConstructionUserAttendanceMonthResp;
-import org.dromara.project.domain.resp.constructionuser.ConstructionUserAttendanceTotalResp;
-import org.dromara.project.domain.resp.constructionuser.ConstructionUserGisResp;
-import org.dromara.project.domain.vo.BusConstructionUserVo;
+import org.dromara.project.domain.vo.constructionuser.BusConstructionUserAttendanceMonthVo;
+import org.dromara.project.domain.vo.constructionuser.BusConstructionUserAttendanceTotalVo;
+import org.dromara.project.domain.vo.constructionuser.BusConstructionUserGisVo;
+import org.dromara.project.domain.vo.constructionuser.BusConstructionUserVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -39,7 +39,7 @@ public interface IBusConstructionUserService extends IService<BusConstructionUse
      * @param pageQuery 分页参数
      * @return 施工人员分页列表
      */
-    TableDataInfo<BusConstructionUserVo> queryPageList(ConstructionUserQueryReq req, PageQuery pageQuery);
+    TableDataInfo<BusConstructionUserVo> queryPageList(BusConstructionUserQueryReq req, PageQuery pageQuery);
 
     /**
      * 分页查询施工人员考勤列表
@@ -48,7 +48,7 @@ public interface IBusConstructionUserService extends IService<BusConstructionUse
      * @param pageQuery 分页参数
      * @return 施工人员考勤分页列表
      */
-    TableDataInfo<ConstructionUserAttendanceTotalResp> queryPageAttendanceList(ConstructionUserAttendanceQueryReq req, PageQuery pageQuery);
+    TableDataInfo<BusConstructionUserAttendanceTotalVo> queryPageAttendanceList(BusConstructionUserAttendanceQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询施工人员月考勤列表
@@ -56,7 +56,7 @@ public interface IBusConstructionUserService extends IService<BusConstructionUse
      * @param req 查询条件
      * @return 施工人员考勤月列表
      */
-    List<ConstructionUserAttendanceMonthResp> queryAttendanceMonthList(ConstructionUserAttendanceMonthReq req);
+    List<BusConstructionUserAttendanceMonthVo> queryAttendanceMonthList(BusConstructionUserAttendanceMonthReq req);
 
     /**
      * 查询符合条件的施工人员列表
@@ -64,7 +64,7 @@ public interface IBusConstructionUserService extends IService<BusConstructionUse
      * @param req 查询条件
      * @return 施工人员列表
      */
-    List<BusConstructionUserExportVo> queryList(ConstructionUserQueryReq req);
+    List<BusConstructionUserExportVo> queryList(BusConstructionUserQueryReq req);
 
     /**
      * 获取施工人员大屏数据
@@ -72,7 +72,7 @@ public interface IBusConstructionUserService extends IService<BusConstructionUse
      * @param req 查询条件
      * @return 施工人员大屏数据
      */
-    ConstructionUserGisResp getGisData(ConstructionUserGisReq req);
+    BusConstructionUserGisVo getGisData(BusConstructionUserGisReq req);
 
     /**
      * 新增施工人员
@@ -80,7 +80,7 @@ public interface IBusConstructionUserService extends IService<BusConstructionUse
      * @param req 施工人员
      * @return 是否新增成功
      */
-    Long insertByBo(ConstructionUserCreateReq req);
+    Long insertByBo(BusConstructionUserCreateReq req);
 
     /**
      * 修改施工人员
@@ -88,7 +88,7 @@ public interface IBusConstructionUserService extends IService<BusConstructionUse
      * @param req 施工人员
      * @return 是否修改成功
      */
-    Boolean updateByBo(ConstructionUserUpdateReq req);
+    Boolean updateByBo(BusConstructionUserUpdateReq req);
 
     /**
      * 修改施工人员工资
@@ -96,7 +96,7 @@ public interface IBusConstructionUserService extends IService<BusConstructionUse
      * @param req 修改施工人员工资对象
      * @return 是否修改成功
      */
-    Boolean updateSalary(ConstructionUserUpdateSalaryReq req);
+    Boolean updateSalary(BusConstructionUserUpdateSalaryReq req);
 
     /**
      * 修改施工人员打卡状态
@@ -104,7 +104,7 @@ public interface IBusConstructionUserService extends IService<BusConstructionUse
      * @param req 修改施工人员打卡状态对象
      * @return 是否修改成功
      */
-    Boolean updateClock(ConstructionUserUpdateClockReq req);
+    Boolean updateClock(BusConstructionUserUpdateClockReq req);
 
     /**
      * 修改施工人员项目(人员迁移)
@@ -112,7 +112,7 @@ public interface IBusConstructionUserService extends IService<BusConstructionUse
      * @param req 修改施工人员项目对象
      * @return 是否修改成功
      */
-    Boolean changeUserProject(ConstructionUserChangeProjectReq req);
+    Boolean changeUserProject(BusConstructionUserChangeProjectReq req);
 
     /**
      * 批量修改施工人员状态
@@ -120,7 +120,7 @@ public interface IBusConstructionUserService extends IService<BusConstructionUse
      * @param req 批量修改施工人员状态对象
      * @return 是否修改成功
      */
-    Boolean batchUpdateStatus(ConstructionUserBatchUpdateStatusReq req);
+    Boolean batchUpdateStatus(BusConstructionUserBatchUpdateStatusReq req);
 
     /**
      * 根据项目id批量修改施工人员打卡状态
@@ -128,7 +128,7 @@ public interface IBusConstructionUserService extends IService<BusConstructionUse
      * @param req 批量修改施工人员打卡状态对象
      * @return 是否修改成功
      */
-    Boolean batchUpdateClockByProjectId(ConstructionUserBatchUpdateClockReq req);
+    Boolean batchUpdateClockByProjectId(BusConstructionUserBatchUpdateClockReq req);
 
     /**
      * 校验并批量删除施工人员信息
@@ -153,7 +153,7 @@ public interface IBusConstructionUserService extends IService<BusConstructionUse
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<BusConstructionUser> buildQueryWrapper(ConstructionUserQueryReq req);
+    LambdaQueryWrapper<BusConstructionUser> buildQueryWrapper(BusConstructionUserQueryReq req);
 
     /**
      * 获取施工人员分页对象视图
@@ -169,7 +169,7 @@ public interface IBusConstructionUserService extends IService<BusConstructionUse
      * @param req 施工人员考勤分页查询条件
      * @return 施工人员考勤分页对象视图
      */
-    Page<ConstructionUserAttendanceTotalResp> getAttendanceTotalVoPage(ConstructionUserAttendanceQueryReq req,
-                                                                       PageQuery pageQuery);
+    Page<BusConstructionUserAttendanceTotalVo> getAttendanceTotalVoPage(BusConstructionUserAttendanceQueryReq req,
+                                                                        PageQuery pageQuery);
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorService.java
index d4205964..428ddc2f 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorService.java
@@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusContractor;
-import org.dromara.project.domain.req.contractor.ContractorCreateReq;
-import org.dromara.project.domain.req.contractor.ContractorQueryReq;
-import org.dromara.project.domain.req.contractor.ContractorUpdateReq;
-import org.dromara.project.domain.vo.BusContractorVo;
+import org.dromara.project.domain.req.contractor.BusContractorCreateReq;
+import org.dromara.project.domain.req.contractor.BusContractorQueryReq;
+import org.dromara.project.domain.req.contractor.BusContractorUpdateReq;
+import org.dromara.project.domain.vo.contractor.BusContractorVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -37,7 +37,7 @@ public interface IBusContractorService extends IService<BusContractor> {
      * @param pageQuery 分页参数
      * @return 分包单位分页列表
      */
-    TableDataInfo<BusContractorVo> queryPageList(ContractorQueryReq req, PageQuery pageQuery);
+    TableDataInfo<BusContractorVo> queryPageList(BusContractorQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的分包单位列表
@@ -45,7 +45,7 @@ public interface IBusContractorService extends IService<BusContractor> {
      * @param req 查询条件
      * @return 分包单位列表
      */
-    List<BusContractorVo> queryList(ContractorQueryReq req);
+    List<BusContractorVo> queryList(BusContractorQueryReq req);
 
     /**
      * 新增分包单位
@@ -53,7 +53,7 @@ public interface IBusContractorService extends IService<BusContractor> {
      * @param req 分包单位
      * @return 新增id
      */
-    Long insertByBo(ContractorCreateReq req);
+    Long insertByBo(BusContractorCreateReq req);
 
     /**
      * 修改分包单位
@@ -61,7 +61,7 @@ public interface IBusContractorService extends IService<BusContractor> {
      * @param req 分包单位
      * @return 是否修改成功
      */
-    Boolean updateByBo(ContractorUpdateReq req);
+    Boolean updateByBo(BusContractorUpdateReq req);
 
     /**
      * 校验并批量删除分包单位信息
@@ -86,7 +86,7 @@ public interface IBusContractorService extends IService<BusContractor> {
      * @param req 分包公司查询条件
      * @return 分包公司查询条件封装
      */
-    LambdaQueryWrapper<BusContractor> buildQueryWrapper(ContractorQueryReq req);
+    LambdaQueryWrapper<BusContractor> buildQueryWrapper(BusContractorQueryReq req);
 
     /**
      * 获取分包公司分页对象视图
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusDailyPieceItemService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusDailyPieceItemService.java
index f8cad6ee..050174a4 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusDailyPieceItemService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusDailyPieceItemService.java
@@ -2,7 +2,7 @@ package org.dromara.project.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.project.domain.BusDailyPieceItem;
-import org.dromara.project.domain.vo.BusDailyPieceItemVo;
+import org.dromara.project.domain.vo.dailypieceitem.BusDailyPieceItemVo;
 
 import java.util.List;
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusLeaveService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusLeaveService.java
index 1aa26e1f..d83e149c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusLeaveService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusLeaveService.java
@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusLeave;
-import org.dromara.project.domain.req.leave.LeaveManagerReviewReq;
-import org.dromara.project.domain.req.leave.LeaveQueryReq;
-import org.dromara.project.domain.vo.BusLeaveVo;
+import org.dromara.project.domain.req.leave.BusLeaveManagerReviewReq;
+import org.dromara.project.domain.req.leave.BusLeaveQueryReq;
+import org.dromara.project.domain.vo.leave.BusLeaveVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -36,7 +36,7 @@ public interface IBusLeaveService extends IService<BusLeave> {
      * @param pageQuery 分页参数
      * @return 施工人员请假申请分页列表
      */
-    TableDataInfo<BusLeaveVo> queryPageList(LeaveQueryReq req, PageQuery pageQuery);
+    TableDataInfo<BusLeaveVo> queryPageList(BusLeaveQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的施工人员请假申请列表
@@ -44,7 +44,7 @@ public interface IBusLeaveService extends IService<BusLeave> {
      * @param req 查询条件
      * @return 施工人员请假申请列表
      */
-    List<BusLeaveVo> queryList(LeaveQueryReq req);
+    List<BusLeaveVo> queryList(BusLeaveQueryReq req);
 
     /**
      * 管理员审核施工人员请假申请
@@ -52,7 +52,7 @@ public interface IBusLeaveService extends IService<BusLeave> {
      * @param req 管理员审核施工人员请假申请
      * @return 是否审核成功
      */
-    Boolean managerReview(LeaveManagerReviewReq req);
+    Boolean managerReview(BusLeaveManagerReviewReq req);
 
     /**
      * 校验并批量删除施工人员请假申请信息
@@ -77,7 +77,7 @@ public interface IBusLeaveService extends IService<BusLeave> {
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<BusLeave> buildQueryWrapper(LeaveQueryReq req);
+    LambdaQueryWrapper<BusLeave> buildQueryWrapper(BusLeaveQueryReq req);
 
     /**
      * 获取施工人员请假申请分页对象视图
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectFileService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectFileService.java
index 969163ad..3bd2cee8 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectFileService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectFileService.java
@@ -7,10 +7,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusProjectFile;
-import org.dromara.project.domain.req.projectfile.ProjectFileQueryReq;
-import org.dromara.project.domain.req.projectfile.ProjectFileUpdateReq;
-import org.dromara.project.domain.req.projectfile.ProjectFileUploadDxfReq;
-import org.dromara.project.domain.vo.BusProjectFileVo;
+import org.dromara.project.domain.req.projectfile.BusProjectFileQueryReq;
+import org.dromara.project.domain.req.projectfile.BusProjectFileUpdateReq;
+import org.dromara.project.domain.req.projectfile.BusProjectFileUploadDxfReq;
+import org.dromara.project.domain.vo.projectfile.BusProjectFileVo;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Collection;
@@ -39,7 +39,7 @@ public interface IBusProjectFileService extends IService<BusProjectFile> {
      * @param pageQuery 分页参数
      * @return 项目文件存储分页列表
      */
-    TableDataInfo<BusProjectFileVo> queryPageList(ProjectFileQueryReq req, PageQuery pageQuery);
+    TableDataInfo<BusProjectFileVo> queryPageList(BusProjectFileQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的项目文件存储列表
@@ -47,7 +47,7 @@ public interface IBusProjectFileService extends IService<BusProjectFile> {
      * @param req 查询条件
      * @return 项目文件存储列表
      */
-    List<BusProjectFileVo> queryList(ProjectFileQueryReq req);
+    List<BusProjectFileVo> queryList(BusProjectFileQueryReq req);
 
     /**
      * 修改项目文件存储
@@ -55,7 +55,7 @@ public interface IBusProjectFileService extends IService<BusProjectFile> {
      * @param req 项目文件存储
      * @return 是否修改成功
      */
-    Boolean updateByBo(ProjectFileUpdateReq req);
+    Boolean updateByBo(BusProjectFileUpdateReq req);
 
     /**
      * 校验并批量删除项目文件存储信息
@@ -81,7 +81,7 @@ public interface IBusProjectFileService extends IService<BusProjectFile> {
      * @param req  请求
      * @return 主键
      */
-    Long uploadDxf2Json(MultipartFile file, ProjectFileUploadDxfReq req);
+    Long uploadDxf2Json(MultipartFile file, BusProjectFileUploadDxfReq req);
 
     /**
      * 获取项目文件存储视图对象
@@ -97,7 +97,7 @@ public interface IBusProjectFileService extends IService<BusProjectFile> {
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<BusProjectFile> buildQueryWrapper(ProjectFileQueryReq req);
+    LambdaQueryWrapper<BusProjectFile> buildQueryWrapper(BusProjectFileQueryReq req);
 
     /**
      * 获取项目文件存储分页对象视图
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectNewsService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectNewsService.java
index 7cc3168e..e06e66df 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectNewsService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectNewsService.java
@@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusProjectNews;
-import org.dromara.project.domain.req.projectnews.ProjectNewsCreateReq;
-import org.dromara.project.domain.req.projectnews.ProjectNewsGisReq;
-import org.dromara.project.domain.req.projectnews.ProjectNewsQueryReq;
-import org.dromara.project.domain.req.projectnews.ProjectNewsUpdateReq;
-import org.dromara.project.domain.resp.projectnews.ProjectNewsGisResp;
-import org.dromara.project.domain.vo.BusProjectNewsVo;
+import org.dromara.project.domain.req.projectnews.BusProjectNewsCreateReq;
+import org.dromara.project.domain.req.projectnews.BusProjectNewsGisReq;
+import org.dromara.project.domain.req.projectnews.BusProjectNewsQueryReq;
+import org.dromara.project.domain.req.projectnews.BusProjectNewsUpdateReq;
+import org.dromara.project.domain.vo.projectnews.BusProjectNewsGisVo;
+import org.dromara.project.domain.vo.projectnews.BusProjectNewsVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -39,7 +39,7 @@ public interface IBusProjectNewsService extends IService<BusProjectNews> {
      * @param pageQuery 分页参数
      * @return 项目新闻分页列表
      */
-    TableDataInfo<BusProjectNewsVo> queryPageList(ProjectNewsQueryReq req, PageQuery pageQuery);
+    TableDataInfo<BusProjectNewsVo> queryPageList(BusProjectNewsQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的项目新闻列表
@@ -47,7 +47,7 @@ public interface IBusProjectNewsService extends IService<BusProjectNews> {
      * @param req 查询条件
      * @return 项目新闻列表
      */
-    List<BusProjectNewsVo> queryList(ProjectNewsQueryReq req);
+    List<BusProjectNewsVo> queryList(BusProjectNewsQueryReq req);
 
     /**
      * 查询大屏项目新闻列表
@@ -55,7 +55,7 @@ public interface IBusProjectNewsService extends IService<BusProjectNews> {
      * @param req 列表查询条件
      * @return 大屏项目新闻列表
      */
-    List<ProjectNewsGisResp> queryGisList(ProjectNewsGisReq req);
+    List<BusProjectNewsGisVo> queryGisList(BusProjectNewsGisReq req);
 
     /**
      * 新增项目新闻
@@ -63,7 +63,7 @@ public interface IBusProjectNewsService extends IService<BusProjectNews> {
      * @param req 项目新闻
      * @return 新增项目新闻id
      */
-    Long insertByBo(ProjectNewsCreateReq req);
+    Long insertByBo(BusProjectNewsCreateReq req);
 
     /**
      * 修改项目新闻
@@ -71,7 +71,7 @@ public interface IBusProjectNewsService extends IService<BusProjectNews> {
      * @param req 项目新闻
      * @return 是否修改成功
      */
-    Boolean updateByBo(ProjectNewsUpdateReq req);
+    Boolean updateByBo(BusProjectNewsUpdateReq req);
 
     /**
      * 校验并批量删除项目新闻信息
@@ -96,7 +96,7 @@ public interface IBusProjectNewsService extends IService<BusProjectNews> {
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<BusProjectNews> buildQueryWrapper(ProjectNewsQueryReq req);
+    LambdaQueryWrapper<BusProjectNews> buildQueryWrapper(BusProjectNewsQueryReq req);
 
     /**
      * 获取项目新闻存储分页对象视图
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java
index e2b8aae9..dec2c471 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java
@@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusProject;
-import org.dromara.project.domain.req.project.ProjectCreateReq;
-import org.dromara.project.domain.req.project.ProjectQueryReq;
-import org.dromara.project.domain.req.project.ProjectUpdateReq;
-import org.dromara.project.domain.resp.project.ProjectContractorListResp;
-import org.dromara.project.domain.vo.BusProjectVo;
+import org.dromara.project.domain.req.project.BusProjectCreateReq;
+import org.dromara.project.domain.req.project.BusProjectQueryReq;
+import org.dromara.project.domain.req.project.BusProjectUpdateReq;
+import org.dromara.project.domain.vo.project.BusProjectContractorListVo;
+import org.dromara.project.domain.vo.project.BusProjectVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -38,7 +38,7 @@ public interface IBusProjectService extends IService<BusProject> {
      * @param pageQuery 分页参数
      * @return 项目分页列表
      */
-    TableDataInfo<BusProjectVo> queryPageList(ProjectQueryReq req, PageQuery pageQuery);
+    TableDataInfo<BusProjectVo> queryPageList(BusProjectQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的项目列表
@@ -46,14 +46,14 @@ public interface IBusProjectService extends IService<BusProject> {
      * @param req 查询条件
      * @return 项目列表
      */
-    List<BusProjectVo> queryList(ProjectQueryReq req);
+    List<BusProjectVo> queryList(BusProjectQueryReq req);
 
     /**
      * 查询当前登录用户项目列表以及项目列表下的分包公司列表
      *
      * @return 项目列表以及项目列表下的分包公司列表
      */
-    List<ProjectContractorListResp> queryProjectContractorList();
+    List<BusProjectContractorListVo> queryProjectContractorList();
 
     /**
      * 新增项目
@@ -61,7 +61,7 @@ public interface IBusProjectService extends IService<BusProject> {
      * @param dto 项目
      * @return 新项目 id
      */
-    Long insertByBo(ProjectCreateReq dto);
+    Long insertByBo(BusProjectCreateReq dto);
 
     /**
      * 修改项目
@@ -69,7 +69,7 @@ public interface IBusProjectService extends IService<BusProject> {
      * @param req 项目
      * @return 是否修改成功
      */
-    Boolean updateByBo(ProjectUpdateReq req);
+    Boolean updateByBo(BusProjectUpdateReq req);
 
     /**
      * 校验并批量删除项目信息
@@ -94,7 +94,7 @@ public interface IBusProjectService extends IService<BusProject> {
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<BusProject> buildQueryWrapper(ProjectQueryReq req);
+    LambdaQueryWrapper<BusProject> buildQueryWrapper(BusProjectQueryReq req);
 
     /**
      * 获取项目分页对象视图
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamMemberService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamMemberService.java
index 865a3ea3..61109e55 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamMemberService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamMemberService.java
@@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusProjectTeamMember;
-import org.dromara.project.domain.req.projectteammember.ProjectTeamMemberCreateReq;
-import org.dromara.project.domain.req.projectteammember.ProjectTeamMemberExitReq;
-import org.dromara.project.domain.req.projectteammember.ProjectTeamMemberQueryReq;
-import org.dromara.project.domain.req.projectteammember.ProjectTeamMemberUpdateReq;
-import org.dromara.project.domain.vo.BusProjectTeamMemberVo;
+import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberCreateReq;
+import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberExitReq;
+import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberQueryReq;
+import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberUpdateReq;
+import org.dromara.project.domain.vo.projectteammember.BusProjectTeamMemberVo;
 
 import java.util.List;
 
@@ -37,7 +37,7 @@ public interface IBusProjectTeamMemberService extends IService<BusProjectTeamMem
      * @param pageQuery 分页参数
      * @return 项目班组下的成员分页列表
      */
-    TableDataInfo<BusProjectTeamMemberVo> queryPageList(ProjectTeamMemberQueryReq req, PageQuery pageQuery);
+    TableDataInfo<BusProjectTeamMemberVo> queryPageList(BusProjectTeamMemberQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的项目班组下的成员列表
@@ -45,7 +45,7 @@ public interface IBusProjectTeamMemberService extends IService<BusProjectTeamMem
      * @param req 查询条件
      * @return 项目班组下的成员列表
      */
-    List<BusProjectTeamMemberVo> queryList(ProjectTeamMemberQueryReq req);
+    List<BusProjectTeamMemberVo> queryList(BusProjectTeamMemberQueryReq req);
 
     /**
      * 新增项目班组下的成员
@@ -53,7 +53,7 @@ public interface IBusProjectTeamMemberService extends IService<BusProjectTeamMem
      * @param req 项目班组下的成员
      * @return 是否新增成功
      */
-    Long insertByBo(ProjectTeamMemberCreateReq req);
+    Long insertByBo(BusProjectTeamMemberCreateReq req);
 
     /**
      * 修改项目班组下的成员
@@ -61,7 +61,7 @@ public interface IBusProjectTeamMemberService extends IService<BusProjectTeamMem
      * @param req 项目班组下的成员
      * @return 是否修改成功
      */
-    Boolean updateByBo(ProjectTeamMemberUpdateReq req);
+    Boolean updateByBo(BusProjectTeamMemberUpdateReq req);
 
     /**
      * 根据主键删除项目班组与人员关联（人员退场）
@@ -69,7 +69,7 @@ public interface IBusProjectTeamMemberService extends IService<BusProjectTeamMem
      * @param req 班组人员退场对象
      * @return 是否删除成功
      */
-    Boolean deleteById(ProjectTeamMemberExitReq req);
+    Boolean deleteById(BusProjectTeamMemberExitReq req);
 
     /**
      * 获取项目班组成员视图对象
@@ -85,7 +85,7 @@ public interface IBusProjectTeamMemberService extends IService<BusProjectTeamMem
      * @param req 项目班组成员查询条件
      * @return 项目班组成员查询条件封装
      */
-    LambdaQueryWrapper<BusProjectTeamMember> buildQueryWrapper(ProjectTeamMemberQueryReq req);
+    LambdaQueryWrapper<BusProjectTeamMember> buildQueryWrapper(BusProjectTeamMemberQueryReq req);
 
     /**
      * 获取项目班组成员分页对象视图
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamService.java
index 5ce555e7..9c3c0531 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamService.java
@@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusProjectTeam;
-import org.dromara.project.domain.req.projectteam.ProjectTeamCreateReq;
-import org.dromara.project.domain.req.projectteam.ProjectTeamQueryReq;
-import org.dromara.project.domain.req.projectteam.ProjectTeamUpdateReq;
-import org.dromara.project.domain.resp.projectteam.ProjectTeamForemanResp;
-import org.dromara.project.domain.vo.BusProjectTeamVo;
+import org.dromara.project.domain.req.projectteam.BusProjectTeamCreateReq;
+import org.dromara.project.domain.req.projectteam.BusProjectTeamQueryReq;
+import org.dromara.project.domain.req.projectteam.BusProjectTeamUpdateReq;
+import org.dromara.project.domain.vo.projectteam.BusProjectTeamForemanVo;
+import org.dromara.project.domain.vo.projectteam.BusProjectTeamVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -38,7 +38,7 @@ public interface IBusProjectTeamService extends IService<BusProjectTeam> {
      * @param pageQuery 分页参数
      * @return 项目班组分页列表
      */
-    TableDataInfo<BusProjectTeamVo> queryPageList(ProjectTeamQueryReq req, PageQuery pageQuery);
+    TableDataInfo<BusProjectTeamVo> queryPageList(BusProjectTeamQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的项目班组列表
@@ -46,7 +46,7 @@ public interface IBusProjectTeamService extends IService<BusProjectTeam> {
      * @param req 查询条件
      * @return 项目班组列表
      */
-    List<BusProjectTeamVo> queryList(ProjectTeamQueryReq req);
+    List<BusProjectTeamVo> queryList(BusProjectTeamQueryReq req);
 
     /**
      * 新增项目班组
@@ -54,7 +54,7 @@ public interface IBusProjectTeamService extends IService<BusProjectTeam> {
      * @param req 项目班组
      * @return 是否新增成功
      */
-    Long insertByBo(ProjectTeamCreateReq req);
+    Long insertByBo(BusProjectTeamCreateReq req);
 
     /**
      * 修改项目班组
@@ -62,7 +62,7 @@ public interface IBusProjectTeamService extends IService<BusProjectTeam> {
      * @param req 项目班组
      * @return 是否修改成功
      */
-    Boolean updateByBo(ProjectTeamUpdateReq req);
+    Boolean updateByBo(BusProjectTeamUpdateReq req);
 
     /**
      * 校验并批量删除项目班组信息
@@ -79,7 +79,7 @@ public interface IBusProjectTeamService extends IService<BusProjectTeam> {
      * @param projectId 项目id
      * @return 项目班组和班组长分页列表
      */
-    List<ProjectTeamForemanResp> queryForemanList(Long projectId);
+    List<BusProjectTeamForemanVo> queryForemanList(Long projectId);
 
     /**
      * 获取项目班组视图对象
@@ -95,7 +95,7 @@ public interface IBusProjectTeamService extends IService<BusProjectTeam> {
      * @param req 项目班组查询条件
      * @return 项目班组查询条件封装
      */
-    LambdaQueryWrapper<BusProjectTeam> buildQueryWrapper(ProjectTeamQueryReq req);
+    LambdaQueryWrapper<BusProjectTeam> buildQueryWrapper(BusProjectTeamQueryReq req);
 
     /**
      * 获取项目班组分页对象视图
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusReissueCardService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusReissueCardService.java
index db8b89da..70848432 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusReissueCardService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusReissueCardService.java
@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusReissueCard;
-import org.dromara.project.domain.req.reissuecard.ReissueCardManagerReviewReq;
-import org.dromara.project.domain.req.reissuecard.ReissueCardQueryReq;
-import org.dromara.project.domain.vo.BusReissueCardVo;
+import org.dromara.project.domain.req.reissuecard.BusReissueCardManagerReviewReq;
+import org.dromara.project.domain.req.reissuecard.BusReissueCardQueryReq;
+import org.dromara.project.domain.vo.reissuecard.BusReissueCardVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -36,7 +36,7 @@ public interface IBusReissueCardService extends IService<BusReissueCard> {
      * @param pageQuery 分页参数
      * @return 施工人员补卡申请分页列表
      */
-    TableDataInfo<BusReissueCardVo> queryPageList(ReissueCardQueryReq req, PageQuery pageQuery);
+    TableDataInfo<BusReissueCardVo> queryPageList(BusReissueCardQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的施工人员补卡申请列表
@@ -44,7 +44,7 @@ public interface IBusReissueCardService extends IService<BusReissueCard> {
      * @param req 查询条件
      * @return 施工人员补卡申请列表
      */
-    List<BusReissueCardVo> queryList(ReissueCardQueryReq req);
+    List<BusReissueCardVo> queryList(BusReissueCardQueryReq req);
 
     /**
      * 管理员审核施工人员补卡申请
@@ -52,7 +52,7 @@ public interface IBusReissueCardService extends IService<BusReissueCard> {
      * @param req 管理员审核施工人员补卡申请
      * @return 是否审核成功
      */
-    Boolean managerReview(ReissueCardManagerReviewReq req);
+    Boolean managerReview(BusReissueCardManagerReviewReq req);
 
     /**
      * 校验并批量删除施工人员补卡申请信息
@@ -77,7 +77,7 @@ public interface IBusReissueCardService extends IService<BusReissueCard> {
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<BusReissueCard> buildQueryWrapper(ReissueCardQueryReq req);
+    LambdaQueryWrapper<BusReissueCard> buildQueryWrapper(BusReissueCardQueryReq req);
 
     /**
      * 获取施工人员补卡申请分页对象视图
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusUserProjectRelevancyService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusUserProjectRelevancyService.java
index 59f983f6..88bd623f 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusUserProjectRelevancyService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusUserProjectRelevancyService.java
@@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusUserProjectRelevancy;
-import org.dromara.project.domain.req.project.ProjectBatchByProjectListReq;
-import org.dromara.project.domain.req.userprojectrelevancy.UserProjectRelevancyCreateReq;
-import org.dromara.project.domain.req.userprojectrelevancy.UserProjectRelevancyQueryReq;
-import org.dromara.project.domain.req.userprojectrelevancy.UserProjectRelevancyUpdateReq;
-import org.dromara.project.domain.resp.userprojectrelevancy.LoginUserProjectRelevancyResp;
-import org.dromara.project.domain.vo.BusUserProjectRelevancyVo;
+import org.dromara.project.domain.req.project.BusProjectBatchByProjectListReq;
+import org.dromara.project.domain.req.userprojectrelevancy.BusUserProjectRelevancyCreateReq;
+import org.dromara.project.domain.req.userprojectrelevancy.BusUserProjectRelevancyQueryReq;
+import org.dromara.project.domain.req.userprojectrelevancy.BusUserProjectRelevancyUpdateReq;
+import org.dromara.project.domain.vo.userprojectrelevancy.BusLoginUserProjectRelevancyVo;
+import org.dromara.project.domain.vo.userprojectrelevancy.BusUserProjectRelevancyVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -39,7 +39,7 @@ public interface IBusUserProjectRelevancyService extends IService<BusUserProject
      * @param pageQuery 分页参数
      * @return 系统用户与项目关联分页列表
      */
-    TableDataInfo<BusUserProjectRelevancyVo> queryPageList(UserProjectRelevancyQueryReq req, PageQuery pageQuery);
+    TableDataInfo<BusUserProjectRelevancyVo> queryPageList(BusUserProjectRelevancyQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的系统用户与项目关联列表
@@ -47,7 +47,7 @@ public interface IBusUserProjectRelevancyService extends IService<BusUserProject
      * @param req 查询条件
      * @return 系统用户与项目关联列表
      */
-    List<BusUserProjectRelevancyVo> queryList(UserProjectRelevancyQueryReq req);
+    List<BusUserProjectRelevancyVo> queryList(BusUserProjectRelevancyQueryReq req);
 
     /**
      * 新增系统用户与项目关联
@@ -55,7 +55,7 @@ public interface IBusUserProjectRelevancyService extends IService<BusUserProject
      * @param req 系统用户与项目关联
      * @return 新增关联id
      */
-    Long insertByBo(UserProjectRelevancyCreateReq req);
+    Long insertByBo(BusUserProjectRelevancyCreateReq req);
 
     /**
      * 修改系统用户与项目关联
@@ -63,7 +63,7 @@ public interface IBusUserProjectRelevancyService extends IService<BusUserProject
      * @param req 系统用户与项目关联
      * @return 是否修改成功
      */
-    Boolean updateByBo(UserProjectRelevancyUpdateReq req);
+    Boolean updateByBo(BusUserProjectRelevancyUpdateReq req);
 
     /**
      * 校验并批量删除系统用户与项目关联信息
@@ -80,7 +80,7 @@ public interface IBusUserProjectRelevancyService extends IService<BusUserProject
      * @param userId 登录用户ID
      * @return 当前登录用户项目列表
      */
-    List<LoginUserProjectRelevancyResp> queryListByUserId(Long userId);
+    List<BusLoginUserProjectRelevancyVo> queryListByUserId(Long userId);
 
     /**
      * 获取当前登录用户项目分页
@@ -90,7 +90,7 @@ public interface IBusUserProjectRelevancyService extends IService<BusUserProject
      * @param pageQuery 分页参数
      * @return 当前登录用户项目分页
      */
-    TableDataInfo<BusUserProjectRelevancyVo> queryPageByUserId(Long userId, UserProjectRelevancyQueryReq req, PageQuery pageQuery);
+    TableDataInfo<BusUserProjectRelevancyVo> queryPageByUserId(Long userId, BusUserProjectRelevancyQueryReq req, PageQuery pageQuery);
 
     /**
      * 批量新增用户和项目关联
@@ -98,7 +98,7 @@ public interface IBusUserProjectRelevancyService extends IService<BusUserProject
      * @param req 新增参数
      * @return 是否增加成功
      */
-    Boolean insertBatchByProjectList(ProjectBatchByProjectListReq req);
+    Boolean insertBatchByProjectList(BusProjectBatchByProjectListReq req);
 
     /**
      * 获取系统用户与项目关联视图
@@ -114,7 +114,7 @@ public interface IBusUserProjectRelevancyService extends IService<BusUserProject
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<BusUserProjectRelevancy> buildQueryWrapper(UserProjectRelevancyQueryReq req);
+    LambdaQueryWrapper<BusUserProjectRelevancy> buildQueryWrapper(BusUserProjectRelevancyQueryReq req);
 
     /**
      * 获取系统用户与项目关联分页视图
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusWorkWageService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusWorkWageService.java
index 2f09a3da..68e8fe10 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusWorkWageService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusWorkWageService.java
@@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusWorkWage;
-import org.dromara.project.domain.req.workwage.WorkWageCreateReq;
-import org.dromara.project.domain.req.workwage.WorkWageQueryReq;
-import org.dromara.project.domain.req.workwage.WorkWageUpdateReq;
-import org.dromara.project.domain.vo.BusWorkWageVo;
+import org.dromara.project.domain.req.workwage.BusWorkWageCreateReq;
+import org.dromara.project.domain.req.workwage.BusWorkWageQueryReq;
+import org.dromara.project.domain.req.workwage.BusWorkWageUpdateReq;
+import org.dromara.project.domain.vo.workwage.BusWorkWageVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -37,7 +37,7 @@ public interface IBusWorkWageService extends IService<BusWorkWage> {
      * @param pageQuery 分页参数
      * @return 工种薪水分页列表
      */
-    TableDataInfo<BusWorkWageVo> queryPageList(WorkWageQueryReq req, PageQuery pageQuery);
+    TableDataInfo<BusWorkWageVo> queryPageList(BusWorkWageQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的工种薪水列表
@@ -45,7 +45,7 @@ public interface IBusWorkWageService extends IService<BusWorkWage> {
      * @param req 查询条件
      * @return 工种薪水列表
      */
-    List<BusWorkWageVo> queryList(WorkWageQueryReq req);
+    List<BusWorkWageVo> queryList(BusWorkWageQueryReq req);
 
     /**
      * 新增工种薪水
@@ -53,7 +53,7 @@ public interface IBusWorkWageService extends IService<BusWorkWage> {
      * @param req 工种薪水
      * @return 新增工种薪水id
      */
-    Long insertByBo(WorkWageCreateReq req);
+    Long insertByBo(BusWorkWageCreateReq req);
 
     /**
      * 修改工种薪水
@@ -61,7 +61,7 @@ public interface IBusWorkWageService extends IService<BusWorkWage> {
      * @param req 工种薪水
      * @return 是否修改成功
      */
-    Boolean updateByBo(WorkWageUpdateReq req);
+    Boolean updateByBo(BusWorkWageUpdateReq req);
 
     /**
      * 校验并批量删除工种薪水信息
@@ -86,7 +86,7 @@ public interface IBusWorkWageService extends IService<BusWorkWage> {
      * @param req 查询条件
      * @return 查询条件封装
      */
-    LambdaQueryWrapper<BusWorkWage> buildQueryWrapper(WorkWageQueryReq req);
+    LambdaQueryWrapper<BusWorkWage> buildQueryWrapper(BusWorkWageQueryReq req);
 
     /**
      * 获取工种薪水分页对象视图
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusWorkerDailyReportService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusWorkerDailyReportService.java
index 7e7dee3c..b5a67ec0 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusWorkerDailyReportService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusWorkerDailyReportService.java
@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusWorkerDailyReport;
-import org.dromara.project.domain.req.workerdailyreport.WorkerDailyReportQueryReq;
-import org.dromara.project.domain.vo.BusWorkerDailyReportVo;
+import org.dromara.project.domain.req.workerdailyreport.BusWorkerDailyReportQueryReq;
+import org.dromara.project.domain.vo.workerdailyreport.BusWorkerDailyReportVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -35,7 +35,7 @@ public interface IBusWorkerDailyReportService extends IService<BusWorkerDailyRep
      * @param pageQuery 分页参数
      * @return 施工人员日报分页列表
      */
-    TableDataInfo<BusWorkerDailyReportVo> queryPageList(WorkerDailyReportQueryReq req, PageQuery pageQuery);
+    TableDataInfo<BusWorkerDailyReportVo> queryPageList(BusWorkerDailyReportQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的施工人员日报列表
@@ -43,7 +43,7 @@ public interface IBusWorkerDailyReportService extends IService<BusWorkerDailyRep
      * @param req 查询条件
      * @return 施工人员日报列表
      */
-    List<BusWorkerDailyReportVo> queryList(WorkerDailyReportQueryReq req);
+    List<BusWorkerDailyReportVo> queryList(BusWorkerDailyReportQueryReq req);
 
     /**
      * 校验并批量删除施工人员日报信息
@@ -68,7 +68,7 @@ public interface IBusWorkerDailyReportService extends IService<BusWorkerDailyRep
      * @param req 施工人员日报列表查询条件
      * @return 施工人员日报列表查询条件封装
      */
-    LambdaQueryWrapper<BusWorkerDailyReport> buildQueryWrapper(WorkerDailyReportQueryReq req);
+    LambdaQueryWrapper<BusWorkerDailyReport> buildQueryWrapper(BusWorkerDailyReportQueryReq req);
 
     /**
      * 获取施工人员日报列表分页对象视图
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
index c0f1efce..3d251aac 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
@@ -18,16 +18,16 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusAttendance;
 import org.dromara.project.domain.BusConstructionUser;
 import org.dromara.project.domain.BusProjectTeamMember;
-import org.dromara.project.domain.enums.AttendanceClockStatusEnum;
-import org.dromara.project.domain.enums.AttendanceCommuterEnum;
-import org.dromara.project.domain.enums.AttendanceStatusEnum;
-import org.dromara.project.domain.req.attendance.AttendanceMonthByUserIdReq;
-import org.dromara.project.domain.req.attendance.AttendanceQueryReq;
-import org.dromara.project.domain.req.attendance.AttendanceQueryTwoWeekReq;
-import org.dromara.project.domain.resp.attendance.AttendanceClockDateForTwoWeekResp;
-import org.dromara.project.domain.resp.attendance.AttendanceListByDay;
-import org.dromara.project.domain.resp.attendance.AttendanceMonthByUserIdResp;
-import org.dromara.project.domain.vo.BusAttendanceVo;
+import org.dromara.project.domain.enums.BusAttendanceClockStatusEnum;
+import org.dromara.project.domain.enums.BusAttendanceCommuterEnum;
+import org.dromara.project.domain.enums.BusAttendanceStatusEnum;
+import org.dromara.project.domain.req.attendance.BusAttendanceMonthByUserIdReq;
+import org.dromara.project.domain.req.attendance.BusAttendanceQueryReq;
+import org.dromara.project.domain.req.attendance.BusAttendanceQueryTwoWeekReq;
+import org.dromara.project.domain.vo.attendance.BusAttendanceClockDateForTwoWeekVo;
+import org.dromara.project.domain.vo.attendance.BusAttendanceListByDay;
+import org.dromara.project.domain.vo.attendance.BusAttendanceMonthByUserIdVo;
+import org.dromara.project.domain.vo.attendance.BusAttendanceVo;
 import org.dromara.project.mapper.BusAttendanceMapper;
 import org.dromara.project.service.*;
 import org.springframework.beans.BeanUtils;
@@ -62,8 +62,8 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
     private IBusConstructionBlacklistService constructionBlacklistService;
 
     // 出勤状态（正常、迟到、早退）
-    private static final Set<String> ATTENDANCE_STATUS = new HashSet<>(Arrays.asList(AttendanceClockStatusEnum.NORMAL.getValue(),
-        AttendanceClockStatusEnum.LATE.getValue(), AttendanceClockStatusEnum.LEAVEEARLY.getValue()));
+    private static final Set<String> ATTENDANCE_STATUS = new HashSet<>(Arrays.asList(BusAttendanceClockStatusEnum.NORMAL.getValue(),
+        BusAttendanceClockStatusEnum.LATE.getValue(), BusAttendanceClockStatusEnum.LEAVEEARLY.getValue()));
 
     /**
      * 查询考勤
@@ -88,7 +88,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
      * @return 考勤分页列表
      */
     @Override
-    public TableDataInfo<BusAttendanceVo> queryPageList(AttendanceQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusAttendanceVo> queryPageList(BusAttendanceQueryReq req, PageQuery pageQuery) {
         Page<BusAttendance> result = this.page(pageQuery.build(), buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
@@ -100,7 +100,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
      * @return 考勤列表
      */
     @Override
-    public List<AttendanceClockDateForTwoWeekResp> listClockDateForTwoWeek(AttendanceQueryTwoWeekReq req) {
+    public List<BusAttendanceClockDateForTwoWeekVo> listClockDateForTwoWeek(BusAttendanceQueryTwoWeekReq req) {
         Long projectId = req.getProjectId();
         if (projectService.getById(projectId) == null) {
             throw new ServiceException("项目信息不存在", HttpStatus.NOT_FOUND);
@@ -144,10 +144,10 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
         Map<Date, List<BusAttendance>> dateListMap = this.list(lqw)
             .stream().collect(Collectors.groupingBy(BusAttendance::getClockDate));
         // 遍历每个日期，计算考勤状态
-        List<AttendanceClockDateForTwoWeekResp> respList = new ArrayList<>();
+        List<BusAttendanceClockDateForTwoWeekVo> respList = new ArrayList<>();
         // 遍历从两周前到今天的所有日期
         for (LocalDate localDate = startLocal; !localDate.isAfter(endLocal); localDate = localDate.plusDays(1)) {
-            AttendanceClockDateForTwoWeekResp resp = new AttendanceClockDateForTwoWeekResp();
+            BusAttendanceClockDateForTwoWeekVo resp = new BusAttendanceClockDateForTwoWeekVo();
             // 转换为 Date 类型（时分秒为 00:00:00）
             Date currentDate = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
             resp.setClockDate(currentDate);
@@ -167,27 +167,27 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
                     String clockAllDayStatus = null;
                     // 遍历同一用户的考勤记录，分别获取上下班状态
                     for (BusAttendance a : userAttendanceList) {
-                        if (AttendanceCommuterEnum.CLOCKIN.getValue().equals(a.getCommuter())) {
+                        if (BusAttendanceCommuterEnum.CLOCKIN.getValue().equals(a.getCommuter())) {
                             clockInStatus = a.getClockStatus();
-                        } else if (AttendanceCommuterEnum.CLOCKOUT.getValue().equals(a.getCommuter())) {
+                        } else if (BusAttendanceCommuterEnum.CLOCKOUT.getValue().equals(a.getCommuter())) {
                             clockOutStatus = a.getClockStatus();
-                        } else if (AttendanceCommuterEnum.ALLDAY.getValue().equals(a.getCommuter())) {
+                        } else if (BusAttendanceCommuterEnum.ALLDAY.getValue().equals(a.getCommuter())) {
                             clockAllDayStatus = a.getClockStatus();
                         }
                     }
                     // 统计考勤状态
-                    if (AttendanceClockStatusEnum.LEAVE.getValue().equals(clockAllDayStatus)) {
+                    if (BusAttendanceClockStatusEnum.LEAVE.getValue().equals(clockAllDayStatus)) {
                         leave++;
-                    } else if ((AttendanceClockStatusEnum.NORMAL.getValue().equals(clockInStatus)
-                        || AttendanceClockStatusEnum.REISSUE.getValue().equals(clockInStatus))
-                        && (AttendanceClockStatusEnum.NORMAL.getValue().equals(clockOutStatus)
-                        || AttendanceClockStatusEnum.REISSUE.getValue().equals(clockOutStatus))) {
+                    } else if ((BusAttendanceClockStatusEnum.NORMAL.getValue().equals(clockInStatus)
+                        || BusAttendanceClockStatusEnum.REISSUE.getValue().equals(clockInStatus))
+                        && (BusAttendanceClockStatusEnum.NORMAL.getValue().equals(clockOutStatus)
+                        || BusAttendanceClockStatusEnum.REISSUE.getValue().equals(clockOutStatus))) {
                         attendance++;
-                    } else if (AttendanceClockStatusEnum.UNCLOCK.getValue().equals(clockInStatus)
-                        && AttendanceClockStatusEnum.UNCLOCK.getValue().equals(clockOutStatus)) {
+                    } else if (BusAttendanceClockStatusEnum.UNCLOCK.getValue().equals(clockInStatus)
+                        && BusAttendanceClockStatusEnum.UNCLOCK.getValue().equals(clockOutStatus)) {
                         absenteeism++;
-                    } else if (AttendanceClockStatusEnum.UNCLOCK.getValue().equals(clockInStatus)
-                        || AttendanceClockStatusEnum.UNCLOCK.getValue().equals(clockOutStatus)) {
+                    } else if (BusAttendanceClockStatusEnum.UNCLOCK.getValue().equals(clockInStatus)
+                        || BusAttendanceClockStatusEnum.UNCLOCK.getValue().equals(clockOutStatus)) {
                         halfAttendance++;
                     }
                 }
@@ -199,7 +199,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
             respList.add(resp);
         }
         // 按打卡日期正序排列
-        respList.sort(Comparator.comparing(AttendanceClockDateForTwoWeekResp::getClockDate));
+        respList.sort(Comparator.comparing(BusAttendanceClockDateForTwoWeekVo::getClockDate));
         return respList;
     }
 
@@ -210,7 +210,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
      * @return 考勤列表
      */
     @Override
-    public List<AttendanceMonthByUserIdResp> listAttendanceMonthListByUserId(AttendanceMonthByUserIdReq req) {
+    public List<BusAttendanceMonthByUserIdVo> listAttendanceMonthListByUserId(BusAttendanceMonthByUserIdReq req) {
         Long userId = req.getUserId();
         String clockMonth = req.getClockMonth();
         if (constructionUserService.getById(userId) == null) {
@@ -238,47 +238,47 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
             .list()
             .stream().collect(Collectors.groupingBy(BusAttendance::getClockDate));
         // 遍历每天，计算考勤状态
-        List<AttendanceMonthByUserIdResp> respList = new ArrayList<>();
+        List<BusAttendanceMonthByUserIdVo> respList = new ArrayList<>();
         dateListMap.forEach((date, attendanceList) -> {
-            AttendanceMonthByUserIdResp resp = new AttendanceMonthByUserIdResp();
+            BusAttendanceMonthByUserIdVo resp = new BusAttendanceMonthByUserIdVo();
             resp.setId(userId);
             resp.setClockDate(date);
-            List<AttendanceListByDay> attendanceListByDayList = new ArrayList<>();
+            List<BusAttendanceListByDay> attendanceListByDayList = new ArrayList<>();
             String clockInStatus = null;
             String clockOutStatus = null;
             String clockAllDayStatus = null;
             String status;
             for (BusAttendance attendance : attendanceList) {
                 // 获取考勤记录
-                AttendanceListByDay day = AttendanceListByDay.build(attendance);
+                BusAttendanceListByDay day = BusAttendanceListByDay.build(attendance);
                 attendanceListByDayList.add(day);
                 // 获取上下班状态
-                if (AttendanceCommuterEnum.CLOCKIN.getValue().equals(attendance.getCommuter())) {
+                if (BusAttendanceCommuterEnum.CLOCKIN.getValue().equals(attendance.getCommuter())) {
                     clockInStatus = attendance.getClockStatus();
-                } else if (AttendanceCommuterEnum.CLOCKOUT.getValue().equals(attendance.getCommuter())) {
+                } else if (BusAttendanceCommuterEnum.CLOCKOUT.getValue().equals(attendance.getCommuter())) {
                     clockOutStatus = attendance.getClockStatus();
                 } else {
                     clockAllDayStatus = attendance.getClockStatus();
                 }
             }
             // 统计当天考勤状态
-            if (AttendanceClockStatusEnum.LEAVE.getValue().equals(clockAllDayStatus)) {
+            if (BusAttendanceClockStatusEnum.LEAVE.getValue().equals(clockAllDayStatus)) {
                 return;
-            } else if (AttendanceClockStatusEnum.NORMAL.getValue().equals(clockInStatus)
-                && AttendanceClockStatusEnum.NORMAL.getValue().equals(clockOutStatus)) {
-                status = AttendanceStatusEnum.NORMAL.getValue();
-            } else if (AttendanceClockStatusEnum.REISSUE.getValue().equals(clockInStatus)
-                || AttendanceClockStatusEnum.REISSUE.getValue().equals(clockOutStatus)) {
-                status = AttendanceStatusEnum.REISSUE.getValue();
+            } else if (BusAttendanceClockStatusEnum.NORMAL.getValue().equals(clockInStatus)
+                && BusAttendanceClockStatusEnum.NORMAL.getValue().equals(clockOutStatus)) {
+                status = BusAttendanceStatusEnum.NORMAL.getValue();
+            } else if (BusAttendanceClockStatusEnum.REISSUE.getValue().equals(clockInStatus)
+                || BusAttendanceClockStatusEnum.REISSUE.getValue().equals(clockOutStatus)) {
+                status = BusAttendanceStatusEnum.REISSUE.getValue();
             } else {
-                status = AttendanceStatusEnum.ERROR.getValue();
+                status = BusAttendanceStatusEnum.ERROR.getValue();
             }
             resp.setStatus(status);
             resp.setAttendanceList(attendanceListByDayList);
             respList.add(resp);
         });
         // 按打卡日期正序排列
-        respList.sort(Comparator.comparing(AttendanceMonthByUserIdResp::getClockDate));
+        respList.sort(Comparator.comparing(BusAttendanceMonthByUserIdVo::getClockDate));
         return respList;
     }
 
@@ -289,7 +289,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
      * @return 考勤列表
      */
     @Override
-    public List<BusAttendanceVo> queryList(AttendanceQueryReq req) {
+    public List<BusAttendanceVo> queryList(BusAttendanceQueryReq req) {
         LambdaQueryWrapper<BusAttendance> lqw = buildQueryWrapper(req);
         return this.list(lqw).stream().map(this::getVo).toList();
     }
@@ -353,7 +353,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusAttendance> buildQueryWrapper(AttendanceQueryReq req) {
+    public LambdaQueryWrapper<BusAttendance> buildQueryWrapper(BusAttendanceQueryReq req) {
         LambdaQueryWrapper<BusAttendance> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
@@ -377,7 +377,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
         lqw.eq(StringUtils.isNotBlank(clockStatus), BusAttendance::getClockStatus, clockStatus);
         lqw.eq(ObjectUtils.isNotEmpty(clockDate), BusAttendance::getClockDate, clockDate);
         // 不包含请假的考勤记录
-        lqw.ne(BusAttendance::getClockStatus, AttendanceClockStatusEnum.LEAVE.getValue());
+        lqw.ne(BusAttendance::getClockStatus, BusAttendanceClockStatusEnum.LEAVE.getValue());
         return lqw;
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionBlacklistServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionBlacklistServiceImpl.java
index a81c98af..51d92fdc 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionBlacklistServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionBlacklistServiceImpl.java
@@ -15,9 +15,9 @@ import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.project.domain.BusConstructionBlacklist;
 import org.dromara.project.domain.BusConstructionUser;
 import org.dromara.project.domain.BusProjectTeamMember;
-import org.dromara.project.domain.req.constructionblacklist.ConstructionBlacklistCreateReq;
-import org.dromara.project.domain.req.constructionblacklist.ConstructionBlacklistQueryReq;
-import org.dromara.project.domain.vo.BusConstructionBlacklistVo;
+import org.dromara.project.domain.req.constructionblacklist.BusConstructionBlacklistCreateReq;
+import org.dromara.project.domain.req.constructionblacklist.BusConstructionBlacklistQueryReq;
+import org.dromara.project.domain.vo.constructionblacklist.BusConstructionBlacklistVo;
 import org.dromara.project.mapper.BusConstructionBlacklistMapper;
 import org.dromara.project.service.IBusConstructionBlacklistService;
 import org.dromara.project.service.IBusConstructionUserService;
@@ -70,7 +70,7 @@ public class BusConstructionBlacklistServiceImpl extends ServiceImpl<BusConstruc
      * @return 黑名单分页列表
      */
     @Override
-    public TableDataInfo<BusConstructionBlacklistVo> queryPageList(ConstructionBlacklistQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusConstructionBlacklistVo> queryPageList(BusConstructionBlacklistQueryReq req, PageQuery pageQuery) {
         LambdaQueryWrapper<BusConstructionBlacklist> lqw = buildQueryWrapper(req);
         Page<BusConstructionBlacklistVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
@@ -83,7 +83,7 @@ public class BusConstructionBlacklistServiceImpl extends ServiceImpl<BusConstruc
      * @return 黑名单列表
      */
     @Override
-    public List<BusConstructionBlacklistVo> queryList(ConstructionBlacklistQueryReq req) {
+    public List<BusConstructionBlacklistVo> queryList(BusConstructionBlacklistQueryReq req) {
         LambdaQueryWrapper<BusConstructionBlacklist> lqw = buildQueryWrapper(req);
         return baseMapper.selectVoList(lqw);
     }
@@ -110,7 +110,7 @@ public class BusConstructionBlacklistServiceImpl extends ServiceImpl<BusConstruc
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Long insertByBo(ConstructionBlacklistCreateReq req) {
+    public Long insertByBo(BusConstructionBlacklistCreateReq req) {
         // 将实体类和 DTO 进行转换
         BusConstructionBlacklist constructionBlacklist = new BusConstructionBlacklist();
         BeanUtils.copyProperties(req, constructionBlacklist);
@@ -203,7 +203,7 @@ public class BusConstructionBlacklistServiceImpl extends ServiceImpl<BusConstruc
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusConstructionBlacklist> buildQueryWrapper(ConstructionBlacklistQueryReq req) {
+    public LambdaQueryWrapper<BusConstructionBlacklist> buildQueryWrapper(BusConstructionBlacklistQueryReq req) {
         LambdaQueryWrapper<BusConstructionBlacklist> lqw = new LambdaQueryWrapper<>();
         Long id = req.getId();
         Long userId = req.getUserId();
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserExitServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserExitServiceImpl.java
index 52df3577..5d57638b 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserExitServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserExitServiceImpl.java
@@ -11,8 +11,8 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusConstructionUserExit;
-import org.dromara.project.domain.req.constructionuserexit.ConstructionUserExitQueryReq;
-import org.dromara.project.domain.vo.BusConstructionUserExitVo;
+import org.dromara.project.domain.req.constructionuserexit.BusConstructionUserExitQueryReq;
+import org.dromara.project.domain.vo.constructionuserexit.BusConstructionUserExitVo;
 import org.dromara.project.mapper.BusConstructionUserExitMapper;
 import org.dromara.project.service.IBusConstructionUserExitService;
 import org.dromara.system.domain.vo.SysOssVo;
@@ -55,7 +55,7 @@ public class BusConstructionUserExitServiceImpl extends ServiceImpl<BusConstruct
      * @return 施工人员入场退场记录信息分页列表
      */
     @Override
-    public TableDataInfo<BusConstructionUserExitVo> queryPageList(ConstructionUserExitQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusConstructionUserExitVo> queryPageList(BusConstructionUserExitQueryReq req, PageQuery pageQuery) {
         Page<BusConstructionUserExit> result = this.page(pageQuery.build(), buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
@@ -67,7 +67,7 @@ public class BusConstructionUserExitServiceImpl extends ServiceImpl<BusConstruct
      * @return 施工人员入场退场记录信息列表
      */
     @Override
-    public List<BusConstructionUserExitVo> queryList(ConstructionUserExitQueryReq req) {
+    public List<BusConstructionUserExitVo> queryList(BusConstructionUserExitQueryReq req) {
         LambdaQueryWrapper<BusConstructionUserExit> lqw = buildQueryWrapper(req);
         return this.list(lqw).stream().map(this::getVo).toList();
     }
@@ -101,7 +101,7 @@ public class BusConstructionUserExitServiceImpl extends ServiceImpl<BusConstruct
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusConstructionUserExit> buildQueryWrapper(ConstructionUserExitQueryReq req) {
+    public LambdaQueryWrapper<BusConstructionUserExit> buildQueryWrapper(BusConstructionUserExitQueryReq req) {
         LambdaQueryWrapper<BusConstructionUserExit> lqw = Wrappers.lambdaQuery();
         if (req == null) {
             return lqw;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserFileServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserFileServiceImpl.java
index 3db65427..3daeb537 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserFileServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserFileServiceImpl.java
@@ -18,16 +18,16 @@ import org.dromara.common.core.utils.ObjectUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.file.FileUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.project.constant.ConstructionUserConstant;
+import org.dromara.project.constant.BusConstructionUserConstant;
 import org.dromara.project.domain.BusConstructionBlacklist;
 import org.dromara.project.domain.BusConstructionUser;
 import org.dromara.project.domain.BusConstructionUserFile;
 import org.dromara.project.domain.BusProject;
-import org.dromara.project.domain.req.constructionuserfile.ConstructionUserFileQueryReq;
-import org.dromara.project.domain.req.constructionuserfile.ConstructionUserFileReq;
-import org.dromara.project.domain.req.constructionuserfile.ConstructionUserFileSaveReq;
-import org.dromara.project.domain.req.constructionuserfile.ConstructionUserFileTemplateReq;
-import org.dromara.project.domain.vo.BusConstructionUserFileVo;
+import org.dromara.project.domain.req.constructionuserfile.BusConstructionUserFileQueryReq;
+import org.dromara.project.domain.req.constructionuserfile.BusConstructionUserFileReq;
+import org.dromara.project.domain.req.constructionuserfile.BusConstructionUserFileSaveReq;
+import org.dromara.project.domain.req.constructionuserfile.BusConstructionUserFileTemplateReq;
+import org.dromara.project.domain.vo.constructionuserfile.BusConstructionUserFileVo;
 import org.dromara.project.mapper.BusConstructionUserFileMapper;
 import org.dromara.project.service.IBusConstructionBlacklistService;
 import org.dromara.project.service.IBusConstructionUserFileService;
@@ -98,7 +98,7 @@ public class BusConstructionUserFileServiceImpl extends ServiceImpl<BusConstruct
      * @return 施工人员文件存储列表
      */
     @Override
-    public List<BusConstructionUserFileVo> queryList(ConstructionUserFileQueryReq req) {
+    public List<BusConstructionUserFileVo> queryList(BusConstructionUserFileQueryReq req) {
         LambdaQueryWrapper<BusConstructionUserFile> lqw = buildQueryWrapper(req);
         return baseMapper.selectVoList(lqw);
     }
@@ -110,7 +110,7 @@ public class BusConstructionUserFileServiceImpl extends ServiceImpl<BusConstruct
      * @param response 响应对象
      */
     @Override
-    public void downloadFileTemplate(ConstructionUserFileTemplateReq req, HttpServletResponse response) {
+    public void downloadFileTemplate(BusConstructionUserFileTemplateReq req, HttpServletResponse response) {
         // 1. 校验项目是否存在
         Long projectId = req.getProjectId();
         BusProject project = projectService.getById(projectId);
@@ -137,7 +137,7 @@ public class BusConstructionUserFileServiceImpl extends ServiceImpl<BusConstruct
                 zipOut.putNextEntry(new ZipEntry(personFolder));
                 zipOut.closeEntry();
                 // 7.2. 在个人文件夹下写几个子文件夹
-                List<SysDictDataVo> dictDataList = dictTypeService.selectDictDataByType(ConstructionUserConstant.USER_FILE_TYPE);
+                List<SysDictDataVo> dictDataList = dictTypeService.selectDictDataByType(BusConstructionUserConstant.USER_FILE_TYPE);
                 for (SysDictDataVo dataVo : dictDataList) {
                     String subFolderPath = personFolder + dataVo.getDictValue() + "_" + dataVo.getDictLabel() + "/";
                     zipOut.putNextEntry(new ZipEntry(subFolderPath));
@@ -307,11 +307,11 @@ public class BusConstructionUserFileServiceImpl extends ServiceImpl<BusConstruct
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean saveFileList(ConstructionUserFileSaveReq req) {
+    public Boolean saveFileList(BusConstructionUserFileSaveReq req) {
         // 1. 参数校验
         // 判断参数是否为空
         Long userId = req.getUserId();
-        List<ConstructionUserFileReq> fileList = req.getFileList();
+        List<BusConstructionUserFileReq> fileList = req.getFileList();
         if (userId == null || CollUtil.isEmpty(fileList)) {
             throw new ServiceException("施工人员文件存储参数错误", HttpStatus.BAD_REQUEST);
         }
@@ -335,7 +335,7 @@ public class BusConstructionUserFileServiceImpl extends ServiceImpl<BusConstruct
         List<BusConstructionUserFile> saveOrUpdateList = new ArrayList<>();
         // 处理删除的数据
         List<Long> deleteList = new ArrayList<>();
-        for (ConstructionUserFileReq fileReq : fileList) {
+        for (BusConstructionUserFileReq fileReq : fileList) {
             String fileType = fileReq.getFileType();
             String fileId = fileReq.getFileId();
             if (existingFileMap.containsKey(fileType)) {
@@ -387,7 +387,7 @@ public class BusConstructionUserFileServiceImpl extends ServiceImpl<BusConstruct
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusConstructionUserFile> buildQueryWrapper(ConstructionUserFileQueryReq req) {
+    public LambdaQueryWrapper<BusConstructionUserFile> buildQueryWrapper(BusConstructionUserFileQueryReq req) {
         LambdaQueryWrapper<BusConstructionUserFile> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
@@ -412,7 +412,7 @@ public class BusConstructionUserFileServiceImpl extends ServiceImpl<BusConstruct
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusConstructionUser> buildTemplateQueryWrapper(ConstructionUserFileTemplateReq req) {
+    public LambdaQueryWrapper<BusConstructionUser> buildTemplateQueryWrapper(BusConstructionUserFileTemplateReq req) {
         LambdaQueryWrapper<BusConstructionUser> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java
index 5d135bc4..07db2bf1 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java
@@ -18,20 +18,20 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.project.constant.ConstructionUserConstant;
+import org.dromara.project.constant.BusConstructionUserConstant;
 import org.dromara.project.domain.*;
-import org.dromara.project.domain.enums.AttendanceClockStatusEnum;
-import org.dromara.project.domain.enums.AttendanceCommuterEnum;
-import org.dromara.project.domain.enums.ConstructionUserAttendanceStatusEnum;
-import org.dromara.project.domain.enums.ConstructionUserFileStatusEnum;
+import org.dromara.project.domain.enums.BusAttendanceClockStatusEnum;
+import org.dromara.project.domain.enums.BusAttendanceCommuterEnum;
+import org.dromara.project.domain.enums.BusConstructionUserAttendanceStatusEnum;
+import org.dromara.project.domain.enums.BusConstructionUserFileStatusEnum;
 import org.dromara.project.domain.exportvo.BusConstructionUserExportVo;
 import org.dromara.project.domain.req.constructionuser.*;
-import org.dromara.project.domain.resp.constructionuser.ConstructionUserAttendanceByDay;
-import org.dromara.project.domain.resp.constructionuser.ConstructionUserAttendanceMonthResp;
-import org.dromara.project.domain.resp.constructionuser.ConstructionUserAttendanceTotalResp;
-import org.dromara.project.domain.resp.constructionuser.ConstructionUserGisResp;
-import org.dromara.project.domain.vo.BusConstructionUserVo;
-import org.dromara.project.domain.vo.BusContractorVo;
+import org.dromara.project.domain.vo.constructionuser.BusConstructionUserAttendanceByDay;
+import org.dromara.project.domain.vo.constructionuser.BusConstructionUserAttendanceMonthVo;
+import org.dromara.project.domain.vo.constructionuser.BusConstructionUserAttendanceTotalVo;
+import org.dromara.project.domain.vo.constructionuser.BusConstructionUserGisVo;
+import org.dromara.project.domain.vo.constructionuser.BusConstructionUserVo;
+import org.dromara.project.domain.vo.contractor.BusContractorVo;
 import org.dromara.project.mapper.BusConstructionUserMapper;
 import org.dromara.project.service.*;
 import org.dromara.system.domain.vo.SysOssVo;
@@ -112,7 +112,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
      * @return 施工人员分页列表
      */
     @Override
-    public TableDataInfo<BusConstructionUserVo> queryPageList(ConstructionUserQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusConstructionUserVo> queryPageList(BusConstructionUserQueryReq req, PageQuery pageQuery) {
         // 查询数据库
         Page<BusConstructionUser> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(getVoPage(result));
@@ -126,8 +126,8 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
      * @return 施工人员考勤分页列表
      */
     @Override
-    public TableDataInfo<ConstructionUserAttendanceTotalResp> queryPageAttendanceList(ConstructionUserAttendanceQueryReq req,
-                                                                                      PageQuery pageQuery) {
+    public TableDataInfo<BusConstructionUserAttendanceTotalVo> queryPageAttendanceList(BusConstructionUserAttendanceQueryReq req,
+                                                                                       PageQuery pageQuery) {
         return TableDataInfo.build(getAttendanceTotalVoPage(req, pageQuery));
     }
 
@@ -138,7 +138,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
      * @return 施工人员考勤月列表
      */
     @Override
-    public List<ConstructionUserAttendanceMonthResp> queryAttendanceMonthList(ConstructionUserAttendanceMonthReq req) {
+    public List<BusConstructionUserAttendanceMonthVo> queryAttendanceMonthList(BusConstructionUserAttendanceMonthReq req) {
         Long id = req.getUserId();
         String clockMonth = req.getClockMonth();
         if (this.getById(id) == null) {
@@ -170,13 +170,13 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
         Map<Long, List<SysOssVo>> ossIdUrlMap = ossService.listByIds(picIds)
             .stream().collect(Collectors.groupingBy(SysOssVo::getOssId));
         // 遍历每天，计算考勤状态
-        List<ConstructionUserAttendanceMonthResp> respList = new ArrayList<>();
+        List<BusConstructionUserAttendanceMonthVo> respList = new ArrayList<>();
         dateListMap.forEach((date, attendanceList) -> {
-            ConstructionUserAttendanceMonthResp resp = new ConstructionUserAttendanceMonthResp();
+            BusConstructionUserAttendanceMonthVo resp = new BusConstructionUserAttendanceMonthVo();
             resp.setId(id);
             resp.setClockDate(date);
             // 获取考勤记录
-            ConstructionUserAttendanceByDay day = ConstructionUserAttendanceByDay.build(attendanceList);
+            BusConstructionUserAttendanceByDay day = BusConstructionUserAttendanceByDay.build(attendanceList);
             // 填充打卡图片url
             if (day != null) {
                 if (day.getUpClockPicId() != null) {
@@ -192,32 +192,32 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
             String status;
             for (BusAttendance attendance : attendanceList) {
                 // 获取上下班状态
-                if (AttendanceCommuterEnum.CLOCKIN.getValue().equals(attendance.getCommuter())) {
+                if (BusAttendanceCommuterEnum.CLOCKIN.getValue().equals(attendance.getCommuter())) {
                     clockInStatus = attendance.getClockStatus();
-                } else if (AttendanceCommuterEnum.CLOCKOUT.getValue().equals(attendance.getCommuter())) {
+                } else if (BusAttendanceCommuterEnum.CLOCKOUT.getValue().equals(attendance.getCommuter())) {
                     clockOutStatus = attendance.getClockStatus();
                 } else {
                     clockAllDayStatus = attendance.getClockStatus();
                 }
             }
             // 统计当天考勤状态
-            if (AttendanceClockStatusEnum.LEAVE.getValue().equals(clockAllDayStatus)) {
-                status = ConstructionUserAttendanceStatusEnum.LEAVE.getValue();
-            } else if (AttendanceClockStatusEnum.UNCLOCK.getValue().equals(clockInStatus)
-                && AttendanceClockStatusEnum.UNCLOCK.getValue().equals(clockOutStatus)) {
-                status = ConstructionUserAttendanceStatusEnum.UNCLOCK.getValue();
-            } else if (AttendanceClockStatusEnum.UNCLOCK.getValue().equals(clockInStatus)
-                || AttendanceClockStatusEnum.UNCLOCK.getValue().equals(clockOutStatus)) {
-                status = ConstructionUserAttendanceStatusEnum.ONECLOCK.getValue();
+            if (BusAttendanceClockStatusEnum.LEAVE.getValue().equals(clockAllDayStatus)) {
+                status = BusConstructionUserAttendanceStatusEnum.LEAVE.getValue();
+            } else if (BusAttendanceClockStatusEnum.UNCLOCK.getValue().equals(clockInStatus)
+                && BusAttendanceClockStatusEnum.UNCLOCK.getValue().equals(clockOutStatus)) {
+                status = BusConstructionUserAttendanceStatusEnum.UNCLOCK.getValue();
+            } else if (BusAttendanceClockStatusEnum.UNCLOCK.getValue().equals(clockInStatus)
+                || BusAttendanceClockStatusEnum.UNCLOCK.getValue().equals(clockOutStatus)) {
+                status = BusConstructionUserAttendanceStatusEnum.ONECLOCK.getValue();
             } else {
-                status = ConstructionUserAttendanceStatusEnum.NORMAL.getValue();
+                status = BusConstructionUserAttendanceStatusEnum.NORMAL.getValue();
             }
             resp.setStatus(status);
             resp.setClockList(day);
             respList.add(resp);
         });
         // 按打卡日期正序排列
-        respList.sort(Comparator.comparing(ConstructionUserAttendanceMonthResp::getClockDate));
+        respList.sort(Comparator.comparing(BusConstructionUserAttendanceMonthVo::getClockDate));
         return respList;
     }
 
@@ -228,7 +228,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
      * @return 施工人员列表
      */
     @Override
-    public List<BusConstructionUserExportVo> queryList(ConstructionUserQueryReq req) {
+    public List<BusConstructionUserExportVo> queryList(BusConstructionUserQueryReq req) {
         LambdaQueryWrapper<BusConstructionUser> lqw = this.buildQueryWrapper(req);
         List<BusConstructionUserVo> constructionUserVoList = this.list(lqw).stream().map(this::getVo).toList();
         // 关联项目信息
@@ -263,7 +263,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
      * @return 施工人员大屏数据
      */
     @Override
-    public ConstructionUserGisResp getGisData(ConstructionUserGisReq req) {
+    public BusConstructionUserGisVo getGisData(BusConstructionUserGisReq req) {
         // 参数校验
         Long projectId = req.getProjectId();
         BusProject project = projectService.getById(projectId);
@@ -271,7 +271,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
             throw new ServiceException("项目信息不存在", HttpStatus.NOT_FOUND);
         }
         // 获取大屏数据
-        ConstructionUserGisResp resp = new ConstructionUserGisResp();
+        BusConstructionUserGisVo resp = new BusConstructionUserGisVo();
         // 获取施工人员总数
         Long count = this.lambdaQuery()
             .eq(BusConstructionUser::getProjectId, projectId).count();
@@ -291,7 +291,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
      * @return 是否新增成功
      */
     @Override
-    public Long insertByBo(ConstructionUserCreateReq req) {
+    public Long insertByBo(BusConstructionUserCreateReq req) {
         // 将实体类和 DTO 进行转换
         BusConstructionUser constructionUser = new BusConstructionUser();
         BeanUtils.copyProperties(req, constructionUser);
@@ -314,7 +314,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(ConstructionUserUpdateReq req) {
+    public Boolean updateByBo(BusConstructionUserUpdateReq req) {
         // 将实体类和 DTO 进行转换
         BusConstructionUser constructionUser = new BusConstructionUser();
         BeanUtils.copyProperties(req, constructionUser);
@@ -339,7 +339,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateSalary(ConstructionUserUpdateSalaryReq req) {
+    public Boolean updateSalary(BusConstructionUserUpdateSalaryReq req) {
         Long id = req.getId();
         Long salary = req.getSalary();
         // 判断对应施工人员是否存在
@@ -365,7 +365,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateClock(ConstructionUserUpdateClockReq req) {
+    public Boolean updateClock(BusConstructionUserUpdateClockReq req) {
         Long id = req.getId();
         String clock = req.getClock();
         // 判断对应施工人员是否存在
@@ -392,7 +392,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
      * @return 是否修改成功
      */
     @Override
-    public Boolean changeUserProject(ConstructionUserChangeProjectReq req) {
+    public Boolean changeUserProject(BusConstructionUserChangeProjectReq req) {
         Long id = req.getId();
         // 判断对应施工人员是否存在
         BusConstructionUser constructionUser = this.getById(id);
@@ -433,7 +433,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean batchUpdateStatus(ConstructionUserBatchUpdateStatusReq req) {
+    public Boolean batchUpdateStatus(BusConstructionUserBatchUpdateStatusReq req) {
         List<Long> idList = req.getIdList();
         String status = req.getStatus();
         // 查询对应数据是否存在
@@ -477,7 +477,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
      * @return 是否修改成功
      */
     @Override
-    public Boolean batchUpdateClockByProjectId(ConstructionUserBatchUpdateClockReq req) {
+    public Boolean batchUpdateClockByProjectId(BusConstructionUserBatchUpdateClockReq req) {
         Long projectId = req.getProjectId();
         String clock = req.getClock();
         // 校验打卡状态是否为空
@@ -651,7 +651,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusConstructionUser> buildQueryWrapper(ConstructionUserQueryReq req) {
+    public LambdaQueryWrapper<BusConstructionUser> buildQueryWrapper(BusConstructionUserQueryReq req) {
         LambdaQueryWrapper<BusConstructionUser> lqw = Wrappers.lambdaQuery();
         if (req == null) {
             return lqw;
@@ -750,7 +750,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
             BusWorkWage::getWage,
             (wage1, wage2) -> wage1
         ));
-        int fileTypeSize = dictTypeService.selectDictDataByType(ConstructionUserConstant.USER_FILE_TYPE).size();
+        int fileTypeSize = dictTypeService.selectDictDataByType(BusConstructionUserConstant.USER_FILE_TYPE).size();
         // 填充信息
         List<BusConstructionUserVo> constructionUserVoList = constructionUserList.stream().map(constructionUser -> {
             BusConstructionUserVo constructionUserVo = new BusConstructionUserVo();
@@ -774,11 +774,11 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
                 .eq(BusConstructionUserFile::getUserId, constructionUser.getId());
             long count = constructionUserFileService.count(constructionUserFileLqw);
             if (count <= 0) {
-                constructionUserVo.setFileUploadStatus(ConstructionUserFileStatusEnum.NOUPLOAD.getValue());
+                constructionUserVo.setFileUploadStatus(BusConstructionUserFileStatusEnum.NOUPLOAD.getValue());
             } else if (count < fileTypeSize) {
-                constructionUserVo.setFileUploadStatus(ConstructionUserFileStatusEnum.PARTUPLOAD.getValue());
+                constructionUserVo.setFileUploadStatus(BusConstructionUserFileStatusEnum.PARTUPLOAD.getValue());
             } else if (count == fileTypeSize) {
-                constructionUserVo.setFileUploadStatus(ConstructionUserFileStatusEnum.UPLOAD.getValue());
+                constructionUserVo.setFileUploadStatus(BusConstructionUserFileStatusEnum.UPLOAD.getValue());
             }
             return constructionUserVo;
         }).toList();
@@ -793,8 +793,8 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
      * @return 施工人员考勤分页对象视图
      */
     @Override
-    public Page<ConstructionUserAttendanceTotalResp> getAttendanceTotalVoPage(ConstructionUserAttendanceQueryReq req,
-                                                                              PageQuery pageQuery) {
+    public Page<BusConstructionUserAttendanceTotalVo> getAttendanceTotalVoPage(BusConstructionUserAttendanceQueryReq req,
+                                                                               PageQuery pageQuery) {
         LambdaQueryWrapper<BusConstructionUser> lqw = Wrappers.lambdaQuery();
         // 从对象中取值
         String userName = req.getUserName();
@@ -842,7 +842,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
         // 分页查询获取数据
         Page<BusConstructionUser> constructionUserPage = this.page(pageQuery.build(), lqw);
         List<BusConstructionUser> constructionUserList = constructionUserPage.getRecords();
-        Page<ConstructionUserAttendanceTotalResp> constructionUserAttendanceTotalPage = new Page<>(
+        Page<BusConstructionUserAttendanceTotalVo> constructionUserAttendanceTotalPage = new Page<>(
             constructionUserPage.getCurrent(),
             constructionUserPage.getSize(),
             constructionUserPage.getTotal());
@@ -856,8 +856,8 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
         Map<Long, List<BusAttendance>> userIdBusAttendanceListMap = attendanceService.list(attendanceLqw)
             .stream().collect(Collectors.groupingBy(BusAttendance::getUserId));
         // 填充信息
-        List<ConstructionUserAttendanceTotalResp> userAttendanceTotalList = constructionUserList.stream().map(constructionUser -> {
-            ConstructionUserAttendanceTotalResp constructionUserAttendanceTotalResp = new ConstructionUserAttendanceTotalResp();
+        List<BusConstructionUserAttendanceTotalVo> userAttendanceTotalList = constructionUserList.stream().map(constructionUser -> {
+            BusConstructionUserAttendanceTotalVo constructionUserAttendanceTotalResp = new BusConstructionUserAttendanceTotalVo();
             Long id = constructionUser.getId();
             BeanUtils.copyProperties(constructionUser, constructionUserAttendanceTotalResp);
             // 关联施工人员考勤信息
@@ -879,28 +879,28 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
                         String clockAllDayStatus = null;
                         // 获取上下班状态
                         for (BusAttendance attendance : dailyList) {
-                            if (AttendanceCommuterEnum.CLOCKIN.getValue().equals(attendance.getCommuter())) {
+                            if (BusAttendanceCommuterEnum.CLOCKIN.getValue().equals(attendance.getCommuter())) {
                                 clockInStatus = attendance.getClockStatus();
-                            } else if (AttendanceCommuterEnum.CLOCKOUT.getValue().equals(attendance.getCommuter())) {
+                            } else if (BusAttendanceCommuterEnum.CLOCKOUT.getValue().equals(attendance.getCommuter())) {
                                 clockOutStatus = attendance.getClockStatus();
                             } else {
                                 clockAllDayStatus = attendance.getClockStatus();
                             }
                         }
                         // 统计考勤状态
-                        if (AttendanceClockStatusEnum.LATE.getValue().equals(clockInStatus)) {
+                        if (BusAttendanceClockStatusEnum.LATE.getValue().equals(clockInStatus)) {
                             lateDays++;
                         }
-                        if (AttendanceClockStatusEnum.LEAVEEARLY.getValue().equals(clockOutStatus)) {
+                        if (BusAttendanceClockStatusEnum.LEAVEEARLY.getValue().equals(clockOutStatus)) {
                             leaveEarlyDays++;
                         }
-                        if (AttendanceClockStatusEnum.LEAVE.getValue().equals(clockAllDayStatus)) {
+                        if (BusAttendanceClockStatusEnum.LEAVE.getValue().equals(clockAllDayStatus)) {
                             leaveDays++;
                         } else {
-                            if (clockInStatus == null || AttendanceClockStatusEnum.UNCLOCK.getValue().equals(clockInStatus)) {
+                            if (clockInStatus == null || BusAttendanceClockStatusEnum.UNCLOCK.getValue().equals(clockInStatus)) {
                                 unClockDays++;
                             }
-                            if (clockOutStatus == null || AttendanceClockStatusEnum.UNCLOCK.getValue().equals(clockOutStatus)) {
+                            if (clockOutStatus == null || BusAttendanceClockStatusEnum.UNCLOCK.getValue().equals(clockOutStatus)) {
                                 unClockDays++;
                             }
                         }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusContractorServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusContractorServiceImpl.java
index 40d9a3da..716b5e8a 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusContractorServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusContractorServiceImpl.java
@@ -18,10 +18,10 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.project.domain.BusConstructionUser;
 import org.dromara.project.domain.BusContractor;
-import org.dromara.project.domain.req.contractor.ContractorCreateReq;
-import org.dromara.project.domain.req.contractor.ContractorQueryReq;
-import org.dromara.project.domain.req.contractor.ContractorUpdateReq;
-import org.dromara.project.domain.vo.BusContractorVo;
+import org.dromara.project.domain.req.contractor.BusContractorCreateReq;
+import org.dromara.project.domain.req.contractor.BusContractorQueryReq;
+import org.dromara.project.domain.req.contractor.BusContractorUpdateReq;
+import org.dromara.project.domain.vo.contractor.BusContractorVo;
 import org.dromara.project.mapper.BusContractorMapper;
 import org.dromara.project.service.IBusConstructionUserService;
 import org.dromara.project.service.IBusContractorService;
@@ -74,7 +74,7 @@ public class BusContractorServiceImpl extends ServiceImpl<BusContractorMapper, B
      * @return 分包单位分页列表
      */
     @Override
-    public TableDataInfo<BusContractorVo> queryPageList(ContractorQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusContractorVo> queryPageList(BusContractorQueryReq req, PageQuery pageQuery) {
         // 查询数据库
         Page<BusContractor> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
@@ -87,7 +87,7 @@ public class BusContractorServiceImpl extends ServiceImpl<BusContractorMapper, B
      * @return 分包单位列表
      */
     @Override
-    public List<BusContractorVo> queryList(ContractorQueryReq req) {
+    public List<BusContractorVo> queryList(BusContractorQueryReq req) {
         LambdaQueryWrapper<BusContractor> lqw = this.buildQueryWrapper(req);
         List<BusContractor> list = this.list(lqw);
         return list.stream().map(this::getVo).toList();
@@ -100,7 +100,7 @@ public class BusContractorServiceImpl extends ServiceImpl<BusContractorMapper, B
      * @return 新增id
      */
     @Override
-    public Long insertByBo(ContractorCreateReq req) {
+    public Long insertByBo(BusContractorCreateReq req) {
         // 将实体类和 DTO 进行转换
         BusContractor contractor = new BusContractor();
         BeanUtils.copyProperties(req, contractor);
@@ -129,7 +129,7 @@ public class BusContractorServiceImpl extends ServiceImpl<BusContractorMapper, B
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(ContractorUpdateReq req) {
+    public Boolean updateByBo(BusContractorUpdateReq req) {
         // 将实体类和 DTO 进行转换
         BusContractor contractor = new BusContractor();
         BeanUtils.copyProperties(req, contractor);
@@ -247,7 +247,7 @@ public class BusContractorServiceImpl extends ServiceImpl<BusContractorMapper, B
      * @return 分包公司查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusContractor> buildQueryWrapper(ContractorQueryReq req) {
+    public LambdaQueryWrapper<BusContractor> buildQueryWrapper(BusContractorQueryReq req) {
         LambdaQueryWrapper<BusContractor> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusDailyPieceItemServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusDailyPieceItemServiceImpl.java
index 733efbf6..55240c96 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusDailyPieceItemServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusDailyPieceItemServiceImpl.java
@@ -3,7 +3,7 @@ package org.dromara.project.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.dromara.project.domain.BusDailyPieceItem;
-import org.dromara.project.domain.vo.BusDailyPieceItemVo;
+import org.dromara.project.domain.vo.dailypieceitem.BusDailyPieceItemVo;
 import org.dromara.project.mapper.BusDailyPieceItemMapper;
 import org.dromara.project.service.IBusDailyPieceItemService;
 import org.springframework.beans.BeanUtils;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusLeaveServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusLeaveServiceImpl.java
index f54927eb..44830b91 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusLeaveServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusLeaveServiceImpl.java
@@ -15,13 +15,13 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusAttendance;
 import org.dromara.project.domain.BusLeave;
 import org.dromara.project.domain.BusProjectTeam;
-import org.dromara.project.domain.enums.AttendanceClockStatusEnum;
-import org.dromara.project.domain.enums.AttendanceCommuterEnum;
-import org.dromara.project.domain.enums.OpinionStatusEnum;
-import org.dromara.project.domain.enums.ReviewStatusEnum;
-import org.dromara.project.domain.req.leave.LeaveManagerReviewReq;
-import org.dromara.project.domain.req.leave.LeaveQueryReq;
-import org.dromara.project.domain.vo.BusLeaveVo;
+import org.dromara.project.domain.enums.BusAttendanceClockStatusEnum;
+import org.dromara.project.domain.enums.BusAttendanceCommuterEnum;
+import org.dromara.project.domain.enums.BusOpinionStatusEnum;
+import org.dromara.project.domain.enums.BusReviewStatusEnum;
+import org.dromara.project.domain.req.leave.BusLeaveManagerReviewReq;
+import org.dromara.project.domain.req.leave.BusLeaveQueryReq;
+import org.dromara.project.domain.vo.leave.BusLeaveVo;
 import org.dromara.project.mapper.BusLeaveMapper;
 import org.dromara.project.service.IBusAttendanceService;
 import org.dromara.project.service.IBusLeaveService;
@@ -71,7 +71,7 @@ public class BusLeaveServiceImpl extends ServiceImpl<BusLeaveMapper, BusLeave>
      * @return 施工人员请假申请分页列表
      */
     @Override
-    public TableDataInfo<BusLeaveVo> queryPageList(LeaveQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusLeaveVo> queryPageList(BusLeaveQueryReq req, PageQuery pageQuery) {
         Page<BusLeave> result = this.page(pageQuery.build(), buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
@@ -83,7 +83,7 @@ public class BusLeaveServiceImpl extends ServiceImpl<BusLeaveMapper, BusLeave>
      * @return 施工人员请假申请列表
      */
     @Override
-    public List<BusLeaveVo> queryList(LeaveQueryReq req) {
+    public List<BusLeaveVo> queryList(BusLeaveQueryReq req) {
         LambdaQueryWrapper<BusLeave> lqw = buildQueryWrapper(req);
         return baseMapper.selectVoList(lqw);
     }
@@ -96,7 +96,7 @@ public class BusLeaveServiceImpl extends ServiceImpl<BusLeaveMapper, BusLeave>
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean managerReview(LeaveManagerReviewReq req) {
+    public Boolean managerReview(BusLeaveManagerReviewReq req) {
         Long id = req.getId();
         String managerOpinion = req.getManagerOpinion();
         // 判断该请假记录是否存在
@@ -105,12 +105,12 @@ public class BusLeaveServiceImpl extends ServiceImpl<BusLeaveMapper, BusLeave>
             throw new ServiceException("施工人员请假申请不存在", HttpStatus.NOT_FOUND);
         }
         // 如果已经审核过，则返回
-        if (!OpinionStatusEnum.UNREAD.getValue().equals(oldLeave.getManagerOpinion())) {
+        if (!BusOpinionStatusEnum.UNREAD.getValue().equals(oldLeave.getManagerOpinion())) {
             throw new ServiceException("该请假已审核，请勿重复操作", HttpStatus.BAD_REQUEST);
         }
         // 判断班组长是否审核通过
         String gangerOpinion = oldLeave.getGangerOpinion();
-        if (!OpinionStatusEnum.PASS.getValue().equals(gangerOpinion)) {
+        if (!BusOpinionStatusEnum.PASS.getValue().equals(gangerOpinion)) {
             throw new ServiceException("请等待班组长审核通过后再进行操作", HttpStatus.BAD_REQUEST);
         }
         // todo 判断当前用户是否为项目管理员
@@ -144,8 +144,8 @@ public class BusLeaveServiceImpl extends ServiceImpl<BusLeaveMapper, BusLeave>
             Date date = DateUtils.addDays(startTime, (int) i);
             attendance.setLeaveId(id);
             attendance.setClockDate(date);
-            attendance.setClockStatus(AttendanceClockStatusEnum.LEAVE.getValue());
-            attendance.setCommuter(AttendanceCommuterEnum.ALLDAY.getValue());
+            attendance.setClockStatus(BusAttendanceClockStatusEnum.LEAVE.getValue());
+            attendance.setCommuter(BusAttendanceCommuterEnum.ALLDAY.getValue());
             attendanceList.add(attendance);
         }
         boolean saveBatch = attendanceService.saveBatch(attendanceList);
@@ -192,7 +192,7 @@ public class BusLeaveServiceImpl extends ServiceImpl<BusLeaveMapper, BusLeave>
             leaveVo.setTeamName(team.getTeamName());
         }
         // 添加审核状态
-        String status = ReviewStatusEnum.getEnumByOpinionStatus(leave.getGangerOpinion(), leave.getManagerOpinion());
+        String status = BusReviewStatusEnum.getEnumByOpinionStatus(leave.getGangerOpinion(), leave.getManagerOpinion());
         leaveVo.setStatus(status);
         return leaveVo;
     }
@@ -204,7 +204,7 @@ public class BusLeaveServiceImpl extends ServiceImpl<BusLeaveMapper, BusLeave>
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusLeave> buildQueryWrapper(LeaveQueryReq req) {
+    public LambdaQueryWrapper<BusLeave> buildQueryWrapper(BusLeaveQueryReq req) {
         LambdaQueryWrapper<BusLeave> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
@@ -266,7 +266,7 @@ public class BusLeaveServiceImpl extends ServiceImpl<BusLeaveMapper, BusLeave>
             }
             leaveVo.setTeamName(teamName);
             // 添加审核状态
-            String status = ReviewStatusEnum.getEnumByOpinionStatus(leave.getGangerOpinion(), leave.getManagerOpinion());
+            String status = BusReviewStatusEnum.getEnumByOpinionStatus(leave.getGangerOpinion(), leave.getManagerOpinion());
             leaveVo.setStatus(status);
             return leaveVo;
         }).toList();
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectFileServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectFileServiceImpl.java
index 5b689573..c859da82 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectFileServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectFileServiceImpl.java
@@ -23,10 +23,10 @@ import org.dromara.common.sse.utils.SseMessageUtils;
 import org.dromara.constant.DesignMapFileConstant;
 import org.dromara.project.domain.BusProject;
 import org.dromara.project.domain.BusProjectFile;
-import org.dromara.project.domain.req.projectfile.ProjectFileQueryReq;
-import org.dromara.project.domain.req.projectfile.ProjectFileUpdateReq;
-import org.dromara.project.domain.req.projectfile.ProjectFileUploadDxfReq;
-import org.dromara.project.domain.vo.BusProjectFileVo;
+import org.dromara.project.domain.req.projectfile.BusProjectFileQueryReq;
+import org.dromara.project.domain.req.projectfile.BusProjectFileUpdateReq;
+import org.dromara.project.domain.req.projectfile.BusProjectFileUploadDxfReq;
+import org.dromara.project.domain.vo.projectfile.BusProjectFileVo;
 import org.dromara.project.mapper.BusProjectFileMapper;
 import org.dromara.project.service.IBusProjectFileService;
 import org.dromara.project.service.IBusProjectService;
@@ -90,7 +90,7 @@ public class BusProjectFileServiceImpl extends ServiceImpl<BusProjectFileMapper,
      * @return 项目文件存储分页列表
      */
     @Override
-    public TableDataInfo<BusProjectFileVo> queryPageList(ProjectFileQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusProjectFileVo> queryPageList(BusProjectFileQueryReq req, PageQuery pageQuery) {
         Page<BusProjectFile> projectFilePage = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(projectFilePage));
     }
@@ -102,7 +102,7 @@ public class BusProjectFileServiceImpl extends ServiceImpl<BusProjectFileMapper,
      * @return 项目文件存储列表
      */
     @Override
-    public List<BusProjectFileVo> queryList(ProjectFileQueryReq req) {
+    public List<BusProjectFileVo> queryList(BusProjectFileQueryReq req) {
         LambdaQueryWrapper<BusProjectFile> lqw = this.buildQueryWrapper(req);
         return this.list(lqw).stream().map(this::getVo).toList();
     }
@@ -114,7 +114,7 @@ public class BusProjectFileServiceImpl extends ServiceImpl<BusProjectFileMapper,
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(ProjectFileUpdateReq req) {
+    public Boolean updateByBo(BusProjectFileUpdateReq req) {
         // 将实体类和 DTO 进行转换
         BusProjectFile projectFile = new BusProjectFile();
         BeanUtils.copyProperties(req, projectFile);
@@ -213,7 +213,7 @@ public class BusProjectFileServiceImpl extends ServiceImpl<BusProjectFileMapper,
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Long uploadDxf2Json(MultipartFile file, ProjectFileUploadDxfReq req) {
+    public Long uploadDxf2Json(MultipartFile file, BusProjectFileUploadDxfReq req) {
         Long userId = LoginHelper.getUserId();
         // 获取当前登录用户key值
         String string = String.valueOf(userId + req.getProjectId());
@@ -350,7 +350,7 @@ public class BusProjectFileServiceImpl extends ServiceImpl<BusProjectFileMapper,
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusProjectFile> buildQueryWrapper(ProjectFileQueryReq req) {
+    public LambdaQueryWrapper<BusProjectFile> buildQueryWrapper(BusProjectFileQueryReq req) {
         LambdaQueryWrapper<BusProjectFile> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectNewsServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectNewsServiceImpl.java
index 2bea1ec9..67489910 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectNewsServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectNewsServiceImpl.java
@@ -12,12 +12,12 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.project.domain.BusProjectNews;
-import org.dromara.project.domain.req.projectnews.ProjectNewsCreateReq;
-import org.dromara.project.domain.req.projectnews.ProjectNewsGisReq;
-import org.dromara.project.domain.req.projectnews.ProjectNewsQueryReq;
-import org.dromara.project.domain.req.projectnews.ProjectNewsUpdateReq;
-import org.dromara.project.domain.resp.projectnews.ProjectNewsGisResp;
-import org.dromara.project.domain.vo.BusProjectNewsVo;
+import org.dromara.project.domain.req.projectnews.BusProjectNewsCreateReq;
+import org.dromara.project.domain.req.projectnews.BusProjectNewsGisReq;
+import org.dromara.project.domain.req.projectnews.BusProjectNewsQueryReq;
+import org.dromara.project.domain.req.projectnews.BusProjectNewsUpdateReq;
+import org.dromara.project.domain.vo.projectnews.BusProjectNewsGisVo;
+import org.dromara.project.domain.vo.projectnews.BusProjectNewsVo;
 import org.dromara.project.mapper.BusProjectNewsMapper;
 import org.dromara.project.service.IBusProjectNewsService;
 import org.dromara.project.service.IBusProjectService;
@@ -64,7 +64,7 @@ public class BusProjectNewsServiceImpl extends ServiceImpl<BusProjectNewsMapper,
      * @return 项目新闻分页列表
      */
     @Override
-    public TableDataInfo<BusProjectNewsVo> queryPageList(ProjectNewsQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusProjectNewsVo> queryPageList(BusProjectNewsQueryReq req, PageQuery pageQuery) {
         Page<BusProjectNews> projectNewsPage = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(projectNewsPage));
     }
@@ -76,7 +76,7 @@ public class BusProjectNewsServiceImpl extends ServiceImpl<BusProjectNewsMapper,
      * @return 项目新闻列表
      */
     @Override
-    public List<BusProjectNewsVo> queryList(ProjectNewsQueryReq req) {
+    public List<BusProjectNewsVo> queryList(BusProjectNewsQueryReq req) {
         LambdaQueryWrapper<BusProjectNews> lqw = this.buildQueryWrapper(req);
         return this.list(lqw).stream().map(this::getVo).toList();
     }
@@ -88,7 +88,7 @@ public class BusProjectNewsServiceImpl extends ServiceImpl<BusProjectNewsMapper,
      * @return 大屏项目新闻列表
      */
     @Override
-    public List<ProjectNewsGisResp> queryGisList(ProjectNewsGisReq req) {
+    public List<BusProjectNewsGisVo> queryGisList(BusProjectNewsGisReq req) {
         Long projectId = req.getProjectId();
         if (projectId == null || projectService.getById(projectId) == null) {
             throw new ServiceException("对应项目不存在", HttpStatus.NOT_FOUND);
@@ -98,7 +98,7 @@ public class BusProjectNewsServiceImpl extends ServiceImpl<BusProjectNewsMapper,
             .eq(BusProjectNews::getProjectId, projectId)
             .list();
         return projectNewsList.stream().map(projectNews -> {
-            ProjectNewsGisResp projectNewsGisResp = new ProjectNewsGisResp();
+            BusProjectNewsGisVo projectNewsGisResp = new BusProjectNewsGisVo();
             BeanUtils.copyProperties(projectNews, projectNewsGisResp);
             return projectNewsGisResp;
         }).toList();
@@ -111,7 +111,7 @@ public class BusProjectNewsServiceImpl extends ServiceImpl<BusProjectNewsMapper,
      * @return 新增项目新闻id
      */
     @Override
-    public Long insertByBo(ProjectNewsCreateReq req) {
+    public Long insertByBo(BusProjectNewsCreateReq req) {
         // 将实体类和 DTO 进行转换
         BusProjectNews projectNews = new BusProjectNews();
         BeanUtils.copyProperties(req, projectNews);
@@ -132,7 +132,7 @@ public class BusProjectNewsServiceImpl extends ServiceImpl<BusProjectNewsMapper,
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(ProjectNewsUpdateReq req) {
+    public Boolean updateByBo(BusProjectNewsUpdateReq req) {
         // 将实体类和 DTO 进行转换
         BusProjectNews projectNews = new BusProjectNews();
         BeanUtils.copyProperties(req, projectNews);
@@ -211,7 +211,7 @@ public class BusProjectNewsServiceImpl extends ServiceImpl<BusProjectNewsMapper,
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusProjectNews> buildQueryWrapper(ProjectNewsQueryReq req) {
+    public LambdaQueryWrapper<BusProjectNews> buildQueryWrapper(BusProjectNewsQueryReq req) {
         LambdaQueryWrapper<BusProjectNews> lqw = new LambdaQueryWrapper<>();
         Long projectId = req.getProjectId();
         lqw.eq(ObjectUtils.isNotEmpty(projectId), BusProjectNews::getProjectId, projectId);
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java
index d065258c..5c3b2162 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java
@@ -21,11 +21,11 @@ import org.dromara.project.domain.BusContractor;
 import org.dromara.project.domain.BusProject;
 import org.dromara.project.domain.BusProjectFile;
 import org.dromara.project.domain.BusUserProjectRelevancy;
-import org.dromara.project.domain.req.project.ProjectCreateReq;
-import org.dromara.project.domain.req.project.ProjectQueryReq;
-import org.dromara.project.domain.req.project.ProjectUpdateReq;
-import org.dromara.project.domain.resp.project.ProjectContractorListResp;
-import org.dromara.project.domain.vo.BusProjectVo;
+import org.dromara.project.domain.req.project.BusProjectCreateReq;
+import org.dromara.project.domain.req.project.BusProjectQueryReq;
+import org.dromara.project.domain.req.project.BusProjectUpdateReq;
+import org.dromara.project.domain.vo.project.BusProjectContractorListVo;
+import org.dromara.project.domain.vo.project.BusProjectVo;
 import org.dromara.project.mapper.BusProjectMapper;
 import org.dromara.project.service.IBusContractorService;
 import org.dromara.project.service.IBusProjectFileService;
@@ -84,7 +84,7 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
      * @return 项目分页列表
      */
     @Override
-    public TableDataInfo<BusProjectVo> queryPageList(ProjectQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusProjectVo> queryPageList(BusProjectQueryReq req, PageQuery pageQuery) {
         // 查询数据库
         Page<BusProject> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
@@ -97,7 +97,7 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
      * @return 项目列表
      */
     @Override
-    public List<BusProjectVo> queryList(ProjectQueryReq req) {
+    public List<BusProjectVo> queryList(BusProjectQueryReq req) {
         LambdaQueryWrapper<BusProject> lqw = this.buildQueryWrapper(req);
         return this.list(lqw).stream().map(this::getVo).toList();
     }
@@ -108,7 +108,7 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
      * @return 项目列表以及项目列表下的分包公司列表
      */
     @Override
-    public List<ProjectContractorListResp> queryProjectContractorList() {
+    public List<BusProjectContractorListVo> queryProjectContractorList() {
         Long userId = LoginHelper.getUserId();
         // 获取当前登录用户的项目列表
         LambdaQueryWrapper<BusUserProjectRelevancy> userProjectRelevancyLqw = Wrappers.lambdaQuery(BusUserProjectRelevancy.class)
@@ -123,7 +123,7 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
             .collect(Collectors.groupingBy(BusContractor::getProjectId));
         // 获取封装
         return projectList.stream().map(project -> {
-            ProjectContractorListResp projectContractorListResp = new ProjectContractorListResp();
+            BusProjectContractorListVo projectContractorListResp = new BusProjectContractorListVo();
             // 添加项目信息
             projectContractorListResp.setId(project.getId());
             projectContractorListResp.setProjectName(project.getProjectName());
@@ -147,7 +147,7 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Long insertByBo(ProjectCreateReq req) {
+    public Long insertByBo(BusProjectCreateReq req) {
         // 将实体类和 DTO 进行转换
         BusProject project = new BusProject();
         BeanUtils.copyProperties(req, project);
@@ -191,7 +191,7 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(ProjectUpdateReq req) {
+    public Boolean updateByBo(BusProjectUpdateReq req) {
         // 将实体类和 DTO 进行转换
         BusProject project = new BusProject();
         BeanUtils.copyProperties(req, project);
@@ -310,7 +310,7 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusProject> buildQueryWrapper(ProjectQueryReq req) {
+    public LambdaQueryWrapper<BusProject> buildQueryWrapper(BusProjectQueryReq req) {
         LambdaQueryWrapper<BusProject> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
index 56814dd5..44702b1d 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
@@ -19,12 +19,12 @@ import org.dromara.project.domain.BusConstructionUser;
 import org.dromara.project.domain.BusConstructionUserExit;
 import org.dromara.project.domain.BusProjectTeam;
 import org.dromara.project.domain.BusProjectTeamMember;
-import org.dromara.project.domain.enums.ProjectTeamMemberPostEnum;
-import org.dromara.project.domain.req.projectteammember.ProjectTeamMemberCreateReq;
-import org.dromara.project.domain.req.projectteammember.ProjectTeamMemberExitReq;
-import org.dromara.project.domain.req.projectteammember.ProjectTeamMemberQueryReq;
-import org.dromara.project.domain.req.projectteammember.ProjectTeamMemberUpdateReq;
-import org.dromara.project.domain.vo.BusProjectTeamMemberVo;
+import org.dromara.project.domain.enums.BusProjectTeamMemberPostEnum;
+import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberCreateReq;
+import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberExitReq;
+import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberQueryReq;
+import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberUpdateReq;
+import org.dromara.project.domain.vo.projectteammember.BusProjectTeamMemberVo;
 import org.dromara.project.mapper.BusProjectTeamMemberMapper;
 import org.dromara.project.service.*;
 import org.springframework.beans.BeanUtils;
@@ -85,7 +85,7 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
      * @return 项目班组下的成员分页列表
      */
     @Override
-    public TableDataInfo<BusProjectTeamMemberVo> queryPageList(ProjectTeamMemberQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusProjectTeamMemberVo> queryPageList(BusProjectTeamMemberQueryReq req, PageQuery pageQuery) {
         // 查询数据库
         Page<BusProjectTeamMember> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
@@ -98,7 +98,7 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
      * @return 项目班组下的成员列表
      */
     @Override
-    public List<BusProjectTeamMemberVo> queryList(ProjectTeamMemberQueryReq req) {
+    public List<BusProjectTeamMemberVo> queryList(BusProjectTeamMemberQueryReq req) {
         LambdaQueryWrapper<BusProjectTeamMember> lqw = this.buildQueryWrapper(req);
         List<BusProjectTeamMember> list = this.list(lqw);
         return list.stream().map(this::getVo).toList();
@@ -112,7 +112,7 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Long insertByBo(ProjectTeamMemberCreateReq req) {
+    public Long insertByBo(BusProjectTeamMemberCreateReq req) {
         // 将实体类和 DTO 进行转换
         BusProjectTeamMember projectTeamMember = new BusProjectTeamMember();
         BeanUtils.copyProperties(req, projectTeamMember);
@@ -157,7 +157,7 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean updateByBo(ProjectTeamMemberUpdateReq req) {
+    public Boolean updateByBo(BusProjectTeamMemberUpdateReq req) {
         // 将实体类和 DTO 进行转换
         BusProjectTeamMember projectTeamMember = new BusProjectTeamMember();
         BeanUtils.copyProperties(req, projectTeamMember);
@@ -194,7 +194,7 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
         Long projectId = entity.getProjectId();
         Long memberId = entity.getMemberId();
         String postId = entity.getPostId();
-        ProjectTeamMemberPostEnum postEnum = ProjectTeamMemberPostEnum.getEnumByValue(postId);
+        BusProjectTeamMemberPostEnum postEnum = BusProjectTeamMemberPostEnum.getEnumByValue(postId);
         if (create) {
             if (projectId == null) {
                 throw new ServiceException("项目 id 不能为空", HttpStatus.BAD_REQUEST);
@@ -222,7 +222,7 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean deleteById(ProjectTeamMemberExitReq req) {
+    public Boolean deleteById(BusProjectTeamMemberExitReq req) {
         // 判断是否有权限操作对应项目下的内容
         Long userId = LoginHelper.getUserId();
         Long id = req.getId();
@@ -288,7 +288,7 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
      * @return 项目班组成员查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusProjectTeamMember> buildQueryWrapper(ProjectTeamMemberQueryReq req) {
+    public LambdaQueryWrapper<BusProjectTeamMember> buildQueryWrapper(BusProjectTeamMemberQueryReq req) {
         LambdaQueryWrapper<BusProjectTeamMember> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java
index d64fb3d3..06dd9f08 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java
@@ -17,13 +17,13 @@ import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.project.domain.BusConstructionUser;
 import org.dromara.project.domain.BusProjectTeam;
 import org.dromara.project.domain.BusProjectTeamMember;
-import org.dromara.project.domain.enums.ProjectTeamMemberPostEnum;
-import org.dromara.project.domain.req.projectteam.ProjectTeamCreateReq;
-import org.dromara.project.domain.req.projectteam.ProjectTeamQueryReq;
-import org.dromara.project.domain.req.projectteam.ProjectTeamUpdateReq;
-import org.dromara.project.domain.resp.projectteam.ForemanVo;
-import org.dromara.project.domain.resp.projectteam.ProjectTeamForemanResp;
-import org.dromara.project.domain.vo.BusProjectTeamVo;
+import org.dromara.project.domain.enums.BusProjectTeamMemberPostEnum;
+import org.dromara.project.domain.req.projectteam.BusProjectTeamCreateReq;
+import org.dromara.project.domain.req.projectteam.BusProjectTeamQueryReq;
+import org.dromara.project.domain.req.projectteam.BusProjectTeamUpdateReq;
+import org.dromara.project.domain.vo.projectteam.BusForemanVo;
+import org.dromara.project.domain.vo.projectteam.BusProjectTeamForemanVo;
+import org.dromara.project.domain.vo.projectteam.BusProjectTeamVo;
 import org.dromara.project.mapper.BusProjectTeamMapper;
 import org.dromara.project.service.IBusConstructionUserService;
 import org.dromara.project.service.IBusProjectService;
@@ -84,7 +84,7 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
      * @return 项目班组分页列表
      */
     @Override
-    public TableDataInfo<BusProjectTeamVo> queryPageList(ProjectTeamQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusProjectTeamVo> queryPageList(BusProjectTeamQueryReq req, PageQuery pageQuery) {
         // 查询数据库
         Page<BusProjectTeam> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
@@ -97,7 +97,7 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
      * @return 项目班组列表
      */
     @Override
-    public List<BusProjectTeamVo> queryList(ProjectTeamQueryReq req) {
+    public List<BusProjectTeamVo> queryList(BusProjectTeamQueryReq req) {
         LambdaQueryWrapper<BusProjectTeam> lqw = this.buildQueryWrapper(req);
         List<BusProjectTeam> list = this.list(lqw);
         return list.stream().map(this::getVo).toList();
@@ -110,7 +110,7 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
      * @return 是否新增成功
      */
     @Override
-    public Long insertByBo(ProjectTeamCreateReq req) {
+    public Long insertByBo(BusProjectTeamCreateReq req) {
         // 将实体类和 DTO 进行转换
         BusProjectTeam projectTeam = new BusProjectTeam();
         BeanUtils.copyProperties(req, projectTeam);
@@ -131,7 +131,7 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(ProjectTeamUpdateReq req) {
+    public Boolean updateByBo(BusProjectTeamUpdateReq req) {
         // 将实体类和 DTO 进行转换
         BusProjectTeam projectTeam = new BusProjectTeam();
         BeanUtils.copyProperties(req, projectTeam);
@@ -207,7 +207,7 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
      * @return 项目班组和班组长分页列表
      */
     @Override
-    public List<ProjectTeamForemanResp> queryForemanList(Long projectId) {
+    public List<BusProjectTeamForemanVo> queryForemanList(Long projectId) {
         List<BusProjectTeam> projectTeamList = this.list(Wrappers.lambdaQuery(BusProjectTeam.class).eq(BusProjectTeam::getProjectId, projectId));
         if (CollUtil.isEmpty(projectTeamList)) {
             return List.of();
@@ -219,7 +219,7 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
             .select(BusProjectTeamMember::getMemberId)
             .eq(BusProjectTeamMember::getProjectId, projectId)
             .in(BusProjectTeamMember::getTeamId, teamIdList)
-            .eq(BusProjectTeamMember::getPostId, ProjectTeamMemberPostEnum.FOREMAN.getValue());
+            .eq(BusProjectTeamMember::getPostId, BusProjectTeamMemberPostEnum.FOREMAN.getValue());
         Set<Long> foremanIdList = projectTeamMemberService.list(lqw).stream()
             .map(BusProjectTeamMember::getMemberId).collect(Collectors.toSet());
         if (CollUtil.isEmpty(foremanIdList)) {
@@ -230,14 +230,14 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
             .collect(Collectors.groupingBy(BusConstructionUser::getTeamId));
         // 封装数据
         return projectTeamList.stream().map(projectTeam -> {
-            ProjectTeamForemanResp projectTeamForemanResp = new ProjectTeamForemanResp();
+            BusProjectTeamForemanVo projectTeamForemanResp = new BusProjectTeamForemanVo();
             projectTeamForemanResp.setId(projectTeam.getId());
             projectTeamForemanResp.setTeamName(projectTeam.getTeamName());
             projectTeamForemanResp.setProjectId(projectTeam.getProjectId());
             if (foremanMap.containsKey(projectTeam.getId())) {
                 List<BusConstructionUser> constructionUserList = foremanMap.get(projectTeam.getId());
-                List<ForemanVo> foremanVoList = constructionUserList.stream()
-                    .map(constructionUser -> new ForemanVo(constructionUser.getId(), constructionUser.getUserName()))
+                List<BusForemanVo> foremanVoList = constructionUserList.stream()
+                    .map(constructionUser -> new BusForemanVo(constructionUser.getId(), constructionUser.getUserName()))
                     .toList();
                 projectTeamForemanResp.setForemanList(foremanVoList);
             }
@@ -274,7 +274,7 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
      * @return 项目班组查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusProjectTeam> buildQueryWrapper(ProjectTeamQueryReq req) {
+    public LambdaQueryWrapper<BusProjectTeam> buildQueryWrapper(BusProjectTeamQueryReq req) {
         LambdaQueryWrapper<BusProjectTeam> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusReissueCardServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusReissueCardServiceImpl.java
index d7ebc139..fa6402c9 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusReissueCardServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusReissueCardServiceImpl.java
@@ -16,13 +16,13 @@ import org.dromara.project.domain.BusAttendance;
 import org.dromara.project.domain.BusProject;
 import org.dromara.project.domain.BusProjectTeam;
 import org.dromara.project.domain.BusReissueCard;
-import org.dromara.project.domain.enums.AttendanceClockStatusEnum;
-import org.dromara.project.domain.enums.AttendanceCommuterEnum;
-import org.dromara.project.domain.enums.OpinionStatusEnum;
-import org.dromara.project.domain.enums.ReviewStatusEnum;
-import org.dromara.project.domain.req.reissuecard.ReissueCardManagerReviewReq;
-import org.dromara.project.domain.req.reissuecard.ReissueCardQueryReq;
-import org.dromara.project.domain.vo.BusReissueCardVo;
+import org.dromara.project.domain.enums.BusAttendanceClockStatusEnum;
+import org.dromara.project.domain.enums.BusAttendanceCommuterEnum;
+import org.dromara.project.domain.enums.BusOpinionStatusEnum;
+import org.dromara.project.domain.enums.BusReviewStatusEnum;
+import org.dromara.project.domain.req.reissuecard.BusReissueCardManagerReviewReq;
+import org.dromara.project.domain.req.reissuecard.BusReissueCardQueryReq;
+import org.dromara.project.domain.vo.reissuecard.BusReissueCardVo;
 import org.dromara.project.mapper.BusReissueCardMapper;
 import org.dromara.project.service.IBusAttendanceService;
 import org.dromara.project.service.IBusProjectService;
@@ -73,7 +73,7 @@ public class BusReissueCardServiceImpl extends ServiceImpl<BusReissueCardMapper,
      * @return 施工人员补卡申请分页列表
      */
     @Override
-    public TableDataInfo<BusReissueCardVo> queryPageList(ReissueCardQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusReissueCardVo> queryPageList(BusReissueCardQueryReq req, PageQuery pageQuery) {
         Page<BusReissueCard> result = this.page(pageQuery.build(), buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
@@ -85,7 +85,7 @@ public class BusReissueCardServiceImpl extends ServiceImpl<BusReissueCardMapper,
      * @return 施工人员补卡申请列表
      */
     @Override
-    public List<BusReissueCardVo> queryList(ReissueCardQueryReq req) {
+    public List<BusReissueCardVo> queryList(BusReissueCardQueryReq req) {
         LambdaQueryWrapper<BusReissueCard> lqw = buildQueryWrapper(req);
         return baseMapper.selectVoList(lqw);
     }
@@ -98,7 +98,7 @@ public class BusReissueCardServiceImpl extends ServiceImpl<BusReissueCardMapper,
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean managerReview(ReissueCardManagerReviewReq req) {
+    public Boolean managerReview(BusReissueCardManagerReviewReq req) {
         Long id = req.getId();
         String managerOpinion = req.getManagerOpinion();
         // 判断该补卡记录是否存在
@@ -107,12 +107,12 @@ public class BusReissueCardServiceImpl extends ServiceImpl<BusReissueCardMapper,
             throw new ServiceException("施工人员补卡申请不存在", HttpStatus.NOT_FOUND);
         }
         // 如果已经审核过，则返回
-        if (!OpinionStatusEnum.UNREAD.getValue().equals(managerOpinion)) {
+        if (!BusOpinionStatusEnum.UNREAD.getValue().equals(managerOpinion)) {
             throw new ServiceException("该请假已审核，请勿重复操作", HttpStatus.BAD_REQUEST);
         }
         // 判断班组长是否审核通过
         String gangerOpinion = oldReissueCard.getGangerOpinion();
-        if (!OpinionStatusEnum.PASS.getValue().equals(gangerOpinion)) {
+        if (!BusOpinionStatusEnum.PASS.getValue().equals(gangerOpinion)) {
             throw new ServiceException("请等待班组长审核通过后再进行操作", HttpStatus.BAD_REQUEST);
         }
         // todo 判断当前用户是否为项目管理员
@@ -137,17 +137,17 @@ public class BusReissueCardServiceImpl extends ServiceImpl<BusReissueCardMapper,
         // 根据补卡类型更新考勤时间
         String[] clockTime = project.getPunchRange().split(",");
         String reissueCardType = oldReissueCard.getReissueCardType();
-        if (AttendanceCommuterEnum.CLOCKIN.getValue().equals(reissueCardType)) {
+        if (BusAttendanceCommuterEnum.CLOCKIN.getValue().equals(reissueCardType)) {
             // 拼接时间，获取项目的上班打卡时间
             Date date = DateUtils.combineDateAndTime(oldAttendance.getClockDate(), clockTime[0] + ":00");
             attendance.setClockTime(date);
-        } else if (AttendanceCommuterEnum.CLOCKOUT.getValue().equals(reissueCardType)) {
+        } else if (BusAttendanceCommuterEnum.CLOCKOUT.getValue().equals(reissueCardType)) {
             // 拼接时间，获取项目的下班打卡时间
             Date date = DateUtils.combineDateAndTime(oldAttendance.getClockDate(), clockTime[1] + ":00");
             attendance.setClockTime(date);
         }
         attendance.setId(oldReissueCard.getAttendanceId());
-        attendance.setClockStatus(AttendanceClockStatusEnum.REISSUE.getValue());
+        attendance.setClockStatus(BusAttendanceClockStatusEnum.REISSUE.getValue());
         boolean updateAttendance = attendanceService.updateById(attendance);
         if (!updateAttendance) {
             throw new ServiceException("更新考勤记录失败", HttpStatus.ERROR);
@@ -192,7 +192,7 @@ public class BusReissueCardServiceImpl extends ServiceImpl<BusReissueCardMapper,
             reissueCardVo.setTeamName(team.getTeamName());
         }
         // 添加审核状态
-        String status = ReviewStatusEnum.getEnumByOpinionStatus(reissueCard.getGangerOpinion(), reissueCard.getManagerOpinion());
+        String status = BusReviewStatusEnum.getEnumByOpinionStatus(reissueCard.getGangerOpinion(), reissueCard.getManagerOpinion());
         reissueCardVo.setStatus(status);
         return reissueCardVo;
     }
@@ -204,7 +204,7 @@ public class BusReissueCardServiceImpl extends ServiceImpl<BusReissueCardMapper,
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusReissueCard> buildQueryWrapper(ReissueCardQueryReq req) {
+    public LambdaQueryWrapper<BusReissueCard> buildQueryWrapper(BusReissueCardQueryReq req) {
         LambdaQueryWrapper<BusReissueCard> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
@@ -268,7 +268,7 @@ public class BusReissueCardServiceImpl extends ServiceImpl<BusReissueCardMapper,
             }
             reissueCardVo.setTeamName(teamName);
             // 添加审核状态
-            String status = ReviewStatusEnum.getEnumByOpinionStatus(reissueCard.getGangerOpinion(), reissueCard.getManagerOpinion());
+            String status = BusReviewStatusEnum.getEnumByOpinionStatus(reissueCard.getGangerOpinion(), reissueCard.getManagerOpinion());
             reissueCardVo.setStatus(status);
             return reissueCardVo;
         }).toList();
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusUserProjectRelevancyServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusUserProjectRelevancyServiceImpl.java
index 4b8bc0a3..437329ba 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusUserProjectRelevancyServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusUserProjectRelevancyServiceImpl.java
@@ -15,12 +15,12 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.project.domain.BusProject;
 import org.dromara.project.domain.BusUserProjectRelevancy;
-import org.dromara.project.domain.req.project.ProjectBatchByProjectListReq;
-import org.dromara.project.domain.req.userprojectrelevancy.UserProjectRelevancyCreateReq;
-import org.dromara.project.domain.req.userprojectrelevancy.UserProjectRelevancyQueryReq;
-import org.dromara.project.domain.req.userprojectrelevancy.UserProjectRelevancyUpdateReq;
-import org.dromara.project.domain.resp.userprojectrelevancy.LoginUserProjectRelevancyResp;
-import org.dromara.project.domain.vo.BusUserProjectRelevancyVo;
+import org.dromara.project.domain.req.project.BusProjectBatchByProjectListReq;
+import org.dromara.project.domain.req.userprojectrelevancy.BusUserProjectRelevancyCreateReq;
+import org.dromara.project.domain.req.userprojectrelevancy.BusUserProjectRelevancyQueryReq;
+import org.dromara.project.domain.req.userprojectrelevancy.BusUserProjectRelevancyUpdateReq;
+import org.dromara.project.domain.vo.userprojectrelevancy.BusLoginUserProjectRelevancyVo;
+import org.dromara.project.domain.vo.userprojectrelevancy.BusUserProjectRelevancyVo;
 import org.dromara.project.mapper.BusUserProjectRelevancyMapper;
 import org.dromara.project.service.IBusProjectService;
 import org.dromara.project.service.IBusUserProjectRelevancyService;
@@ -75,7 +75,7 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl<BusUserProje
      * @return 系统用户与项目关联分页列表
      */
     @Override
-    public TableDataInfo<BusUserProjectRelevancyVo> queryPageList(UserProjectRelevancyQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusUserProjectRelevancyVo> queryPageList(BusUserProjectRelevancyQueryReq req, PageQuery pageQuery) {
         // 查询数据库
         Page<BusUserProjectRelevancy> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
@@ -88,7 +88,7 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl<BusUserProje
      * @return 系统用户与项目关联列表
      */
     @Override
-    public List<BusUserProjectRelevancyVo> queryList(UserProjectRelevancyQueryReq req) {
+    public List<BusUserProjectRelevancyVo> queryList(BusUserProjectRelevancyQueryReq req) {
         LambdaQueryWrapper<BusUserProjectRelevancy> lqw = this.buildQueryWrapper(req);
         return this.list(lqw).stream().map(this::getVo).toList();
     }
@@ -100,7 +100,7 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl<BusUserProje
      * @return 新增关联id
      */
     @Override
-    public Long insertByBo(UserProjectRelevancyCreateReq req) {
+    public Long insertByBo(BusUserProjectRelevancyCreateReq req) {
         // 将实体类和 DTO 进行转换
         BusUserProjectRelevancy userProjectRelevancy = new BusUserProjectRelevancy();
         BeanUtils.copyProperties(req, userProjectRelevancy);
@@ -128,7 +128,7 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl<BusUserProje
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(UserProjectRelevancyUpdateReq req) {
+    public Boolean updateByBo(BusUserProjectRelevancyUpdateReq req) {
         // 将实体类和 DTO 进行转换
         BusUserProjectRelevancy userProjectRelevancy = new BusUserProjectRelevancy();
         BeanUtils.copyProperties(req, userProjectRelevancy);
@@ -203,7 +203,7 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl<BusUserProje
      * @return 当前登录用户项目列表
      */
     @Override
-    public List<LoginUserProjectRelevancyResp> queryListByUserId(Long userId) {
+    public List<BusLoginUserProjectRelevancyVo> queryListByUserId(Long userId) {
         // 添加查询条件，根据当前用户，获取数据
         LambdaQueryWrapper<BusUserProjectRelevancy> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(BusUserProjectRelevancy::getUserId, userId);
@@ -217,7 +217,7 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl<BusUserProje
                 projectQueryWrapper.eq("id", projectId);
                 BusProject project = projectService.getOne(projectQueryWrapper);
                 if (project != null) {
-                    LoginUserProjectRelevancyResp loginUserProjectRelevancy = new LoginUserProjectRelevancyResp();
+                    BusLoginUserProjectRelevancyVo loginUserProjectRelevancy = new BusLoginUserProjectRelevancyVo();
                     loginUserProjectRelevancy.setId(userProjectRelevancy.getId());
                     loginUserProjectRelevancy.setUserId(userProjectRelevancy.getUserId());
                     loginUserProjectRelevancy.setProjectId(projectId);
@@ -240,7 +240,7 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl<BusUserProje
      * @return 当前登录用户项目分页
      */
     @Override
-    public TableDataInfo<BusUserProjectRelevancyVo> queryPageByUserId(Long userId, UserProjectRelevancyQueryReq req,
+    public TableDataInfo<BusUserProjectRelevancyVo> queryPageByUserId(Long userId, BusUserProjectRelevancyQueryReq req,
                                                                       PageQuery pageQuery) {
         // 添加查询条件
         req.setUserId(userId);
@@ -258,7 +258,7 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl<BusUserProje
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean insertBatchByProjectList(ProjectBatchByProjectListReq req) {
+    public Boolean insertBatchByProjectList(BusProjectBatchByProjectListReq req) {
         Long userId = req.getUserId();
         Long[] projectIdList = req.getProjectIdList();
         long count = projectService.count(new QueryWrapper<BusProject>().in("id", (Object[]) projectIdList));
@@ -316,7 +316,7 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl<BusUserProje
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusUserProjectRelevancy> buildQueryWrapper(UserProjectRelevancyQueryReq req) {
+    public LambdaQueryWrapper<BusUserProjectRelevancy> buildQueryWrapper(BusUserProjectRelevancyQueryReq req) {
         LambdaQueryWrapper<BusUserProjectRelevancy> queryWrapper = new LambdaQueryWrapper<>();
         if (req == null) {
             return queryWrapper;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusWorkWageServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusWorkWageServiceImpl.java
index 0489644e..9a0cc31b 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusWorkWageServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusWorkWageServiceImpl.java
@@ -13,11 +13,11 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.project.domain.BusWorkWage;
-import org.dromara.project.domain.enums.WageMeasureUnitEnum;
-import org.dromara.project.domain.req.workwage.WorkWageCreateReq;
-import org.dromara.project.domain.req.workwage.WorkWageQueryReq;
-import org.dromara.project.domain.req.workwage.WorkWageUpdateReq;
-import org.dromara.project.domain.vo.BusWorkWageVo;
+import org.dromara.project.domain.enums.BusWageMeasureUnitEnum;
+import org.dromara.project.domain.req.workwage.BusWorkWageCreateReq;
+import org.dromara.project.domain.req.workwage.BusWorkWageQueryReq;
+import org.dromara.project.domain.req.workwage.BusWorkWageUpdateReq;
+import org.dromara.project.domain.vo.workwage.BusWorkWageVo;
 import org.dromara.project.mapper.BusWorkWageMapper;
 import org.dromara.project.service.IBusProjectService;
 import org.dromara.project.service.IBusWorkWageService;
@@ -64,7 +64,7 @@ public class BusWorkWageServiceImpl extends ServiceImpl<BusWorkWageMapper, BusWo
      * @return 工种薪水分页列表
      */
     @Override
-    public TableDataInfo<BusWorkWageVo> queryPageList(WorkWageQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusWorkWageVo> queryPageList(BusWorkWageQueryReq req, PageQuery pageQuery) {
         Page<BusWorkWage> result = this.page(pageQuery.build(), buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
@@ -76,7 +76,7 @@ public class BusWorkWageServiceImpl extends ServiceImpl<BusWorkWageMapper, BusWo
      * @return 工种薪水列表
      */
     @Override
-    public List<BusWorkWageVo> queryList(WorkWageQueryReq req) {
+    public List<BusWorkWageVo> queryList(BusWorkWageQueryReq req) {
         LambdaQueryWrapper<BusWorkWage> lqw = buildQueryWrapper(req);
         return this.list(lqw).stream().map(this::getVo).toList();
     }
@@ -88,7 +88,7 @@ public class BusWorkWageServiceImpl extends ServiceImpl<BusWorkWageMapper, BusWo
      * @return 新增工种薪水id
      */
     @Override
-    public Long insertByBo(WorkWageCreateReq req) {
+    public Long insertByBo(BusWorkWageCreateReq req) {
         // 将实体类和 DTO 进行转换
         BusWorkWage workWage = new BusWorkWage();
         BeanUtils.copyProperties(req, workWage);
@@ -107,10 +107,10 @@ public class BusWorkWageServiceImpl extends ServiceImpl<BusWorkWageMapper, BusWo
         String wageCalculationType = req.getWageCalculationType();
         switch (wageCalculationType) {
             case "1":
-                workWage.setWageMeasureUnit(WageMeasureUnitEnum.TIME.getValue());
+                workWage.setWageMeasureUnit(BusWageMeasureUnitEnum.TIME.getValue());
                 break;
             case "2":
-                workWage.setWageMeasureUnit(WageMeasureUnitEnum.PIECE.getValue());
+                workWage.setWageMeasureUnit(BusWageMeasureUnitEnum.PIECE.getValue());
                 break;
             default:
                 throw new ServiceException("工资计算方式错误", HttpStatus.BAD_REQUEST);
@@ -130,7 +130,7 @@ public class BusWorkWageServiceImpl extends ServiceImpl<BusWorkWageMapper, BusWo
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(WorkWageUpdateReq req) {
+    public Boolean updateByBo(BusWorkWageUpdateReq req) {
         // 将实体类和 DTO 进行转换
         BusWorkWage workWage = new BusWorkWage();
         BeanUtils.copyProperties(req, workWage);
@@ -209,7 +209,7 @@ public class BusWorkWageServiceImpl extends ServiceImpl<BusWorkWageMapper, BusWo
      * @return 查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusWorkWage> buildQueryWrapper(WorkWageQueryReq req) {
+    public LambdaQueryWrapper<BusWorkWage> buildQueryWrapper(BusWorkWageQueryReq req) {
         LambdaQueryWrapper<BusWorkWage> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusWorkerDailyReportServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusWorkerDailyReportServiceImpl.java
index 46f45960..f30859ff 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusWorkerDailyReportServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusWorkerDailyReportServiceImpl.java
@@ -14,9 +14,9 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusDailyPieceItem;
 import org.dromara.project.domain.BusProjectTeam;
 import org.dromara.project.domain.BusWorkerDailyReport;
-import org.dromara.project.domain.req.workerdailyreport.WorkerDailyReportQueryReq;
-import org.dromara.project.domain.vo.BusDailyPieceItemVo;
-import org.dromara.project.domain.vo.BusWorkerDailyReportVo;
+import org.dromara.project.domain.req.workerdailyreport.BusWorkerDailyReportQueryReq;
+import org.dromara.project.domain.vo.dailypieceitem.BusDailyPieceItemVo;
+import org.dromara.project.domain.vo.workerdailyreport.BusWorkerDailyReportVo;
 import org.dromara.project.mapper.BusWorkerDailyReportMapper;
 import org.dromara.project.service.IBusDailyPieceItemService;
 import org.dromara.project.service.IBusProjectTeamService;
@@ -71,7 +71,7 @@ public class BusWorkerDailyReportServiceImpl extends ServiceImpl<BusWorkerDailyR
      * @return 施工人员日报分页列表
      */
     @Override
-    public TableDataInfo<BusWorkerDailyReportVo> queryPageList(WorkerDailyReportQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<BusWorkerDailyReportVo> queryPageList(BusWorkerDailyReportQueryReq req, PageQuery pageQuery) {
         LambdaQueryWrapper<BusWorkerDailyReport> lqw = this.buildQueryWrapper(req);
         Page<BusWorkerDailyReport> result = this.page(pageQuery.build(), lqw);
         return TableDataInfo.build(this.getVoPage(result));
@@ -84,7 +84,7 @@ public class BusWorkerDailyReportServiceImpl extends ServiceImpl<BusWorkerDailyR
      * @return 施工人员日报列表
      */
     @Override
-    public List<BusWorkerDailyReportVo> queryList(WorkerDailyReportQueryReq req) {
+    public List<BusWorkerDailyReportVo> queryList(BusWorkerDailyReportQueryReq req) {
         LambdaQueryWrapper<BusWorkerDailyReport> lqw = buildQueryWrapper(req);
         return baseMapper.selectVoList(lqw);
     }
@@ -143,7 +143,7 @@ public class BusWorkerDailyReportServiceImpl extends ServiceImpl<BusWorkerDailyR
      * @return 施工人员日报列表查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusWorkerDailyReport> buildQueryWrapper(WorkerDailyReportQueryReq req) {
+    public LambdaQueryWrapper<BusWorkerDailyReport> buildQueryWrapper(BusWorkerDailyReportQueryReq req) {
         LambdaQueryWrapper<BusWorkerDailyReport> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/constant/QualityConstant.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/constant/QltQualityConstant.java
similarity index 79%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/constant/QualityConstant.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/constant/QltQualityConstant.java
index 85540e25..42c47909 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/constant/QualityConstant.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/constant/QltQualityConstant.java
@@ -1,8 +1,8 @@
 package org.dromara.quality.constant;
 
 import org.dromara.common.core.utils.DateUtils;
-import org.dromara.quality.domain.BusQualityConstructionLog;
-import org.dromara.quality.domain.BusQualityInspection;
+import org.dromara.quality.domain.QltQualityConstructionLog;
+import org.dromara.quality.domain.QltQualityInspection;
 
 import java.text.SimpleDateFormat;
 
@@ -10,7 +10,7 @@ import java.text.SimpleDateFormat;
  * @author lcj
  * @date 2025/4/17 14:36
  */
-public interface QualityConstant {
+public interface QltQualityConstant {
 
     String QUALITY_INSPECTION_CHECK_TYPE = "quality_inspection_check_type";
 
@@ -20,12 +20,12 @@ public interface QualityConstant {
 
     String QUALITY_CONSTRUCTION_LOG_FILE_URL = "docs/quality/constructionLog/";
 
-    static String getQualityConstructionLogFileUrl(BusQualityConstructionLog qualityConstructionLog) {
+    static String getQualityConstructionLogFileUrl(QltQualityConstructionLog qualityConstructionLog) {
         String timestamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(qualityConstructionLog.getUpdateTime());
         return String.format("%s%s/%s", QUALITY_CONSTRUCTION_LOG_FILE_URL, qualityConstructionLog.getId(), timestamp);
     }
 
-    static String getQualityConstructionLogFileName(BusQualityConstructionLog qualityConstructionLog) {
+    static String getQualityConstructionLogFileName(QltQualityConstructionLog qualityConstructionLog) {
         String createDate = DateUtils.formatDate(qualityConstructionLog.getCreateTime());
         return String.format("施工日志（%s）.docx", createDate);
     }
@@ -34,12 +34,12 @@ public interface QualityConstant {
 
     String QUALITY_INSPECTION_FILE_URL = "docs/quality/inspection/";
 
-    static String getQualityInspectionFileUrl(BusQualityInspection qualityInspection) {
+    static String getQualityInspectionFileUrl(QltQualityInspection qualityInspection) {
         String timestamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(qualityInspection.getUpdateTime());
         return String.format("%s%s/%s", QUALITY_INSPECTION_FILE_URL, qualityInspection.getId(), timestamp);
     }
 
-    static String getQualityInspectionFileName(BusQualityInspection qualityInspection) {
+    static String getQualityInspectionFileName(QltQualityInspection qualityInspection) {
         String createDate = DateUtils.formatDate(qualityInspection.getCreateTime());
         return String.format("整改通知单（%s）.docx", createDate);
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/BusQualityConstructionLogController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityConstructionLogController.java
similarity index 77%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/BusQualityConstructionLogController.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityConstructionLogController.java
index 6917c039..5521deac 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/BusQualityConstructionLogController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityConstructionLogController.java
@@ -15,11 +15,11 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.quality.domain.req.qualityconstructionlog.QualityConstructionLogCreateReq;
-import org.dromara.quality.domain.req.qualityconstructionlog.QualityConstructionLogQueryReq;
-import org.dromara.quality.domain.req.qualityconstructionlog.QualityConstructionLogUpdateReq;
-import org.dromara.quality.domain.vo.BusQualityConstructionLogVo;
-import org.dromara.quality.service.IBusQualityConstructionLogService;
+import org.dromara.quality.domain.req.qualityconstructionlog.QltQualityConstructionLogCreateReq;
+import org.dromara.quality.domain.req.qualityconstructionlog.QltQualityConstructionLogQueryReq;
+import org.dromara.quality.domain.req.qualityconstructionlog.QltQualityConstructionLogUpdateReq;
+import org.dromara.quality.domain.vo.qualityconstructionlog.QltQualityConstructionLogVo;
+import org.dromara.quality.service.IQltQualityConstructionLogService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -34,17 +34,17 @@ import java.util.List;
 @Validated
 @RestController
 @RequestMapping("/quality/qualityConstructionLog")
-public class BusQualityConstructionLogController extends BaseController {
+public class QltQualityConstructionLogController extends BaseController {
 
     @Resource
-    private IBusQualityConstructionLogService busQualityConstructionLogService;
+    private IQltQualityConstructionLogService busQualityConstructionLogService;
 
     /**
      * 查询质量-施工日志列表
      */
     @SaCheckPermission("quality:qualityConstructionLog:list")
     @GetMapping("/list")
-    public TableDataInfo<BusQualityConstructionLogVo> list(QualityConstructionLogQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<QltQualityConstructionLogVo> list(QltQualityConstructionLogQueryReq req, PageQuery pageQuery) {
         return busQualityConstructionLogService.queryPageList(req, pageQuery);
     }
 
@@ -54,9 +54,9 @@ public class BusQualityConstructionLogController extends BaseController {
     @SaCheckPermission("quality:qualityConstructionLog:export")
     @Log(title = "质量-施工日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(QualityConstructionLogQueryReq req, HttpServletResponse response) {
-        List<BusQualityConstructionLogVo> list = busQualityConstructionLogService.queryList(req);
-        ExcelUtil.exportExcel(list, "质量-施工日志", BusQualityConstructionLogVo.class, response);
+    public void export(QltQualityConstructionLogQueryReq req, HttpServletResponse response) {
+        List<QltQualityConstructionLogVo> list = busQualityConstructionLogService.queryList(req);
+        ExcelUtil.exportExcel(list, "质量-施工日志", QltQualityConstructionLogVo.class, response);
     }
 
     /**
@@ -77,7 +77,7 @@ public class BusQualityConstructionLogController extends BaseController {
      */
     @SaCheckPermission("quality:qualityConstructionLog:query")
     @GetMapping("/{id}")
-    public R<BusQualityConstructionLogVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<QltQualityConstructionLogVo> getInfo(@NotNull(message = "主键不能为空")
                                                   @PathVariable Long id) {
         return R.ok(busQualityConstructionLogService.queryById(id));
     }
@@ -89,7 +89,7 @@ public class BusQualityConstructionLogController extends BaseController {
     @Log(title = "质量-施工日志", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody QualityConstructionLogCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody QltQualityConstructionLogCreateReq req) {
         return R.ok(busQualityConstructionLogService.insertByBo(req));
     }
 
@@ -100,7 +100,7 @@ public class BusQualityConstructionLogController extends BaseController {
     @Log(title = "质量-施工日志", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody QualityConstructionLogUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody QltQualityConstructionLogUpdateReq req) {
         return toAjax(busQualityConstructionLogService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/BusQualityInspectionController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityInspectionController.java
similarity index 74%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/BusQualityInspectionController.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityInspectionController.java
index 0097793c..1057a274 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/BusQualityInspectionController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityInspectionController.java
@@ -15,13 +15,13 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.quality.domain.req.qualityinspection.QualityInspectionCreateReq;
-import org.dromara.quality.domain.req.qualityinspection.QualityInspectionGisReq;
-import org.dromara.quality.domain.req.qualityinspection.QualityInspectionQueryReq;
-import org.dromara.quality.domain.req.qualityinspection.QualityInspectionUpdateReq;
-import org.dromara.quality.domain.vo.BusQualityInspectionVo;
-import org.dromara.quality.domain.vo.QualityInspectionListGisVo;
-import org.dromara.quality.service.IBusQualityInspectionService;
+import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionCreateReq;
+import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionGisReq;
+import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionQueryReq;
+import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionUpdateReq;
+import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionVo;
+import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionListGisVo;
+import org.dromara.quality.service.IQltQualityInspectionService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,16 +37,16 @@ import java.util.List;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/quality/qualityInspection")
-public class BusQualityInspectionController extends BaseController {
+public class QltQualityInspectionController extends BaseController {
 
-    private final IBusQualityInspectionService busQualityInspectionService;
+    private final IQltQualityInspectionService busQualityInspectionService;
 
     /**
      * 查询质量-检查工单列表
      */
     @SaCheckPermission("quality:qualityInspection:list")
     @GetMapping("/list")
-    public TableDataInfo<BusQualityInspectionVo> list(QualityInspectionQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<QltQualityInspectionVo> list(QltQualityInspectionQueryReq req, PageQuery pageQuery) {
         return busQualityInspectionService.queryPageList(req, pageQuery);
     }
 
@@ -56,16 +56,16 @@ public class BusQualityInspectionController extends BaseController {
     @SaCheckPermission("quality:qualityInspection:export")
     @Log(title = "质量-检查工单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(QualityInspectionQueryReq req, HttpServletResponse response) {
-        List<BusQualityInspectionVo> list = busQualityInspectionService.queryList(req);
-        ExcelUtil.exportExcel(list, "质量-检查工单", BusQualityInspectionVo.class, response);
+    public void export(QltQualityInspectionQueryReq req, HttpServletResponse response) {
+        List<QltQualityInspectionVo> list = busQualityInspectionService.queryList(req);
+        ExcelUtil.exportExcel(list, "质量-检查工单", QltQualityInspectionVo.class, response);
     }
 
     /**
      * 查询大屏质量信息
      */
     @GetMapping("/gis")
-    public R<QualityInspectionListGisVo> queryGisList(QualityInspectionGisReq req) {
+    public R<QltQualityInspectionListGisVo> queryGisList(QltQualityInspectionGisReq req) {
         return R.ok(busQualityInspectionService.queryGisList(req));
     }
 
@@ -87,7 +87,7 @@ public class BusQualityInspectionController extends BaseController {
      */
     @SaCheckPermission("quality:qualityInspection:query")
     @GetMapping("/{id}")
-    public R<BusQualityInspectionVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<QltQualityInspectionVo> getInfo(@NotNull(message = "主键不能为空")
                                              @PathVariable Long id) {
         return R.ok(busQualityInspectionService.queryById(id));
     }
@@ -99,7 +99,7 @@ public class BusQualityInspectionController extends BaseController {
     @Log(title = "质量-检查工单", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody QualityInspectionCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody QltQualityInspectionCreateReq req) {
         return R.ok(busQualityInspectionService.insertByBo(req));
     }
 
@@ -110,7 +110,7 @@ public class BusQualityInspectionController extends BaseController {
     @Log(title = "质量-检查工单", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody QualityInspectionUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody QltQualityInspectionUpdateReq req) {
         return toAjax(busQualityInspectionService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/BusQualityConstructionLog.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/QltQualityConstructionLog.java
similarity index 87%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/BusQualityConstructionLog.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/QltQualityConstructionLog.java
index a8df87b6..77b499f5 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/BusQualityConstructionLog.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/QltQualityConstructionLog.java
@@ -11,15 +11,15 @@ import java.io.Serial;
 import java.util.Date;
 
 /**
- * 质量-施工日志对象 bus_quality_construction_log
+ * 质量-施工日志对象 qlt_quality_construction_log
  *
  * @author lcj
  * @date 2025-04-16
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("bus_quality_construction_log")
-public class BusQualityConstructionLog extends BaseEntity {
+@TableName("qlt_quality_construction_log")
+public class QltQualityConstructionLog extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/BusQualityInspection.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/QltQualityInspection.java
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/BusQualityInspection.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/QltQualityInspection.java
index 323951c4..f40f1345 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/BusQualityInspection.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/QltQualityInspection.java
@@ -11,15 +11,15 @@ import java.io.Serial;
 import java.util.Date;
 
 /**
- * 质量-检查工单对象 bus_quality_inspection
+ * 质量-检查工单对象 qlt_quality_inspection
  *
  * @author lcj
  * @date 2025-04-16
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("bus_quality_inspection")
-public class BusQualityInspection extends BaseEntity {
+@TableName("qlt_quality_inspection")
+public class QltQualityInspection extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/enums/QualityInspectionStatusEnum.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/enums/QltQualityInspectionStatusEnum.java
similarity index 76%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/enums/QualityInspectionStatusEnum.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/enums/QltQualityInspectionStatusEnum.java
index 9fbb8953..0f3c01f4 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/enums/QualityInspectionStatusEnum.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/enums/QltQualityInspectionStatusEnum.java
@@ -7,7 +7,7 @@ import lombok.Getter;
  * @date 2025/4/16 14:26
  */
 @Getter
-public enum QualityInspectionStatusEnum {
+public enum QltQualityInspectionStatusEnum {
 
     INFORM("通知", "1"),
     RECTIFICATION("整改", "2"),
@@ -17,7 +17,7 @@ public enum QualityInspectionStatusEnum {
 
     private final String value;
 
-    QualityInspectionStatusEnum(String text, String value) {
+    QltQualityInspectionStatusEnum(String text, String value) {
         this.text = text;
         this.value = value;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/enums/QualityInspectionVerificationTypeEnum.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/enums/QltQualityInspectionVerificationTypeEnum.java
similarity index 70%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/enums/QualityInspectionVerificationTypeEnum.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/enums/QltQualityInspectionVerificationTypeEnum.java
index 637e483b..d760fa70 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/enums/QualityInspectionVerificationTypeEnum.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/enums/QltQualityInspectionVerificationTypeEnum.java
@@ -7,7 +7,7 @@ import lombok.Getter;
  * @date 2025/4/28 14:59
  */
 @Getter
-public enum QualityInspectionVerificationTypeEnum {
+public enum QltQualityInspectionVerificationTypeEnum {
 
     PASS("通过", "1"),
     UNPASS("未通过", "2");
@@ -16,7 +16,7 @@ public enum QualityInspectionVerificationTypeEnum {
 
     private final String value;
 
-    QualityInspectionVerificationTypeEnum(String text, String value) {
+    QltQualityInspectionVerificationTypeEnum(String text, String value) {
         this.text = text;
         this.value = value;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QualityConstructionLogCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QltQualityConstructionLogCreateReq.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QualityConstructionLogCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QltQualityConstructionLogCreateReq.java
index b66f17be..57adc5fe 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QualityConstructionLogCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QltQualityConstructionLogCreateReq.java
@@ -12,7 +12,7 @@ import java.util.Date;
  * @date 2025/4/16 11:54
  */
 @Data
-public class QualityConstructionLogCreateReq implements Serializable {
+public class QltQualityConstructionLogCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -9122588005233479105L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QualityConstructionLogQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QltQualityConstructionLogQueryReq.java
similarity index 88%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QualityConstructionLogQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QltQualityConstructionLogQueryReq.java
index a3c3a8ae..a0c4590b 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QualityConstructionLogQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QltQualityConstructionLogQueryReq.java
@@ -12,7 +12,7 @@ import java.util.Date;
  * @date 2025/4/16 11:55
  */
 @Data
-public class QualityConstructionLogQueryReq implements Serializable {
+public class QltQualityConstructionLogQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -4555254995729496353L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QualityConstructionLogUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QltQualityConstructionLogUpdateReq.java
similarity index 90%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QualityConstructionLogUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QltQualityConstructionLogUpdateReq.java
index 3f5fe465..3f6b8685 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QualityConstructionLogUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QltQualityConstructionLogUpdateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/16 11:57
  */
 @Data
-public class QualityConstructionLogUpdateReq implements Serializable {
+public class QltQualityConstructionLogUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 5378506292803717193L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QualityInspectionCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionCreateReq.java
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QualityInspectionCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionCreateReq.java
index 1be78cc4..62c17386 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QualityInspectionCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionCreateReq.java
@@ -11,7 +11,7 @@ import java.util.Date;
  * @date 2025/4/16 14:03
  */
 @Data
-public class QualityInspectionCreateReq implements Serializable {
+public class QltQualityInspectionCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -4466466614771971424L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QualityInspectionGisReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionGisReq.java
similarity index 88%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QualityInspectionGisReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionGisReq.java
index b61e4a5f..b3ca1abf 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QualityInspectionGisReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionGisReq.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 2025/4/28 14:40
  */
 @Data
-public class QualityInspectionGisReq implements Serializable {
+public class QltQualityInspectionGisReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1643422493177660330L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QualityInspectionQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionQueryReq.java
similarity index 89%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QualityInspectionQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionQueryReq.java
index f944336d..54244701 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QualityInspectionQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/16 14:04
  */
 @Data
-public class QualityInspectionQueryReq implements Serializable {
+public class QltQualityInspectionQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3468757869732753393L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QualityInspectionUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionUpdateReq.java
similarity index 95%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QualityInspectionUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionUpdateReq.java
index e84ca0d9..e99604ac 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QualityInspectionUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionUpdateReq.java
@@ -11,7 +11,7 @@ import java.util.Date;
  * @date 2025/4/16 14:04
  */
 @Data
-public class QualityInspectionUpdateReq implements Serializable {
+public class QltQualityInspectionUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -8931016399391922936L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/BusQualityConstructionLogVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/qualityconstructionlog/QltQualityConstructionLogVo.java
similarity index 81%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/BusQualityConstructionLogVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/qualityconstructionlog/QltQualityConstructionLogVo.java
index 7df12069..07a18748 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/BusQualityConstructionLogVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/qualityconstructionlog/QltQualityConstructionLogVo.java
@@ -1,10 +1,10 @@
-package org.dromara.quality.domain.vo;
+package org.dromara.quality.domain.vo.qualityconstructionlog;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.quality.domain.BusQualityConstructionLog;
+import org.dromara.quality.domain.QltQualityConstructionLog;
 import org.dromara.system.domain.vo.SysOssVo;
 
 import java.io.Serial;
@@ -14,15 +14,15 @@ import java.util.List;
 
 
 /**
- * 质量-施工日志视图对象 bus_quality_construction_log
+ * 质量-施工日志视图对象 qlt_quality_construction_log
  *
  * @author lcj
  * @date 2025-04-16
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = BusQualityConstructionLog.class)
-public class BusQualityConstructionLogVo implements Serializable {
+@AutoMapper(target = QltQualityConstructionLog.class)
+public class QltQualityConstructionLogVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/QualityInspectionGis.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/qualityinspection/QltQualityInspectionGis.java
similarity index 64%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/QualityInspectionGis.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/qualityinspection/QltQualityInspectionGis.java
index 5f863bd0..b14b8024 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/QualityInspectionGis.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/qualityinspection/QltQualityInspectionGis.java
@@ -1,5 +1,6 @@
-package org.dromara.quality.domain.vo;
+package org.dromara.quality.domain.vo.qualityinspection;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -13,7 +14,7 @@ import java.util.Date;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class QualityInspectionGis {
+public class QltQualityInspectionGis {
 
     /**
      * 主键
@@ -33,6 +34,9 @@ public class QualityInspectionGis {
     /**
      * 创建时间
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING,
+        pattern = "yyyy-MM-dd",
+        timezone = "GMT+8")
     private Date createTime;
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/QualityInspectionListGisVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/qualityinspection/QltQualityInspectionListGisVo.java
similarity index 70%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/QualityInspectionListGisVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/qualityinspection/QltQualityInspectionListGisVo.java
index 7d7db82c..f8cc9ada 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/QualityInspectionListGisVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/qualityinspection/QltQualityInspectionListGisVo.java
@@ -1,4 +1,4 @@
-package org.dromara.quality.domain.vo;
+package org.dromara.quality.domain.vo.qualityinspection;
 
 import lombok.Data;
 
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/4/28 14:22
  */
 @Data
-public class QualityInspectionListGisVo implements Serializable {
+public class QltQualityInspectionListGisVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -1100954070125585535L;
@@ -19,7 +19,7 @@ public class QualityInspectionListGisVo implements Serializable {
     /**
      * 巡检列表
      */
-    private List<QualityInspectionGis> list;
+    private List<QltQualityInspectionGis> list;
 
     /**
      * 巡检总数
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/BusQualityInspectionVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/qualityinspection/QltQualityInspectionVo.java
similarity index 90%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/BusQualityInspectionVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/qualityinspection/QltQualityInspectionVo.java
index f30f6e22..e82cd9db 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/BusQualityInspectionVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/qualityinspection/QltQualityInspectionVo.java
@@ -1,4 +1,4 @@
-package org.dromara.quality.domain.vo;
+package org.dromara.quality.domain.vo.qualityinspection;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -6,7 +6,7 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
-import org.dromara.quality.domain.BusQualityInspection;
+import org.dromara.quality.domain.QltQualityInspection;
 import org.dromara.system.domain.vo.SysOssVo;
 
 import java.io.Serial;
@@ -16,15 +16,15 @@ import java.util.List;
 
 
 /**
- * 质量-检查工单视图对象 bus_quality_inspection
+ * 质量-检查工单视图对象 qlt_quality_inspection
  *
  * @author lcj
  * @date 2025-04-16
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = BusQualityInspection.class)
-public class BusQualityInspectionVo implements Serializable {
+@AutoMapper(target = QltQualityInspection.class)
+public class QltQualityInspectionVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/mapper/BusQualityConstructionLogMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/mapper/BusQualityConstructionLogMapper.java
deleted file mode 100644
index 040fa5c2..00000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/mapper/BusQualityConstructionLogMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.dromara.quality.mapper;
-
-import org.dromara.quality.domain.BusQualityConstructionLog;
-import org.dromara.quality.domain.vo.BusQualityConstructionLogVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-
-/**
- * 质量-施工日志Mapper接口
- *
- * @author lcj
- * @date 2025-04-16
- */
-public interface BusQualityConstructionLogMapper extends BaseMapperPlus<BusQualityConstructionLog, BusQualityConstructionLogVo> {
-
-}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/mapper/BusQualityInspectionMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/mapper/BusQualityInspectionMapper.java
deleted file mode 100644
index 47571d80..00000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/mapper/BusQualityInspectionMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.dromara.quality.mapper;
-
-import org.dromara.quality.domain.BusQualityInspection;
-import org.dromara.quality.domain.vo.BusQualityInspectionVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-
-/**
- * 质量-检查工单Mapper接口
- *
- * @author lcj
- * @date 2025-04-16
- */
-public interface BusQualityInspectionMapper extends BaseMapperPlus<BusQualityInspection, BusQualityInspectionVo> {
-
-}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/mapper/QltQualityConstructionLogMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/mapper/QltQualityConstructionLogMapper.java
new file mode 100644
index 00000000..ac35f9e6
--- /dev/null
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/mapper/QltQualityConstructionLogMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.quality.mapper;
+
+import org.dromara.quality.domain.QltQualityConstructionLog;
+import org.dromara.quality.domain.vo.qualityconstructionlog.QltQualityConstructionLogVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 质量-施工日志Mapper接口
+ *
+ * @author lcj
+ * @date 2025-04-16
+ */
+public interface QltQualityConstructionLogMapper extends BaseMapperPlus<QltQualityConstructionLog, QltQualityConstructionLogVo> {
+
+}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/mapper/QltQualityInspectionMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/mapper/QltQualityInspectionMapper.java
new file mode 100644
index 00000000..c4b1e204
--- /dev/null
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/mapper/QltQualityInspectionMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.quality.mapper;
+
+import org.dromara.quality.domain.QltQualityInspection;
+import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 质量-检查工单Mapper接口
+ *
+ * @author lcj
+ * @date 2025-04-16
+ */
+public interface QltQualityInspectionMapper extends BaseMapperPlus<QltQualityInspection, QltQualityInspectionVo> {
+
+}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IBusQualityConstructionLogService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IQltQualityConstructionLogService.java
similarity index 66%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IBusQualityConstructionLogService.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IQltQualityConstructionLogService.java
index 0791c7af..4c4b09c3 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IBusQualityConstructionLogService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IQltQualityConstructionLogService.java
@@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import jakarta.servlet.http.HttpServletResponse;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.quality.domain.BusQualityConstructionLog;
-import org.dromara.quality.domain.req.qualityconstructionlog.QualityConstructionLogCreateReq;
-import org.dromara.quality.domain.req.qualityconstructionlog.QualityConstructionLogQueryReq;
-import org.dromara.quality.domain.req.qualityconstructionlog.QualityConstructionLogUpdateReq;
-import org.dromara.quality.domain.vo.BusQualityConstructionLogVo;
+import org.dromara.quality.domain.QltQualityConstructionLog;
+import org.dromara.quality.domain.req.qualityconstructionlog.QltQualityConstructionLogCreateReq;
+import org.dromara.quality.domain.req.qualityconstructionlog.QltQualityConstructionLogQueryReq;
+import org.dromara.quality.domain.req.qualityconstructionlog.QltQualityConstructionLogUpdateReq;
+import org.dromara.quality.domain.vo.qualityconstructionlog.QltQualityConstructionLogVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -21,7 +21,7 @@ import java.util.List;
  * @author lcj
  * @date 2025-04-16
  */
-public interface IBusQualityConstructionLogService extends IService<BusQualityConstructionLog> {
+public interface IQltQualityConstructionLogService extends IService<QltQualityConstructionLog> {
 
     /**
      * 查询质量-施工日志
@@ -29,7 +29,7 @@ public interface IBusQualityConstructionLogService extends IService<BusQualityCo
      * @param id 主键
      * @return 质量-施工日志
      */
-    BusQualityConstructionLogVo queryById(Long id);
+    QltQualityConstructionLogVo queryById(Long id);
 
     /**
      * 分页查询质量-施工日志列表
@@ -38,7 +38,7 @@ public interface IBusQualityConstructionLogService extends IService<BusQualityCo
      * @param pageQuery 分页参数
      * @return 质量-施工日志分页列表
      */
-    TableDataInfo<BusQualityConstructionLogVo> queryPageList(QualityConstructionLogQueryReq req, PageQuery pageQuery);
+    TableDataInfo<QltQualityConstructionLogVo> queryPageList(QltQualityConstructionLogQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的质量-施工日志列表
@@ -46,7 +46,7 @@ public interface IBusQualityConstructionLogService extends IService<BusQualityCo
      * @param req 查询条件
      * @return 质量-施工日志列表
      */
-    List<BusQualityConstructionLogVo> queryList(QualityConstructionLogQueryReq req);
+    List<QltQualityConstructionLogVo> queryList(QltQualityConstructionLogQueryReq req);
 
     /**
      * 新增质量-施工日志
@@ -54,7 +54,7 @@ public interface IBusQualityConstructionLogService extends IService<BusQualityCo
      * @param req 质量-施工日志
      * @return 新增日志主键
      */
-    Long insertByBo(QualityConstructionLogCreateReq req);
+    Long insertByBo(QltQualityConstructionLogCreateReq req);
 
     /**
      * 修改质量-施工日志
@@ -62,7 +62,7 @@ public interface IBusQualityConstructionLogService extends IService<BusQualityCo
      * @param req 质量-施工日志
      * @return 是否修改成功
      */
-    Boolean updateByBo(QualityConstructionLogUpdateReq req);
+    Boolean updateByBo(QltQualityConstructionLogUpdateReq req);
 
     /**
      * 校验并批量删除质量-施工日志信息
@@ -79,7 +79,7 @@ public interface IBusQualityConstructionLogService extends IService<BusQualityCo
      * @param qualityConstructionLog 质量-施工日志对象
      * @return 质量-施工日志视图对象
      */
-    BusQualityConstructionLogVo getVo(BusQualityConstructionLog qualityConstructionLog);
+    QltQualityConstructionLogVo getVo(QltQualityConstructionLog qualityConstructionLog);
 
     /**
      * 获取质量-施工日志查询条件封装
@@ -87,7 +87,7 @@ public interface IBusQualityConstructionLogService extends IService<BusQualityCo
      * @param req 质量-施工日志查询条件
      * @return 质量-施工日志查询条件封装
      */
-    LambdaQueryWrapper<BusQualityConstructionLog> buildQueryWrapper(QualityConstructionLogQueryReq req);
+    LambdaQueryWrapper<QltQualityConstructionLog> buildQueryWrapper(QltQualityConstructionLogQueryReq req);
 
     /**
      * 获取质量-施工日志分页对象视图
@@ -95,7 +95,7 @@ public interface IBusQualityConstructionLogService extends IService<BusQualityCo
      * @param qualityConstructionLogPage 质量-施工日志分页对象
      * @return 质量-施工日志分页对象视图
      */
-    Page<BusQualityConstructionLogVo> getVoPage(Page<BusQualityConstructionLog> qualityConstructionLogPage);
+    Page<QltQualityConstructionLogVo> getVoPage(Page<QltQualityConstructionLog> qualityConstructionLogPage);
 
     /**
      * 导出质量-施工日志
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IBusQualityInspectionService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IQltQualityInspectionService.java
similarity index 65%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IBusQualityInspectionService.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IQltQualityInspectionService.java
index 502ea4b0..9dee821d 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IBusQualityInspectionService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IQltQualityInspectionService.java
@@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import jakarta.servlet.http.HttpServletResponse;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.quality.domain.BusQualityInspection;
-import org.dromara.quality.domain.req.qualityinspection.QualityInspectionCreateReq;
-import org.dromara.quality.domain.req.qualityinspection.QualityInspectionGisReq;
-import org.dromara.quality.domain.req.qualityinspection.QualityInspectionQueryReq;
-import org.dromara.quality.domain.req.qualityinspection.QualityInspectionUpdateReq;
-import org.dromara.quality.domain.vo.BusQualityInspectionVo;
-import org.dromara.quality.domain.vo.QualityInspectionListGisVo;
+import org.dromara.quality.domain.QltQualityInspection;
+import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionCreateReq;
+import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionGisReq;
+import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionQueryReq;
+import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionUpdateReq;
+import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionVo;
+import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionListGisVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -23,7 +23,7 @@ import java.util.List;
  * @author lcj
  * @date 2025-04-16
  */
-public interface IBusQualityInspectionService extends IService<BusQualityInspection> {
+public interface IQltQualityInspectionService extends IService<QltQualityInspection> {
 
     /**
      * 查询质量-检查工单
@@ -31,7 +31,7 @@ public interface IBusQualityInspectionService extends IService<BusQualityInspect
      * @param id 主键
      * @return 质量-检查工单
      */
-    BusQualityInspectionVo queryById(Long id);
+    QltQualityInspectionVo queryById(Long id);
 
     /**
      * 分页查询质量-检查工单列表
@@ -40,7 +40,7 @@ public interface IBusQualityInspectionService extends IService<BusQualityInspect
      * @param pageQuery 分页参数
      * @return 质量-检查工单分页列表
      */
-    TableDataInfo<BusQualityInspectionVo> queryPageList(QualityInspectionQueryReq req, PageQuery pageQuery);
+    TableDataInfo<QltQualityInspectionVo> queryPageList(QltQualityInspectionQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的质量-检查工单列表
@@ -48,7 +48,7 @@ public interface IBusQualityInspectionService extends IService<BusQualityInspect
      * @param req 查询条件
      * @return 质量-检查工单列表
      */
-    List<BusQualityInspectionVo> queryList(QualityInspectionQueryReq req);
+    List<QltQualityInspectionVo> queryList(QltQualityInspectionQueryReq req);
 
     /**
      * 查询大屏质量-检查工单列表
@@ -56,7 +56,7 @@ public interface IBusQualityInspectionService extends IService<BusQualityInspect
      * @param req 查询条件
      * @return 质量-检查工单列表
      */
-    QualityInspectionListGisVo queryGisList(QualityInspectionGisReq req);
+    QltQualityInspectionListGisVo queryGisList(QltQualityInspectionGisReq req);
 
     /**
      * 新增质量-检查工单
@@ -64,7 +64,7 @@ public interface IBusQualityInspectionService extends IService<BusQualityInspect
      * @param req 质量-检查工单
      * @return 新增检查工单id
      */
-    Long insertByBo(QualityInspectionCreateReq req);
+    Long insertByBo(QltQualityInspectionCreateReq req);
 
     /**
      * 修改质量-检查工单
@@ -72,7 +72,7 @@ public interface IBusQualityInspectionService extends IService<BusQualityInspect
      * @param req 质量-检查工单
      * @return 是否修改成功
      */
-    Boolean updateByBo(QualityInspectionUpdateReq req);
+    Boolean updateByBo(QltQualityInspectionUpdateReq req);
 
     /**
      * 校验并批量删除质量-检查工单信息
@@ -89,7 +89,7 @@ public interface IBusQualityInspectionService extends IService<BusQualityInspect
      * @param qualityInspection 质量-检查工单对象
      * @return 质量-检查工单视图对象
      */
-    BusQualityInspectionVo getVo(BusQualityInspection qualityInspection);
+    QltQualityInspectionVo getVo(QltQualityInspection qualityInspection);
 
     /**
      * 获取质量-检查工单查询条件封装
@@ -97,7 +97,7 @@ public interface IBusQualityInspectionService extends IService<BusQualityInspect
      * @param req 质量-检查工单查询条件
      * @return 质量-检查工单查询条件封装
      */
-    LambdaQueryWrapper<BusQualityInspection> buildQueryWrapper(QualityInspectionQueryReq req);
+    LambdaQueryWrapper<QltQualityInspection> buildQueryWrapper(QltQualityInspectionQueryReq req);
 
     /**
      * 获取质量-检查工单分页对象视图
@@ -105,7 +105,7 @@ public interface IBusQualityInspectionService extends IService<BusQualityInspect
      * @param qualityInspectionPage 质量-检查工单分页对象
      * @return 质量-检查工单分页对象视图
      */
-    Page<BusQualityInspectionVo> getVoPage(Page<BusQualityInspection> qualityInspectionPage);
+    Page<QltQualityInspectionVo> getVoPage(Page<QltQualityInspection> qualityInspectionPage);
 
     /**
      * 导出质量-检查工单
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/BusQualityConstructionLogServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityConstructionLogServiceImpl.java
similarity index 84%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/BusQualityConstructionLogServiceImpl.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityConstructionLogServiceImpl.java
index a254d424..7e7b6f91 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/BusQualityConstructionLogServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityConstructionLogServiceImpl.java
@@ -22,14 +22,14 @@ import org.dromara.common.oss.exception.OssException;
 import org.dromara.common.oss.factory.OssFactory;
 import org.dromara.project.domain.BusProject;
 import org.dromara.project.service.IBusProjectService;
-import org.dromara.quality.constant.QualityConstant;
-import org.dromara.quality.domain.BusQualityConstructionLog;
-import org.dromara.quality.domain.req.qualityconstructionlog.QualityConstructionLogCreateReq;
-import org.dromara.quality.domain.req.qualityconstructionlog.QualityConstructionLogQueryReq;
-import org.dromara.quality.domain.req.qualityconstructionlog.QualityConstructionLogUpdateReq;
-import org.dromara.quality.domain.vo.BusQualityConstructionLogVo;
-import org.dromara.quality.mapper.BusQualityConstructionLogMapper;
-import org.dromara.quality.service.IBusQualityConstructionLogService;
+import org.dromara.quality.constant.QltQualityConstant;
+import org.dromara.quality.domain.QltQualityConstructionLog;
+import org.dromara.quality.domain.req.qualityconstructionlog.QltQualityConstructionLogCreateReq;
+import org.dromara.quality.domain.req.qualityconstructionlog.QltQualityConstructionLogQueryReq;
+import org.dromara.quality.domain.req.qualityconstructionlog.QltQualityConstructionLogUpdateReq;
+import org.dromara.quality.domain.vo.qualityconstructionlog.QltQualityConstructionLogVo;
+import org.dromara.quality.mapper.QltQualityConstructionLogMapper;
+import org.dromara.quality.service.IQltQualityConstructionLogService;
 import org.dromara.system.domain.vo.SysOssVo;
 import org.dromara.system.domain.vo.SysUserVo;
 import org.dromara.system.service.ISysOssService;
@@ -58,8 +58,8 @@ import java.util.zip.ZipOutputStream;
  */
 @Slf4j
 @Service
-public class BusQualityConstructionLogServiceImpl extends ServiceImpl<BusQualityConstructionLogMapper, BusQualityConstructionLog>
-    implements IBusQualityConstructionLogService {
+public class QltQualityConstructionLogServiceImpl extends ServiceImpl<QltQualityConstructionLogMapper, QltQualityConstructionLog>
+    implements IQltQualityConstructionLogService {
 
     @Resource
     private IBusProjectService projectService;
@@ -77,8 +77,8 @@ public class BusQualityConstructionLogServiceImpl extends ServiceImpl<BusQuality
      * @return 质量-施工日志
      */
     @Override
-    public BusQualityConstructionLogVo queryById(Long id) {
-        BusQualityConstructionLog qualityConstructionLog = this.getById(id);
+    public QltQualityConstructionLogVo queryById(Long id) {
+        QltQualityConstructionLog qualityConstructionLog = this.getById(id);
         if (qualityConstructionLog == null) {
             throw new ServiceException("施工日志信息不存在", HttpStatus.NOT_FOUND);
         }
@@ -93,8 +93,8 @@ public class BusQualityConstructionLogServiceImpl extends ServiceImpl<BusQuality
      * @return 质量-施工日志分页列表
      */
     @Override
-    public TableDataInfo<BusQualityConstructionLogVo> queryPageList(QualityConstructionLogQueryReq req, PageQuery pageQuery) {
-        Page<BusQualityConstructionLog> result = this.page(pageQuery.build(), buildQueryWrapper(req));
+    public TableDataInfo<QltQualityConstructionLogVo> queryPageList(QltQualityConstructionLogQueryReq req, PageQuery pageQuery) {
+        Page<QltQualityConstructionLog> result = this.page(pageQuery.build(), buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
 
@@ -105,8 +105,8 @@ public class BusQualityConstructionLogServiceImpl extends ServiceImpl<BusQuality
      * @return 质量-施工日志列表
      */
     @Override
-    public List<BusQualityConstructionLogVo> queryList(QualityConstructionLogQueryReq req) {
-        LambdaQueryWrapper<BusQualityConstructionLog> lqw = buildQueryWrapper(req);
+    public List<QltQualityConstructionLogVo> queryList(QltQualityConstructionLogQueryReq req) {
+        LambdaQueryWrapper<QltQualityConstructionLog> lqw = buildQueryWrapper(req);
         return this.list(lqw).stream().map(this::getVo).toList();
     }
 
@@ -117,9 +117,9 @@ public class BusQualityConstructionLogServiceImpl extends ServiceImpl<BusQuality
      * @return 新增日志主键
      */
     @Override
-    public Long insertByBo(QualityConstructionLogCreateReq req) {
+    public Long insertByBo(QltQualityConstructionLogCreateReq req) {
         // 将实体类和 DTO 进行转换
-        BusQualityConstructionLog qualityConstructionLog = new BusQualityConstructionLog();
+        QltQualityConstructionLog qualityConstructionLog = new QltQualityConstructionLog();
         BeanUtils.copyProperties(req, qualityConstructionLog);
         // 数据校验
         validEntityBeforeSave(qualityConstructionLog, true);
@@ -139,14 +139,14 @@ public class BusQualityConstructionLogServiceImpl extends ServiceImpl<BusQuality
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(QualityConstructionLogUpdateReq req) {
+    public Boolean updateByBo(QltQualityConstructionLogUpdateReq req) {
         // 将实体类和 DTO 进行转换
-        BusQualityConstructionLog qualityConstructionLog = new BusQualityConstructionLog();
+        QltQualityConstructionLog qualityConstructionLog = new QltQualityConstructionLog();
         BeanUtils.copyProperties(req, qualityConstructionLog);
         // 数据校验
         validEntityBeforeSave(qualityConstructionLog, false);
         // 判断是否存在
-        BusQualityConstructionLog oldQualityConstructionLog = this.getById(qualityConstructionLog.getId());
+        QltQualityConstructionLog oldQualityConstructionLog = this.getById(qualityConstructionLog.getId());
         if (oldQualityConstructionLog == null) {
             throw new ServiceException("修改施工日志信息失败，数据不存在", HttpStatus.NOT_FOUND);
         }
@@ -157,7 +157,7 @@ public class BusQualityConstructionLogServiceImpl extends ServiceImpl<BusQuality
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(BusQualityConstructionLog entity, Boolean create) {
+    private void validEntityBeforeSave(QltQualityConstructionLog entity, Boolean create) {
         // TODO 做一些数据校验,如唯一约束
         Long projectId = entity.getProjectId();
         if (create) {
@@ -193,9 +193,9 @@ public class BusQualityConstructionLogServiceImpl extends ServiceImpl<BusQuality
      * @return 质量-施工日志视图对象
      */
     @Override
-    public BusQualityConstructionLogVo getVo(BusQualityConstructionLog qualityConstructionLog) {
+    public QltQualityConstructionLogVo getVo(QltQualityConstructionLog qualityConstructionLog) {
         // 对象转封装类
-        BusQualityConstructionLogVo qualityConstructionLogVo = new BusQualityConstructionLogVo();
+        QltQualityConstructionLogVo qualityConstructionLogVo = new QltQualityConstructionLogVo();
         if (qualityConstructionLog == null) {
             return qualityConstructionLogVo;
         }
@@ -228,16 +228,16 @@ public class BusQualityConstructionLogServiceImpl extends ServiceImpl<BusQuality
      * @return 质量-施工日志查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusQualityConstructionLog> buildQueryWrapper(QualityConstructionLogQueryReq req) {
-        LambdaQueryWrapper<BusQualityConstructionLog> lqw = new LambdaQueryWrapper<>();
+    public LambdaQueryWrapper<QltQualityConstructionLog> buildQueryWrapper(QltQualityConstructionLogQueryReq req) {
+        LambdaQueryWrapper<QltQualityConstructionLog> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
         }
         Long projectId = req.getProjectId();
         Date happenDate = req.getHappenDate();
         // 精准查询
-        lqw.eq(ObjectUtils.isNotEmpty(projectId), BusQualityConstructionLog::getProjectId, projectId);
-        lqw.eq(ObjectUtils.isNotEmpty(happenDate), BusQualityConstructionLog::getHappenDate, happenDate);
+        lqw.eq(ObjectUtils.isNotEmpty(projectId), QltQualityConstructionLog::getProjectId, projectId);
+        lqw.eq(ObjectUtils.isNotEmpty(happenDate), QltQualityConstructionLog::getHappenDate, happenDate);
         return lqw;
     }
 
@@ -248,11 +248,11 @@ public class BusQualityConstructionLogServiceImpl extends ServiceImpl<BusQuality
      * @return 质量-施工日志分页对象视图
      */
     @Override
-    public Page<BusQualityConstructionLogVo> getVoPage(Page<BusQualityConstructionLog> qualityConstructionLogPage) {
+    public Page<QltQualityConstructionLogVo> getVoPage(Page<QltQualityConstructionLog> qualityConstructionLogPage) {
         // 获取质量-施工日志列表
-        List<BusQualityConstructionLog> qualityConstructionLogList = qualityConstructionLogPage.getRecords();
+        List<QltQualityConstructionLog> qualityConstructionLogList = qualityConstructionLogPage.getRecords();
         // 添加分页信息
-        Page<BusQualityConstructionLogVo> qualityConstructionLogVoPage = new Page<>(
+        Page<QltQualityConstructionLogVo> qualityConstructionLogVoPage = new Page<>(
             qualityConstructionLogPage.getCurrent(),
             qualityConstructionLogPage.getSize(),
             qualityConstructionLogPage.getTotal());
@@ -260,7 +260,7 @@ public class BusQualityConstructionLogServiceImpl extends ServiceImpl<BusQuality
             return qualityConstructionLogVoPage;
         }
         // 获取项目名称
-        List<Long> projectIdList = qualityConstructionLogList.stream().map(BusQualityConstructionLog::getProjectId).distinct().toList();
+        List<Long> projectIdList = qualityConstructionLogList.stream().map(QltQualityConstructionLog::getProjectId).distinct().toList();
         if (projectIdList.size() != 1) {
             throw new ServiceException("仅能查询单个项目下的施工日志", HttpStatus.BAD_REQUEST);
         }
@@ -269,17 +269,17 @@ public class BusQualityConstructionLogServiceImpl extends ServiceImpl<BusQuality
             throw new ServiceException("项目不存在", HttpStatus.NOT_FOUND);
         }
         // 获取创建用户信息
-        List<Long> createByList = qualityConstructionLogList.stream().map(BusQualityConstructionLog::getCreateBy).distinct().toList();
+        List<Long> createByList = qualityConstructionLogList.stream().map(QltQualityConstructionLog::getCreateBy).distinct().toList();
         List<SysUserVo> userVoList = userService.selectUserByIds(createByList, null);
         Map<Long, String> userMap = userVoList.stream().collect(Collectors.toMap(SysUserVo::getUserId, SysUserVo::getNickName));
         // 获取附件信息
-        List<Long> ossIdList = qualityConstructionLogList.stream().map(BusQualityConstructionLog::getFile).filter(StringUtils::isNotBlank)
+        List<Long> ossIdList = qualityConstructionLogList.stream().map(QltQualityConstructionLog::getFile).filter(StringUtils::isNotBlank)
             .flatMap(fileId -> Arrays.stream(fileId.split(",")).map(Long::parseLong)).distinct().toList();
         Map<Long, List<SysOssVo>> ossMap = ossService.listByIds(ossIdList)
             .stream().collect(Collectors.groupingBy(SysOssVo::getOssId));
         // 对象列表 => 封装对象列表
-        List<BusQualityConstructionLogVo> qualityConstructionLogVoList = qualityConstructionLogList.stream().map(qualityConstructionLog -> {
-            BusQualityConstructionLogVo qualityConstructionLogVo = new BusQualityConstructionLogVo();
+        List<QltQualityConstructionLogVo> qualityConstructionLogVoList = qualityConstructionLogList.stream().map(qualityConstructionLog -> {
+            QltQualityConstructionLogVo qualityConstructionLogVo = new QltQualityConstructionLogVo();
             // 对象转封装类
             BeanUtils.copyProperties(qualityConstructionLog, qualityConstructionLogVo);
             // 项目名称
@@ -317,16 +317,16 @@ public class BusQualityConstructionLogServiceImpl extends ServiceImpl<BusQuality
      */
     @Override
     public void exportWordById(Long id, HttpServletResponse response) {
-        BusQualityConstructionLog qualityConstructionLog = this.getById(id);
+        QltQualityConstructionLog qualityConstructionLog = this.getById(id);
         if (qualityConstructionLog == null) {
             throw new ServiceException("质量-施工日志不存在");
         }
         Map<String, String> replacementMap = getReplacementMap(qualityConstructionLog);
-        Path targetDir = Paths.get(QualityConstant.getQualityConstructionLogFileUrl(qualityConstructionLog));
+        Path targetDir = Paths.get(QltQualityConstant.getQualityConstructionLogFileUrl(qualityConstructionLog));
         // 如果存在目录则直接返回，不存在则生成文件并返回
         if (!Files.exists(targetDir)) {
             // 清理旧文件
-            String baseUrl = QualityConstant.QUALITY_CONSTRUCTION_LOG_FILE_URL + qualityConstructionLog.getId();
+            String baseUrl = QltQualityConstant.QUALITY_CONSTRUCTION_LOG_FILE_URL + qualityConstructionLog.getId();
             try {
                 Path dirPath = Paths.get(baseUrl);
                 FileUtils.deleteDirectory(dirPath);
@@ -334,7 +334,7 @@ public class BusQualityConstructionLogServiceImpl extends ServiceImpl<BusQuality
                 log.error("文件目录：{}，清理失败", baseUrl, e);
             }
             // 生成文件
-            try (FileInputStream fis = new FileInputStream(QualityConstant.QUALITY_CONSTRUCTION_LOG_TEMPLATE_PATH);
+            try (FileInputStream fis = new FileInputStream(QltQualityConstant.QUALITY_CONSTRUCTION_LOG_TEMPLATE_PATH);
                  XWPFDocument document = new XWPFDocument(fis)) {
                 // 替换段落中的文本
                 for (XWPFParagraph paragraph : document.getParagraphs()) {
@@ -355,7 +355,7 @@ public class BusQualityConstructionLogServiceImpl extends ServiceImpl<BusQuality
                     Files.createDirectories(targetDir);
                 }
                 // 组合目标文件名
-                String fileName = QualityConstant.getQualityConstructionLogFileName(qualityConstructionLog);
+                String fileName = QltQualityConstant.getQualityConstructionLogFileName(qualityConstructionLog);
                 // 保存修改后的文件
                 try (FileOutputStream fos = new FileOutputStream(targetDir.resolve(fileName).toFile())) {
                     document.write(fos);
@@ -380,7 +380,7 @@ public class BusQualityConstructionLogServiceImpl extends ServiceImpl<BusQuality
      * @param qualityConstructionLog 施工日志对象
      * @return Map
      */
-    public Map<String, String> getReplacementMap(BusQualityConstructionLog qualityConstructionLog) {
+    public Map<String, String> getReplacementMap(QltQualityConstructionLog qualityConstructionLog) {
         Map<String, String> replacementMap = new HashMap<>();
         String createName = userService.selectUserById(qualityConstructionLog.getCreateBy()).getNickName();
         replacementMap.put("${createName}", createName);
@@ -408,7 +408,7 @@ public class BusQualityConstructionLogServiceImpl extends ServiceImpl<BusQuality
     public void replaceInParagraph(XWPFParagraph paragraph,
                                    Map<String, String> replacements,
                                    XWPFDocument document,
-                                   BusQualityConstructionLog qualityConstructionLog) throws InvalidFormatException, IOException {
+                                   QltQualityConstructionLog qualityConstructionLog) throws InvalidFormatException, IOException {
         // 先拷贝 paragraph 里所有的 run
         List<XWPFRun> runs = new ArrayList<>(paragraph.getRuns());
         // 在拷贝上遍历，修改原 paragraph（增删 run）都不会抛 CME
@@ -433,7 +433,7 @@ public class BusQualityConstructionLogServiceImpl extends ServiceImpl<BusQuality
                                 // 获取附件的ossId
                                 List<Long> ossIdList = Arrays.stream(value.split(",")).map(Long::parseLong).toList();
                                 List<SysOssVo> ossVoList = ossService.listByIds(ossIdList);
-                                String baseFile = QualityConstant.getQualityConstructionLogFileUrl(qualityConstructionLog) + "/file";
+                                String baseFile = QltQualityConstant.getQualityConstructionLogFileUrl(qualityConstructionLog) + "/file";
                                 for (SysOssVo ossVo : ossVoList) {
                                     String lowerVal = ossVo.getUrl().toLowerCase();
                                     OssClient storage = OssFactory.instance(ossVo.getService());
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/BusQualityInspectionServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java
similarity index 82%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/BusQualityInspectionServiceImpl.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java
index 35a17d60..109cff77 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/BusQualityInspectionServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java
@@ -25,19 +25,19 @@ import org.dromara.project.domain.BusConstructionUser;
 import org.dromara.project.domain.BusProject;
 import org.dromara.project.service.IBusConstructionUserService;
 import org.dromara.project.service.IBusProjectService;
-import org.dromara.quality.constant.QualityConstant;
-import org.dromara.quality.domain.BusQualityInspection;
-import org.dromara.quality.domain.enums.QualityInspectionStatusEnum;
-import org.dromara.quality.domain.enums.QualityInspectionVerificationTypeEnum;
-import org.dromara.quality.domain.req.qualityinspection.QualityInspectionCreateReq;
-import org.dromara.quality.domain.req.qualityinspection.QualityInspectionGisReq;
-import org.dromara.quality.domain.req.qualityinspection.QualityInspectionQueryReq;
-import org.dromara.quality.domain.req.qualityinspection.QualityInspectionUpdateReq;
-import org.dromara.quality.domain.vo.BusQualityInspectionVo;
-import org.dromara.quality.domain.vo.QualityInspectionGis;
-import org.dromara.quality.domain.vo.QualityInspectionListGisVo;
-import org.dromara.quality.mapper.BusQualityInspectionMapper;
-import org.dromara.quality.service.IBusQualityInspectionService;
+import org.dromara.quality.constant.QltQualityConstant;
+import org.dromara.quality.domain.QltQualityInspection;
+import org.dromara.quality.domain.enums.QltQualityInspectionStatusEnum;
+import org.dromara.quality.domain.enums.QltQualityInspectionVerificationTypeEnum;
+import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionCreateReq;
+import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionGisReq;
+import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionQueryReq;
+import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionUpdateReq;
+import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionVo;
+import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionGis;
+import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionListGisVo;
+import org.dromara.quality.mapper.QltQualityInspectionMapper;
+import org.dromara.quality.service.IQltQualityInspectionService;
 import org.dromara.system.domain.vo.SysOssVo;
 import org.dromara.system.domain.vo.SysUserVo;
 import org.dromara.system.service.ISysDictDataService;
@@ -67,8 +67,8 @@ import java.util.zip.ZipOutputStream;
  */
 @Slf4j
 @Service
-public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspectionMapper, BusQualityInspection>
-    implements IBusQualityInspectionService {
+public class QltQualityInspectionServiceImpl extends ServiceImpl<QltQualityInspectionMapper, QltQualityInspection>
+    implements IQltQualityInspectionService {
 
     @Resource
     private IBusProjectService projectService;
@@ -92,8 +92,8 @@ public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspe
      * @return 质量-检查工单
      */
     @Override
-    public BusQualityInspectionVo queryById(Long id) {
-        BusQualityInspection qualityInspection = this.getById(id);
+    public QltQualityInspectionVo queryById(Long id) {
+        QltQualityInspection qualityInspection = this.getById(id);
         if (qualityInspection == null) {
             throw new ServiceException("检查工单信息不存在", HttpStatus.NOT_FOUND);
         }
@@ -108,8 +108,8 @@ public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspe
      * @return 质量-检查工单分页列表
      */
     @Override
-    public TableDataInfo<BusQualityInspectionVo> queryPageList(QualityInspectionQueryReq req, PageQuery pageQuery) {
-        Page<BusQualityInspection> result = this.page(pageQuery.build(), buildQueryWrapper(req));
+    public TableDataInfo<QltQualityInspectionVo> queryPageList(QltQualityInspectionQueryReq req, PageQuery pageQuery) {
+        Page<QltQualityInspection> result = this.page(pageQuery.build(), buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
 
@@ -120,8 +120,8 @@ public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspe
      * @return 质量-检查工单列表
      */
     @Override
-    public List<BusQualityInspectionVo> queryList(QualityInspectionQueryReq req) {
-        LambdaQueryWrapper<BusQualityInspection> lqw = buildQueryWrapper(req);
+    public List<QltQualityInspectionVo> queryList(QltQualityInspectionQueryReq req) {
+        LambdaQueryWrapper<QltQualityInspection> lqw = buildQueryWrapper(req);
         return this.list(lqw).stream().map(this::getVo).toList();
     }
 
@@ -132,33 +132,33 @@ public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspe
      * @return 质量-检查工单列表
      */
     @Override
-    public QualityInspectionListGisVo queryGisList(QualityInspectionGisReq req) {
+    public QltQualityInspectionListGisVo queryGisList(QltQualityInspectionGisReq req) {
         Long projectId = req.getProjectId();
         if (projectId == null || projectService.getById(projectId) == null) {
             throw new ServiceException("项目信息不存在", HttpStatus.NOT_FOUND);
         }
-        QualityInspectionListGisVo gisVo = new QualityInspectionListGisVo();
-        List<BusQualityInspection> qualityInspectionList = this.lambdaQuery()
-            .eq(BusQualityInspection::getProjectId, projectId)
+        QltQualityInspectionListGisVo gisVo = new QltQualityInspectionListGisVo();
+        List<QltQualityInspection> qualityInspectionList = this.lambdaQuery()
+            .eq(QltQualityInspection::getProjectId, projectId)
             .list();
         if (CollUtil.isEmpty(qualityInspectionList)) {
             return gisVo;
         }
         // 获取最新的检查工单
-        List<BusQualityInspection> topList = qualityInspectionList.stream()
-            .sorted(Comparator.comparing(BusQualityInspection::getCreateTime).reversed())
+        List<QltQualityInspection> topList = qualityInspectionList.stream()
+            .sorted(Comparator.comparing(QltQualityInspection::getCreateTime).reversed())
             .limit(req.getPageSize())
             .toList();
-        List<QualityInspectionGis> gisList = topList.stream().map(qualityInspection -> {
-            QualityInspectionGis gis = new QualityInspectionGis();
+        List<QltQualityInspectionGis> gisList = topList.stream().map(qualityInspection -> {
+            QltQualityInspectionGis gis = new QltQualityInspectionGis();
             BeanUtils.copyProperties(qualityInspection, gis);
             return gis;
         }).toList();
         // 获取整改情况
         long passCount = 0L;
-        for (BusQualityInspection qualityInspection : qualityInspectionList) {
-            if (QualityInspectionStatusEnum.VERIFICATION.getValue().equals(qualityInspection.getInspectionStatus())
-                && QualityInspectionVerificationTypeEnum.PASS.getValue().equals(qualityInspection.getVerificationType())) {
+        for (QltQualityInspection qualityInspection : qualityInspectionList) {
+            if (QltQualityInspectionStatusEnum.VERIFICATION.getValue().equals(qualityInspection.getInspectionStatus())
+                && QltQualityInspectionVerificationTypeEnum.PASS.getValue().equals(qualityInspection.getVerificationType())) {
                 passCount++;
             }
         }
@@ -175,14 +175,14 @@ public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspe
      * @return 新增检查工单id
      */
     @Override
-    public Long insertByBo(QualityInspectionCreateReq req) {
+    public Long insertByBo(QltQualityInspectionCreateReq req) {
         // 将实体类和 DTO 进行转换
-        BusQualityInspection qualityInspection = new BusQualityInspection();
+        QltQualityInspection qualityInspection = new QltQualityInspection();
         BeanUtils.copyProperties(req, qualityInspection);
         // 数据校验
         validEntityBeforeSave(qualityInspection, true);
         // 填充默认值
-        qualityInspection.setInspectionStatus(QualityInspectionStatusEnum.INFORM.getValue());
+        qualityInspection.setInspectionStatus(QltQualityInspectionStatusEnum.INFORM.getValue());
         // 写入数据库
         boolean save = this.save(qualityInspection);
         if (!save) {
@@ -199,14 +199,14 @@ public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspe
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(QualityInspectionUpdateReq req) {
+    public Boolean updateByBo(QltQualityInspectionUpdateReq req) {
         // 将实体类和 DTO 进行转换
-        BusQualityInspection qualityInspection = new BusQualityInspection();
+        QltQualityInspection qualityInspection = new QltQualityInspection();
         BeanUtils.copyProperties(req, qualityInspection);
         // 数据校验
         validEntityBeforeSave(qualityInspection, false);
         // 判断是否存在
-        BusQualityInspection oldQualityInspection = this.getById(qualityInspection.getId());
+        QltQualityInspection oldQualityInspection = this.getById(qualityInspection.getId());
         if (oldQualityInspection == null) {
             throw new ServiceException("修改检查工单信息失败，数据不存在", HttpStatus.NOT_FOUND);
         }
@@ -217,7 +217,7 @@ public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspe
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(BusQualityInspection entity, Boolean create) {
+    private void validEntityBeforeSave(QltQualityInspection entity, Boolean create) {
         // TODO 做一些数据校验,如唯一约束
         Long projectId = entity.getProjectId();
         if (create) {
@@ -241,10 +241,10 @@ public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspe
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         Long userId = LoginHelper.getUserId();
-        List<BusQualityInspection> qualityInspectionList = this.listByIds(ids);
+        List<QltQualityInspection> qualityInspectionList = this.listByIds(ids);
         if (isValid) {
             // TODO 做一些业务上的校验,判断是否需要校验
-            List<Long> projectId = qualityInspectionList.stream().map(BusQualityInspection::getProjectId).toList();
+            List<Long> projectId = qualityInspectionList.stream().map(QltQualityInspection::getProjectId).toList();
             projectService.validAuth(projectId, userId);
         }
         return this.removeBatchByIds(ids);
@@ -257,9 +257,9 @@ public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspe
      * @return 质量-检查工单视图对象
      */
     @Override
-    public BusQualityInspectionVo getVo(BusQualityInspection qualityInspection) {
+    public QltQualityInspectionVo getVo(QltQualityInspection qualityInspection) {
         // 对象转封装类
-        BusQualityInspectionVo qualityInspectionVo = new BusQualityInspectionVo();
+        QltQualityInspectionVo qualityInspectionVo = new QltQualityInspectionVo();
         if (qualityInspection == null) {
             return qualityInspectionVo;
         }
@@ -304,8 +304,8 @@ public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspe
      * @return 质量-检查工单查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusQualityInspection> buildQueryWrapper(QualityInspectionQueryReq req) {
-        LambdaQueryWrapper<BusQualityInspection> lqw = new LambdaQueryWrapper<>();
+    public LambdaQueryWrapper<QltQualityInspection> buildQueryWrapper(QltQualityInspectionQueryReq req) {
+        LambdaQueryWrapper<QltQualityInspection> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
         }
@@ -314,10 +314,10 @@ public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspe
         String inspectionStatus = req.getInspectionStatus();
         Long teamId = req.getTeamId();
         // 精确查询
-        lqw.eq(ObjectUtils.isNotEmpty(projectId), BusQualityInspection::getProjectId, projectId);
-        lqw.eq(ObjectUtils.isNotEmpty(inspectionType), BusQualityInspection::getInspectionType, inspectionType);
-        lqw.eq(ObjectUtils.isNotEmpty(inspectionStatus), BusQualityInspection::getInspectionStatus, inspectionStatus);
-        lqw.eq(ObjectUtils.isNotEmpty(teamId), BusQualityInspection::getTeamId, teamId);
+        lqw.eq(ObjectUtils.isNotEmpty(projectId), QltQualityInspection::getProjectId, projectId);
+        lqw.eq(ObjectUtils.isNotEmpty(inspectionType), QltQualityInspection::getInspectionType, inspectionType);
+        lqw.eq(ObjectUtils.isNotEmpty(inspectionStatus), QltQualityInspection::getInspectionStatus, inspectionStatus);
+        lqw.eq(ObjectUtils.isNotEmpty(teamId), QltQualityInspection::getTeamId, teamId);
         return lqw;
     }
 
@@ -328,11 +328,11 @@ public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspe
      * @return 质量-检查工单分页对象视图
      */
     @Override
-    public Page<BusQualityInspectionVo> getVoPage(Page<BusQualityInspection> qualityInspectionPage) {
+    public Page<QltQualityInspectionVo> getVoPage(Page<QltQualityInspection> qualityInspectionPage) {
         // 获取质量-检查工单列表
-        List<BusQualityInspection> qualityInspectionList = qualityInspectionPage.getRecords();
+        List<QltQualityInspection> qualityInspectionList = qualityInspectionPage.getRecords();
         // 添加分页信息
-        Page<BusQualityInspectionVo> qualityInspectionVoPage = new Page<>(
+        Page<QltQualityInspectionVo> qualityInspectionVoPage = new Page<>(
             qualityInspectionPage.getCurrent(),
             qualityInspectionPage.getSize(),
             qualityInspectionPage.getTotal());
@@ -340,7 +340,7 @@ public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspe
             return qualityInspectionVoPage;
         }
         // 获取项目名称
-        List<Long> projectIdList = qualityInspectionList.stream().map(BusQualityInspection::getProjectId).distinct().toList();
+        List<Long> projectIdList = qualityInspectionList.stream().map(QltQualityInspection::getProjectId).distinct().toList();
         if (projectIdList.size() != 1) {
             throw new ServiceException("仅能查询单个项目下的施工日志", HttpStatus.BAD_REQUEST);
         }
@@ -349,25 +349,25 @@ public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspe
             throw new ServiceException("项目不存在", HttpStatus.NOT_FOUND);
         }
         // 获取整改人信息
-        List<Long> correctorList = qualityInspectionList.stream().map(BusQualityInspection::getCorrector).distinct().toList();
+        List<Long> correctorList = qualityInspectionList.stream().map(QltQualityInspection::getCorrector).distinct().toList();
         Map<Long, String> correctorMap = constructionUserService.listByIds(correctorList)
             .stream().collect(Collectors.toMap(BusConstructionUser::getId, BusConstructionUser::getUserName));
         // 获取创建用户信息
-        List<Long> createByList = qualityInspectionList.stream().map(BusQualityInspection::getCreateBy).distinct().toList();
+        List<Long> createByList = qualityInspectionList.stream().map(QltQualityInspection::getCreateBy).distinct().toList();
         List<SysUserVo> userVoList = userService.selectUserByIds(createByList, null);
         Map<Long, String> userMap = userVoList.stream().collect(Collectors.toMap(SysUserVo::getUserId, SysUserVo::getNickName));
         // 获取附件信息
-        List<Long> ossInspectionFileIdList = qualityInspectionList.stream().map(BusQualityInspection::getInspectionFile).filter(StringUtils::isNotBlank)
+        List<Long> ossInspectionFileIdList = qualityInspectionList.stream().map(QltQualityInspection::getInspectionFile).filter(StringUtils::isNotBlank)
             .flatMap(fileId -> Arrays.stream(fileId.split(",")).map(Long::parseLong)).distinct().toList();
         List<Long> ossIdList = new ArrayList<>(ossInspectionFileIdList);
-        List<Long> ossRectificationFileIdList = qualityInspectionList.stream().map(BusQualityInspection::getRectificationFile).filter(StringUtils::isNotBlank)
+        List<Long> ossRectificationFileIdList = qualityInspectionList.stream().map(QltQualityInspection::getRectificationFile).filter(StringUtils::isNotBlank)
             .flatMap(fileId -> Arrays.stream(fileId.split(",")).map(Long::parseLong)).distinct().toList();
         ossIdList.addAll(ossRectificationFileIdList);
         Map<Long, List<SysOssVo>> ossMap = ossService.listByIds(ossIdList)
             .stream().collect(Collectors.groupingBy(SysOssVo::getOssId));
         // 对象列表 => 封装对象列表
-        List<BusQualityInspectionVo> qualityInspectionVoList = qualityInspectionList.stream().map(qualityInspection -> {
-            BusQualityInspectionVo qualityInspectionVo = new BusQualityInspectionVo();
+        List<QltQualityInspectionVo> qualityInspectionVoList = qualityInspectionList.stream().map(qualityInspection -> {
+            QltQualityInspectionVo qualityInspectionVo = new QltQualityInspectionVo();
             BeanUtils.copyProperties(qualityInspection, qualityInspectionVo);
             qualityInspectionVo.setProjectName(project.getProjectName());
             // 关联整改人信息
@@ -421,16 +421,16 @@ public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspe
      */
     @Override
     public void exportWordById(Long id, HttpServletResponse response) {
-        BusQualityInspection qualityInspection = this.getById(id);
+        QltQualityInspection qualityInspection = this.getById(id);
         if (qualityInspection == null) {
             throw new ServiceException("质量-检查工单不存在");
         }
         Map<String, String> replacementMap = getReplacementMap(qualityInspection);
-        Path targetDir = Paths.get(QualityConstant.getQualityInspectionFileUrl(qualityInspection));
+        Path targetDir = Paths.get(QltQualityConstant.getQualityInspectionFileUrl(qualityInspection));
         // 如果存在目录则直接返回，不存在则生成文件并返回
         if (!Files.exists(targetDir)) {
             // 清理旧文件
-            String baseUrl = QualityConstant.QUALITY_INSPECTION_FILE_URL + qualityInspection.getId();
+            String baseUrl = QltQualityConstant.QUALITY_INSPECTION_FILE_URL + qualityInspection.getId();
             try {
                 Path dirPath = Paths.get(baseUrl);
                 FileUtils.deleteDirectory(dirPath);
@@ -438,7 +438,7 @@ public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspe
                 log.error("文件目录：{}，清理失败", baseUrl, e);
             }
             // 生成文件
-            try (FileInputStream fis = new FileInputStream(QualityConstant.QUALITY_INSPECTION_TEMPLATE_PATH);
+            try (FileInputStream fis = new FileInputStream(QltQualityConstant.QUALITY_INSPECTION_TEMPLATE_PATH);
                  XWPFDocument document = new XWPFDocument(fis)) {
                 // 替换段落中的文本
                 for (XWPFParagraph paragraph : document.getParagraphs()) {
@@ -459,7 +459,7 @@ public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspe
                     Files.createDirectories(targetDir);
                 }
                 // 组合目标文件名
-                String fileName = QualityConstant.getQualityInspectionFileName(qualityInspection);
+                String fileName = QltQualityConstant.getQualityInspectionFileName(qualityInspection);
                 // 保存修改后的文件
                 try (FileOutputStream fos = new FileOutputStream(targetDir.resolve(fileName).toFile())) {
                     document.write(fos);
@@ -484,7 +484,7 @@ public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspe
      * @param qualityInspection 质量-检查工单对象
      * @return Map
      */
-    public Map<String, String> getReplacementMap(BusQualityInspection qualityInspection) {
+    public Map<String, String> getReplacementMap(QltQualityInspection qualityInspection) {
         Map<String, String> replacementMap = new HashMap<>();
         String createName = userService.selectUserById(qualityInspection.getCreateBy()).getNickName();
         replacementMap.put("${createName}", createName);
@@ -497,13 +497,13 @@ public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspe
         replacementMap.put("${correctorName}", correctorName);
         Date rectificationTime = qualityInspection.getRectificationTime();
         replacementMap.put("${rectificationTime}", rectificationTime != null ? DateUtils.formatDateTime(rectificationTime) : "");
-        String inspectionType = dictDataService.selectDictLabel(QualityConstant.QUALITY_INSPECTION_CHECK_TYPE, qualityInspection.getInspectionType());
+        String inspectionType = dictDataService.selectDictLabel(QltQualityConstant.QUALITY_INSPECTION_CHECK_TYPE, qualityInspection.getInspectionType());
         replacementMap.put("${inspectionType}", inspectionType);
         Date replyPeriodDate = qualityInspection.getReplyPeriodDate();
         replacementMap.put("${replyPeriodDate}", replyPeriodDate != null ? DateUtils.formatDate(replyPeriodDate) : "");
         replacementMap.put("${inspectionResult}", qualityInspection.getInspectionResult());
         replacementMap.put("${inspectionFile}", qualityInspection.getInspectionFile());
-        String inspectionStatus = dictDataService.selectDictLabel(QualityConstant.QUALITY_INSPECTION_STATUS_TYPE, qualityInspection.getInspectionStatus());
+        String inspectionStatus = dictDataService.selectDictLabel(QltQualityConstant.QUALITY_INSPECTION_STATUS_TYPE, qualityInspection.getInspectionStatus());
         replacementMap.put("${inspectionStatus}", inspectionStatus);
         replacementMap.put("${rectificationResult}", qualityInspection.getRectificationResult());
         replacementMap.put("${rectificationFile}", qualityInspection.getRectificationFile());
@@ -522,7 +522,7 @@ public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspe
     public void replaceInParagraph(XWPFParagraph paragraph,
                                    Map<String, String> replacements,
                                    XWPFDocument document,
-                                   BusQualityInspection qualityInspection)
+                                   QltQualityInspection qualityInspection)
         throws InvalidFormatException, IOException {
         // 先拷贝 paragraph 里所有的 run
         List<XWPFRun> runs = new ArrayList<>(paragraph.getRuns());
@@ -548,7 +548,7 @@ public class BusQualityInspectionServiceImpl extends ServiceImpl<BusQualityInspe
                                 // 获取附件的ossId
                                 List<Long> ossIdList = Arrays.stream(value.split(",")).map(Long::parseLong).toList();
                                 List<SysOssVo> ossVoList = ossService.listByIds(ossIdList);
-                                String baseFile = QualityConstant.getQualityInspectionFileUrl(qualityInspection) + "/file";
+                                String baseFile = QltQualityConstant.getQualityInspectionFileUrl(qualityInspection) + "/file";
                                 for (SysOssVo ossVo : ossVoList) {
                                     String lowerVal = ossVo.getUrl().toLowerCase();
                                     OssClient storage = OssFactory.instance(ossVo.getService());
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/constant/DocumentSafetyMeetingConstant.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/constant/HseDocumentSafetyMeetingConstant.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/constant/DocumentSafetyMeetingConstant.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/constant/HseDocumentSafetyMeetingConstant.java
index 1734f80d..65fe1424 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/constant/DocumentSafetyMeetingConstant.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/constant/HseDocumentSafetyMeetingConstant.java
@@ -6,7 +6,7 @@ import java.util.List;
  * @author lcj
  * @date 2025/4/14 10:50
  */
-public interface DocumentSafetyMeetingConstant {
+public interface HseDocumentSafetyMeetingConstant {
 
     /**
      * 顶级目录前缀
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/constant/SafetyConstant.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/constant/HseSafetyConstant.java
similarity index 82%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/constant/SafetyConstant.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/constant/HseSafetyConstant.java
index 671e2f18..1ca37c90 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/constant/SafetyConstant.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/constant/HseSafetyConstant.java
@@ -1,7 +1,7 @@
 package org.dromara.safety.constant;
 
 import org.dromara.common.core.utils.DateUtils;
-import org.dromara.safety.domain.BusSafetyInspection;
+import org.dromara.safety.domain.HseSafetyInspection;
 
 import java.text.SimpleDateFormat;
 
@@ -9,7 +9,7 @@ import java.text.SimpleDateFormat;
  * @author lcj
  * @date 2025/4/16 23:09
  */
-public interface SafetyConstant {
+public interface HseSafetyConstant {
 
     String SAFETY_INSPECTION_TYPE = "safety_inspection_type";
 
@@ -21,12 +21,12 @@ public interface SafetyConstant {
 
     String SAFETY_INSPECTION_TEMPLATE_PATH = "docs/template/安全生产监督检查通知书模版.docx";
 
-    static String getSafetyInspectionFileUrl(BusSafetyInspection safetyInspection) {
+    static String getSafetyInspectionFileUrl(HseSafetyInspection safetyInspection) {
         String timestamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(safetyInspection.getUpdateTime());
         return String.format("%s%s/%s", SAFETY_INSPECTION_FILE_URL, safetyInspection.getId(), timestamp);
     }
 
-    static String getSafetyInspectionFileName(BusSafetyInspection safetyInspection) {
+    static String getSafetyInspectionFileName(HseSafetyInspection safetyInspection) {
         String createDate = DateUtils.formatDate(safetyInspection.getCreateTime());
         return String.format("安全生产监督检查通知书（%s）.docx", createDate);
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusDocumentSafetyMeetingController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseDocumentSafetyMeetingController.java
similarity index 78%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusDocumentSafetyMeetingController.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseDocumentSafetyMeetingController.java
index cc358668..a99326a5 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusDocumentSafetyMeetingController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseDocumentSafetyMeetingController.java
@@ -11,12 +11,12 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.safety.domain.req.documentsafetymeeting.DocumentSafetyMeetingCreateFileReq;
-import org.dromara.safety.domain.req.documentsafetymeeting.DocumentSafetyMeetingCreateFolderReq;
-import org.dromara.safety.domain.req.documentsafetymeeting.DocumentSafetyMeetingQueryReq;
-import org.dromara.safety.domain.vo.documentsafetymeeting.BusDocumentSafetyMeetingVo;
-import org.dromara.safety.domain.vo.documentsafetymeeting.DocumentSafetyMeetingRecycleBinVo;
-import org.dromara.safety.service.IBusDocumentSafetyMeetingService;
+import org.dromara.safety.domain.req.documentsafetymeeting.HseDocumentSafetyMeetingCreateFileReq;
+import org.dromara.safety.domain.req.documentsafetymeeting.HseDocumentSafetyMeetingCreateFolderReq;
+import org.dromara.safety.domain.req.documentsafetymeeting.HseDocumentSafetyMeetingQueryReq;
+import org.dromara.safety.domain.vo.documentsafetymeeting.HseDocumentSafetyMeetingVo;
+import org.dromara.safety.domain.vo.documentsafetymeeting.HseDocumentSafetyMeetingRecycleBinVo;
+import org.dromara.safety.service.IHseDocumentSafetyMeetingService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -32,17 +32,17 @@ import java.util.List;
 @Validated
 @RestController
 @RequestMapping("/safety/documentSafetyMeeting")
-public class BusDocumentSafetyMeetingController extends BaseController {
+public class HseDocumentSafetyMeetingController extends BaseController {
 
     @Resource
-    private IBusDocumentSafetyMeetingService busDocumentSafetyMeetingService;
+    private IHseDocumentSafetyMeetingService busDocumentSafetyMeetingService;
 
     /**
      * 查询安全会议纪要列表
      */
     @SaCheckPermission("safety:documentSafetyMeeting:list")
     @GetMapping("/list")
-    public R<List<BusDocumentSafetyMeetingVo>> list(DocumentSafetyMeetingQueryReq req) {
+    public R<List<HseDocumentSafetyMeetingVo>> list(HseDocumentSafetyMeetingQueryReq req) {
         return R.ok(busDocumentSafetyMeetingService.queryList(req));
     }
 
@@ -51,7 +51,7 @@ public class BusDocumentSafetyMeetingController extends BaseController {
      */
     @SaCheckPermission("safety:documentSafetyMeeting:list")
     @GetMapping("/recycleBin/list")
-    public TableDataInfo<DocumentSafetyMeetingRecycleBinVo> list(DocumentSafetyMeetingQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<HseDocumentSafetyMeetingRecycleBinVo> list(HseDocumentSafetyMeetingQueryReq req, PageQuery pageQuery) {
         return busDocumentSafetyMeetingService.queryRecycleBinPageList(req, pageQuery);
     }
 
@@ -62,7 +62,7 @@ public class BusDocumentSafetyMeetingController extends BaseController {
      */
     @SaCheckPermission("safety:documentSafetyMeeting:query")
     @GetMapping("/{id}")
-    public R<BusDocumentSafetyMeetingVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<HseDocumentSafetyMeetingVo> getInfo(@NotNull(message = "主键不能为空")
                                                  @PathVariable Long id) {
         return R.ok(busDocumentSafetyMeetingService.queryById(id));
     }
@@ -74,7 +74,7 @@ public class BusDocumentSafetyMeetingController extends BaseController {
     @Log(title = "安全会议纪要", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/folder")
-    public R<Long> addFolder(@RequestBody DocumentSafetyMeetingCreateFolderReq req) {
+    public R<Long> addFolder(@RequestBody HseDocumentSafetyMeetingCreateFolderReq req) {
         return R.ok(busDocumentSafetyMeetingService.insertByFolder(req));
     }
 
@@ -85,7 +85,7 @@ public class BusDocumentSafetyMeetingController extends BaseController {
     @Log(title = "安全会议纪要", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/file")
-    public R<Long> addFile(@RequestPart("file") MultipartFile file, DocumentSafetyMeetingCreateFileReq req) {
+    public R<Long> addFile(@RequestPart("file") MultipartFile file, HseDocumentSafetyMeetingCreateFileReq req) {
         return R.ok(busDocumentSafetyMeetingService.insertByFile(file, req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusQuestionBankController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionBankController.java
similarity index 74%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusQuestionBankController.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionBankController.java
index 572cae3f..b083374c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusQuestionBankController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionBankController.java
@@ -16,11 +16,11 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.safety.domain.req.questionbank.QuestionBankCreateReq;
-import org.dromara.safety.domain.req.questionbank.QuestionBankQueryReq;
-import org.dromara.safety.domain.req.questionbank.QuestionBankUpdateReq;
-import org.dromara.safety.domain.vo.BusQuestionBankVo;
-import org.dromara.safety.service.IBusQuestionBankService;
+import org.dromara.safety.domain.req.questionbank.HseQuestionBankCreateReq;
+import org.dromara.safety.domain.req.questionbank.HseQuestionBankQueryReq;
+import org.dromara.safety.domain.req.questionbank.HseQuestionBankUpdateReq;
+import org.dromara.safety.domain.vo.questionbank.HseQuestionBankVo;
+import org.dromara.safety.service.IHseQuestionBankService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -36,16 +36,16 @@ import java.util.List;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/safety/questionBank")
-public class BusQuestionBankController extends BaseController {
+public class HseQuestionBankController extends BaseController {
 
-    private final IBusQuestionBankService busQuestionBankService;
+    private final IHseQuestionBankService busQuestionBankService;
 
     /**
      * 查询题库列表
      */
     @SaCheckPermission("safety:questionBank:list")
     @GetMapping("/list")
-    public TableDataInfo<BusQuestionBankVo> list(QuestionBankQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<HseQuestionBankVo> list(HseQuestionBankQueryReq req, PageQuery pageQuery) {
         return busQuestionBankService.queryPageList(req, pageQuery);
     }
 
@@ -55,9 +55,9 @@ public class BusQuestionBankController extends BaseController {
     @SaCheckPermission("safety:questionBank:export")
     @Log(title = "题库", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(QuestionBankQueryReq req, HttpServletResponse response) {
-        List<BusQuestionBankVo> list = busQuestionBankService.queryList(req);
-        ExcelUtil.exportExcel(list, "题库", BusQuestionBankVo.class, response);
+    public void export(HseQuestionBankQueryReq req, HttpServletResponse response) {
+        List<HseQuestionBankVo> list = busQuestionBankService.queryList(req);
+        ExcelUtil.exportExcel(list, "题库", HseQuestionBankVo.class, response);
     }
 
     /**
@@ -67,7 +67,7 @@ public class BusQuestionBankController extends BaseController {
      */
     @SaCheckPermission("safety:questionBank:query")
     @GetMapping("/{id}")
-    public R<BusQuestionBankVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<HseQuestionBankVo> getInfo(@NotNull(message = "主键不能为空")
                                         @PathVariable Long id) {
         return R.ok(busQuestionBankService.queryById(id));
     }
@@ -79,7 +79,7 @@ public class BusQuestionBankController extends BaseController {
     @Log(title = "题库", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody QuestionBankCreateReq req,
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody HseQuestionBankCreateReq req,
                        HttpServletRequest request) {
         return R.ok(busQuestionBankService.insertByBo(req, request));
     }
@@ -91,7 +91,7 @@ public class BusQuestionBankController extends BaseController {
     @Log(title = "题库", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody QuestionBankUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody HseQuestionBankUpdateReq req) {
         return toAjax(busQuestionBankService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusQuestionUserAnswerController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionUserAnswerController.java
similarity index 76%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusQuestionUserAnswerController.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionUserAnswerController.java
index ae7ef921..1b16d23e 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusQuestionUserAnswerController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionUserAnswerController.java
@@ -15,12 +15,12 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.safety.domain.req.questionuseranswer.QuestionUserAnswerBatchDownloadFileReq;
-import org.dromara.safety.domain.req.questionuseranswer.QuestionUserAnswerCreateReq;
-import org.dromara.safety.domain.req.questionuseranswer.QuestionUserAnswerQueryReq;
-import org.dromara.safety.domain.req.questionuseranswer.QuestionUserAnswerUpdateReq;
-import org.dromara.safety.domain.vo.BusQuestionUserAnswerVo;
-import org.dromara.safety.service.IBusQuestionUserAnswerService;
+import org.dromara.safety.domain.req.questionuseranswer.HseQuestionUserAnswerBatchDownloadFileReq;
+import org.dromara.safety.domain.req.questionuseranswer.HseQuestionUserAnswerCreateReq;
+import org.dromara.safety.domain.req.questionuseranswer.HseQuestionUserAnswerQueryReq;
+import org.dromara.safety.domain.req.questionuseranswer.HseQuestionUserAnswerUpdateReq;
+import org.dromara.safety.domain.vo.questionuseranswer.HseQuestionUserAnswerVo;
+import org.dromara.safety.service.IHseQuestionUserAnswerService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -37,16 +37,16 @@ import java.util.List;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/safety/questionUserAnswer")
-public class BusQuestionUserAnswerController extends BaseController {
+public class HseQuestionUserAnswerController extends BaseController {
 
-    private final IBusQuestionUserAnswerService busQuestionUserAnswerService;
+    private final IHseQuestionUserAnswerService busQuestionUserAnswerService;
 
     /**
      * 查询用户试卷存储列表
      */
     @SaCheckPermission("safety:questionUserAnswer:list")
     @GetMapping("/list")
-    public TableDataInfo<BusQuestionUserAnswerVo> list(QuestionUserAnswerQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<HseQuestionUserAnswerVo> list(HseQuestionUserAnswerQueryReq req, PageQuery pageQuery) {
         return busQuestionUserAnswerService.queryPageList(req, pageQuery);
     }
 
@@ -56,9 +56,9 @@ public class BusQuestionUserAnswerController extends BaseController {
     @SaCheckPermission("safety:questionUserAnswer:export")
     @Log(title = "用户试卷存储", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(QuestionUserAnswerQueryReq req, HttpServletResponse response) {
-        List<BusQuestionUserAnswerVo> list = busQuestionUserAnswerService.queryList(req);
-        ExcelUtil.exportExcel(list, "用户试卷存储", BusQuestionUserAnswerVo.class, response);
+    public void export(HseQuestionUserAnswerQueryReq req, HttpServletResponse response) {
+        List<HseQuestionUserAnswerVo> list = busQuestionUserAnswerService.queryList(req);
+        ExcelUtil.exportExcel(list, "用户试卷存储", HseQuestionUserAnswerVo.class, response);
     }
 
     /**
@@ -68,7 +68,7 @@ public class BusQuestionUserAnswerController extends BaseController {
     @Log(title = "用户试卷存储", businessType = BusinessType.EXPORT)
     @RepeatSubmit()
     @PostMapping("/exportFile")
-    public void exportFile(QuestionUserAnswerBatchDownloadFileReq req,
+    public void exportFile(HseQuestionUserAnswerBatchDownloadFileReq req,
                            HttpServletResponse response) {
         busQuestionUserAnswerService.batchDownloadFile(req, response);
     }
@@ -80,7 +80,7 @@ public class BusQuestionUserAnswerController extends BaseController {
      */
     @SaCheckPermission("safety:questionUserAnswer:query")
     @GetMapping("/{id}")
-    public R<BusQuestionUserAnswerVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<HseQuestionUserAnswerVo> getInfo(@NotNull(message = "主键不能为空")
                                               @PathVariable Long id) {
         return R.ok(busQuestionUserAnswerService.queryById(id));
     }
@@ -92,7 +92,7 @@ public class BusQuestionUserAnswerController extends BaseController {
     @Log(title = "用户试卷存储", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody QuestionUserAnswerCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody HseQuestionUserAnswerCreateReq req) {
         return R.ok(busQuestionUserAnswerService.insertByBo(req));
     }
 
@@ -115,7 +115,7 @@ public class BusQuestionUserAnswerController extends BaseController {
     @Log(title = "用户试卷存储", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody QuestionUserAnswerUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody HseQuestionUserAnswerUpdateReq req) {
         return toAjax(busQuestionUserAnswerService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusQuestionsCategoryController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionsCategoryController.java
similarity index 73%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusQuestionsCategoryController.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionsCategoryController.java
index d8766558..4d8fdeea 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusQuestionsCategoryController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionsCategoryController.java
@@ -15,11 +15,11 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.safety.domain.req.questionscategory.QuestionsCategoryCreateReq;
-import org.dromara.safety.domain.req.questionscategory.QuestionsCategoryQueryReq;
-import org.dromara.safety.domain.req.questionscategory.QuestionsCategoryUpdateReq;
-import org.dromara.safety.domain.vo.BusQuestionsCategoryVo;
-import org.dromara.safety.service.IBusQuestionsCategoryService;
+import org.dromara.safety.domain.req.questionscategory.HseQuestionsCategoryCreateReq;
+import org.dromara.safety.domain.req.questionscategory.HseQuestionsCategoryQueryReq;
+import org.dromara.safety.domain.req.questionscategory.HseQuestionsCategoryUpdateReq;
+import org.dromara.safety.domain.vo.questionscategory.HseQuestionsCategoryVo;
+import org.dromara.safety.service.IHseQuestionsCategoryService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -35,16 +35,16 @@ import java.util.List;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/safety/questionsCategory")
-public class BusQuestionsCategoryController extends BaseController {
+public class HseQuestionsCategoryController extends BaseController {
 
-    private final IBusQuestionsCategoryService busQuestionsCategoryService;
+    private final IHseQuestionsCategoryService busQuestionsCategoryService;
 
     /**
      * 查询题库类别列表
      */
     @SaCheckPermission("safety:questionsCategory:list")
     @GetMapping("/list")
-    public TableDataInfo<BusQuestionsCategoryVo> list(QuestionsCategoryQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<HseQuestionsCategoryVo> list(HseQuestionsCategoryQueryReq req, PageQuery pageQuery) {
         return busQuestionsCategoryService.queryPageList(req, pageQuery);
     }
 
@@ -54,9 +54,9 @@ public class BusQuestionsCategoryController extends BaseController {
     @SaCheckPermission("safety:questionsCategory:export")
     @Log(title = "题库类别", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(QuestionsCategoryQueryReq req, HttpServletResponse response) {
-        List<BusQuestionsCategoryVo> list = busQuestionsCategoryService.queryList(req);
-        ExcelUtil.exportExcel(list, "题库类别", BusQuestionsCategoryVo.class, response);
+    public void export(HseQuestionsCategoryQueryReq req, HttpServletResponse response) {
+        List<HseQuestionsCategoryVo> list = busQuestionsCategoryService.queryList(req);
+        ExcelUtil.exportExcel(list, "题库类别", HseQuestionsCategoryVo.class, response);
     }
 
     /**
@@ -66,7 +66,7 @@ public class BusQuestionsCategoryController extends BaseController {
      */
     @SaCheckPermission("safety:questionsCategory:query")
     @GetMapping("/{id}")
-    public R<BusQuestionsCategoryVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<HseQuestionsCategoryVo> getInfo(@NotNull(message = "主键不能为空")
                                              @PathVariable Long id) {
         return R.ok(busQuestionsCategoryService.queryById(id));
     }
@@ -78,7 +78,7 @@ public class BusQuestionsCategoryController extends BaseController {
     @Log(title = "题库类别", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody QuestionsCategoryCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody HseQuestionsCategoryCreateReq req) {
         return R.ok(busQuestionsCategoryService.insertByBo(req));
     }
 
@@ -89,7 +89,7 @@ public class BusQuestionsCategoryController extends BaseController {
     @Log(title = "题库类别", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody QuestionsCategoryUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody HseQuestionsCategoryUpdateReq req) {
         return toAjax(busQuestionsCategoryService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusQuestionsConfigController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionsConfigController.java
similarity index 74%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusQuestionsConfigController.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionsConfigController.java
index 56e7c8b1..d9e5ec42 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusQuestionsConfigController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionsConfigController.java
@@ -15,11 +15,11 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.safety.domain.req.questionsconfig.QuestionsConfigCreateReq;
-import org.dromara.safety.domain.req.questionsconfig.QuestionsConfigQueryReq;
-import org.dromara.safety.domain.req.questionsconfig.QuestionsConfigUpdateReq;
-import org.dromara.safety.domain.vo.BusQuestionsConfigVo;
-import org.dromara.safety.service.IBusQuestionsConfigService;
+import org.dromara.safety.domain.req.questionsconfig.HseQuestionsConfigCreateReq;
+import org.dromara.safety.domain.req.questionsconfig.HseQuestionsConfigQueryReq;
+import org.dromara.safety.domain.req.questionsconfig.HseQuestionsConfigUpdateReq;
+import org.dromara.safety.domain.vo.questionsconfig.HseQuestionsConfigVo;
+import org.dromara.safety.service.IHseQuestionsConfigService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -35,16 +35,16 @@ import java.util.List;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/safety/questionsConfig")
-public class BusQuestionsConfigController extends BaseController {
+public class HseQuestionsConfigController extends BaseController {
 
-    private final IBusQuestionsConfigService busQuestionsConfigService;
+    private final IHseQuestionsConfigService busQuestionsConfigService;
 
     /**
      * 查询题库配置列表
      */
     @SaCheckPermission("safety:questionsConfig:list")
     @GetMapping("/list")
-    public TableDataInfo<BusQuestionsConfigVo> list(QuestionsConfigQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<HseQuestionsConfigVo> list(HseQuestionsConfigQueryReq req, PageQuery pageQuery) {
         return busQuestionsConfigService.queryPageList(req, pageQuery);
     }
 
@@ -54,9 +54,9 @@ public class BusQuestionsConfigController extends BaseController {
     @SaCheckPermission("safety:questionsConfig:export")
     @Log(title = "题库配置", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(QuestionsConfigQueryReq req, HttpServletResponse response) {
-        List<BusQuestionsConfigVo> list = busQuestionsConfigService.queryList(req);
-        ExcelUtil.exportExcel(list, "题库配置", BusQuestionsConfigVo.class, response);
+    public void export(HseQuestionsConfigQueryReq req, HttpServletResponse response) {
+        List<HseQuestionsConfigVo> list = busQuestionsConfigService.queryList(req);
+        ExcelUtil.exportExcel(list, "题库配置", HseQuestionsConfigVo.class, response);
     }
 
     /**
@@ -66,7 +66,7 @@ public class BusQuestionsConfigController extends BaseController {
      */
     @SaCheckPermission("safety:questionsConfig:query")
     @GetMapping("/{id}")
-    public R<BusQuestionsConfigVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<HseQuestionsConfigVo> getInfo(@NotNull(message = "主键不能为空")
                                            @PathVariable Long id) {
         return R.ok(busQuestionsConfigService.queryById(id));
     }
@@ -78,7 +78,7 @@ public class BusQuestionsConfigController extends BaseController {
     @Log(title = "题库配置", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody QuestionsConfigCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody HseQuestionsConfigCreateReq req) {
         return R.ok(busQuestionsConfigService.insertByBo(req));
     }
 
@@ -89,7 +89,7 @@ public class BusQuestionsConfigController extends BaseController {
     @Log(title = "题库配置", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody QuestionsConfigUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody HseQuestionsConfigUpdateReq req) {
         return toAjax(busQuestionsConfigService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusSafetyInspectionController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyInspectionController.java
similarity index 73%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusSafetyInspectionController.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyInspectionController.java
index 5d8bbeb0..0860d5e1 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusSafetyInspectionController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyInspectionController.java
@@ -15,13 +15,13 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.safety.domain.req.safetyinspection.SafetyInspectionCreateReq;
-import org.dromara.safety.domain.req.safetyinspection.SafetyInspectionGisReq;
-import org.dromara.safety.domain.req.safetyinspection.SafetyInspectionQueryReq;
-import org.dromara.safety.domain.req.safetyinspection.SafetyInspectionUpdateReq;
-import org.dromara.safety.domain.vo.safetyinspection.BusSafetyInspectionVo;
-import org.dromara.safety.domain.vo.safetyinspection.SafetyInspectionListGisVo;
-import org.dromara.safety.service.IBusSafetyInspectionService;
+import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionCreateReq;
+import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionGisReq;
+import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionQueryReq;
+import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionUpdateReq;
+import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionVo;
+import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionListGisVo;
+import org.dromara.safety.service.IHseSafetyInspectionService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,16 +37,16 @@ import java.util.List;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/safety/safetyInspection")
-public class BusSafetyInspectionController extends BaseController {
+public class HseSafetyInspectionController extends BaseController {
 
-    private final IBusSafetyInspectionService busSafetyInspectionService;
+    private final IHseSafetyInspectionService busSafetyInspectionService;
 
     /**
      * 查询安全巡检工单列表
      */
     @SaCheckPermission("safety:safetyInspection:list")
     @GetMapping("/list")
-    public TableDataInfo<BusSafetyInspectionVo> list(SafetyInspectionQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<HseSafetyInspectionVo> list(HseSafetyInspectionQueryReq req, PageQuery pageQuery) {
         return busSafetyInspectionService.queryPageList(req, pageQuery);
     }
 
@@ -56,9 +56,9 @@ public class BusSafetyInspectionController extends BaseController {
     @SaCheckPermission("safety:safetyInspection:export")
     @Log(title = "安全巡检工单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(SafetyInspectionQueryReq req, HttpServletResponse response) {
-        List<BusSafetyInspectionVo> list = busSafetyInspectionService.queryList(req);
-        ExcelUtil.exportExcel(list, "安全巡检工单", BusSafetyInspectionVo.class, response);
+    public void export(HseSafetyInspectionQueryReq req, HttpServletResponse response) {
+        List<HseSafetyInspectionVo> list = busSafetyInspectionService.queryList(req);
+        ExcelUtil.exportExcel(list, "安全巡检工单", HseSafetyInspectionVo.class, response);
     }
 
     /**
@@ -76,7 +76,7 @@ public class BusSafetyInspectionController extends BaseController {
      * 查询大屏安全信息
      */
     @GetMapping("/gis")
-    public R<SafetyInspectionListGisVo> queryGisList(SafetyInspectionGisReq req) {
+    public R<HseSafetyInspectionListGisVo> queryGisList(HseSafetyInspectionGisReq req) {
         return R.ok(busSafetyInspectionService.queryGisList(req));
     }
 
@@ -87,7 +87,7 @@ public class BusSafetyInspectionController extends BaseController {
      */
     @SaCheckPermission("safety:safetyInspection:query")
     @GetMapping("/{id}")
-    public R<BusSafetyInspectionVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<HseSafetyInspectionVo> getInfo(@NotNull(message = "主键不能为空")
                                             @PathVariable Long id) {
         return R.ok(busSafetyInspectionService.queryById(id));
     }
@@ -99,7 +99,7 @@ public class BusSafetyInspectionController extends BaseController {
     @Log(title = "安全巡检工单", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody SafetyInspectionCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody HseSafetyInspectionCreateReq req) {
         return R.ok(busSafetyInspectionService.insertByBo(req));
     }
 
@@ -110,7 +110,7 @@ public class BusSafetyInspectionController extends BaseController {
     @Log(title = "安全巡检工单", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SafetyInspectionUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody HseSafetyInspectionUpdateReq req) {
         return toAjax(busSafetyInspectionService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusSafetyLogController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyLogController.java
similarity index 75%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusSafetyLogController.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyLogController.java
index 769d6b2f..60cbaebc 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusSafetyLogController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyLogController.java
@@ -15,11 +15,11 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.safety.domain.req.safetylog.SafetyLogCreateReq;
-import org.dromara.safety.domain.req.safetylog.SafetyLogQueryReq;
-import org.dromara.safety.domain.req.safetylog.SafetyLogUpdateReq;
-import org.dromara.safety.domain.vo.BusSafetyLogVo;
-import org.dromara.safety.service.IBusSafetyLogService;
+import org.dromara.safety.domain.req.safetylog.HseSafetyLogCreateReq;
+import org.dromara.safety.domain.req.safetylog.HseSafetyLogQueryReq;
+import org.dromara.safety.domain.req.safetylog.HseSafetyLogUpdateReq;
+import org.dromara.safety.domain.vo.safetylog.HseSafetyLogVo;
+import org.dromara.safety.service.IHseSafetyLogService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -35,16 +35,16 @@ import java.util.List;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/safety/safetyLog")
-public class BusSafetyLogController extends BaseController {
+public class HseSafetyLogController extends BaseController {
 
-    private final IBusSafetyLogService busSafetyLogService;
+    private final IHseSafetyLogService busSafetyLogService;
 
     /**
      * 查询安全日志列表
      */
     @SaCheckPermission("safety:safetyLog:list")
     @GetMapping("/list")
-    public TableDataInfo<BusSafetyLogVo> list(SafetyLogQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<HseSafetyLogVo> list(HseSafetyLogQueryReq req, PageQuery pageQuery) {
         return busSafetyLogService.queryPageList(req, pageQuery);
     }
 
@@ -54,9 +54,9 @@ public class BusSafetyLogController extends BaseController {
     @SaCheckPermission("safety:safetyLog:export")
     @Log(title = "安全日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(SafetyLogQueryReq req, HttpServletResponse response) {
-        List<BusSafetyLogVo> list = busSafetyLogService.queryList(req);
-        ExcelUtil.exportExcel(list, "安全日志", BusSafetyLogVo.class, response);
+    public void export(HseSafetyLogQueryReq req, HttpServletResponse response) {
+        List<HseSafetyLogVo> list = busSafetyLogService.queryList(req);
+        ExcelUtil.exportExcel(list, "安全日志", HseSafetyLogVo.class, response);
     }
 
     /**
@@ -66,7 +66,7 @@ public class BusSafetyLogController extends BaseController {
      */
     @SaCheckPermission("safety:safetyLog:query")
     @GetMapping("/{id}")
-    public R<BusSafetyLogVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<HseSafetyLogVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(busSafetyLogService.queryById(id));
     }
@@ -78,7 +78,7 @@ public class BusSafetyLogController extends BaseController {
     @Log(title = "安全日志", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody SafetyLogCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody HseSafetyLogCreateReq req) {
         return R.ok(busSafetyLogService.insertByBo(req));
     }
 
@@ -89,7 +89,7 @@ public class BusSafetyLogController extends BaseController {
     @Log(title = "安全日志", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SafetyLogUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody HseSafetyLogUpdateReq req) {
         return toAjax(busSafetyLogService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusSafetyWeeklyReportController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyWeeklyReportController.java
similarity index 73%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusSafetyWeeklyReportController.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyWeeklyReportController.java
index 039aa711..8dfdeb11 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusSafetyWeeklyReportController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyWeeklyReportController.java
@@ -15,11 +15,11 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.safety.domain.req.safetyweeklyreport.SafetyWeeklyReportCreateReq;
-import org.dromara.safety.domain.req.safetyweeklyreport.SafetyWeeklyReportQueryReq;
-import org.dromara.safety.domain.req.safetyweeklyreport.SafetyWeeklyReportUpdateReq;
-import org.dromara.safety.domain.vo.BusSafetyWeeklyReportVo;
-import org.dromara.safety.service.IBusSafetyWeeklyReportService;
+import org.dromara.safety.domain.req.safetyweeklyreport.HseSafetyWeeklyReportCreateReq;
+import org.dromara.safety.domain.req.safetyweeklyreport.HseSafetyWeeklyReportQueryReq;
+import org.dromara.safety.domain.req.safetyweeklyreport.HseSafetyWeeklyReportUpdateReq;
+import org.dromara.safety.domain.vo.safetyweeklyreport.HseSafetyWeeklyReportVo;
+import org.dromara.safety.service.IHseSafetyWeeklyReportService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -35,16 +35,16 @@ import java.util.List;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/safety/safetyWeeklyReport")
-public class BusSafetyWeeklyReportController extends BaseController {
+public class HseSafetyWeeklyReportController extends BaseController {
 
-    private final IBusSafetyWeeklyReportService busSafetyWeeklyReportService;
+    private final IHseSafetyWeeklyReportService busSafetyWeeklyReportService;
 
     /**
      * 查询安全周报列表
      */
     @SaCheckPermission("safety:safetyWeeklyReport:list")
     @GetMapping("/list")
-    public TableDataInfo<BusSafetyWeeklyReportVo> list(SafetyWeeklyReportQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<HseSafetyWeeklyReportVo> list(HseSafetyWeeklyReportQueryReq req, PageQuery pageQuery) {
         return busSafetyWeeklyReportService.queryPageList(req, pageQuery);
     }
 
@@ -54,9 +54,9 @@ public class BusSafetyWeeklyReportController extends BaseController {
     @SaCheckPermission("safety:safetyWeeklyReport:export")
     @Log(title = "安全周报", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(SafetyWeeklyReportQueryReq req, HttpServletResponse response) {
-        List<BusSafetyWeeklyReportVo> list = busSafetyWeeklyReportService.queryList(req);
-        ExcelUtil.exportExcel(list, "安全周报", BusSafetyWeeklyReportVo.class, response);
+    public void export(HseSafetyWeeklyReportQueryReq req, HttpServletResponse response) {
+        List<HseSafetyWeeklyReportVo> list = busSafetyWeeklyReportService.queryList(req);
+        ExcelUtil.exportExcel(list, "安全周报", HseSafetyWeeklyReportVo.class, response);
     }
 
     /**
@@ -66,7 +66,7 @@ public class BusSafetyWeeklyReportController extends BaseController {
      */
     @SaCheckPermission("safety:safetyWeeklyReport:query")
     @GetMapping("/{id}")
-    public R<BusSafetyWeeklyReportVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<HseSafetyWeeklyReportVo> getInfo(@NotNull(message = "主键不能为空")
                                               @PathVariable Long id) {
         return R.ok(busSafetyWeeklyReportService.queryById(id));
     }
@@ -78,7 +78,7 @@ public class BusSafetyWeeklyReportController extends BaseController {
     @Log(title = "安全周报", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody SafetyWeeklyReportCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody HseSafetyWeeklyReportCreateReq req) {
         return R.ok(busSafetyWeeklyReportService.insertByBo(req));
     }
 
@@ -89,7 +89,7 @@ public class BusSafetyWeeklyReportController extends BaseController {
     @Log(title = "安全周报", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SafetyWeeklyReportUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody HseSafetyWeeklyReportUpdateReq req) {
         return toAjax(busSafetyWeeklyReportService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusTeamMeetingController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseTeamMeetingController.java
similarity index 74%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusTeamMeetingController.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseTeamMeetingController.java
index 32c3778f..a96f7143 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/BusTeamMeetingController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseTeamMeetingController.java
@@ -15,11 +15,11 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.safety.domain.req.teammeeting.TeamMeetingCreateReq;
-import org.dromara.safety.domain.req.teammeeting.TeamMeetingQueryReq;
-import org.dromara.safety.domain.req.teammeeting.TeamMeetingUpdateReq;
-import org.dromara.safety.domain.vo.teammeeting.BusTeamMeetingVo;
-import org.dromara.safety.service.IBusTeamMeetingService;
+import org.dromara.safety.domain.req.teammeeting.HseTeamMeetingCreateReq;
+import org.dromara.safety.domain.req.teammeeting.HseTeamMeetingQueryReq;
+import org.dromara.safety.domain.req.teammeeting.HseTeamMeetingUpdateReq;
+import org.dromara.safety.domain.vo.teammeeting.HseTeamMeetingVo;
+import org.dromara.safety.service.IHseTeamMeetingService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -35,16 +35,16 @@ import java.util.List;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/safety/teamMeeting")
-public class BusTeamMeetingController extends BaseController {
+public class HseTeamMeetingController extends BaseController {
 
-    private final IBusTeamMeetingService busTeamMeetingService;
+    private final IHseTeamMeetingService busTeamMeetingService;
 
     /**
      * 查询站班会列表
      */
     @SaCheckPermission("safety:teamMeeting:list")
     @GetMapping("/list")
-    public TableDataInfo<BusTeamMeetingVo> list(TeamMeetingQueryReq req, PageQuery pageQuery) {
+    public TableDataInfo<HseTeamMeetingVo> list(HseTeamMeetingQueryReq req, PageQuery pageQuery) {
         return busTeamMeetingService.queryPageList(req, pageQuery);
     }
 
@@ -54,9 +54,9 @@ public class BusTeamMeetingController extends BaseController {
     @SaCheckPermission("safety:teamMeeting:export")
     @Log(title = "站班会", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(TeamMeetingQueryReq req, HttpServletResponse response) {
-        List<BusTeamMeetingVo> list = busTeamMeetingService.queryList(req);
-        ExcelUtil.exportExcel(list, "站班会", BusTeamMeetingVo.class, response);
+    public void export(HseTeamMeetingQueryReq req, HttpServletResponse response) {
+        List<HseTeamMeetingVo> list = busTeamMeetingService.queryList(req);
+        ExcelUtil.exportExcel(list, "站班会", HseTeamMeetingVo.class, response);
     }
 
     /**
@@ -66,7 +66,7 @@ public class BusTeamMeetingController extends BaseController {
      */
     @SaCheckPermission("safety:teamMeeting:query")
     @GetMapping("/{id}")
-    public R<BusTeamMeetingVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<HseTeamMeetingVo> getInfo(@NotNull(message = "主键不能为空")
                                        @PathVariable Long id) {
         return R.ok(busTeamMeetingService.queryById(id));
     }
@@ -78,7 +78,7 @@ public class BusTeamMeetingController extends BaseController {
     @Log(title = "站班会", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody TeamMeetingCreateReq req) {
+    public R<Long> add(@Validated(AddGroup.class) @RequestBody HseTeamMeetingCreateReq req) {
         return R.ok(busTeamMeetingService.insertByBo(req));
     }
 
@@ -89,7 +89,7 @@ public class BusTeamMeetingController extends BaseController {
     @Log(title = "站班会", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TeamMeetingUpdateReq req) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody HseTeamMeetingUpdateReq req) {
         return toAjax(busTeamMeetingService.updateByBo(req));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusDocumentSafetyMeeting.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseDocumentSafetyMeeting.java
similarity index 89%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusDocumentSafetyMeeting.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseDocumentSafetyMeeting.java
index 7fa69ed8..8856bef4 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusDocumentSafetyMeeting.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseDocumentSafetyMeeting.java
@@ -10,15 +10,15 @@ import java.io.Serial;
 import java.util.Date;
 
 /**
- * 安全会议纪要对象 bus_document_safety_meeting
+ * 安全会议纪要对象 hse_document_safety_meeting
  *
  * @author lcj
  * @date 2025-04-14
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("bus_document_safety_meeting")
-public class BusDocumentSafetyMeeting extends BaseEntity {
+@TableName("hse_document_safety_meeting")
+public class HseDocumentSafetyMeeting extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusQuestionBank.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionBank.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusQuestionBank.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionBank.java
index 11c9a9a5..6eed4537 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusQuestionBank.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionBank.java
@@ -11,15 +11,15 @@ import java.io.Serial;
 import java.util.Date;
 
 /**
- * 题库对象 bus_question_bank
+ * 题库对象 hse_question_bank
  *
  * @author lcj
  * @date 2025-03-24
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("bus_question_bank")
-public class BusQuestionBank extends BaseEntity {
+@TableName("hse_question_bank")
+public class HseQuestionBank extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusQuestionUserAnswer.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionUserAnswer.java
similarity index 90%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusQuestionUserAnswer.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionUserAnswer.java
index ae73edf9..11579b8c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusQuestionUserAnswer.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionUserAnswer.java
@@ -11,15 +11,15 @@ import java.io.Serial;
 import java.util.Date;
 
 /**
- * 用户试卷存储对象 bus_question_user_answer
+ * 用户试卷存储对象 hse_question_user_answer
  *
  * @author lcj
  * @date 2025-03-24
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("bus_question_user_answer")
-public class BusQuestionUserAnswer extends BaseEntity {
+@TableName("hse_question_user_answer")
+public class HseQuestionUserAnswer extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusQuestionsCategory.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionsCategory.java
similarity index 83%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusQuestionsCategory.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionsCategory.java
index 7fb8295d..57bd1b4d 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusQuestionsCategory.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionsCategory.java
@@ -9,14 +9,14 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 题库类别对象 bus_questions_category
+ * 题库类别对象 hse_questions_category
  *
  * @author lcj
  * @date 2025-04-15
  */
 @Data
-@TableName("bus_questions_category")
-public class BusQuestionsCategory implements Serializable {
+@TableName("hse_questions_category")
+public class HseQuestionsCategory implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusQuestionsConfig.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionsConfig.java
similarity index 89%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusQuestionsConfig.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionsConfig.java
index ea1030b1..1b86e769 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusQuestionsConfig.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionsConfig.java
@@ -8,14 +8,14 @@ import java.io.Serial;
 import java.io.Serializable;
 
 /**
- * 题库配置对象 bus_questions_config
+ * 题库配置对象 hse_questions_config
  *
  * @author lcj
  * @date 2025-03-24
  */
 @Data
-@TableName("bus_questions_config")
-public class BusQuestionsConfig implements Serializable {
+@TableName("hse_questions_config")
+public class HseQuestionsConfig implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusSafetyInspection.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyInspection.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusSafetyInspection.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyInspection.java
index 2e38e0e4..15fca8a9 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusSafetyInspection.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyInspection.java
@@ -11,15 +11,15 @@ import java.io.Serial;
 import java.util.Date;
 
 /**
- * 安全巡检工单对象 bus_safety_inspection
+ * 安全巡检工单对象 hse_safety_inspection
  *
  * @author lcj
  * @date 2025-03-20
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("bus_safety_inspection")
-public class BusSafetyInspection extends BaseEntity {
+@TableName("hse_safety_inspection")
+public class HseSafetyInspection extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusSafetyLog.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyLog.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusSafetyLog.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyLog.java
index fee228a4..3ed66f6c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusSafetyLog.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyLog.java
@@ -11,15 +11,15 @@ import java.io.Serial;
 import java.util.Date;
 
 /**
- * 安全日志对象 bus_safety_log
+ * 安全日志对象 hse_safety_log
  *
  * @author lcj
  * @date 2025-03-20
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("bus_safety_log")
-public class BusSafetyLog extends BaseEntity {
+@TableName("hse_safety_log")
+public class HseSafetyLog extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusSafetyWeeklyReport.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyWeeklyReport.java
similarity index 88%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusSafetyWeeklyReport.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyWeeklyReport.java
index 275abd44..601c4746 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusSafetyWeeklyReport.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyWeeklyReport.java
@@ -11,15 +11,15 @@ import java.io.Serial;
 import java.util.Date;
 
 /**
- * 安全周报对象 bus_safety_weekly_report
+ * 安全周报对象 hse_safety_weekly_report
  *
  * @author lcj
  * @date 2025-03-20
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("bus_safety_weekly_report")
-public class BusSafetyWeeklyReport extends BaseEntity {
+@TableName("hse_safety_weekly_report")
+public class HseSafetyWeeklyReport extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusTeamMeeting.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseTeamMeeting.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusTeamMeeting.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseTeamMeeting.java
index eaec62a6..9f83b7a7 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/BusTeamMeeting.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseTeamMeeting.java
@@ -11,15 +11,15 @@ import java.io.Serial;
 import java.util.Date;
 
 /**
- * 站班会对象 bus_team_meeting
+ * 站班会对象 hse_team_meeting
  *
  * @author lcj
  * @date 2025-03-19
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("bus_team_meeting")
-public class BusTeamMeeting extends BaseEntity {
+@TableName("hse_team_meeting")
+public class HseTeamMeeting extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/DocumentStatusEnum.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/HseDocumentStatusEnum.java
similarity index 77%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/DocumentStatusEnum.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/HseDocumentStatusEnum.java
index 789f5e90..88c59bac 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/DocumentStatusEnum.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/HseDocumentStatusEnum.java
@@ -7,7 +7,7 @@ import lombok.Getter;
  * @date 2025/4/14 14:03
  */
 @Getter
-public enum DocumentStatusEnum {
+public enum HseDocumentStatusEnum {
 
     NORMAL("正常", "0"),
     DELETE("删除", "1");
@@ -16,7 +16,7 @@ public enum DocumentStatusEnum {
 
     private final String value;
 
-    DocumentStatusEnum(String text, String value) {
+    HseDocumentStatusEnum(String text, String value) {
         this.text = text;
         this.value = value;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/DocumentTypeEnum.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/HseDocumentTypeEnum.java
similarity index 79%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/DocumentTypeEnum.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/HseDocumentTypeEnum.java
index 36bd3a26..272a6074 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/DocumentTypeEnum.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/HseDocumentTypeEnum.java
@@ -7,7 +7,7 @@ import lombok.Getter;
  * @date 2025/4/14 10:42
  */
 @Getter
-public enum DocumentTypeEnum {
+public enum HseDocumentTypeEnum {
 
     FILE("文件", "1"),
     FOLDER("文件夹", "2"),
@@ -17,7 +17,7 @@ public enum DocumentTypeEnum {
 
     private final String value;
 
-    DocumentTypeEnum(String text, String value) {
+    HseDocumentTypeEnum(String text, String value) {
         this.text = text;
         this.value = value;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/SafetyExamTypeEnum.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/HseSafetyExamTypeEnum.java
similarity index 77%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/SafetyExamTypeEnum.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/HseSafetyExamTypeEnum.java
index a97ac879..ed8d8d01 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/SafetyExamTypeEnum.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/HseSafetyExamTypeEnum.java
@@ -7,7 +7,7 @@ import lombok.Getter;
  * @date 2025/4/15 14:56
  */
 @Getter
-public enum SafetyExamTypeEnum {
+public enum HseSafetyExamTypeEnum {
 
     ONLINE("线上考试", "1"),
     OFFLINE("线下考试", "2");
@@ -16,7 +16,7 @@ public enum SafetyExamTypeEnum {
 
     private final String value;
 
-    SafetyExamTypeEnum(String text, String value) {
+    HseSafetyExamTypeEnum(String text, String value) {
         this.text = text;
         this.value = value;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/SafetyInspectionReviewTypeEnum.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/HseSafetyInspectionReviewTypeEnum.java
similarity index 72%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/SafetyInspectionReviewTypeEnum.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/HseSafetyInspectionReviewTypeEnum.java
index 7131052a..b0102b77 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/SafetyInspectionReviewTypeEnum.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/HseSafetyInspectionReviewTypeEnum.java
@@ -7,7 +7,7 @@ import lombok.Getter;
  * @date 2025/4/28 15:49
  */
 @Getter
-public enum SafetyInspectionReviewTypeEnum {
+public enum HseSafetyInspectionReviewTypeEnum {
 
     PASS("通过", "1"),
     UNPASS("未通过", "2");
@@ -16,7 +16,7 @@ public enum SafetyInspectionReviewTypeEnum {
 
     private final String value;
 
-    SafetyInspectionReviewTypeEnum(String text, String value) {
+    HseSafetyInspectionReviewTypeEnum(String text, String value) {
         this.text = text;
         this.value = value;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/SafetyInspectionStatusEnum.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/HseSafetyInspectionStatusEnum.java
similarity index 76%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/SafetyInspectionStatusEnum.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/HseSafetyInspectionStatusEnum.java
index cd409086..8f138221 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/SafetyInspectionStatusEnum.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/enums/HseSafetyInspectionStatusEnum.java
@@ -7,7 +7,7 @@ import lombok.Getter;
  * @date 2025/4/28 15:47
  */
 @Getter
-public enum SafetyInspectionStatusEnum {
+public enum HseSafetyInspectionStatusEnum {
 
     INFORM("通知", "1"),
     RECTIFICATION("整改", "2"),
@@ -17,7 +17,7 @@ public enum SafetyInspectionStatusEnum {
 
     private final String value;
 
-    SafetyInspectionStatusEnum(String text, String value) {
+    HseSafetyInspectionStatusEnum(String text, String value) {
         this.text = text;
         this.value = value;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/DocumentSafetyMeetingCreateFileReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/HseDocumentSafetyMeetingCreateFileReq.java
similarity index 86%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/DocumentSafetyMeetingCreateFileReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/HseDocumentSafetyMeetingCreateFileReq.java
index aded134c..beb7aa74 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/DocumentSafetyMeetingCreateFileReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/HseDocumentSafetyMeetingCreateFileReq.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 2025/4/14 10:06
  */
 @Data
-public class DocumentSafetyMeetingCreateFileReq implements Serializable {
+public class HseDocumentSafetyMeetingCreateFileReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -4889729533450017719L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/DocumentSafetyMeetingCreateFolderReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/HseDocumentSafetyMeetingCreateFolderReq.java
similarity index 89%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/DocumentSafetyMeetingCreateFolderReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/HseDocumentSafetyMeetingCreateFolderReq.java
index f63bfe6d..f35dd5df 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/DocumentSafetyMeetingCreateFolderReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/HseDocumentSafetyMeetingCreateFolderReq.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 2025/4/14 10:06
  */
 @Data
-public class DocumentSafetyMeetingCreateFolderReq implements Serializable {
+public class HseDocumentSafetyMeetingCreateFolderReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 486922166637112952L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/DocumentSafetyMeetingQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/HseDocumentSafetyMeetingQueryReq.java
similarity index 89%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/DocumentSafetyMeetingQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/HseDocumentSafetyMeetingQueryReq.java
index 1c1f1b63..5942f75c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/DocumentSafetyMeetingQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/HseDocumentSafetyMeetingQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/14 10:04
  */
 @Data
-public class DocumentSafetyMeetingQueryReq implements Serializable {
+public class HseDocumentSafetyMeetingQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -5290567924829663119L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/QuestionBankCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/HseQuestionBankCreateReq.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/QuestionBankCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/HseQuestionBankCreateReq.java
index 040ef534..b3d29585 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/QuestionBankCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/HseQuestionBankCreateReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/3/24 17:32
  */
 @Data
-public class QuestionBankCreateReq implements Serializable {
+public class HseQuestionBankCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 9014952417764490638L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/QuestionBankQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/HseQuestionBankQueryReq.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/QuestionBankQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/HseQuestionBankQueryReq.java
index 33fc8cdb..bbe51818 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/QuestionBankQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/HseQuestionBankQueryReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/3/24 17:33
  */
 @Data
-public class QuestionBankQueryReq implements Serializable {
+public class HseQuestionBankQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -8924454189341614745L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/QuestionBankUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/HseQuestionBankUpdateReq.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/QuestionBankUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/HseQuestionBankUpdateReq.java
index dd87a5e7..758cf112 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/QuestionBankUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/HseQuestionBankUpdateReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/3/24 17:33
  */
 @Data
-public class QuestionBankUpdateReq implements Serializable {
+public class HseQuestionBankUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 4537637385171186219L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/QuestionsCategoryCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/HseQuestionsCategoryCreateReq.java
similarity index 85%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/QuestionsCategoryCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/HseQuestionsCategoryCreateReq.java
index cf82b77f..6a34c16a 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/QuestionsCategoryCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/HseQuestionsCategoryCreateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/15 9:39
  */
 @Data
-public class QuestionsCategoryCreateReq implements Serializable {
+public class HseQuestionsCategoryCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -3517465472029929723L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/QuestionsCategoryQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/HseQuestionsCategoryQueryReq.java
similarity index 85%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/QuestionsCategoryQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/HseQuestionsCategoryQueryReq.java
index 467ec485..af023ce8 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/QuestionsCategoryQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/HseQuestionsCategoryQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/15 9:39
  */
 @Data
-public class QuestionsCategoryQueryReq implements Serializable {
+public class HseQuestionsCategoryQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 8543449238477998979L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/QuestionsCategoryUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/HseQuestionsCategoryUpdateReq.java
similarity index 86%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/QuestionsCategoryUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/HseQuestionsCategoryUpdateReq.java
index 542698e2..1585c421 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/QuestionsCategoryUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/HseQuestionsCategoryUpdateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/4/15 9:39
  */
 @Data
-public class QuestionsCategoryUpdateReq implements Serializable {
+public class HseQuestionsCategoryUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -6588543841396112020L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/QuestionsConfigCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/HseQuestionsConfigCreateReq.java
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/QuestionsConfigCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/HseQuestionsConfigCreateReq.java
index 71632dd8..d0f9e800 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/QuestionsConfigCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/HseQuestionsConfigCreateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/24 17:34
  */
 @Data
-public class QuestionsConfigCreateReq implements Serializable {
+public class HseQuestionsConfigCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -6430325731025840429L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/QuestionsConfigQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/HseQuestionsConfigQueryReq.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/QuestionsConfigQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/HseQuestionsConfigQueryReq.java
index f5ec4996..fd2dca58 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/QuestionsConfigQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/HseQuestionsConfigQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/24 17:34
  */
 @Data
-public class QuestionsConfigQueryReq implements Serializable {
+public class HseQuestionsConfigQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 8187034953273515023L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/QuestionsConfigUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/HseQuestionsConfigUpdateReq.java
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/QuestionsConfigUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/HseQuestionsConfigUpdateReq.java
index 143a726d..65ee19b5 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/QuestionsConfigUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/HseQuestionsConfigUpdateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/24 17:34
  */
 @Data
-public class QuestionsConfigUpdateReq implements Serializable {
+public class HseQuestionsConfigUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 6861554491377407420L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/QuestionUserAnswerBatchDownloadFileReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerBatchDownloadFileReq.java
similarity index 81%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/QuestionUserAnswerBatchDownloadFileReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerBatchDownloadFileReq.java
index 974be4b2..df2899bd 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/QuestionUserAnswerBatchDownloadFileReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerBatchDownloadFileReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/4/15 16:35
  */
 @Data
-public class QuestionUserAnswerBatchDownloadFileReq implements Serializable {
+public class HseQuestionUserAnswerBatchDownloadFileReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 5011807834768249135L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/QuestionUserAnswerCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerCreateReq.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/QuestionUserAnswerCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerCreateReq.java
index 6ba7353e..afbb1d6e 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/QuestionUserAnswerCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerCreateReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/3/24 17:35
  */
 @Data
-public class QuestionUserAnswerCreateReq implements Serializable {
+public class HseQuestionUserAnswerCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -8893028317840090277L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/QuestionUserAnswerQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerQueryReq.java
similarity index 86%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/QuestionUserAnswerQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerQueryReq.java
index 463e0768..9e5a0344 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/QuestionUserAnswerQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/24 17:35
  */
 @Data
-public class QuestionUserAnswerQueryReq implements Serializable {
+public class HseQuestionUserAnswerQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -7056242109124074218L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/QuestionUserAnswerUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerUpdateReq.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/QuestionUserAnswerUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerUpdateReq.java
index 5e4a32bb..a5e73f08 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/QuestionUserAnswerUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerUpdateReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/3/24 17:35
  */
 @Data
-public class QuestionUserAnswerUpdateReq implements Serializable {
+public class HseQuestionUserAnswerUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -588982799152215348L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/QuestionUserAnswerUploadTemp.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerUploadTemp.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/QuestionUserAnswerUploadTemp.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerUploadTemp.java
index 336b5c3b..0f415e01 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/QuestionUserAnswerUploadTemp.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerUploadTemp.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * @date 2025/4/15 14:34
  */
 @Data
-public class QuestionUserAnswerUploadTemp {
+public class HseQuestionUserAnswerUploadTemp {
 
     /**
      * 项目id
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/SafetyInspectionCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionCreateReq.java
similarity index 96%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/SafetyInspectionCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionCreateReq.java
index 7bf0181f..deaebf9f 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/SafetyInspectionCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionCreateReq.java
@@ -12,7 +12,7 @@ import java.util.Date;
  * @date 2025/3/19 11:00
  */
 @Data
-public class SafetyInspectionCreateReq implements Serializable {
+public class HseSafetyInspectionCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 5355703238184894846L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/SafetyInspectionGisReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionGisReq.java
similarity index 88%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/SafetyInspectionGisReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionGisReq.java
index 078aefed..6ad79288 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/SafetyInspectionGisReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionGisReq.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 2025/4/28 15:31
  */
 @Data
-public class SafetyInspectionGisReq implements Serializable {
+public class HseSafetyInspectionGisReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 873967698184867248L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/SafetyInspectionQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionQueryReq.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/SafetyInspectionQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionQueryReq.java
index c4c60bd2..dc32b2c6 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/SafetyInspectionQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/19 11:01
  */
 @Data
-public class SafetyInspectionQueryReq implements Serializable {
+public class HseSafetyInspectionQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 8880866939746311233L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/SafetyInspectionUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionUpdateReq.java
similarity index 96%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/SafetyInspectionUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionUpdateReq.java
index e2a4af40..f5549215 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/SafetyInspectionUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionUpdateReq.java
@@ -12,7 +12,7 @@ import java.util.Date;
  * @date 2025/3/19 11:01
  */
 @Data
-public class SafetyInspectionUpdateReq implements Serializable {
+public class HseSafetyInspectionUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -5443601902997524139L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/SafetyLogCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/HseSafetyLogCreateReq.java
similarity index 95%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/SafetyLogCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/HseSafetyLogCreateReq.java
index 9370f339..3dc89854 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/SafetyLogCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/HseSafetyLogCreateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/20 14:40
  */
 @Data
-public class SafetyLogCreateReq implements Serializable {
+public class HseSafetyLogCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 7902209238488203624L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/SafetyLogQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/HseSafetyLogQueryReq.java
similarity index 89%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/SafetyLogQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/HseSafetyLogQueryReq.java
index 4440a6ca..84666dea 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/SafetyLogQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/HseSafetyLogQueryReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/20 14:40
  */
 @Data
-public class SafetyLogQueryReq implements Serializable {
+public class HseSafetyLogQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 2954315254418593105L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/SafetyLogUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/HseSafetyLogUpdateReq.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/SafetyLogUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/HseSafetyLogUpdateReq.java
index 119f6795..0dacf33f 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/SafetyLogUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/HseSafetyLogUpdateReq.java
@@ -4,14 +4,13 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @author lcj
  * @date 2025/3/20 14:40
  */
 @Data
-public class SafetyLogUpdateReq implements Serializable {
+public class HseSafetyLogUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 8109768478468736455L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/SafetyWeeklyReportCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/HseSafetyWeeklyReportCreateReq.java
similarity index 90%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/SafetyWeeklyReportCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/HseSafetyWeeklyReportCreateReq.java
index afc0b52f..f6a63dec 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/SafetyWeeklyReportCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/HseSafetyWeeklyReportCreateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/20 15:18
  */
 @Data
-public class SafetyWeeklyReportCreateReq implements Serializable {
+public class HseSafetyWeeklyReportCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -5473182951365487135L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/SafetyWeeklyReportQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/HseSafetyWeeklyReportQueryReq.java
similarity index 89%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/SafetyWeeklyReportQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/HseSafetyWeeklyReportQueryReq.java
index 6bb2657c..24987de7 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/SafetyWeeklyReportQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/HseSafetyWeeklyReportQueryReq.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025/3/20 15:18
  */
 @Data
-public class SafetyWeeklyReportQueryReq implements Serializable {
+public class HseSafetyWeeklyReportQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -6673067596591751334L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/SafetyWeeklyReportUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/HseSafetyWeeklyReportUpdateReq.java
similarity index 90%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/SafetyWeeklyReportUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/HseSafetyWeeklyReportUpdateReq.java
index cc75a64e..0b92f78d 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/SafetyWeeklyReportUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/HseSafetyWeeklyReportUpdateReq.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @date 2025/3/20 15:18
  */
 @Data
-public class SafetyWeeklyReportUpdateReq implements Serializable {
+public class HseSafetyWeeklyReportUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -2130234917426422988L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/TeamMeetingCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/HseTeamMeetingCreateReq.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/TeamMeetingCreateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/HseTeamMeetingCreateReq.java
index 6759ac9a..36164c52 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/TeamMeetingCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/HseTeamMeetingCreateReq.java
@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2025/3/19 11:00
  */
 @Data
-public class TeamMeetingCreateReq implements Serializable {
+public class HseTeamMeetingCreateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 5355703238184894846L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/TeamMeetingQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/HseTeamMeetingQueryReq.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/TeamMeetingQueryReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/HseTeamMeetingQueryReq.java
index 2e166594..5ef0684e 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/TeamMeetingQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/HseTeamMeetingQueryReq.java
@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2025/3/19 11:01
  */
 @Data
-public class TeamMeetingQueryReq implements Serializable {
+public class HseTeamMeetingQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 8880866939746311233L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/TeamMeetingUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/HseTeamMeetingUpdateReq.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/TeamMeetingUpdateReq.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/HseTeamMeetingUpdateReq.java
index dedaefe8..d34091a9 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/TeamMeetingUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/HseTeamMeetingUpdateReq.java
@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2025/3/19 11:01
  */
 @Data
-public class TeamMeetingUpdateReq implements Serializable {
+public class HseTeamMeetingUpdateReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -5443601902997524139L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/documentsafetymeeting/DocumentSafetyMeetingRecycleBinVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/documentsafetymeeting/HseDocumentSafetyMeetingRecycleBinVo.java
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/documentsafetymeeting/DocumentSafetyMeetingRecycleBinVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/documentsafetymeeting/HseDocumentSafetyMeetingRecycleBinVo.java
index 14feb3df..19002e79 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/documentsafetymeeting/DocumentSafetyMeetingRecycleBinVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/documentsafetymeeting/HseDocumentSafetyMeetingRecycleBinVo.java
@@ -11,7 +11,7 @@ import java.util.Date;
  * @date 2025/4/14 17:44
  */
 @Data
-public class DocumentSafetyMeetingRecycleBinVo implements Serializable {
+public class HseDocumentSafetyMeetingRecycleBinVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1302984678621164410L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/documentsafetymeeting/BusDocumentSafetyMeetingVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/documentsafetymeeting/HseDocumentSafetyMeetingVo.java
similarity index 80%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/documentsafetymeeting/BusDocumentSafetyMeetingVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/documentsafetymeeting/HseDocumentSafetyMeetingVo.java
index d74eaba0..fdc473c9 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/documentsafetymeeting/BusDocumentSafetyMeetingVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/documentsafetymeeting/HseDocumentSafetyMeetingVo.java
@@ -2,21 +2,21 @@ package org.dromara.safety.domain.vo.documentsafetymeeting;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.safety.domain.BusDocumentSafetyMeeting;
+import org.dromara.safety.domain.HseDocumentSafetyMeeting;
 
 import java.io.Serial;
 import java.io.Serializable;
 
 
 /**
- * 安全会议纪要视图对象 bus_document_safety_meeting
+ * 安全会议纪要视图对象 hse_document_safety_meeting
  *
  * @author lcj
  * @date 2025-04-14
  */
 @Data
-@AutoMapper(target = BusDocumentSafetyMeeting.class)
-public class BusDocumentSafetyMeetingVo implements Serializable {
+@AutoMapper(target = HseDocumentSafetyMeeting.class)
+public class HseDocumentSafetyMeetingVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusQuestionBankVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/questionbank/HseQuestionBankVo.java
similarity index 86%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusQuestionBankVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/questionbank/HseQuestionBankVo.java
index a72757a0..662d2f05 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusQuestionBankVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/questionbank/HseQuestionBankVo.java
@@ -1,4 +1,4 @@
-package org.dromara.safety.domain.vo;
+package org.dromara.safety.domain.vo.questionbank;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -6,7 +6,7 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
-import org.dromara.safety.domain.BusQuestionBank;
+import org.dromara.safety.domain.HseQuestionBank;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -15,15 +15,15 @@ import java.util.List;
 
 
 /**
- * 题库视图对象 bus_question_bank
+ * 题库视图对象 hse_question_bank
  *
  * @author lcj
  * @date 2025-03-24
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = BusQuestionBank.class)
-public class BusQuestionBankVo implements Serializable {
+@AutoMapper(target = HseQuestionBank.class)
+public class HseQuestionBankVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusQuestionsCategoryVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/questionscategory/HseQuestionsCategoryVo.java
similarity index 68%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusQuestionsCategoryVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/questionscategory/HseQuestionsCategoryVo.java
index 42a57869..f39023ee 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusQuestionsCategoryVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/questionscategory/HseQuestionsCategoryVo.java
@@ -1,25 +1,25 @@
-package org.dromara.safety.domain.vo;
+package org.dromara.safety.domain.vo.questionscategory;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.safety.domain.BusQuestionsCategory;
+import org.dromara.safety.domain.HseQuestionsCategory;
 
 import java.io.Serial;
 import java.io.Serializable;
 
 
 /**
- * 题库类别视图对象 bus_questions_category
+ * 题库类别视图对象 hse_questions_category
  *
  * @author lcj
  * @date 2025-04-15
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = BusQuestionsCategory.class)
-public class BusQuestionsCategoryVo implements Serializable {
+@AutoMapper(target = HseQuestionsCategory.class)
+public class HseQuestionsCategoryVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusQuestionsConfigVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/questionsconfig/HseQuestionsConfigVo.java
similarity index 85%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusQuestionsConfigVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/questionsconfig/HseQuestionsConfigVo.java
index d03a4122..bf744855 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusQuestionsConfigVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/questionsconfig/HseQuestionsConfigVo.java
@@ -1,25 +1,25 @@
-package org.dromara.safety.domain.vo;
+package org.dromara.safety.domain.vo.questionsconfig;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.safety.domain.BusQuestionsConfig;
+import org.dromara.safety.domain.HseQuestionsConfig;
 
 import java.io.Serial;
 import java.io.Serializable;
 
 
 /**
- * 题库配置视图对象 bus_questions_config
+ * 题库配置视图对象 hse_questions_config
  *
  * @author lcj
  * @date 2025-03-24
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = BusQuestionsConfig.class)
-public class BusQuestionsConfigVo implements Serializable {
+@AutoMapper(target = HseQuestionsConfig.class)
+public class HseQuestionsConfigVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusQuestionUserAnswerVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/questionuseranswer/HseQuestionUserAnswerVo.java
similarity index 87%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusQuestionUserAnswerVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/questionuseranswer/HseQuestionUserAnswerVo.java
index c7f81776..a1957653 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusQuestionUserAnswerVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/questionuseranswer/HseQuestionUserAnswerVo.java
@@ -1,4 +1,4 @@
-package org.dromara.safety.domain.vo;
+package org.dromara.safety.domain.vo.questionuseranswer;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -6,7 +6,7 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
-import org.dromara.safety.domain.BusQuestionUserAnswer;
+import org.dromara.safety.domain.HseQuestionUserAnswer;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -15,15 +15,15 @@ import java.util.List;
 
 
 /**
- * 用户试卷存储视图对象 bus_question_user_answer
+ * 用户试卷存储视图对象 hse_question_user_answer
  *
  * @author lcj
  * @date 2025-03-24
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = BusQuestionUserAnswer.class)
-public class BusQuestionUserAnswerVo implements Serializable {
+@AutoMapper(target = HseQuestionUserAnswer.class)
+public class HseQuestionUserAnswerVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyinspection/SafetyInspectionListGisVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyinspection/HseSafetyInspectionListGisVo.java
similarity index 75%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyinspection/SafetyInspectionListGisVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyinspection/HseSafetyInspectionListGisVo.java
index 27c4122e..6da042ff 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyinspection/SafetyInspectionListGisVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyinspection/HseSafetyInspectionListGisVo.java
@@ -1,7 +1,7 @@
 package org.dromara.safety.domain.vo.safetyinspection;
 
 import lombok.Data;
-import org.dromara.safety.domain.vo.teammeeting.TeamMeetingGis;
+import org.dromara.safety.domain.vo.teammeeting.HseTeamMeetingGis;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -12,7 +12,7 @@ import java.util.List;
  * @date 2025/4/28 15:26
  */
 @Data
-public class SafetyInspectionListGisVo implements Serializable {
+public class HseSafetyInspectionListGisVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -8788573264526273230L;
@@ -20,7 +20,7 @@ public class SafetyInspectionListGisVo implements Serializable {
     /**
      * 站班会列表
      */
-    private List<TeamMeetingGis> teamMeetingList;
+    private List<HseTeamMeetingGis> teamMeetingList;
 
     /**
      * 站班会总数
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyinspection/BusSafetyInspectionVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyinspection/HseSafetyInspectionVo.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyinspection/BusSafetyInspectionVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyinspection/HseSafetyInspectionVo.java
index 59a97802..ca484497 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyinspection/BusSafetyInspectionVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyinspection/HseSafetyInspectionVo.java
@@ -6,7 +6,7 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
-import org.dromara.safety.domain.BusSafetyInspection;
+import org.dromara.safety.domain.HseSafetyInspection;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -14,15 +14,15 @@ import java.util.Date;
 
 
 /**
- * 安全巡检工单视图对象 bus_safety_inspection
+ * 安全巡检工单视图对象 hse_safety_inspection
  *
  * @author lcj
  * @date 2025-03-20
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = BusSafetyInspection.class)
-public class BusSafetyInspectionVo implements Serializable {
+@AutoMapper(target = HseSafetyInspection.class)
+public class HseSafetyInspectionVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusSafetyLogVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetylog/HseSafetyLogVo.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusSafetyLogVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetylog/HseSafetyLogVo.java
index 642d21c4..32f3f078 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusSafetyLogVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetylog/HseSafetyLogVo.java
@@ -1,4 +1,4 @@
-package org.dromara.safety.domain.vo;
+package org.dromara.safety.domain.vo.safetylog;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -7,24 +7,23 @@ import lombok.Data;
 import org.dromara.common.core.domain.vo.IdAndNameVO;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
-import org.dromara.safety.domain.BusSafetyLog;
+import org.dromara.safety.domain.HseSafetyLog;
 
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 
 
 /**
- * 安全日志视图对象 bus_safety_log
+ * 安全日志视图对象 hse_safety_log
  *
  * @author lcj
  * @date 2025-03-20
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = BusSafetyLog.class)
-public class BusSafetyLogVo implements Serializable {
+@AutoMapper(target = HseSafetyLog.class)
+public class HseSafetyLogVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusSafetyWeeklyReportVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyweeklyreport/HseSafetyWeeklyReportVo.java
similarity index 81%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusSafetyWeeklyReportVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyweeklyreport/HseSafetyWeeklyReportVo.java
index 25a6e535..591ffd8d 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusSafetyWeeklyReportVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyweeklyreport/HseSafetyWeeklyReportVo.java
@@ -1,10 +1,10 @@
-package org.dromara.safety.domain.vo;
+package org.dromara.safety.domain.vo.safetyweeklyreport;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.safety.domain.BusSafetyWeeklyReport;
+import org.dromara.safety.domain.HseSafetyWeeklyReport;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -12,15 +12,15 @@ import java.util.Date;
 
 
 /**
- * 安全周报视图对象 bus_safety_weekly_report
+ * 安全周报视图对象 hse_safety_weekly_report
  *
  * @author lcj
  * @date 2025-03-20
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = BusSafetyWeeklyReport.class)
-public class BusSafetyWeeklyReportVo implements Serializable {
+@AutoMapper(target = HseSafetyWeeklyReport.class)
+public class HseSafetyWeeklyReportVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/teammeeting/TeamMeetingGis.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/teammeeting/HseTeamMeetingGis.java
similarity index 72%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/teammeeting/TeamMeetingGis.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/teammeeting/HseTeamMeetingGis.java
index a0990c37..305dce76 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/teammeeting/TeamMeetingGis.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/teammeeting/HseTeamMeetingGis.java
@@ -1,5 +1,6 @@
 package org.dromara.safety.domain.vo.teammeeting;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -13,7 +14,7 @@ import java.util.Date;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class TeamMeetingGis {
+public class HseTeamMeetingGis {
 
     /**
      * 主键id
@@ -33,6 +34,9 @@ public class TeamMeetingGis {
     /**
      * 开会时间
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING,
+        pattern = "yyyy-MM-dd",
+        timezone = "GMT+8")
     private Date meetingDate;
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/teammeeting/BusTeamMeetingVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/teammeeting/HseTeamMeetingVo.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/teammeeting/BusTeamMeetingVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/teammeeting/HseTeamMeetingVo.java
index ad8df1b3..cd8df6ad 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/teammeeting/BusTeamMeetingVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/teammeeting/HseTeamMeetingVo.java
@@ -7,7 +7,7 @@ import lombok.Data;
 import org.dromara.common.core.domain.vo.IdAndNameVO;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
-import org.dromara.safety.domain.BusTeamMeeting;
+import org.dromara.safety.domain.HseTeamMeeting;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -16,15 +16,15 @@ import java.util.List;
 
 
 /**
- * 站班会视图对象 bus_team_meeting
+ * 站班会视图对象 hse_team_meeting
  *
  * @author lcj
  * @date 2025-03-19
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = BusTeamMeeting.class)
-public class BusTeamMeetingVo implements Serializable {
+@AutoMapper(target = HseTeamMeeting.class)
+public class HseTeamMeetingVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusDocumentSafetyMeetingMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusDocumentSafetyMeetingMapper.java
deleted file mode 100644
index a81f7bd5..00000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusDocumentSafetyMeetingMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.dromara.safety.mapper;
-
-import org.dromara.safety.domain.BusDocumentSafetyMeeting;
-import org.dromara.safety.domain.vo.documentsafetymeeting.BusDocumentSafetyMeetingVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-
-/**
- * 安全会议纪要Mapper接口
- *
- * @author lcj
- * @date 2025-04-14
- */
-public interface BusDocumentSafetyMeetingMapper extends BaseMapperPlus<BusDocumentSafetyMeeting, BusDocumentSafetyMeetingVo> {
-
-}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusQuestionBankMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusQuestionBankMapper.java
deleted file mode 100644
index 643ce6c8..00000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusQuestionBankMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.dromara.safety.mapper;
-
-import org.dromara.safety.domain.BusQuestionBank;
-import org.dromara.safety.domain.vo.BusQuestionBankVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-
-/**
- * 题库Mapper接口
- *
- * @author lcj
- * @date 2025-03-24
- */
-public interface BusQuestionBankMapper extends BaseMapperPlus<BusQuestionBank, BusQuestionBankVo> {
-
-}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusQuestionUserAnswerMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusQuestionUserAnswerMapper.java
deleted file mode 100644
index 612fe4fb..00000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusQuestionUserAnswerMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.dromara.safety.mapper;
-
-import org.dromara.safety.domain.BusQuestionUserAnswer;
-import org.dromara.safety.domain.vo.BusQuestionUserAnswerVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-
-/**
- * 用户试卷存储Mapper接口
- *
- * @author lcj
- * @date 2025-03-24
- */
-public interface BusQuestionUserAnswerMapper extends BaseMapperPlus<BusQuestionUserAnswer, BusQuestionUserAnswerVo> {
-
-}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusQuestionsCategoryMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusQuestionsCategoryMapper.java
deleted file mode 100644
index 8b20d54e..00000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusQuestionsCategoryMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.dromara.safety.mapper;
-
-import org.dromara.safety.domain.BusQuestionsCategory;
-import org.dromara.safety.domain.vo.BusQuestionsCategoryVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-
-/**
- * 题库类别Mapper接口
- *
- * @author lcj
- * @date 2025-04-15
- */
-public interface BusQuestionsCategoryMapper extends BaseMapperPlus<BusQuestionsCategory, BusQuestionsCategoryVo> {
-
-}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusQuestionsConfigMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusQuestionsConfigMapper.java
deleted file mode 100644
index a6592046..00000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusQuestionsConfigMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.dromara.safety.mapper;
-
-import org.dromara.safety.domain.BusQuestionsConfig;
-import org.dromara.safety.domain.vo.BusQuestionsConfigVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-
-/**
- * 题库配置Mapper接口
- *
- * @author lcj
- * @date 2025-03-24
- */
-public interface BusQuestionsConfigMapper extends BaseMapperPlus<BusQuestionsConfig, BusQuestionsConfigVo> {
-
-}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusSafetyInspectionMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusSafetyInspectionMapper.java
deleted file mode 100644
index 9d237633..00000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusSafetyInspectionMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.dromara.safety.mapper;
-
-import org.dromara.safety.domain.BusSafetyInspection;
-import org.dromara.safety.domain.vo.safetyinspection.BusSafetyInspectionVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-
-/**
- * 安全巡检工单Mapper接口
- *
- * @author lcj
- * @date 2025-03-20
- */
-public interface BusSafetyInspectionMapper extends BaseMapperPlus<BusSafetyInspection, BusSafetyInspectionVo> {
-
-}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusSafetyLogMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusSafetyLogMapper.java
deleted file mode 100644
index 83262dfa..00000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusSafetyLogMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.dromara.safety.mapper;
-
-import org.dromara.safety.domain.BusSafetyLog;
-import org.dromara.safety.domain.vo.BusSafetyLogVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-
-/**
- * 安全日志Mapper接口
- *
- * @author lcj
- * @date 2025-03-20
- */
-public interface BusSafetyLogMapper extends BaseMapperPlus<BusSafetyLog, BusSafetyLogVo> {
-
-}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusSafetyWeeklyReportMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusSafetyWeeklyReportMapper.java
deleted file mode 100644
index 9f96cdb6..00000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusSafetyWeeklyReportMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.dromara.safety.mapper;
-
-import org.dromara.safety.domain.BusSafetyWeeklyReport;
-import org.dromara.safety.domain.vo.BusSafetyWeeklyReportVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-
-/**
- * 安全周报Mapper接口
- *
- * @author lcj
- * @date 2025-03-20
- */
-public interface BusSafetyWeeklyReportMapper extends BaseMapperPlus<BusSafetyWeeklyReport, BusSafetyWeeklyReportVo> {
-
-}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusTeamMeetingMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusTeamMeetingMapper.java
deleted file mode 100644
index 750e7abb..00000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/BusTeamMeetingMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.dromara.safety.mapper;
-
-import org.dromara.safety.domain.BusTeamMeeting;
-import org.dromara.safety.domain.vo.teammeeting.BusTeamMeetingVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-
-/**
- * 站班会Mapper接口
- *
- * @author lcj
- * @date 2025-03-19
- */
-public interface BusTeamMeetingMapper extends BaseMapperPlus<BusTeamMeeting, BusTeamMeetingVo> {
-
-}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseDocumentSafetyMeetingMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseDocumentSafetyMeetingMapper.java
new file mode 100644
index 00000000..04399d79
--- /dev/null
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseDocumentSafetyMeetingMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.safety.mapper;
+
+import org.dromara.safety.domain.HseDocumentSafetyMeeting;
+import org.dromara.safety.domain.vo.documentsafetymeeting.HseDocumentSafetyMeetingVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 安全会议纪要Mapper接口
+ *
+ * @author lcj
+ * @date 2025-04-14
+ */
+public interface HseDocumentSafetyMeetingMapper extends BaseMapperPlus<HseDocumentSafetyMeeting, HseDocumentSafetyMeetingVo> {
+
+}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseQuestionBankMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseQuestionBankMapper.java
new file mode 100644
index 00000000..2ddc589b
--- /dev/null
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseQuestionBankMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.safety.mapper;
+
+import org.dromara.safety.domain.HseQuestionBank;
+import org.dromara.safety.domain.vo.questionbank.HseQuestionBankVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 题库Mapper接口
+ *
+ * @author lcj
+ * @date 2025-03-24
+ */
+public interface HseQuestionBankMapper extends BaseMapperPlus<HseQuestionBank, HseQuestionBankVo> {
+
+}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseQuestionUserAnswerMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseQuestionUserAnswerMapper.java
new file mode 100644
index 00000000..cb0278fd
--- /dev/null
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseQuestionUserAnswerMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.safety.mapper;
+
+import org.dromara.safety.domain.HseQuestionUserAnswer;
+import org.dromara.safety.domain.vo.questionuseranswer.HseQuestionUserAnswerVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 用户试卷存储Mapper接口
+ *
+ * @author lcj
+ * @date 2025-03-24
+ */
+public interface HseQuestionUserAnswerMapper extends BaseMapperPlus<HseQuestionUserAnswer, HseQuestionUserAnswerVo> {
+
+}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseQuestionsCategoryMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseQuestionsCategoryMapper.java
new file mode 100644
index 00000000..a4bf3345
--- /dev/null
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseQuestionsCategoryMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.safety.mapper;
+
+import org.dromara.safety.domain.HseQuestionsCategory;
+import org.dromara.safety.domain.vo.questionscategory.HseQuestionsCategoryVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 题库类别Mapper接口
+ *
+ * @author lcj
+ * @date 2025-04-15
+ */
+public interface HseQuestionsCategoryMapper extends BaseMapperPlus<HseQuestionsCategory, HseQuestionsCategoryVo> {
+
+}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseQuestionsConfigMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseQuestionsConfigMapper.java
new file mode 100644
index 00000000..71881751
--- /dev/null
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseQuestionsConfigMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.safety.mapper;
+
+import org.dromara.safety.domain.HseQuestionsConfig;
+import org.dromara.safety.domain.vo.questionsconfig.HseQuestionsConfigVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 题库配置Mapper接口
+ *
+ * @author lcj
+ * @date 2025-03-24
+ */
+public interface HseQuestionsConfigMapper extends BaseMapperPlus<HseQuestionsConfig, HseQuestionsConfigVo> {
+
+}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseSafetyInspectionMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseSafetyInspectionMapper.java
new file mode 100644
index 00000000..ea3c8f25
--- /dev/null
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseSafetyInspectionMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.safety.mapper;
+
+import org.dromara.safety.domain.HseSafetyInspection;
+import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 安全巡检工单Mapper接口
+ *
+ * @author lcj
+ * @date 2025-03-20
+ */
+public interface HseSafetyInspectionMapper extends BaseMapperPlus<HseSafetyInspection, HseSafetyInspectionVo> {
+
+}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseSafetyLogMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseSafetyLogMapper.java
new file mode 100644
index 00000000..59298a87
--- /dev/null
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseSafetyLogMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.safety.mapper;
+
+import org.dromara.safety.domain.HseSafetyLog;
+import org.dromara.safety.domain.vo.safetylog.HseSafetyLogVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 安全日志Mapper接口
+ *
+ * @author lcj
+ * @date 2025-03-20
+ */
+public interface HseSafetyLogMapper extends BaseMapperPlus<HseSafetyLog, HseSafetyLogVo> {
+
+}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseSafetyWeeklyReportMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseSafetyWeeklyReportMapper.java
new file mode 100644
index 00000000..c9731d65
--- /dev/null
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseSafetyWeeklyReportMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.safety.mapper;
+
+import org.dromara.safety.domain.HseSafetyWeeklyReport;
+import org.dromara.safety.domain.vo.safetyweeklyreport.HseSafetyWeeklyReportVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 安全周报Mapper接口
+ *
+ * @author lcj
+ * @date 2025-03-20
+ */
+public interface HseSafetyWeeklyReportMapper extends BaseMapperPlus<HseSafetyWeeklyReport, HseSafetyWeeklyReportVo> {
+
+}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseTeamMeetingMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseTeamMeetingMapper.java
new file mode 100644
index 00000000..d7264ae3
--- /dev/null
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseTeamMeetingMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.safety.mapper;
+
+import org.dromara.safety.domain.HseTeamMeeting;
+import org.dromara.safety.domain.vo.teammeeting.HseTeamMeetingVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 站班会Mapper接口
+ *
+ * @author lcj
+ * @date 2025-03-19
+ */
+public interface HseTeamMeetingMapper extends BaseMapperPlus<HseTeamMeeting, HseTeamMeetingVo> {
+
+}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusDocumentSafetyMeetingService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseDocumentSafetyMeetingService.java
similarity index 68%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusDocumentSafetyMeetingService.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseDocumentSafetyMeetingService.java
index 66b829ea..92590bcc 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusDocumentSafetyMeetingService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseDocumentSafetyMeetingService.java
@@ -5,12 +5,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.safety.domain.BusDocumentSafetyMeeting;
-import org.dromara.safety.domain.req.documentsafetymeeting.DocumentSafetyMeetingCreateFileReq;
-import org.dromara.safety.domain.req.documentsafetymeeting.DocumentSafetyMeetingCreateFolderReq;
-import org.dromara.safety.domain.req.documentsafetymeeting.DocumentSafetyMeetingQueryReq;
-import org.dromara.safety.domain.vo.documentsafetymeeting.DocumentSafetyMeetingRecycleBinVo;
-import org.dromara.safety.domain.vo.documentsafetymeeting.BusDocumentSafetyMeetingVo;
+import org.dromara.safety.domain.HseDocumentSafetyMeeting;
+import org.dromara.safety.domain.req.documentsafetymeeting.HseDocumentSafetyMeetingCreateFileReq;
+import org.dromara.safety.domain.req.documentsafetymeeting.HseDocumentSafetyMeetingCreateFolderReq;
+import org.dromara.safety.domain.req.documentsafetymeeting.HseDocumentSafetyMeetingQueryReq;
+import org.dromara.safety.domain.vo.documentsafetymeeting.HseDocumentSafetyMeetingRecycleBinVo;
+import org.dromara.safety.domain.vo.documentsafetymeeting.HseDocumentSafetyMeetingVo;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Collection;
@@ -22,7 +22,7 @@ import java.util.List;
  * @author lcj
  * @date 2025-04-14
  */
-public interface IBusDocumentSafetyMeetingService extends IService<BusDocumentSafetyMeeting> {
+public interface IHseDocumentSafetyMeetingService extends IService<HseDocumentSafetyMeeting> {
 
     /**
      * 查询安全会议纪要
@@ -30,7 +30,7 @@ public interface IBusDocumentSafetyMeetingService extends IService<BusDocumentSa
      * @param id 主键
      * @return 安全会议纪要
      */
-    BusDocumentSafetyMeetingVo queryById(Long id);
+    HseDocumentSafetyMeetingVo queryById(Long id);
 
     /**
      * 分页查询安全会议纪要列表
@@ -38,7 +38,7 @@ public interface IBusDocumentSafetyMeetingService extends IService<BusDocumentSa
      * @param req 查询条件
      * @return 安全会议纪要分页列表
      */
-    List<BusDocumentSafetyMeetingVo> queryList(DocumentSafetyMeetingQueryReq req);
+    List<HseDocumentSafetyMeetingVo> queryList(HseDocumentSafetyMeetingQueryReq req);
 
     /**
      * 分页查询安全会议纪要回收站列表
@@ -47,7 +47,7 @@ public interface IBusDocumentSafetyMeetingService extends IService<BusDocumentSa
      * @param pageQuery 分页参数
      * @return 安全会议纪要分页列表
      */
-    TableDataInfo<DocumentSafetyMeetingRecycleBinVo> queryRecycleBinPageList(DocumentSafetyMeetingQueryReq req, PageQuery pageQuery);
+    TableDataInfo<HseDocumentSafetyMeetingRecycleBinVo> queryRecycleBinPageList(HseDocumentSafetyMeetingQueryReq req, PageQuery pageQuery);
 
     /**
      * 新增安全会议纪要文件夹
@@ -55,7 +55,7 @@ public interface IBusDocumentSafetyMeetingService extends IService<BusDocumentSa
      * @param req 文件夹创建请求
      * @return 是否新增成功
      */
-    Long insertByFolder(DocumentSafetyMeetingCreateFolderReq req);
+    Long insertByFolder(HseDocumentSafetyMeetingCreateFolderReq req);
 
     /**
      * 新增安全会议纪要文件
@@ -64,7 +64,7 @@ public interface IBusDocumentSafetyMeetingService extends IService<BusDocumentSa
      * @param req  文件上传请求
      * @return 是否新增成功
      */
-    Long insertByFile(MultipartFile file, DocumentSafetyMeetingCreateFileReq req);
+    Long insertByFile(MultipartFile file, HseDocumentSafetyMeetingCreateFileReq req);
 
     /**
      * 批量恢复安全会议纪要信息
@@ -96,7 +96,7 @@ public interface IBusDocumentSafetyMeetingService extends IService<BusDocumentSa
      * @param documentSafetyMeeting 安全会议纪要对象
      * @return 安全会议纪要视图对象
      */
-    BusDocumentSafetyMeetingVo getVo(BusDocumentSafetyMeeting documentSafetyMeeting);
+    HseDocumentSafetyMeetingVo getVo(HseDocumentSafetyMeeting documentSafetyMeeting);
 
     /**
      * 获取安全会议纪要查询条件封装
@@ -104,7 +104,7 @@ public interface IBusDocumentSafetyMeetingService extends IService<BusDocumentSa
      * @param req 安全会议纪要查询条件
      * @return 安全会议纪要查询条件封装
      */
-    LambdaQueryWrapper<BusDocumentSafetyMeeting> buildQueryWrapper(DocumentSafetyMeetingQueryReq req);
+    LambdaQueryWrapper<HseDocumentSafetyMeeting> buildQueryWrapper(HseDocumentSafetyMeetingQueryReq req);
 
     /**
      * 获取安全会议纪要分页对象视图
@@ -112,7 +112,7 @@ public interface IBusDocumentSafetyMeetingService extends IService<BusDocumentSa
      * @param documentSafetyMeetingPage 安全会议纪要分页对象
      * @return 安全会议纪要分页对象视图
      */
-    Page<BusDocumentSafetyMeetingVo> getVoPage(Page<BusDocumentSafetyMeeting> documentSafetyMeetingPage);
+    Page<HseDocumentSafetyMeetingVo> getVoPage(Page<HseDocumentSafetyMeeting> documentSafetyMeetingPage);
 
     /**
      * 递归查询所有的文件和文件夹以及文件夹下的子文件夹的id
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusQuestionBankService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionBankService.java
similarity index 65%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusQuestionBankService.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionBankService.java
index 30404891..5b4592f7 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusQuestionBankService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionBankService.java
@@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import jakarta.servlet.http.HttpServletRequest;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.safety.domain.BusQuestionBank;
-import org.dromara.safety.domain.req.questionbank.QuestionBankCreateReq;
-import org.dromara.safety.domain.req.questionbank.QuestionBankQueryReq;
-import org.dromara.safety.domain.req.questionbank.QuestionBankUpdateReq;
-import org.dromara.safety.domain.vo.BusQuestionBankVo;
+import org.dromara.safety.domain.HseQuestionBank;
+import org.dromara.safety.domain.req.questionbank.HseQuestionBankCreateReq;
+import org.dromara.safety.domain.req.questionbank.HseQuestionBankQueryReq;
+import org.dromara.safety.domain.req.questionbank.HseQuestionBankUpdateReq;
+import org.dromara.safety.domain.vo.questionbank.HseQuestionBankVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -21,7 +21,7 @@ import java.util.List;
  * @author lcj
  * @date 2025-03-24
  */
-public interface IBusQuestionBankService extends IService<BusQuestionBank> {
+public interface IHseQuestionBankService extends IService<HseQuestionBank> {
 
     /**
      * 查询题库
@@ -29,7 +29,7 @@ public interface IBusQuestionBankService extends IService<BusQuestionBank> {
      * @param id 主键
      * @return 题库
      */
-    BusQuestionBankVo queryById(Long id);
+    HseQuestionBankVo queryById(Long id);
 
     /**
      * 分页查询题库列表
@@ -38,7 +38,7 @@ public interface IBusQuestionBankService extends IService<BusQuestionBank> {
      * @param pageQuery 分页参数
      * @return 题库分页列表
      */
-    TableDataInfo<BusQuestionBankVo> queryPageList(QuestionBankQueryReq req, PageQuery pageQuery);
+    TableDataInfo<HseQuestionBankVo> queryPageList(HseQuestionBankQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的题库列表
@@ -46,7 +46,7 @@ public interface IBusQuestionBankService extends IService<BusQuestionBank> {
      * @param req 查询条件
      * @return 题库列表
      */
-    List<BusQuestionBankVo> queryList(QuestionBankQueryReq req);
+    List<HseQuestionBankVo> queryList(HseQuestionBankQueryReq req);
 
     /**
      * 新增题库
@@ -54,7 +54,7 @@ public interface IBusQuestionBankService extends IService<BusQuestionBank> {
      * @param req 题库
      * @return 是否新增成功
      */
-    Long insertByBo(QuestionBankCreateReq req, HttpServletRequest request);
+    Long insertByBo(HseQuestionBankCreateReq req, HttpServletRequest request);
 
     /**
      * 修改题库
@@ -62,7 +62,7 @@ public interface IBusQuestionBankService extends IService<BusQuestionBank> {
      * @param req 题库
      * @return 是否修改成功
      */
-    Boolean updateByBo(QuestionBankUpdateReq req);
+    Boolean updateByBo(HseQuestionBankUpdateReq req);
 
     /**
      * 校验并批量删除题库信息
@@ -79,7 +79,7 @@ public interface IBusQuestionBankService extends IService<BusQuestionBank> {
      * @param questionBank 题库对象
      * @return 题库视图对象
      */
-    BusQuestionBankVo getVo(BusQuestionBank questionBank);
+    HseQuestionBankVo getVo(HseQuestionBank questionBank);
 
     /**
      * 获取题库查询条件封装
@@ -87,7 +87,7 @@ public interface IBusQuestionBankService extends IService<BusQuestionBank> {
      * @param req 题库查询条件
      * @return 题库查询条件封装
      */
-    LambdaQueryWrapper<BusQuestionBank> buildQueryWrapper(QuestionBankQueryReq req);
+    LambdaQueryWrapper<HseQuestionBank> buildQueryWrapper(HseQuestionBankQueryReq req);
 
     /**
      * 获取题库分页对象视图
@@ -95,5 +95,5 @@ public interface IBusQuestionBankService extends IService<BusQuestionBank> {
      * @param questionBankPage 题库分页对象
      * @return 题库分页对象视图
      */
-    Page<BusQuestionBankVo> getVoPage(Page<BusQuestionBank> questionBankPage);
+    Page<HseQuestionBankVo> getVoPage(Page<HseQuestionBank> questionBankPage);
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusQuestionUserAnswerService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionUserAnswerService.java
similarity index 67%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusQuestionUserAnswerService.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionUserAnswerService.java
index c71cc430..1c71f9b6 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusQuestionUserAnswerService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionUserAnswerService.java
@@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import jakarta.servlet.http.HttpServletResponse;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.safety.domain.BusQuestionUserAnswer;
-import org.dromara.safety.domain.req.questionuseranswer.QuestionUserAnswerBatchDownloadFileReq;
-import org.dromara.safety.domain.req.questionuseranswer.QuestionUserAnswerCreateReq;
-import org.dromara.safety.domain.req.questionuseranswer.QuestionUserAnswerQueryReq;
-import org.dromara.safety.domain.req.questionuseranswer.QuestionUserAnswerUpdateReq;
-import org.dromara.safety.domain.vo.BusQuestionUserAnswerVo;
+import org.dromara.safety.domain.HseQuestionUserAnswer;
+import org.dromara.safety.domain.req.questionuseranswer.HseQuestionUserAnswerBatchDownloadFileReq;
+import org.dromara.safety.domain.req.questionuseranswer.HseQuestionUserAnswerCreateReq;
+import org.dromara.safety.domain.req.questionuseranswer.HseQuestionUserAnswerQueryReq;
+import org.dromara.safety.domain.req.questionuseranswer.HseQuestionUserAnswerUpdateReq;
+import org.dromara.safety.domain.vo.questionuseranswer.HseQuestionUserAnswerVo;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Collection;
@@ -23,7 +23,7 @@ import java.util.List;
  * @author lcj
  * @date 2025-03-24
  */
-public interface IBusQuestionUserAnswerService extends IService<BusQuestionUserAnswer> {
+public interface IHseQuestionUserAnswerService extends IService<HseQuestionUserAnswer> {
 
     /**
      * 查询用户试卷存储
@@ -31,7 +31,7 @@ public interface IBusQuestionUserAnswerService extends IService<BusQuestionUserA
      * @param id 主键
      * @return 用户试卷存储
      */
-    BusQuestionUserAnswerVo queryById(Long id);
+    HseQuestionUserAnswerVo queryById(Long id);
 
     /**
      * 分页查询用户试卷存储列表
@@ -40,7 +40,7 @@ public interface IBusQuestionUserAnswerService extends IService<BusQuestionUserA
      * @param pageQuery 分页参数
      * @return 用户试卷存储分页列表
      */
-    TableDataInfo<BusQuestionUserAnswerVo> queryPageList(QuestionUserAnswerQueryReq req, PageQuery pageQuery);
+    TableDataInfo<HseQuestionUserAnswerVo> queryPageList(HseQuestionUserAnswerQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的用户试卷存储列表
@@ -48,7 +48,7 @@ public interface IBusQuestionUserAnswerService extends IService<BusQuestionUserA
      * @param req 查询条件
      * @return 用户试卷存储列表
      */
-    List<BusQuestionUserAnswerVo> queryList(QuestionUserAnswerQueryReq req);
+    List<HseQuestionUserAnswerVo> queryList(HseQuestionUserAnswerQueryReq req);
 
     /**
      * 新增用户试卷存储
@@ -56,7 +56,7 @@ public interface IBusQuestionUserAnswerService extends IService<BusQuestionUserA
      * @param req 用户试卷存储
      * @return 新增用户试卷存储id
      */
-    Long insertByBo(QuestionUserAnswerCreateReq req);
+    Long insertByBo(HseQuestionUserAnswerCreateReq req);
 
     /**
      * 通过zip文件批量上传用户试卷存储
@@ -73,7 +73,7 @@ public interface IBusQuestionUserAnswerService extends IService<BusQuestionUserA
      * @param req 用户试卷存储
      * @return 是否修改成功
      */
-    Boolean updateByBo(QuestionUserAnswerUpdateReq req);
+    Boolean updateByBo(HseQuestionUserAnswerUpdateReq req);
 
     /**
      * 校验并批量删除用户试卷存储信息
@@ -90,7 +90,7 @@ public interface IBusQuestionUserAnswerService extends IService<BusQuestionUserA
      * @param questionUserAnswer 用户试卷存储对象
      * @return 用户试卷存储视图对象
      */
-    BusQuestionUserAnswerVo getVo(BusQuestionUserAnswer questionUserAnswer);
+    HseQuestionUserAnswerVo getVo(HseQuestionUserAnswer questionUserAnswer);
 
     /**
      * 获取用户试卷存储查询条件封装
@@ -98,7 +98,7 @@ public interface IBusQuestionUserAnswerService extends IService<BusQuestionUserA
      * @param req 用户试卷存储查询条件
      * @return 用户试卷存储查询条件封装
      */
-    LambdaQueryWrapper<BusQuestionUserAnswer> buildQueryWrapper(QuestionUserAnswerQueryReq req);
+    LambdaQueryWrapper<HseQuestionUserAnswer> buildQueryWrapper(HseQuestionUserAnswerQueryReq req);
 
     /**
      * 获取用户试卷存储分页对象视图
@@ -106,7 +106,7 @@ public interface IBusQuestionUserAnswerService extends IService<BusQuestionUserA
      * @param questionUserAnswerPage 用户试卷存储分页对象
      * @return 用户试卷存储分页对象视图
      */
-    Page<BusQuestionUserAnswerVo> getVoPage(Page<BusQuestionUserAnswer> questionUserAnswerPage);
+    Page<HseQuestionUserAnswerVo> getVoPage(Page<HseQuestionUserAnswer> questionUserAnswerPage);
 
     /**
      * 批量下载用户试卷存储文件
@@ -114,6 +114,6 @@ public interface IBusQuestionUserAnswerService extends IService<BusQuestionUserA
      * @param req      用户试卷存储文件下载请求
      * @param response 设置响应头和向客户端发送文件内容
      */
-    void batchDownloadFile(QuestionUserAnswerBatchDownloadFileReq req, HttpServletResponse response);
+    void batchDownloadFile(HseQuestionUserAnswerBatchDownloadFileReq req, HttpServletResponse response);
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusQuestionsCategoryService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionsCategoryService.java
similarity index 64%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusQuestionsCategoryService.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionsCategoryService.java
index 7fba5f86..9047867c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusQuestionsCategoryService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionsCategoryService.java
@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.safety.domain.BusQuestionsCategory;
-import org.dromara.safety.domain.req.questionscategory.QuestionsCategoryCreateReq;
-import org.dromara.safety.domain.req.questionscategory.QuestionsCategoryQueryReq;
-import org.dromara.safety.domain.req.questionscategory.QuestionsCategoryUpdateReq;
-import org.dromara.safety.domain.vo.BusQuestionsCategoryVo;
+import org.dromara.safety.domain.HseQuestionsCategory;
+import org.dromara.safety.domain.req.questionscategory.HseQuestionsCategoryCreateReq;
+import org.dromara.safety.domain.req.questionscategory.HseQuestionsCategoryQueryReq;
+import org.dromara.safety.domain.req.questionscategory.HseQuestionsCategoryUpdateReq;
+import org.dromara.safety.domain.vo.questionscategory.HseQuestionsCategoryVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -20,7 +20,7 @@ import java.util.List;
  * @author lcj
  * @date 2025-04-15
  */
-public interface IBusQuestionsCategoryService extends IService<BusQuestionsCategory> {
+public interface IHseQuestionsCategoryService extends IService<HseQuestionsCategory> {
 
     /**
      * 查询题库类别
@@ -28,7 +28,7 @@ public interface IBusQuestionsCategoryService extends IService<BusQuestionsCateg
      * @param id 主键
      * @return 题库类别
      */
-    BusQuestionsCategoryVo queryById(Long id);
+    HseQuestionsCategoryVo queryById(Long id);
 
     /**
      * 分页查询题库类别列表
@@ -37,7 +37,7 @@ public interface IBusQuestionsCategoryService extends IService<BusQuestionsCateg
      * @param pageQuery 分页参数
      * @return 题库类别分页列表
      */
-    TableDataInfo<BusQuestionsCategoryVo> queryPageList(QuestionsCategoryQueryReq req, PageQuery pageQuery);
+    TableDataInfo<HseQuestionsCategoryVo> queryPageList(HseQuestionsCategoryQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的题库类别列表
@@ -45,7 +45,7 @@ public interface IBusQuestionsCategoryService extends IService<BusQuestionsCateg
      * @param req 查询条件
      * @return 题库类别列表
      */
-    List<BusQuestionsCategoryVo> queryList(QuestionsCategoryQueryReq req);
+    List<HseQuestionsCategoryVo> queryList(HseQuestionsCategoryQueryReq req);
 
     /**
      * 新增题库类别
@@ -53,7 +53,7 @@ public interface IBusQuestionsCategoryService extends IService<BusQuestionsCateg
      * @param req 题库类别
      * @return 新增题库类别组件
      */
-    Long insertByBo(QuestionsCategoryCreateReq req);
+    Long insertByBo(HseQuestionsCategoryCreateReq req);
 
     /**
      * 修改题库类别
@@ -61,7 +61,7 @@ public interface IBusQuestionsCategoryService extends IService<BusQuestionsCateg
      * @param req 题库类别
      * @return 是否修改成功
      */
-    Boolean updateByBo(QuestionsCategoryUpdateReq req);
+    Boolean updateByBo(HseQuestionsCategoryUpdateReq req);
 
     /**
      * 校验并批量删除题库类别信息
@@ -78,7 +78,7 @@ public interface IBusQuestionsCategoryService extends IService<BusQuestionsCateg
      * @param questionsCategory 题库类别对象
      * @return 题库类别视图对象
      */
-    BusQuestionsCategoryVo getVo(BusQuestionsCategory questionsCategory);
+    HseQuestionsCategoryVo getVo(HseQuestionsCategory questionsCategory);
 
     /**
      * 获取题库类别查询条件封装
@@ -86,7 +86,7 @@ public interface IBusQuestionsCategoryService extends IService<BusQuestionsCateg
      * @param req 题库类别查询条件
      * @return 题库类别查询条件封装
      */
-    LambdaQueryWrapper<BusQuestionsCategory> buildQueryWrapper(QuestionsCategoryQueryReq req);
+    LambdaQueryWrapper<HseQuestionsCategory> buildQueryWrapper(HseQuestionsCategoryQueryReq req);
 
     /**
      * 获取题库类别分页对象视图
@@ -94,6 +94,6 @@ public interface IBusQuestionsCategoryService extends IService<BusQuestionsCateg
      * @param questionsCategoryPage 题库类别分页对象
      * @return 题库类别分页对象视图
      */
-    Page<BusQuestionsCategoryVo> getVoPage(Page<BusQuestionsCategory> questionsCategoryPage);
+    Page<HseQuestionsCategoryVo> getVoPage(Page<HseQuestionsCategory> questionsCategoryPage);
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusQuestionsConfigService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionsConfigService.java
similarity index 65%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusQuestionsConfigService.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionsConfigService.java
index d1f941eb..ac0f13b8 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusQuestionsConfigService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionsConfigService.java
@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.safety.domain.BusQuestionsConfig;
-import org.dromara.safety.domain.req.questionsconfig.QuestionsConfigCreateReq;
-import org.dromara.safety.domain.req.questionsconfig.QuestionsConfigQueryReq;
-import org.dromara.safety.domain.req.questionsconfig.QuestionsConfigUpdateReq;
-import org.dromara.safety.domain.vo.BusQuestionsConfigVo;
+import org.dromara.safety.domain.HseQuestionsConfig;
+import org.dromara.safety.domain.req.questionsconfig.HseQuestionsConfigCreateReq;
+import org.dromara.safety.domain.req.questionsconfig.HseQuestionsConfigQueryReq;
+import org.dromara.safety.domain.req.questionsconfig.HseQuestionsConfigUpdateReq;
+import org.dromara.safety.domain.vo.questionsconfig.HseQuestionsConfigVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -20,7 +20,7 @@ import java.util.List;
  * @author lcj
  * @date 2025-03-24
  */
-public interface IBusQuestionsConfigService extends IService<BusQuestionsConfig> {
+public interface IHseQuestionsConfigService extends IService<HseQuestionsConfig> {
 
     /**
      * 查询题库配置
@@ -28,7 +28,7 @@ public interface IBusQuestionsConfigService extends IService<BusQuestionsConfig>
      * @param id 主键
      * @return 题库配置
      */
-    BusQuestionsConfigVo queryById(Long id);
+    HseQuestionsConfigVo queryById(Long id);
 
     /**
      * 分页查询题库配置列表
@@ -37,7 +37,7 @@ public interface IBusQuestionsConfigService extends IService<BusQuestionsConfig>
      * @param pageQuery 分页参数
      * @return 题库配置分页列表
      */
-    TableDataInfo<BusQuestionsConfigVo> queryPageList(QuestionsConfigQueryReq req, PageQuery pageQuery);
+    TableDataInfo<HseQuestionsConfigVo> queryPageList(HseQuestionsConfigQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的题库配置列表
@@ -45,7 +45,7 @@ public interface IBusQuestionsConfigService extends IService<BusQuestionsConfig>
      * @param req 查询条件
      * @return 题库配置列表
      */
-    List<BusQuestionsConfigVo> queryList(QuestionsConfigQueryReq req);
+    List<HseQuestionsConfigVo> queryList(HseQuestionsConfigQueryReq req);
 
     /**
      * 新增题库配置
@@ -53,7 +53,7 @@ public interface IBusQuestionsConfigService extends IService<BusQuestionsConfig>
      * @param req 题库配置
      * @return 新增配置id
      */
-    Long insertByBo(QuestionsConfigCreateReq req);
+    Long insertByBo(HseQuestionsConfigCreateReq req);
 
     /**
      * 修改题库配置
@@ -61,7 +61,7 @@ public interface IBusQuestionsConfigService extends IService<BusQuestionsConfig>
      * @param req 题库配置
      * @return 是否修改成功
      */
-    Boolean updateByBo(QuestionsConfigUpdateReq req);
+    Boolean updateByBo(HseQuestionsConfigUpdateReq req);
 
     /**
      * 校验并批量删除题库配置信息
@@ -78,7 +78,7 @@ public interface IBusQuestionsConfigService extends IService<BusQuestionsConfig>
      * @param questionsConfig 题库配置对象
      * @return 题库配置视图对象
      */
-    BusQuestionsConfigVo getVo(BusQuestionsConfig questionsConfig);
+    HseQuestionsConfigVo getVo(HseQuestionsConfig questionsConfig);
 
     /**
      * 获取题库配置查询条件封装
@@ -86,7 +86,7 @@ public interface IBusQuestionsConfigService extends IService<BusQuestionsConfig>
      * @param req 题库配置查询条件
      * @return 题库配置查询条件封装
      */
-    LambdaQueryWrapper<BusQuestionsConfig> buildQueryWrapper(QuestionsConfigQueryReq req);
+    LambdaQueryWrapper<HseQuestionsConfig> buildQueryWrapper(HseQuestionsConfigQueryReq req);
 
     /**
      * 获取题库配置分页对象视图
@@ -94,5 +94,5 @@ public interface IBusQuestionsConfigService extends IService<BusQuestionsConfig>
      * @param questionsConfigPage 题库配置分页对象
      * @return 题库配置分页对象视图
      */
-    Page<BusQuestionsConfigVo> getVoPage(Page<BusQuestionsConfig> questionsConfigPage);
+    Page<HseQuestionsConfigVo> getVoPage(Page<HseQuestionsConfig> questionsConfigPage);
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusSafetyInspectionService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyInspectionService.java
similarity index 65%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusSafetyInspectionService.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyInspectionService.java
index e309c97b..a84a73b5 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusSafetyInspectionService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyInspectionService.java
@@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import jakarta.servlet.http.HttpServletResponse;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.safety.domain.BusSafetyInspection;
-import org.dromara.safety.domain.req.safetyinspection.SafetyInspectionCreateReq;
-import org.dromara.safety.domain.req.safetyinspection.SafetyInspectionGisReq;
-import org.dromara.safety.domain.req.safetyinspection.SafetyInspectionQueryReq;
-import org.dromara.safety.domain.req.safetyinspection.SafetyInspectionUpdateReq;
-import org.dromara.safety.domain.vo.safetyinspection.BusSafetyInspectionVo;
-import org.dromara.safety.domain.vo.safetyinspection.SafetyInspectionListGisVo;
+import org.dromara.safety.domain.HseSafetyInspection;
+import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionCreateReq;
+import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionGisReq;
+import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionQueryReq;
+import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionUpdateReq;
+import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionVo;
+import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionListGisVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -23,7 +23,7 @@ import java.util.List;
  * @author lcj
  * @date 2025-03-20
  */
-public interface IBusSafetyInspectionService extends IService<BusSafetyInspection> {
+public interface IHseSafetyInspectionService extends IService<HseSafetyInspection> {
 
     /**
      * 查询安全巡检工单
@@ -31,7 +31,7 @@ public interface IBusSafetyInspectionService extends IService<BusSafetyInspectio
      * @param id 主键
      * @return 安全巡检工单
      */
-    BusSafetyInspectionVo queryById(Long id);
+    HseSafetyInspectionVo queryById(Long id);
 
     /**
      * 分页查询安全巡检工单列表
@@ -40,7 +40,7 @@ public interface IBusSafetyInspectionService extends IService<BusSafetyInspectio
      * @param pageQuery 分页参数
      * @return 安全巡检工单分页列表
      */
-    TableDataInfo<BusSafetyInspectionVo> queryPageList(SafetyInspectionQueryReq req, PageQuery pageQuery);
+    TableDataInfo<HseSafetyInspectionVo> queryPageList(HseSafetyInspectionQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的安全巡检工单列表
@@ -48,7 +48,7 @@ public interface IBusSafetyInspectionService extends IService<BusSafetyInspectio
      * @param req 查询条件
      * @return 安全巡检工单列表
      */
-    List<BusSafetyInspectionVo> queryList(SafetyInspectionQueryReq req);
+    List<HseSafetyInspectionVo> queryList(HseSafetyInspectionQueryReq req);
 
     /**
      * 查询大屏安全信息
@@ -56,7 +56,7 @@ public interface IBusSafetyInspectionService extends IService<BusSafetyInspectio
      * @param req 查询条件
      * @return 安全信息
      */
-    SafetyInspectionListGisVo queryGisList(SafetyInspectionGisReq req);
+    HseSafetyInspectionListGisVo queryGisList(HseSafetyInspectionGisReq req);
 
     /**
      * 新增安全巡检工单
@@ -64,7 +64,7 @@ public interface IBusSafetyInspectionService extends IService<BusSafetyInspectio
      * @param req 安全巡检工单
      * @return 是否新增成功
      */
-    Long insertByBo(SafetyInspectionCreateReq req);
+    Long insertByBo(HseSafetyInspectionCreateReq req);
 
     /**
      * 修改安全巡检工单
@@ -72,7 +72,7 @@ public interface IBusSafetyInspectionService extends IService<BusSafetyInspectio
      * @param req 安全巡检工单
      * @return 是否修改成功
      */
-    Boolean updateByBo(SafetyInspectionUpdateReq req);
+    Boolean updateByBo(HseSafetyInspectionUpdateReq req);
 
     /**
      * 校验并批量删除安全巡检工单信息
@@ -89,7 +89,7 @@ public interface IBusSafetyInspectionService extends IService<BusSafetyInspectio
      * @param safetyInspection 安全巡检工单对象
      * @return 安全巡检工单视图对象
      */
-    BusSafetyInspectionVo getVo(BusSafetyInspection safetyInspection);
+    HseSafetyInspectionVo getVo(HseSafetyInspection safetyInspection);
 
     /**
      * 获取安全巡检工单查询条件封装
@@ -97,7 +97,7 @@ public interface IBusSafetyInspectionService extends IService<BusSafetyInspectio
      * @param req 安全巡检工单查询条件
      * @return 安全巡检工单查询条件封装
      */
-    LambdaQueryWrapper<BusSafetyInspection> buildQueryWrapper(SafetyInspectionQueryReq req);
+    LambdaQueryWrapper<HseSafetyInspection> buildQueryWrapper(HseSafetyInspectionQueryReq req);
 
     /**
      * 获取安全巡检工单分页对象视图
@@ -105,7 +105,7 @@ public interface IBusSafetyInspectionService extends IService<BusSafetyInspectio
      * @param safetyInspectionPage 安全巡检工单分页对象
      * @return 安全巡检工单分页对象视图
      */
-    Page<BusSafetyInspectionVo> getVoPage(Page<BusSafetyInspection> safetyInspectionPage);
+    Page<HseSafetyInspectionVo> getVoPage(Page<HseSafetyInspection> safetyInspectionPage);
 
     /**
      * 根据id导出word
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusSafetyLogService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyLogService.java
similarity index 68%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusSafetyLogService.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyLogService.java
index fe76b1db..86583d55 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusSafetyLogService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyLogService.java
@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.safety.domain.BusSafetyLog;
-import org.dromara.safety.domain.req.safetylog.SafetyLogCreateReq;
-import org.dromara.safety.domain.req.safetylog.SafetyLogQueryReq;
-import org.dromara.safety.domain.req.safetylog.SafetyLogUpdateReq;
-import org.dromara.safety.domain.vo.BusSafetyLogVo;
+import org.dromara.safety.domain.HseSafetyLog;
+import org.dromara.safety.domain.req.safetylog.HseSafetyLogCreateReq;
+import org.dromara.safety.domain.req.safetylog.HseSafetyLogQueryReq;
+import org.dromara.safety.domain.req.safetylog.HseSafetyLogUpdateReq;
+import org.dromara.safety.domain.vo.safetylog.HseSafetyLogVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -20,7 +20,7 @@ import java.util.List;
  * @author lcj
  * @date 2025-03-20
  */
-public interface IBusSafetyLogService extends IService<BusSafetyLog> {
+public interface IHseSafetyLogService extends IService<HseSafetyLog> {
 
     /**
      * 查询安全日志
@@ -28,7 +28,7 @@ public interface IBusSafetyLogService extends IService<BusSafetyLog> {
      * @param id 主键
      * @return 安全日志
      */
-    BusSafetyLogVo queryById(Long id);
+    HseSafetyLogVo queryById(Long id);
 
     /**
      * 分页查询安全日志列表
@@ -37,7 +37,7 @@ public interface IBusSafetyLogService extends IService<BusSafetyLog> {
      * @param pageQuery 分页参数
      * @return 安全日志分页列表
      */
-    TableDataInfo<BusSafetyLogVo> queryPageList(SafetyLogQueryReq req, PageQuery pageQuery);
+    TableDataInfo<HseSafetyLogVo> queryPageList(HseSafetyLogQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的安全日志列表
@@ -45,7 +45,7 @@ public interface IBusSafetyLogService extends IService<BusSafetyLog> {
      * @param req 查询条件
      * @return 安全日志列表
      */
-    List<BusSafetyLogVo> queryList(SafetyLogQueryReq req);
+    List<HseSafetyLogVo> queryList(HseSafetyLogQueryReq req);
 
     /**
      * 新增安全日志
@@ -53,7 +53,7 @@ public interface IBusSafetyLogService extends IService<BusSafetyLog> {
      * @param req 安全日志
      * @return 新增id
      */
-    Long insertByBo(SafetyLogCreateReq req);
+    Long insertByBo(HseSafetyLogCreateReq req);
 
     /**
      * 修改安全日志
@@ -61,7 +61,7 @@ public interface IBusSafetyLogService extends IService<BusSafetyLog> {
      * @param req 安全日志
      * @return 是否修改成功
      */
-    Boolean updateByBo(SafetyLogUpdateReq req);
+    Boolean updateByBo(HseSafetyLogUpdateReq req);
 
     /**
      * 校验并批量删除安全日志信息
@@ -78,7 +78,7 @@ public interface IBusSafetyLogService extends IService<BusSafetyLog> {
      * @param safetyLog 安全日志对象
      * @return 安全日志视图对象
      */
-    BusSafetyLogVo getVo(BusSafetyLog safetyLog);
+    HseSafetyLogVo getVo(HseSafetyLog safetyLog);
 
     /**
      * 获取安全日志查询条件封装
@@ -86,7 +86,7 @@ public interface IBusSafetyLogService extends IService<BusSafetyLog> {
      * @param req 安全日志查询条件
      * @return 安全日志查询条件封装
      */
-    LambdaQueryWrapper<BusSafetyLog> buildQueryWrapper(SafetyLogQueryReq req);
+    LambdaQueryWrapper<HseSafetyLog> buildQueryWrapper(HseSafetyLogQueryReq req);
 
     /**
      * 获取安全日志分页对象视图
@@ -94,5 +94,5 @@ public interface IBusSafetyLogService extends IService<BusSafetyLog> {
      * @param safetyLogPage 安全日志分页对象
      * @return 安全日志分页对象视图
      */
-    Page<BusSafetyLogVo> getVoPage(Page<BusSafetyLog> safetyLogPage);
+    Page<HseSafetyLogVo> getVoPage(Page<HseSafetyLog> safetyLogPage);
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusSafetyWeeklyReportService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyWeeklyReportService.java
similarity index 64%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusSafetyWeeklyReportService.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyWeeklyReportService.java
index 17d1232a..f3616b25 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusSafetyWeeklyReportService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyWeeklyReportService.java
@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.safety.domain.BusSafetyWeeklyReport;
-import org.dromara.safety.domain.req.safetyweeklyreport.SafetyWeeklyReportCreateReq;
-import org.dromara.safety.domain.req.safetyweeklyreport.SafetyWeeklyReportQueryReq;
-import org.dromara.safety.domain.req.safetyweeklyreport.SafetyWeeklyReportUpdateReq;
-import org.dromara.safety.domain.vo.BusSafetyWeeklyReportVo;
+import org.dromara.safety.domain.HseSafetyWeeklyReport;
+import org.dromara.safety.domain.req.safetyweeklyreport.HseSafetyWeeklyReportCreateReq;
+import org.dromara.safety.domain.req.safetyweeklyreport.HseSafetyWeeklyReportQueryReq;
+import org.dromara.safety.domain.req.safetyweeklyreport.HseSafetyWeeklyReportUpdateReq;
+import org.dromara.safety.domain.vo.safetyweeklyreport.HseSafetyWeeklyReportVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -20,7 +20,7 @@ import java.util.List;
  * @author lcj
  * @date 2025-03-20
  */
-public interface IBusSafetyWeeklyReportService extends IService<BusSafetyWeeklyReport> {
+public interface IHseSafetyWeeklyReportService extends IService<HseSafetyWeeklyReport> {
 
     /**
      * 查询安全周报
@@ -28,7 +28,7 @@ public interface IBusSafetyWeeklyReportService extends IService<BusSafetyWeeklyR
      * @param id 主键
      * @return 安全周报
      */
-    BusSafetyWeeklyReportVo queryById(Long id);
+    HseSafetyWeeklyReportVo queryById(Long id);
 
     /**
      * 分页查询安全周报列表
@@ -37,7 +37,7 @@ public interface IBusSafetyWeeklyReportService extends IService<BusSafetyWeeklyR
      * @param pageQuery 分页参数
      * @return 安全周报分页列表
      */
-    TableDataInfo<BusSafetyWeeklyReportVo> queryPageList(SafetyWeeklyReportQueryReq req, PageQuery pageQuery);
+    TableDataInfo<HseSafetyWeeklyReportVo> queryPageList(HseSafetyWeeklyReportQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的安全周报列表
@@ -45,7 +45,7 @@ public interface IBusSafetyWeeklyReportService extends IService<BusSafetyWeeklyR
      * @param req 查询条件
      * @return 安全周报列表
      */
-    List<BusSafetyWeeklyReportVo> queryList(SafetyWeeklyReportQueryReq req);
+    List<HseSafetyWeeklyReportVo> queryList(HseSafetyWeeklyReportQueryReq req);
 
     /**
      * 新增安全周报
@@ -53,7 +53,7 @@ public interface IBusSafetyWeeklyReportService extends IService<BusSafetyWeeklyR
      * @param req 安全周报
      * @return 是否新增成功
      */
-    Long insertByBo(SafetyWeeklyReportCreateReq req);
+    Long insertByBo(HseSafetyWeeklyReportCreateReq req);
 
     /**
      * 修改安全周报
@@ -61,7 +61,7 @@ public interface IBusSafetyWeeklyReportService extends IService<BusSafetyWeeklyR
      * @param req 安全周报
      * @return 是否修改成功
      */
-    Boolean updateByBo(SafetyWeeklyReportUpdateReq req);
+    Boolean updateByBo(HseSafetyWeeklyReportUpdateReq req);
 
     /**
      * 校验并批量删除安全周报信息
@@ -78,7 +78,7 @@ public interface IBusSafetyWeeklyReportService extends IService<BusSafetyWeeklyR
      * @param safetyWeeklyReport 安全周报对象
      * @return 安全周报视图对象
      */
-    BusSafetyWeeklyReportVo getVo(BusSafetyWeeklyReport safetyWeeklyReport);
+    HseSafetyWeeklyReportVo getVo(HseSafetyWeeklyReport safetyWeeklyReport);
 
     /**
      * 获取安全周报查询条件封装
@@ -86,7 +86,7 @@ public interface IBusSafetyWeeklyReportService extends IService<BusSafetyWeeklyR
      * @param req 安全周报查询条件
      * @return 安全周报查询条件封装
      */
-    LambdaQueryWrapper<BusSafetyWeeklyReport> buildQueryWrapper(SafetyWeeklyReportQueryReq req);
+    LambdaQueryWrapper<HseSafetyWeeklyReport> buildQueryWrapper(HseSafetyWeeklyReportQueryReq req);
 
     /**
      * 获取安全周报分页对象视图
@@ -94,6 +94,6 @@ public interface IBusSafetyWeeklyReportService extends IService<BusSafetyWeeklyR
      * @param safetyWeeklyReportPage 安全周报分页对象
      * @return 安全周报分页对象视图
      */
-    Page<BusSafetyWeeklyReportVo> getVoPage(Page<BusSafetyWeeklyReport> safetyWeeklyReportPage);
+    Page<HseSafetyWeeklyReportVo> getVoPage(Page<HseSafetyWeeklyReport> safetyWeeklyReportPage);
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusTeamMeetingService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseTeamMeetingService.java
similarity index 66%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusTeamMeetingService.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseTeamMeetingService.java
index 35ac84ff..db509793 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusTeamMeetingService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseTeamMeetingService.java
@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.safety.domain.BusTeamMeeting;
-import org.dromara.safety.domain.req.teammeeting.TeamMeetingCreateReq;
-import org.dromara.safety.domain.req.teammeeting.TeamMeetingQueryReq;
-import org.dromara.safety.domain.req.teammeeting.TeamMeetingUpdateReq;
-import org.dromara.safety.domain.vo.teammeeting.BusTeamMeetingVo;
+import org.dromara.safety.domain.HseTeamMeeting;
+import org.dromara.safety.domain.req.teammeeting.HseTeamMeetingCreateReq;
+import org.dromara.safety.domain.req.teammeeting.HseTeamMeetingQueryReq;
+import org.dromara.safety.domain.req.teammeeting.HseTeamMeetingUpdateReq;
+import org.dromara.safety.domain.vo.teammeeting.HseTeamMeetingVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -20,7 +20,7 @@ import java.util.List;
  * @author lcj
  * @date 2025-03-19
  */
-public interface IBusTeamMeetingService extends IService<BusTeamMeeting> {
+public interface IHseTeamMeetingService extends IService<HseTeamMeeting> {
 
     /**
      * 查询站班会
@@ -28,7 +28,7 @@ public interface IBusTeamMeetingService extends IService<BusTeamMeeting> {
      * @param id 主键
      * @return 站班会
      */
-    BusTeamMeetingVo queryById(Long id);
+    HseTeamMeetingVo queryById(Long id);
 
     /**
      * 分页查询站班会列表
@@ -37,7 +37,7 @@ public interface IBusTeamMeetingService extends IService<BusTeamMeeting> {
      * @param pageQuery 分页参数
      * @return 站班会分页列表
      */
-    TableDataInfo<BusTeamMeetingVo> queryPageList(TeamMeetingQueryReq req, PageQuery pageQuery);
+    TableDataInfo<HseTeamMeetingVo> queryPageList(HseTeamMeetingQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的站班会列表
@@ -45,7 +45,7 @@ public interface IBusTeamMeetingService extends IService<BusTeamMeeting> {
      * @param req 查询条件
      * @return 站班会列表
      */
-    List<BusTeamMeetingVo> queryList(TeamMeetingQueryReq req);
+    List<HseTeamMeetingVo> queryList(HseTeamMeetingQueryReq req);
 
     /**
      * 新增站班会
@@ -53,7 +53,7 @@ public interface IBusTeamMeetingService extends IService<BusTeamMeeting> {
      * @param req 站班会
      * @return 新增站班会d
      */
-    Long insertByBo(TeamMeetingCreateReq req);
+    Long insertByBo(HseTeamMeetingCreateReq req);
 
     /**
      * 修改站班会
@@ -61,7 +61,7 @@ public interface IBusTeamMeetingService extends IService<BusTeamMeeting> {
      * @param req 站班会
      * @return 是否修改成功
      */
-    Boolean updateByBo(TeamMeetingUpdateReq req);
+    Boolean updateByBo(HseTeamMeetingUpdateReq req);
 
     /**
      * 校验并批量删除站班会信息
@@ -78,7 +78,7 @@ public interface IBusTeamMeetingService extends IService<BusTeamMeeting> {
      * @param teamMeeting 站班会对象
      * @return 站班会视图对象
      */
-    BusTeamMeetingVo getVo(BusTeamMeeting teamMeeting);
+    HseTeamMeetingVo getVo(HseTeamMeeting teamMeeting);
 
     /**
      * 获取站班会查询条件封装
@@ -86,7 +86,7 @@ public interface IBusTeamMeetingService extends IService<BusTeamMeeting> {
      * @param req 站班会查询条件
      * @return 站班会查询条件封装
      */
-    LambdaQueryWrapper<BusTeamMeeting> buildQueryWrapper(TeamMeetingQueryReq req);
+    LambdaQueryWrapper<HseTeamMeeting> buildQueryWrapper(HseTeamMeetingQueryReq req);
 
     /**
      * 获取站班会分页对象视图
@@ -94,6 +94,6 @@ public interface IBusTeamMeetingService extends IService<BusTeamMeeting> {
      * @param teamMeetingPage 站班会分页对象
      * @return 站班会分页对象视图
      */
-    Page<BusTeamMeetingVo> getVoPage(Page<BusTeamMeeting> teamMeetingPage);
+    Page<HseTeamMeetingVo> getVoPage(Page<HseTeamMeeting> teamMeetingPage);
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusDocumentSafetyMeetingServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseDocumentSafetyMeetingServiceImpl.java
similarity index 71%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusDocumentSafetyMeetingServiceImpl.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseDocumentSafetyMeetingServiceImpl.java
index 1d4110ae..c9f728b5 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusDocumentSafetyMeetingServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseDocumentSafetyMeetingServiceImpl.java
@@ -17,17 +17,17 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.service.IBusProjectService;
-import org.dromara.safety.constant.DocumentSafetyMeetingConstant;
-import org.dromara.safety.domain.BusDocumentSafetyMeeting;
-import org.dromara.safety.domain.enums.DocumentStatusEnum;
-import org.dromara.safety.domain.enums.DocumentTypeEnum;
-import org.dromara.safety.domain.req.documentsafetymeeting.DocumentSafetyMeetingCreateFileReq;
-import org.dromara.safety.domain.req.documentsafetymeeting.DocumentSafetyMeetingCreateFolderReq;
-import org.dromara.safety.domain.req.documentsafetymeeting.DocumentSafetyMeetingQueryReq;
-import org.dromara.safety.domain.vo.documentsafetymeeting.DocumentSafetyMeetingRecycleBinVo;
-import org.dromara.safety.domain.vo.documentsafetymeeting.BusDocumentSafetyMeetingVo;
-import org.dromara.safety.mapper.BusDocumentSafetyMeetingMapper;
-import org.dromara.safety.service.IBusDocumentSafetyMeetingService;
+import org.dromara.safety.constant.HseDocumentSafetyMeetingConstant;
+import org.dromara.safety.domain.HseDocumentSafetyMeeting;
+import org.dromara.safety.domain.enums.HseDocumentStatusEnum;
+import org.dromara.safety.domain.enums.HseDocumentTypeEnum;
+import org.dromara.safety.domain.req.documentsafetymeeting.HseDocumentSafetyMeetingCreateFileReq;
+import org.dromara.safety.domain.req.documentsafetymeeting.HseDocumentSafetyMeetingCreateFolderReq;
+import org.dromara.safety.domain.req.documentsafetymeeting.HseDocumentSafetyMeetingQueryReq;
+import org.dromara.safety.domain.vo.documentsafetymeeting.HseDocumentSafetyMeetingRecycleBinVo;
+import org.dromara.safety.domain.vo.documentsafetymeeting.HseDocumentSafetyMeetingVo;
+import org.dromara.safety.mapper.HseDocumentSafetyMeetingMapper;
+import org.dromara.safety.service.IHseDocumentSafetyMeetingService;
 import org.dromara.system.domain.vo.SysOssUploadVo;
 import org.dromara.system.service.ISysOssService;
 import org.springframework.beans.BeanUtils;
@@ -50,8 +50,8 @@ import java.util.stream.Collectors;
 @Slf4j
 @RequiredArgsConstructor
 @Service
-public class BusDocumentSafetyMeetingServiceImpl extends ServiceImpl<BusDocumentSafetyMeetingMapper, BusDocumentSafetyMeeting>
-    implements IBusDocumentSafetyMeetingService {
+public class HseDocumentSafetyMeetingServiceImpl extends ServiceImpl<HseDocumentSafetyMeetingMapper, HseDocumentSafetyMeeting>
+    implements IHseDocumentSafetyMeetingService {
 
     @Resource
     private IBusProjectService projectService;
@@ -66,8 +66,8 @@ public class BusDocumentSafetyMeetingServiceImpl extends ServiceImpl<BusDocument
      * @return 安全会议纪要
      */
     @Override
-    public BusDocumentSafetyMeetingVo queryById(Long id) {
-        BusDocumentSafetyMeeting documentSafetyMeeting = this.getById(id);
+    public HseDocumentSafetyMeetingVo queryById(Long id) {
+        HseDocumentSafetyMeeting documentSafetyMeeting = this.getById(id);
         if (documentSafetyMeeting == null) {
             throw new ServiceException("安全会议纪要信息不存在", HttpStatus.NOT_FOUND);
         }
@@ -81,11 +81,11 @@ public class BusDocumentSafetyMeetingServiceImpl extends ServiceImpl<BusDocument
      * @return 安全会议纪要分页列表
      */
     @Override
-    public List<BusDocumentSafetyMeetingVo> queryList(DocumentSafetyMeetingQueryReq req) {
-        LambdaQueryWrapper<BusDocumentSafetyMeeting> lqw = buildQueryWrapper(req);
+    public List<HseDocumentSafetyMeetingVo> queryList(HseDocumentSafetyMeetingQueryReq req) {
+        LambdaQueryWrapper<HseDocumentSafetyMeeting> lqw = buildQueryWrapper(req);
         // 排除已经删除的文件
-        lqw.eq(BusDocumentSafetyMeeting::getFileStatus, DocumentStatusEnum.NORMAL.getValue());
-        List<BusDocumentSafetyMeeting> result = this.list(lqw);
+        lqw.eq(HseDocumentSafetyMeeting::getFileStatus, HseDocumentStatusEnum.NORMAL.getValue());
+        List<HseDocumentSafetyMeeting> result = this.list(lqw);
         return result.stream().map(this::getVo).toList();
     }
 
@@ -97,13 +97,13 @@ public class BusDocumentSafetyMeetingServiceImpl extends ServiceImpl<BusDocument
      * @return 安全会议纪要分页列表
      */
     @Override
-    public TableDataInfo<DocumentSafetyMeetingRecycleBinVo> queryRecycleBinPageList(DocumentSafetyMeetingQueryReq req, PageQuery pageQuery) {
-        LambdaQueryWrapper<BusDocumentSafetyMeeting> lqw = this.buildQueryWrapper(req);
-        lqw.eq(BusDocumentSafetyMeeting::getFileStatus, DocumentStatusEnum.DELETE.getValue());
-        Page<BusDocumentSafetyMeeting> result = this.page(pageQuery.build(), lqw);
-        List<BusDocumentSafetyMeeting> documentSafetyMeetingList = result.getRecords();
+    public TableDataInfo<HseDocumentSafetyMeetingRecycleBinVo> queryRecycleBinPageList(HseDocumentSafetyMeetingQueryReq req, PageQuery pageQuery) {
+        LambdaQueryWrapper<HseDocumentSafetyMeeting> lqw = this.buildQueryWrapper(req);
+        lqw.eq(HseDocumentSafetyMeeting::getFileStatus, HseDocumentStatusEnum.DELETE.getValue());
+        Page<HseDocumentSafetyMeeting> result = this.page(pageQuery.build(), lqw);
+        List<HseDocumentSafetyMeeting> documentSafetyMeetingList = result.getRecords();
         // 添加分页信息
-        Page<DocumentSafetyMeetingRecycleBinVo> documentSafetyMeetingVoPage = new Page<>(
+        Page<HseDocumentSafetyMeetingRecycleBinVo> documentSafetyMeetingVoPage = new Page<>(
             result.getCurrent(),
             result.getSize(),
             result.getTotal());
@@ -111,8 +111,8 @@ public class BusDocumentSafetyMeetingServiceImpl extends ServiceImpl<BusDocument
             return TableDataInfo.build(documentSafetyMeetingVoPage);
         }
         // 对象列表 => 封装对象列表
-        List<DocumentSafetyMeetingRecycleBinVo> list = documentSafetyMeetingList.stream().map(documentSafetyMeeting -> {
-            DocumentSafetyMeetingRecycleBinVo resp = new DocumentSafetyMeetingRecycleBinVo();
+        List<HseDocumentSafetyMeetingRecycleBinVo> list = documentSafetyMeetingList.stream().map(documentSafetyMeeting -> {
+            HseDocumentSafetyMeetingRecycleBinVo resp = new HseDocumentSafetyMeetingRecycleBinVo();
             BeanUtils.copyProperties(documentSafetyMeeting, resp);
             return resp;
         }).toList();
@@ -127,28 +127,28 @@ public class BusDocumentSafetyMeetingServiceImpl extends ServiceImpl<BusDocument
      * @return 是否新增成功
      */
     @Override
-    public Long insertByFolder(DocumentSafetyMeetingCreateFolderReq req) {
+    public Long insertByFolder(HseDocumentSafetyMeetingCreateFolderReq req) {
         if (req == null) {
             throw new ServiceException("文件夹创建请求不能为空", HttpStatus.BAD_REQUEST);
         }
         if (StringUtils.isEmpty(req.getFileName())) {
             throw new ServiceException("文件夹名称不能为空", HttpStatus.BAD_REQUEST);
         }
-        BusDocumentSafetyMeeting documentSafetyMeeting = new BusDocumentSafetyMeeting();
+        HseDocumentSafetyMeeting documentSafetyMeeting = new HseDocumentSafetyMeeting();
         BeanUtils.copyProperties(req, documentSafetyMeeting);
         Long pid = req.getPid();
         String filePath;
         if (pid != null && pid != 0) {
-            BusDocumentSafetyMeeting pDocumentSafetyMeeting = this.getById(pid);
+            HseDocumentSafetyMeeting pDocumentSafetyMeeting = this.getById(pid);
             // 判断父级目录是否存在
             validParentFolder(pDocumentSafetyMeeting, req.getProjectId());
             filePath = pDocumentSafetyMeeting.getFilePath() + "/" + req.getFileName();
         } else {
-            filePath = DocumentSafetyMeetingConstant.getTopFolderPrefix(req.getProjectId()) + req.getFileName();
+            filePath = HseDocumentSafetyMeetingConstant.getTopFolderPrefix(req.getProjectId()) + req.getFileName();
         }
         // 填充默认值
         documentSafetyMeeting.setFilePath(filePath);
-        documentSafetyMeeting.setFileType(DocumentTypeEnum.FOLDER.getValue());
+        documentSafetyMeeting.setFileType(HseDocumentTypeEnum.FOLDER.getValue());
         boolean save = this.save(documentSafetyMeeting);
         if (!save) {
             throw new ServiceException("新增目录失败，数据库异常", HttpStatus.ERROR);
@@ -163,7 +163,7 @@ public class BusDocumentSafetyMeetingServiceImpl extends ServiceImpl<BusDocument
      * @return 是否新增成功
      */
     @Override
-    public Long insertByFile(MultipartFile file, DocumentSafetyMeetingCreateFileReq req) {
+    public Long insertByFile(MultipartFile file, HseDocumentSafetyMeetingCreateFileReq req) {
         // 数据校验
         if (ObjectUtils.isEmpty(file)) {
             throw new ServiceException("文件不能为空", HttpStatus.BAD_REQUEST);
@@ -182,25 +182,25 @@ public class BusDocumentSafetyMeetingServiceImpl extends ServiceImpl<BusDocument
         Long pid = req.getPid();
         String filePath;
         if (pid != null && pid != 0) {
-            BusDocumentSafetyMeeting pDocumentSafetyMeeting = this.getById(pid);
+            HseDocumentSafetyMeeting pDocumentSafetyMeeting = this.getById(pid);
             // 判断父级目录是否存在
             validParentFolder(pDocumentSafetyMeeting, projectId);
             filePath = pDocumentSafetyMeeting.getFilePath() + "/" + fileName;
         } else {
-            filePath = DocumentSafetyMeetingConstant.getTopFolderPrefix(projectId) + fileName;
+            filePath = HseDocumentSafetyMeetingConstant.getTopFolderPrefix(projectId) + fileName;
         }
         // 上传文件
         SysOssUploadVo ossUploadVo = ossService.uploadWithNoSave(file, filePath);
         // 保存文件信息
-        BusDocumentSafetyMeeting documentSafetyMeeting = new BusDocumentSafetyMeeting();
+        HseDocumentSafetyMeeting documentSafetyMeeting = new HseDocumentSafetyMeeting();
         documentSafetyMeeting.setFilePath(filePath);
         documentSafetyMeeting.setFileUrl(ossUploadVo.getOssId());
         documentSafetyMeeting.setFileSuffix(suffix);
         // 判断文件类型
-        if (DocumentSafetyMeetingConstant.PICTURE_SUFFIX_LIST.contains(suffix)) {
-            documentSafetyMeeting.setFileType(DocumentTypeEnum.PICTURE.getValue());
+        if (HseDocumentSafetyMeetingConstant.PICTURE_SUFFIX_LIST.contains(suffix)) {
+            documentSafetyMeeting.setFileType(HseDocumentTypeEnum.PICTURE.getValue());
         } else {
-            documentSafetyMeeting.setFileType(DocumentTypeEnum.FILE.getValue());
+            documentSafetyMeeting.setFileType(HseDocumentTypeEnum.FILE.getValue());
         }
         documentSafetyMeeting.setFileName(ossUploadVo.getFileName());
         documentSafetyMeeting.setOriginalName(originalFilename);
@@ -226,10 +226,10 @@ public class BusDocumentSafetyMeetingServiceImpl extends ServiceImpl<BusDocument
         List<Long> allParentIdsRecursively = getAllParentIdsRecursively(ids);
         // 需要更新状态的文件集合
         allParentIdsRecursively.addAll(ids);
-        List<BusDocumentSafetyMeeting> updateList = allParentIdsRecursively.stream().map(id -> {
-            BusDocumentSafetyMeeting documentSafetyMeeting = new BusDocumentSafetyMeeting();
+        List<HseDocumentSafetyMeeting> updateList = allParentIdsRecursively.stream().map(id -> {
+            HseDocumentSafetyMeeting documentSafetyMeeting = new HseDocumentSafetyMeeting();
             documentSafetyMeeting.setId(id);
-            documentSafetyMeeting.setFileStatus(DocumentStatusEnum.NORMAL.getValue());
+            documentSafetyMeeting.setFileStatus(HseDocumentStatusEnum.NORMAL.getValue());
             return documentSafetyMeeting;
         }).toList();
         boolean result = this.updateBatchById(updateList);
@@ -241,13 +241,13 @@ public class BusDocumentSafetyMeetingServiceImpl extends ServiceImpl<BusDocument
 
     private List<Long> getAllParentIdsRecursively(Collection<Long> ids) {
         // 使用 list() 方法批量查询当前 id 列表对应的实体数据
-        List<BusDocumentSafetyMeeting> fileList = this.lambdaQuery()
-            .in(BusDocumentSafetyMeeting::getId, ids)
-            .eq(BusDocumentSafetyMeeting::getFileStatus, DocumentStatusEnum.DELETE.getValue())
+        List<HseDocumentSafetyMeeting> fileList = this.lambdaQuery()
+            .in(HseDocumentSafetyMeeting::getId, ids)
+            .eq(HseDocumentSafetyMeeting::getFileStatus, HseDocumentStatusEnum.DELETE.getValue())
             .list();
         // 通过 stream 流过滤出非 0 的父 id，并去重
         List<Long> parentIdList = fileList.stream()
-            .map(BusDocumentSafetyMeeting::getPid)
+            .map(HseDocumentSafetyMeeting::getPid)
             .filter(pid -> pid != 0)
             .distinct()
             .collect(Collectors.toList());
@@ -272,13 +272,13 @@ public class BusDocumentSafetyMeetingServiceImpl extends ServiceImpl<BusDocument
      * @param pDocumentSafetyMeeting 父级目录
      * @param projectId              当前项目id
      */
-    private void validParentFolder(BusDocumentSafetyMeeting pDocumentSafetyMeeting, Long projectId) {
+    private void validParentFolder(HseDocumentSafetyMeeting pDocumentSafetyMeeting, Long projectId) {
         // 判断父级目录是否存在
         if (pDocumentSafetyMeeting == null) {
             throw new ServiceException("父级目录不存在", HttpStatus.NOT_FOUND);
         }
         // 判断父级目录是否是文件夹
-        if (DocumentTypeEnum.FILE.getValue().equals(pDocumentSafetyMeeting.getFileType())) {
+        if (HseDocumentTypeEnum.FILE.getValue().equals(pDocumentSafetyMeeting.getFileType())) {
             throw new ServiceException("父级目录不是文件夹", HttpStatus.BAD_REQUEST);
         }
         // 判断是否为同一个项目
@@ -302,11 +302,11 @@ public class BusDocumentSafetyMeetingServiceImpl extends ServiceImpl<BusDocument
             return true;
         }
         // 批量修改状态为已删除
-        List<BusDocumentSafetyMeeting> documentSafetyMeetingList = allChildIdList.stream().map(id -> {
-            BusDocumentSafetyMeeting documentSafetyMeeting = new BusDocumentSafetyMeeting();
+        List<HseDocumentSafetyMeeting> documentSafetyMeetingList = allChildIdList.stream().map(id -> {
+            HseDocumentSafetyMeeting documentSafetyMeeting = new HseDocumentSafetyMeeting();
             documentSafetyMeeting.setId(id);
             documentSafetyMeeting.setDeletedAt(new Date());
-            documentSafetyMeeting.setFileStatus(DocumentStatusEnum.DELETE.getValue());
+            documentSafetyMeeting.setFileStatus(HseDocumentStatusEnum.DELETE.getValue());
             return documentSafetyMeeting;
         }).toList();
         // 批量修改
@@ -347,9 +347,9 @@ public class BusDocumentSafetyMeetingServiceImpl extends ServiceImpl<BusDocument
      * @return 安全会议纪要视图对象
      */
     @Override
-    public BusDocumentSafetyMeetingVo getVo(BusDocumentSafetyMeeting documentSafetyMeeting) {
+    public HseDocumentSafetyMeetingVo getVo(HseDocumentSafetyMeeting documentSafetyMeeting) {
         // 对象转封装类
-        BusDocumentSafetyMeetingVo documentSafetyMeetingVo = new BusDocumentSafetyMeetingVo();
+        HseDocumentSafetyMeetingVo documentSafetyMeetingVo = new HseDocumentSafetyMeetingVo();
         if (documentSafetyMeeting == null) {
             return documentSafetyMeetingVo;
         }
@@ -364,8 +364,8 @@ public class BusDocumentSafetyMeetingServiceImpl extends ServiceImpl<BusDocument
      * @return 安全会议纪要查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusDocumentSafetyMeeting> buildQueryWrapper(DocumentSafetyMeetingQueryReq req) {
-        LambdaQueryWrapper<BusDocumentSafetyMeeting> lqw = new LambdaQueryWrapper<>();
+    public LambdaQueryWrapper<HseDocumentSafetyMeeting> buildQueryWrapper(HseDocumentSafetyMeetingQueryReq req) {
+        LambdaQueryWrapper<HseDocumentSafetyMeeting> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
         }
@@ -374,11 +374,11 @@ public class BusDocumentSafetyMeetingServiceImpl extends ServiceImpl<BusDocument
         String fileType = req.getFileType();
         String notFileType = req.getNotFileType();
         // 精确查询
-        lqw.eq(ObjectUtils.isNotEmpty(projectId), BusDocumentSafetyMeeting::getProjectId, projectId);
-        lqw.eq(ObjectUtils.isNotEmpty(pid), BusDocumentSafetyMeeting::getPid, pid);
-        lqw.eq(StringUtils.isNotBlank(fileType), BusDocumentSafetyMeeting::getFileType, fileType);
+        lqw.eq(ObjectUtils.isNotEmpty(projectId), HseDocumentSafetyMeeting::getProjectId, projectId);
+        lqw.eq(ObjectUtils.isNotEmpty(pid), HseDocumentSafetyMeeting::getPid, pid);
+        lqw.eq(StringUtils.isNotBlank(fileType), HseDocumentSafetyMeeting::getFileType, fileType);
         // 不等于
-        lqw.ne(StringUtils.isNotBlank(notFileType), BusDocumentSafetyMeeting::getFileType, notFileType);
+        lqw.ne(StringUtils.isNotBlank(notFileType), HseDocumentSafetyMeeting::getFileType, notFileType);
         return lqw;
     }
 
@@ -389,11 +389,11 @@ public class BusDocumentSafetyMeetingServiceImpl extends ServiceImpl<BusDocument
      * @return 安全会议纪要分页对象视图
      */
     @Override
-    public Page<BusDocumentSafetyMeetingVo> getVoPage(Page<BusDocumentSafetyMeeting> documentSafetyMeetingPage) {
+    public Page<HseDocumentSafetyMeetingVo> getVoPage(Page<HseDocumentSafetyMeeting> documentSafetyMeetingPage) {
         // 获取安全会议纪要列表
-        List<BusDocumentSafetyMeeting> documentSafetyMeetingList = documentSafetyMeetingPage.getRecords();
+        List<HseDocumentSafetyMeeting> documentSafetyMeetingList = documentSafetyMeetingPage.getRecords();
         // 添加分页信息
-        Page<BusDocumentSafetyMeetingVo> documentSafetyMeetingVoPage = new Page<>(
+        Page<HseDocumentSafetyMeetingVo> documentSafetyMeetingVoPage = new Page<>(
             documentSafetyMeetingPage.getCurrent(),
             documentSafetyMeetingPage.getSize(),
             documentSafetyMeetingPage.getTotal());
@@ -401,7 +401,7 @@ public class BusDocumentSafetyMeetingServiceImpl extends ServiceImpl<BusDocument
             return documentSafetyMeetingVoPage;
         }
         // 对象列表 => 封装对象列表
-        List<BusDocumentSafetyMeetingVo> documentSafetyMeetingVoList = documentSafetyMeetingList
+        List<HseDocumentSafetyMeetingVo> documentSafetyMeetingVoList = documentSafetyMeetingList
             .stream().map(this::getVo).toList();
         documentSafetyMeetingVoPage.setRecords(documentSafetyMeetingVoList);
         return documentSafetyMeetingVoPage;
@@ -420,8 +420,8 @@ public class BusDocumentSafetyMeetingServiceImpl extends ServiceImpl<BusDocument
             // 将当前id加入集合
             idList.add(id);
             // 查询当前记录（判断是否为文件夹）
-            BusDocumentSafetyMeeting record = this.getById(id);
-            if (record != null && DocumentTypeEnum.FOLDER.getValue().equals(record.getFileType())) {
+            HseDocumentSafetyMeeting record = this.getById(id);
+            if (record != null && HseDocumentTypeEnum.FOLDER.getValue().equals(record.getFileType())) {
                 // 如果是文件夹，递归查询子节点
                 getChildIds(id, idList);
             }
@@ -437,15 +437,15 @@ public class BusDocumentSafetyMeetingServiceImpl extends ServiceImpl<BusDocument
      */
     private void getChildIds(Long parentId, List<Long> ids) {
         // 条件查询，查询pid为parentId的记录
-        List<BusDocumentSafetyMeeting> childList = this.lambdaQuery()
-            .eq(BusDocumentSafetyMeeting::getPid, parentId)
-            .eq(BusDocumentSafetyMeeting::getFileStatus, DocumentStatusEnum.NORMAL.getValue())
+        List<HseDocumentSafetyMeeting> childList = this.lambdaQuery()
+            .eq(HseDocumentSafetyMeeting::getPid, parentId)
+            .eq(HseDocumentSafetyMeeting::getFileStatus, HseDocumentStatusEnum.NORMAL.getValue())
             .list();
         // 遍历所有子记录
-        for (BusDocumentSafetyMeeting child : childList) {
+        for (HseDocumentSafetyMeeting child : childList) {
             ids.add(child.getId());
             // 如果子节点是文件夹，继续递归
-            if (DocumentTypeEnum.FOLDER.getValue().equals(child.getFileType())) {
+            if (HseDocumentTypeEnum.FOLDER.getValue().equals(child.getFileType())) {
                 getChildIds(child.getId(), ids);
             }
         }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusQuestionBankServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionBankServiceImpl.java
similarity index 73%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusQuestionBankServiceImpl.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionBankServiceImpl.java
index 412a2d9e..086e58c8 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusQuestionBankServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionBankServiceImpl.java
@@ -17,15 +17,15 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.project.service.IBusProjectService;
-import org.dromara.safety.domain.BusQuestionBank;
-import org.dromara.safety.domain.BusQuestionsCategory;
-import org.dromara.safety.domain.req.questionbank.QuestionBankCreateReq;
-import org.dromara.safety.domain.req.questionbank.QuestionBankQueryReq;
-import org.dromara.safety.domain.req.questionbank.QuestionBankUpdateReq;
-import org.dromara.safety.domain.vo.BusQuestionBankVo;
-import org.dromara.safety.mapper.BusQuestionBankMapper;
-import org.dromara.safety.service.IBusQuestionBankService;
-import org.dromara.safety.service.IBusQuestionsCategoryService;
+import org.dromara.safety.domain.HseQuestionBank;
+import org.dromara.safety.domain.HseQuestionsCategory;
+import org.dromara.safety.domain.req.questionbank.HseQuestionBankCreateReq;
+import org.dromara.safety.domain.req.questionbank.HseQuestionBankQueryReq;
+import org.dromara.safety.domain.req.questionbank.HseQuestionBankUpdateReq;
+import org.dromara.safety.domain.vo.questionbank.HseQuestionBankVo;
+import org.dromara.safety.mapper.HseQuestionBankMapper;
+import org.dromara.safety.service.IHseQuestionBankService;
+import org.dromara.safety.service.IHseQuestionsCategoryService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,14 +43,14 @@ import java.util.stream.Collectors;
  * @date 2025-03-24
  */
 @Service
-public class BusQuestionBankServiceImpl extends ServiceImpl<BusQuestionBankMapper, BusQuestionBank>
-    implements IBusQuestionBankService {
+public class HseQuestionBankServiceImpl extends ServiceImpl<HseQuestionBankMapper, HseQuestionBank>
+    implements IHseQuestionBankService {
 
     @Resource
     private IBusProjectService projectService;
 
     @Resource
-    private IBusQuestionsCategoryService questionsCategoryService;
+    private IHseQuestionsCategoryService questionsCategoryService;
 
     /**
      * 查询题库
@@ -59,8 +59,8 @@ public class BusQuestionBankServiceImpl extends ServiceImpl<BusQuestionBankMappe
      * @return 题库
      */
     @Override
-    public BusQuestionBankVo queryById(Long id) {
-        BusQuestionBank questionBank = this.getById(id);
+    public HseQuestionBankVo queryById(Long id) {
+        HseQuestionBank questionBank = this.getById(id);
         if (questionBank == null) {
             throw new ServiceException("题库信息不存在", HttpStatus.NOT_FOUND);
         }
@@ -75,8 +75,8 @@ public class BusQuestionBankServiceImpl extends ServiceImpl<BusQuestionBankMappe
      * @return 题库分页列表
      */
     @Override
-    public TableDataInfo<BusQuestionBankVo> queryPageList(QuestionBankQueryReq req, PageQuery pageQuery) {
-        Page<BusQuestionBank> result = this.page(pageQuery.build(), buildQueryWrapper(req));
+    public TableDataInfo<HseQuestionBankVo> queryPageList(HseQuestionBankQueryReq req, PageQuery pageQuery) {
+        Page<HseQuestionBank> result = this.page(pageQuery.build(), buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
 
@@ -87,8 +87,8 @@ public class BusQuestionBankServiceImpl extends ServiceImpl<BusQuestionBankMappe
      * @return 题库列表
      */
     @Override
-    public List<BusQuestionBankVo> queryList(QuestionBankQueryReq req) {
-        LambdaQueryWrapper<BusQuestionBank> lqw = buildQueryWrapper(req);
+    public List<HseQuestionBankVo> queryList(HseQuestionBankQueryReq req) {
+        LambdaQueryWrapper<HseQuestionBank> lqw = buildQueryWrapper(req);
         return this.list(lqw).stream().map(this::getVo).toList();
     }
 
@@ -99,9 +99,9 @@ public class BusQuestionBankServiceImpl extends ServiceImpl<BusQuestionBankMappe
      * @return 是否新增成功
      */
     @Override
-    public Long insertByBo(QuestionBankCreateReq req, HttpServletRequest request) {
+    public Long insertByBo(HseQuestionBankCreateReq req, HttpServletRequest request) {
         // 将实体类和 DTO 进行转换
-        BusQuestionBank questionBank = new BusQuestionBank();
+        HseQuestionBank questionBank = new HseQuestionBank();
         BeanUtils.copyProperties(req, questionBank);
         // 获取当前登录设备
         String token = request.getHeader("authorization");
@@ -125,14 +125,14 @@ public class BusQuestionBankServiceImpl extends ServiceImpl<BusQuestionBankMappe
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(QuestionBankUpdateReq req) {
+    public Boolean updateByBo(HseQuestionBankUpdateReq req) {
         // 将实体类和 DTO 进行转换
-        BusQuestionBank questionBank = new BusQuestionBank();
+        HseQuestionBank questionBank = new HseQuestionBank();
         BeanUtils.copyProperties(req, questionBank);
         // 数据校验
         validEntityBeforeSave(questionBank, false);
         // 判断是否存在
-        BusQuestionBank oldQuestionBank = this.getById(questionBank.getId());
+        HseQuestionBank oldQuestionBank = this.getById(questionBank.getId());
         if (oldQuestionBank == null) {
             throw new ServiceException("修改题库失败，数据不存在", HttpStatus.NOT_FOUND);
         }
@@ -143,7 +143,7 @@ public class BusQuestionBankServiceImpl extends ServiceImpl<BusQuestionBankMappe
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(BusQuestionBank entity, Boolean create) {
+    private void validEntityBeforeSave(HseQuestionBank entity, Boolean create) {
         // TODO 做一些数据校验,如唯一约束
         Long categoryId = entity.getCategoryId();
         String questionType = entity.getQuestionType();
@@ -182,10 +182,10 @@ public class BusQuestionBankServiceImpl extends ServiceImpl<BusQuestionBankMappe
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         Long userId = LoginHelper.getUserId();
-        List<BusQuestionBank> questionBankList = this.listByIds(ids);
+        List<HseQuestionBank> questionBankList = this.listByIds(ids);
         if (isValid) {
             // TODO 做一些业务上的校验,判断是否需要校验
-            List<Long> projectId = questionBankList.stream().map(BusQuestionBank::getProjectId).toList();
+            List<Long> projectId = questionBankList.stream().map(HseQuestionBank::getProjectId).toList();
             projectService.validAuth(projectId, userId);
         }
         return this.removeBatchByIds(ids);
@@ -198,16 +198,16 @@ public class BusQuestionBankServiceImpl extends ServiceImpl<BusQuestionBankMappe
      * @return 题库视图对象
      */
     @Override
-    public BusQuestionBankVo getVo(BusQuestionBank questionBank) {
+    public HseQuestionBankVo getVo(HseQuestionBank questionBank) {
         // 对象转封装类
-        BusQuestionBankVo questionBankVo = new BusQuestionBankVo();
+        HseQuestionBankVo questionBankVo = new HseQuestionBankVo();
         if (questionBank == null) {
             return questionBankVo;
         }
         BeanUtils.copyProperties(questionBank, questionBankVo);
         // 获取题目分类名称
         Long categoryId = questionBank.getCategoryId();
-        BusQuestionsCategory category = questionsCategoryService.getById(categoryId);
+        HseQuestionsCategory category = questionsCategoryService.getById(categoryId);
         if (category != null) {
             questionBankVo.setCategoryName(category.getCategoryName());
         }
@@ -221,8 +221,8 @@ public class BusQuestionBankServiceImpl extends ServiceImpl<BusQuestionBankMappe
      * @return 题库查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusQuestionBank> buildQueryWrapper(QuestionBankQueryReq req) {
-        LambdaQueryWrapper<BusQuestionBank> lqw = new LambdaQueryWrapper<>();
+    public LambdaQueryWrapper<HseQuestionBank> buildQueryWrapper(HseQuestionBankQueryReq req) {
+        LambdaQueryWrapper<HseQuestionBank> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
         }
@@ -236,17 +236,17 @@ public class BusQuestionBankServiceImpl extends ServiceImpl<BusQuestionBankMappe
         // JSON 数组查询
         if (CollUtil.isNotEmpty(optionList)) {
             for (String option : optionList) {
-                lqw.like(BusQuestionBank::getOptions, "\"" + option + "\"");
+                lqw.like(HseQuestionBank::getOptions, "\"" + option + "\"");
             }
         }
         // 模糊查询
-        lqw.like(StringUtils.isNotBlank(questionContent), BusQuestionBank::getQuestionContent, questionContent);
-        lqw.like(StringUtils.isNotBlank(correctAnswer), BusQuestionBank::getCorrectAnswer, correctAnswer);
+        lqw.like(StringUtils.isNotBlank(questionContent), HseQuestionBank::getQuestionContent, questionContent);
+        lqw.like(StringUtils.isNotBlank(correctAnswer), HseQuestionBank::getCorrectAnswer, correctAnswer);
         // 精准查询
-        lqw.eq(ObjectUtils.isNotEmpty(id), BusQuestionBank::getId, id);
-        lqw.eq(ObjectUtils.isNotEmpty(projectId), BusQuestionBank::getProjectId, projectId);
-        lqw.eq(ObjectUtils.isNotEmpty(categoryId), BusQuestionBank::getCategoryId, categoryId);
-        lqw.eq(StringUtils.isNotBlank(questionType), BusQuestionBank::getQuestionType, questionType);
+        lqw.eq(ObjectUtils.isNotEmpty(id), HseQuestionBank::getId, id);
+        lqw.eq(ObjectUtils.isNotEmpty(projectId), HseQuestionBank::getProjectId, projectId);
+        lqw.eq(ObjectUtils.isNotEmpty(categoryId), HseQuestionBank::getCategoryId, categoryId);
+        lqw.eq(StringUtils.isNotBlank(questionType), HseQuestionBank::getQuestionType, questionType);
         return lqw;
     }
 
@@ -257,11 +257,11 @@ public class BusQuestionBankServiceImpl extends ServiceImpl<BusQuestionBankMappe
      * @return 题库分页对象视图
      */
     @Override
-    public Page<BusQuestionBankVo> getVoPage(Page<BusQuestionBank> questionBankPage) {
+    public Page<HseQuestionBankVo> getVoPage(Page<HseQuestionBank> questionBankPage) {
         // 获取分页数据
-        List<BusQuestionBank> questionBankList = questionBankPage.getRecords();
+        List<HseQuestionBank> questionBankList = questionBankPage.getRecords();
         // 添加分页信息
-        Page<BusQuestionBankVo> questionBankVoPage = new Page<>(
+        Page<HseQuestionBankVo> questionBankVoPage = new Page<>(
             questionBankPage.getCurrent(),
             questionBankPage.getSize(),
             questionBankPage.getTotal()
@@ -270,19 +270,19 @@ public class BusQuestionBankServiceImpl extends ServiceImpl<BusQuestionBankMappe
             return questionBankVoPage;
         }
         // 关联查询题目分类信息
-        Set<Long> categoryIdList = questionBankList.stream().map(BusQuestionBank::getCategoryId)
+        Set<Long> categoryIdList = questionBankList.stream().map(HseQuestionBank::getCategoryId)
             .collect(Collectors.toSet());
-        Map<Long, List<BusQuestionsCategory>> questionCategoryMap = questionsCategoryService.listByIds(categoryIdList)
-            .stream().collect(Collectors.groupingBy(BusQuestionsCategory::getId));
+        Map<Long, List<HseQuestionsCategory>> questionCategoryMap = questionsCategoryService.listByIds(categoryIdList)
+            .stream().collect(Collectors.groupingBy(HseQuestionsCategory::getId));
         // 对象列表 => 封装对象列表
-        List<BusQuestionBankVo> questionBankVoList = questionBankList.stream().map(questionBank -> {
-            BusQuestionBankVo questionBankVo = new BusQuestionBankVo();
+        List<HseQuestionBankVo> questionBankVoList = questionBankList.stream().map(questionBank -> {
+            HseQuestionBankVo questionBankVo = new HseQuestionBankVo();
             BeanUtils.copyProperties(questionBank, questionBankVo);
             // 获取题目分类名称
             Long categoryId = questionBank.getCategoryId();
             String categoryName = null;
             if (questionCategoryMap.containsKey(categoryId)) {
-                BusQuestionsCategory category = questionCategoryMap.get(categoryId).get(0);
+                HseQuestionsCategory category = questionCategoryMap.get(categoryId).get(0);
                 categoryName = category.getCategoryName();
             }
             questionBankVo.setCategoryName(categoryName);
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusQuestionUserAnswerServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionUserAnswerServiceImpl.java
similarity index 87%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusQuestionUserAnswerServiceImpl.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionUserAnswerServiceImpl.java
index 6fb8285e..132755fc 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusQuestionUserAnswerServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionUserAnswerServiceImpl.java
@@ -27,12 +27,12 @@ import org.dromara.project.domain.BusProjectTeamMember;
 import org.dromara.project.service.IBusConstructionUserService;
 import org.dromara.project.service.IBusProjectService;
 import org.dromara.project.service.IBusProjectTeamMemberService;
-import org.dromara.safety.domain.BusQuestionUserAnswer;
-import org.dromara.safety.domain.enums.SafetyExamTypeEnum;
+import org.dromara.safety.domain.HseQuestionUserAnswer;
+import org.dromara.safety.domain.enums.HseSafetyExamTypeEnum;
 import org.dromara.safety.domain.req.questionuseranswer.*;
-import org.dromara.safety.domain.vo.BusQuestionUserAnswerVo;
-import org.dromara.safety.mapper.BusQuestionUserAnswerMapper;
-import org.dromara.safety.service.IBusQuestionUserAnswerService;
+import org.dromara.safety.domain.vo.questionuseranswer.HseQuestionUserAnswerVo;
+import org.dromara.safety.mapper.HseQuestionUserAnswerMapper;
+import org.dromara.safety.service.IHseQuestionUserAnswerService;
 import org.dromara.system.domain.vo.SysOssVo;
 import org.dromara.system.service.ISysOssService;
 import org.springframework.beans.BeanUtils;
@@ -59,8 +59,8 @@ import java.util.zip.ZipOutputStream;
  */
 @Slf4j
 @Service
-public class BusQuestionUserAnswerServiceImpl extends ServiceImpl<BusQuestionUserAnswerMapper, BusQuestionUserAnswer>
-    implements IBusQuestionUserAnswerService {
+public class HseQuestionUserAnswerServiceImpl extends ServiceImpl<HseQuestionUserAnswerMapper, HseQuestionUserAnswer>
+    implements IHseQuestionUserAnswerService {
 
     @Resource
     private IBusProjectService projectService;
@@ -81,8 +81,8 @@ public class BusQuestionUserAnswerServiceImpl extends ServiceImpl<BusQuestionUse
      * @return 用户试卷存储
      */
     @Override
-    public BusQuestionUserAnswerVo queryById(Long id) {
-        BusQuestionUserAnswer questionUserAnswer = this.getById(id);
+    public HseQuestionUserAnswerVo queryById(Long id) {
+        HseQuestionUserAnswer questionUserAnswer = this.getById(id);
         if (questionUserAnswer == null) {
             throw new ServiceException("用户试卷存储信息不存在", HttpStatus.NOT_FOUND);
         }
@@ -97,8 +97,8 @@ public class BusQuestionUserAnswerServiceImpl extends ServiceImpl<BusQuestionUse
      * @return 用户试卷存储分页列表
      */
     @Override
-    public TableDataInfo<BusQuestionUserAnswerVo> queryPageList(QuestionUserAnswerQueryReq req, PageQuery pageQuery) {
-        Page<BusQuestionUserAnswer> result = this.page(pageQuery.build(), buildQueryWrapper(req));
+    public TableDataInfo<HseQuestionUserAnswerVo> queryPageList(HseQuestionUserAnswerQueryReq req, PageQuery pageQuery) {
+        Page<HseQuestionUserAnswer> result = this.page(pageQuery.build(), buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
 
@@ -109,8 +109,8 @@ public class BusQuestionUserAnswerServiceImpl extends ServiceImpl<BusQuestionUse
      * @return 用户试卷存储列表
      */
     @Override
-    public List<BusQuestionUserAnswerVo> queryList(QuestionUserAnswerQueryReq req) {
-        LambdaQueryWrapper<BusQuestionUserAnswer> lqw = buildQueryWrapper(req);
+    public List<HseQuestionUserAnswerVo> queryList(HseQuestionUserAnswerQueryReq req) {
+        LambdaQueryWrapper<HseQuestionUserAnswer> lqw = buildQueryWrapper(req);
         return this.list(lqw).stream().map(this::getVo).toList();
     }
 
@@ -121,9 +121,9 @@ public class BusQuestionUserAnswerServiceImpl extends ServiceImpl<BusQuestionUse
      * @return 是否新增成功
      */
     @Override
-    public Long insertByBo(QuestionUserAnswerCreateReq req) {
+    public Long insertByBo(HseQuestionUserAnswerCreateReq req) {
         // 将实体类和 DTO 进行转换
-        BusQuestionUserAnswer questionUserAnswer = new BusQuestionUserAnswer();
+        HseQuestionUserAnswer questionUserAnswer = new HseQuestionUserAnswer();
         BeanUtils.copyProperties(req, questionUserAnswer);
         List<Long> bankIdList = req.getBankIdList();
         if (CollUtil.isNotEmpty(bankIdList)) {
@@ -175,7 +175,7 @@ public class BusQuestionUserAnswerServiceImpl extends ServiceImpl<BusQuestionUse
         String basePath = "unzip_path";
         String destDirPath = String.format("%s/%s/%s/%s", basePath, DateUtils.getDate(), projectId, randomStr);
         // 3. 构建临时存储对象
-        List<QuestionUserAnswerUploadTemp> tempList = new ArrayList<>();
+        List<HseQuestionUserAnswerUploadTemp> tempList = new ArrayList<>();
         try {
             // 4. 创建临时文件
             tempZipFile = File.createTempFile(tempZipFilePath, null);
@@ -215,7 +215,7 @@ public class BusQuestionUserAnswerServiceImpl extends ServiceImpl<BusQuestionUse
                                 .collect(Collectors.joining(","));
                         }
                         // 7. 创建临时对象
-                        QuestionUserAnswerUploadTemp temp = new QuestionUserAnswerUploadTemp();
+                        HseQuestionUserAnswerUploadTemp temp = new HseQuestionUserAnswerUploadTemp();
                         temp.setProjectId(projectId);
                         temp.setUserName(userParts[0]);
                         temp.setUserIdCard(userParts[1]);
@@ -251,15 +251,15 @@ public class BusQuestionUserAnswerServiceImpl extends ServiceImpl<BusQuestionUse
             return true;
         }
         // 8.1 获取用户身份证列表
-        Set<String> idCardList = tempList.stream().map(QuestionUserAnswerUploadTemp::getUserIdCard)
+        Set<String> idCardList = tempList.stream().map(HseQuestionUserAnswerUploadTemp::getUserIdCard)
             .collect(Collectors.toSet());
         // 8.2 根据用户身份证列表查询用户信息
         Map<String, List<BusConstructionUser>> userIdMap = constructionUserService.lambdaQuery()
             .in(BusConstructionUser::getSfzNumber, idCardList).list()
             .stream().collect(Collectors.groupingBy(BusConstructionUser::getSfzNumber));
         // 8.3 遍历临时对象，构造用户试卷存储对象
-        List<BusQuestionUserAnswer> questionUserAnswerList = tempList.stream().map(temp -> {
-            BusQuestionUserAnswer questionUserAnswer = new BusQuestionUserAnswer();
+        List<HseQuestionUserAnswer> questionUserAnswerList = tempList.stream().map(temp -> {
+            HseQuestionUserAnswer questionUserAnswer = new HseQuestionUserAnswer();
             // 8.4 获取对应用户id
             String userIdCard = temp.getUserIdCard();
             Long userId = null;
@@ -280,7 +280,7 @@ public class BusQuestionUserAnswerServiceImpl extends ServiceImpl<BusQuestionUse
             String pass = String.format("%s,%s", temp.getPassScore(), temp.getFullScore());
             questionUserAnswer.setPass(pass);
             questionUserAnswer.setFile(temp.getFile());
-            questionUserAnswer.setExamType(SafetyExamTypeEnum.OFFLINE.getValue());
+            questionUserAnswer.setExamType(HseSafetyExamTypeEnum.OFFLINE.getValue());
             return questionUserAnswer;
         }).toList();
         // 9. 保存
@@ -298,9 +298,9 @@ public class BusQuestionUserAnswerServiceImpl extends ServiceImpl<BusQuestionUse
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(QuestionUserAnswerUpdateReq req) {
+    public Boolean updateByBo(HseQuestionUserAnswerUpdateReq req) {
         // 将实体类和 DTO 进行转换
-        BusQuestionUserAnswer questionUserAnswer = new BusQuestionUserAnswer();
+        HseQuestionUserAnswer questionUserAnswer = new HseQuestionUserAnswer();
         BeanUtils.copyProperties(req, questionUserAnswer);
         List<Long> bankIdList = req.getBankIdList();
         if (CollUtil.isNotEmpty(bankIdList)) {
@@ -315,7 +315,7 @@ public class BusQuestionUserAnswerServiceImpl extends ServiceImpl<BusQuestionUse
         // 数据校验
         validEntityBeforeSave(questionUserAnswer, false);
         // 判断是否存在
-        BusQuestionUserAnswer oldQuestionUserAnswer = this.getById(questionUserAnswer.getId());
+        HseQuestionUserAnswer oldQuestionUserAnswer = this.getById(questionUserAnswer.getId());
         if (oldQuestionUserAnswer == null) {
             throw new ServiceException("修改用户试卷存储失败，数据不存在", HttpStatus.NOT_FOUND);
         }
@@ -326,7 +326,7 @@ public class BusQuestionUserAnswerServiceImpl extends ServiceImpl<BusQuestionUse
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(BusQuestionUserAnswer entity, Boolean create) {
+    private void validEntityBeforeSave(HseQuestionUserAnswer entity, Boolean create) {
         // TODO 做一些数据校验,如唯一约束
         Long projectId = entity.getProjectId();
         if (create) {
@@ -362,9 +362,9 @@ public class BusQuestionUserAnswerServiceImpl extends ServiceImpl<BusQuestionUse
      * @return 用户试卷存储视图对象
      */
     @Override
-    public BusQuestionUserAnswerVo getVo(BusQuestionUserAnswer questionUserAnswer) {
+    public HseQuestionUserAnswerVo getVo(HseQuestionUserAnswer questionUserAnswer) {
         // 对象转封装类
-        BusQuestionUserAnswerVo questionUserAnswerVo = new BusQuestionUserAnswerVo();
+        HseQuestionUserAnswerVo questionUserAnswerVo = new HseQuestionUserAnswerVo();
         if (questionUserAnswer == null) {
             return questionUserAnswerVo;
         }
@@ -402,8 +402,8 @@ public class BusQuestionUserAnswerServiceImpl extends ServiceImpl<BusQuestionUse
      * @return 用户试卷存储查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusQuestionUserAnswer> buildQueryWrapper(QuestionUserAnswerQueryReq req) {
-        LambdaQueryWrapper<BusQuestionUserAnswer> lqw = new LambdaQueryWrapper<>();
+    public LambdaQueryWrapper<HseQuestionUserAnswer> buildQueryWrapper(HseQuestionUserAnswerQueryReq req) {
+        LambdaQueryWrapper<HseQuestionUserAnswer> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
         }
@@ -418,9 +418,9 @@ public class BusQuestionUserAnswerServiceImpl extends ServiceImpl<BusQuestionUse
                 .list();
             if (CollUtil.isNotEmpty(constructionUserList)) {
                 List<Long> userIdList = constructionUserList.stream().map(BusConstructionUser::getId).toList();
-                lqw.in(BusQuestionUserAnswer::getUserId, userIdList);
+                lqw.in(HseQuestionUserAnswer::getUserId, userIdList);
             } else {
-                lqw.eq(BusQuestionUserAnswer::getUserId, null);
+                lqw.eq(HseQuestionUserAnswer::getUserId, null);
             }
         }
         if (ObjectUtils.isNotEmpty(teamId)) {
@@ -430,13 +430,13 @@ public class BusQuestionUserAnswerServiceImpl extends ServiceImpl<BusQuestionUse
                 .list();
             if (CollUtil.isNotEmpty(projectTeamMemberList)) {
                 List<Long> userIdList = projectTeamMemberList.stream().map(BusProjectTeamMember::getMemberId).toList();
-                lqw.in(BusQuestionUserAnswer::getUserId, userIdList);
+                lqw.in(HseQuestionUserAnswer::getUserId, userIdList);
             } else {
-                lqw.eq(BusQuestionUserAnswer::getUserId, null);
+                lqw.eq(HseQuestionUserAnswer::getUserId, null);
             }
         }
         // 精准查询
-        lqw.eq(ObjectUtils.isNotEmpty(projectId), BusQuestionUserAnswer::getProjectId, projectId);
+        lqw.eq(ObjectUtils.isNotEmpty(projectId), HseQuestionUserAnswer::getProjectId, projectId);
         return lqw;
     }
 
@@ -447,11 +447,11 @@ public class BusQuestionUserAnswerServiceImpl extends ServiceImpl<BusQuestionUse
      * @return 用户试卷存储分页对象视图
      */
     @Override
-    public Page<BusQuestionUserAnswerVo> getVoPage(Page<BusQuestionUserAnswer> questionUserAnswerPage) {
+    public Page<HseQuestionUserAnswerVo> getVoPage(Page<HseQuestionUserAnswer> questionUserAnswerPage) {
         // 获取分页数据
-        List<BusQuestionUserAnswer> questionUserAnswerList = questionUserAnswerPage.getRecords();
+        List<HseQuestionUserAnswer> questionUserAnswerList = questionUserAnswerPage.getRecords();
         // 添加分页信息
-        Page<BusQuestionUserAnswerVo> questionUserAnswerVoPage = new Page<>(
+        Page<HseQuestionUserAnswerVo> questionUserAnswerVoPage = new Page<>(
             questionUserAnswerPage.getCurrent(),
             questionUserAnswerPage.getSize(),
             questionUserAnswerPage.getTotal()
@@ -460,7 +460,7 @@ public class BusQuestionUserAnswerServiceImpl extends ServiceImpl<BusQuestionUse
             return questionUserAnswerVoPage;
         }
         // 获取用户名
-        Set<Long> userIdList = questionUserAnswerList.stream().map(BusQuestionUserAnswer::getUserId).collect(Collectors.toSet());
+        Set<Long> userIdList = questionUserAnswerList.stream().map(HseQuestionUserAnswer::getUserId).collect(Collectors.toSet());
         List<BusConstructionUser> constructionUserList = constructionUserService.lambdaQuery()
             .select(BusConstructionUser::getId, BusConstructionUser::getUserName)
             .in(BusConstructionUser::getId, userIdList)
@@ -468,13 +468,13 @@ public class BusQuestionUserAnswerServiceImpl extends ServiceImpl<BusQuestionUse
         Map<Long, String> userNameMap = constructionUserList.stream()
             .collect(Collectors.toMap(BusConstructionUser::getId, BusConstructionUser::getUserName));
         // 获取用户文件
-        Set<Long> fileIdList = questionUserAnswerList.stream().map(BusQuestionUserAnswer::getFile).filter(StringUtils::isNotBlank)
+        Set<Long> fileIdList = questionUserAnswerList.stream().map(HseQuestionUserAnswer::getFile).filter(StringUtils::isNotBlank)
             .flatMap(fileId -> Arrays.stream(fileId.split(",")).map(Long::parseLong)).collect(Collectors.toSet());
         Map<Long, List<SysOssVo>> ossMap = ossService.listByIds(fileIdList)
             .stream().collect(Collectors.groupingBy(SysOssVo::getOssId));
         // 对象列表 => 封装对象列表
-        List<BusQuestionUserAnswerVo> questionUserAnswerVoList = questionUserAnswerList.stream().map(questionUserAnswer -> {
-            BusQuestionUserAnswerVo questionUserAnswerVo = new BusQuestionUserAnswerVo();
+        List<HseQuestionUserAnswerVo> questionUserAnswerVoList = questionUserAnswerList.stream().map(questionUserAnswer -> {
+            HseQuestionUserAnswerVo questionUserAnswerVo = new HseQuestionUserAnswerVo();
             BeanUtils.copyProperties(questionUserAnswer, questionUserAnswerVo);
             // 获取获取用户名
             Long userId = questionUserAnswer.getUserId();
@@ -517,20 +517,20 @@ public class BusQuestionUserAnswerServiceImpl extends ServiceImpl<BusQuestionUse
      * @param response 设置响应头和向客户端发送文件内容
      */
     @Override
-    public void batchDownloadFile(QuestionUserAnswerBatchDownloadFileReq req, HttpServletResponse response) {
+    public void batchDownloadFile(HseQuestionUserAnswerBatchDownloadFileReq req, HttpServletResponse response) {
         // 获取用户试卷存储文件
         List<Long> idList = req.getIdList();
         if (CollUtil.isEmpty(idList)) {
             return;
         }
-        List<BusQuestionUserAnswer> questionUserAnswerList = lambdaQuery()
-            .in(BusQuestionUserAnswer::getId, idList)
+        List<HseQuestionUserAnswer> questionUserAnswerList = lambdaQuery()
+            .in(HseQuestionUserAnswer::getId, idList)
             .list();
         if (CollUtil.isEmpty(questionUserAnswerList)) {
             return;
         }
         // 查询对应施工人员信息
-        Set<Long> userIdSet = questionUserAnswerList.stream().map(BusQuestionUserAnswer::getUserId).collect(Collectors.toSet());
+        Set<Long> userIdSet = questionUserAnswerList.stream().map(HseQuestionUserAnswer::getUserId).collect(Collectors.toSet());
         Map<Long, List<BusConstructionUser>> userMap = constructionUserService.lambdaQuery()
             .select(BusConstructionUser::getId, BusConstructionUser::getUserName)
             .in(BusConstructionUser::getId, userIdSet).list()
@@ -542,7 +542,7 @@ public class BusQuestionUserAnswerServiceImpl extends ServiceImpl<BusQuestionUse
         response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8");
         try (ZipOutputStream zos = new ZipOutputStream(response.getOutputStream())) {
             // 遍历所有用户文件
-            for (BusQuestionUserAnswer questionUserAnswer : questionUserAnswerList) {
+            for (HseQuestionUserAnswer questionUserAnswer : questionUserAnswerList) {
                 String file = questionUserAnswer.getFile();
                 if (StringUtils.isBlank(file)) {
                     continue;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusQuestionsCategoryServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionsCategoryServiceImpl.java
similarity index 72%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusQuestionsCategoryServiceImpl.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionsCategoryServiceImpl.java
index cf44cc86..e7df4db1 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusQuestionsCategoryServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionsCategoryServiceImpl.java
@@ -13,13 +13,13 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.project.service.IBusProjectService;
-import org.dromara.safety.domain.BusQuestionsCategory;
-import org.dromara.safety.domain.req.questionscategory.QuestionsCategoryCreateReq;
-import org.dromara.safety.domain.req.questionscategory.QuestionsCategoryQueryReq;
-import org.dromara.safety.domain.req.questionscategory.QuestionsCategoryUpdateReq;
-import org.dromara.safety.domain.vo.BusQuestionsCategoryVo;
-import org.dromara.safety.mapper.BusQuestionsCategoryMapper;
-import org.dromara.safety.service.IBusQuestionsCategoryService;
+import org.dromara.safety.domain.HseQuestionsCategory;
+import org.dromara.safety.domain.req.questionscategory.HseQuestionsCategoryCreateReq;
+import org.dromara.safety.domain.req.questionscategory.HseQuestionsCategoryQueryReq;
+import org.dromara.safety.domain.req.questionscategory.HseQuestionsCategoryUpdateReq;
+import org.dromara.safety.domain.vo.questionscategory.HseQuestionsCategoryVo;
+import org.dromara.safety.mapper.HseQuestionsCategoryMapper;
+import org.dromara.safety.service.IHseQuestionsCategoryService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,8 +34,8 @@ import java.util.List;
  * @date 2025-04-15
  */
 @Service
-public class BusQuestionsCategoryServiceImpl extends ServiceImpl<BusQuestionsCategoryMapper, BusQuestionsCategory>
-    implements IBusQuestionsCategoryService {
+public class HseQuestionsCategoryServiceImpl extends ServiceImpl<HseQuestionsCategoryMapper, HseQuestionsCategory>
+    implements IHseQuestionsCategoryService {
 
     @Resource
     private IBusProjectService projectService;
@@ -47,8 +47,8 @@ public class BusQuestionsCategoryServiceImpl extends ServiceImpl<BusQuestionsCat
      * @return 题库类别
      */
     @Override
-    public BusQuestionsCategoryVo queryById(Long id) {
-        BusQuestionsCategory questionsCategory = this.getById(id);
+    public HseQuestionsCategoryVo queryById(Long id) {
+        HseQuestionsCategory questionsCategory = this.getById(id);
         if (questionsCategory == null) {
             throw new ServiceException("题库类别信息不存在", HttpStatus.NOT_FOUND);
         }
@@ -63,8 +63,8 @@ public class BusQuestionsCategoryServiceImpl extends ServiceImpl<BusQuestionsCat
      * @return 题库类别分页列表
      */
     @Override
-    public TableDataInfo<BusQuestionsCategoryVo> queryPageList(QuestionsCategoryQueryReq req, PageQuery pageQuery) {
-        Page<BusQuestionsCategory> result = this.page(pageQuery.build(), buildQueryWrapper(req));
+    public TableDataInfo<HseQuestionsCategoryVo> queryPageList(HseQuestionsCategoryQueryReq req, PageQuery pageQuery) {
+        Page<HseQuestionsCategory> result = this.page(pageQuery.build(), buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
 
@@ -75,8 +75,8 @@ public class BusQuestionsCategoryServiceImpl extends ServiceImpl<BusQuestionsCat
      * @return 题库类别列表
      */
     @Override
-    public List<BusQuestionsCategoryVo> queryList(QuestionsCategoryQueryReq req) {
-        LambdaQueryWrapper<BusQuestionsCategory> lqw = this.buildQueryWrapper(req);
+    public List<HseQuestionsCategoryVo> queryList(HseQuestionsCategoryQueryReq req) {
+        LambdaQueryWrapper<HseQuestionsCategory> lqw = this.buildQueryWrapper(req);
         return this.list(lqw).stream().map(this::getVo).toList();
     }
 
@@ -87,9 +87,9 @@ public class BusQuestionsCategoryServiceImpl extends ServiceImpl<BusQuestionsCat
      * @return 新增题库类别主键
      */
     @Override
-    public Long insertByBo(QuestionsCategoryCreateReq req) {
+    public Long insertByBo(HseQuestionsCategoryCreateReq req) {
         // 将实体类和 DTO 进行转换
-        BusQuestionsCategory questionsCategory = new BusQuestionsCategory();
+        HseQuestionsCategory questionsCategory = new HseQuestionsCategory();
         BeanUtils.copyProperties(req, questionsCategory);
         // 数据校验
         validEntityBeforeSave(questionsCategory, true);
@@ -109,14 +109,14 @@ public class BusQuestionsCategoryServiceImpl extends ServiceImpl<BusQuestionsCat
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(QuestionsCategoryUpdateReq req) {
+    public Boolean updateByBo(HseQuestionsCategoryUpdateReq req) {
         // 将实体类和 DTO 进行转换
-        BusQuestionsCategory questionsCategory = new BusQuestionsCategory();
+        HseQuestionsCategory questionsCategory = new HseQuestionsCategory();
         BeanUtils.copyProperties(req, questionsCategory);
         // 数据校验
         validEntityBeforeSave(questionsCategory, false);
         // 判断是否存在
-        BusQuestionsCategory oldQuestionsCategory = this.getById(questionsCategory.getId());
+        HseQuestionsCategory oldQuestionsCategory = this.getById(questionsCategory.getId());
         if (oldQuestionsCategory == null) {
             throw new ServiceException("修改题库类别失败，数据不存在", HttpStatus.NOT_FOUND);
         }
@@ -127,7 +127,7 @@ public class BusQuestionsCategoryServiceImpl extends ServiceImpl<BusQuestionsCat
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(BusQuestionsCategory entity, Boolean create) {
+    private void validEntityBeforeSave(HseQuestionsCategory entity, Boolean create) {
         // TODO 做一些数据校验,如唯一约束
         Long projectId = entity.getProjectId();
         if (create) {
@@ -151,10 +151,10 @@ public class BusQuestionsCategoryServiceImpl extends ServiceImpl<BusQuestionsCat
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         Long userId = LoginHelper.getUserId();
-        List<BusQuestionsCategory> questionsCategoryList = this.listByIds(ids);
+        List<HseQuestionsCategory> questionsCategoryList = this.listByIds(ids);
         if (isValid) {
             // TODO 做一些业务上的校验,判断是否需要校验
-            List<Long> projectId = questionsCategoryList.stream().map(BusQuestionsCategory::getProjectId).toList();
+            List<Long> projectId = questionsCategoryList.stream().map(HseQuestionsCategory::getProjectId).toList();
             projectService.validAuth(projectId, userId);
         }
         return this.removeBatchByIds(ids);
@@ -167,9 +167,9 @@ public class BusQuestionsCategoryServiceImpl extends ServiceImpl<BusQuestionsCat
      * @return 题库类别视图对象
      */
     @Override
-    public BusQuestionsCategoryVo getVo(BusQuestionsCategory questionsCategory) {
+    public HseQuestionsCategoryVo getVo(HseQuestionsCategory questionsCategory) {
         // 对象转封装类
-        BusQuestionsCategoryVo questionsCategoryVo = new BusQuestionsCategoryVo();
+        HseQuestionsCategoryVo questionsCategoryVo = new HseQuestionsCategoryVo();
         if (questionsCategory == null) {
             return questionsCategoryVo;
         }
@@ -184,17 +184,17 @@ public class BusQuestionsCategoryServiceImpl extends ServiceImpl<BusQuestionsCat
      * @return 题库类别查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusQuestionsCategory> buildQueryWrapper(QuestionsCategoryQueryReq req) {
-        LambdaQueryWrapper<BusQuestionsCategory> lqw = new LambdaQueryWrapper<>();
+    public LambdaQueryWrapper<HseQuestionsCategory> buildQueryWrapper(HseQuestionsCategoryQueryReq req) {
+        LambdaQueryWrapper<HseQuestionsCategory> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
         }
         Long projectId = req.getProjectId();
         String categoryName = req.getCategoryName();
         // 模糊查询
-        lqw.like(StringUtils.isNotBlank(categoryName), BusQuestionsCategory::getCategoryName, categoryName);
+        lqw.like(StringUtils.isNotBlank(categoryName), HseQuestionsCategory::getCategoryName, categoryName);
         // 精确查询
-        lqw.eq(ObjectUtils.isNotEmpty(projectId), BusQuestionsCategory::getProjectId, projectId);
+        lqw.eq(ObjectUtils.isNotEmpty(projectId), HseQuestionsCategory::getProjectId, projectId);
         return lqw;
     }
 
@@ -205,11 +205,11 @@ public class BusQuestionsCategoryServiceImpl extends ServiceImpl<BusQuestionsCat
      * @return 题库类别分页对象视图
      */
     @Override
-    public Page<BusQuestionsCategoryVo> getVoPage(Page<BusQuestionsCategory> questionsCategoryPage) {
+    public Page<HseQuestionsCategoryVo> getVoPage(Page<HseQuestionsCategory> questionsCategoryPage) {
         // 获取分页数据
-        List<BusQuestionsCategory> questionsCategoryList = questionsCategoryPage.getRecords();
+        List<HseQuestionsCategory> questionsCategoryList = questionsCategoryPage.getRecords();
         // 添加分页信息
-        Page<BusQuestionsCategoryVo> questionsCategoryVoPage = new Page<>(
+        Page<HseQuestionsCategoryVo> questionsCategoryVoPage = new Page<>(
             questionsCategoryPage.getCurrent(),
             questionsCategoryPage.getSize(),
             questionsCategoryPage.getTotal()
@@ -218,7 +218,7 @@ public class BusQuestionsCategoryServiceImpl extends ServiceImpl<BusQuestionsCat
             return questionsCategoryVoPage;
         }
         // 对象列表 => 封装对象列表
-        List<BusQuestionsCategoryVo> questionsCategoryVoList = questionsCategoryList.stream().map(this::getVo).toList();
+        List<HseQuestionsCategoryVo> questionsCategoryVoList = questionsCategoryList.stream().map(this::getVo).toList();
         questionsCategoryVoPage.setRecords(questionsCategoryVoList);
         return questionsCategoryVoPage;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusQuestionsConfigServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionsConfigServiceImpl.java
similarity index 70%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusQuestionsConfigServiceImpl.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionsConfigServiceImpl.java
index 9fdadb63..2d489184 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusQuestionsConfigServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionsConfigServiceImpl.java
@@ -12,13 +12,13 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.project.service.IBusProjectService;
-import org.dromara.safety.domain.BusQuestionsConfig;
-import org.dromara.safety.domain.req.questionsconfig.QuestionsConfigCreateReq;
-import org.dromara.safety.domain.req.questionsconfig.QuestionsConfigQueryReq;
-import org.dromara.safety.domain.req.questionsconfig.QuestionsConfigUpdateReq;
-import org.dromara.safety.domain.vo.BusQuestionsConfigVo;
-import org.dromara.safety.mapper.BusQuestionsConfigMapper;
-import org.dromara.safety.service.IBusQuestionsConfigService;
+import org.dromara.safety.domain.HseQuestionsConfig;
+import org.dromara.safety.domain.req.questionsconfig.HseQuestionsConfigCreateReq;
+import org.dromara.safety.domain.req.questionsconfig.HseQuestionsConfigQueryReq;
+import org.dromara.safety.domain.req.questionsconfig.HseQuestionsConfigUpdateReq;
+import org.dromara.safety.domain.vo.questionsconfig.HseQuestionsConfigVo;
+import org.dromara.safety.mapper.HseQuestionsConfigMapper;
+import org.dromara.safety.service.IHseQuestionsConfigService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -33,8 +33,8 @@ import java.util.List;
  * @date 2025-03-24
  */
 @Service
-public class BusQuestionsConfigServiceImpl extends ServiceImpl<BusQuestionsConfigMapper, BusQuestionsConfig>
-    implements IBusQuestionsConfigService {
+public class HseQuestionsConfigServiceImpl extends ServiceImpl<HseQuestionsConfigMapper, HseQuestionsConfig>
+    implements IHseQuestionsConfigService {
 
     @Resource
     private IBusProjectService projectService;
@@ -46,8 +46,8 @@ public class BusQuestionsConfigServiceImpl extends ServiceImpl<BusQuestionsConfi
      * @return 题库配置
      */
     @Override
-    public BusQuestionsConfigVo queryById(Long id) {
-        BusQuestionsConfig questionsConfig = this.getById(id);
+    public HseQuestionsConfigVo queryById(Long id) {
+        HseQuestionsConfig questionsConfig = this.getById(id);
         if (questionsConfig == null) {
             throw new ServiceException("题库配置信息不存在", HttpStatus.NOT_FOUND);
         }
@@ -62,8 +62,8 @@ public class BusQuestionsConfigServiceImpl extends ServiceImpl<BusQuestionsConfi
      * @return 题库配置分页列表
      */
     @Override
-    public TableDataInfo<BusQuestionsConfigVo> queryPageList(QuestionsConfigQueryReq req, PageQuery pageQuery) {
-        Page<BusQuestionsConfig> result = this.page(pageQuery.build(), buildQueryWrapper(req));
+    public TableDataInfo<HseQuestionsConfigVo> queryPageList(HseQuestionsConfigQueryReq req, PageQuery pageQuery) {
+        Page<HseQuestionsConfig> result = this.page(pageQuery.build(), buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
 
@@ -74,8 +74,8 @@ public class BusQuestionsConfigServiceImpl extends ServiceImpl<BusQuestionsConfi
      * @return 题库配置列表
      */
     @Override
-    public List<BusQuestionsConfigVo> queryList(QuestionsConfigQueryReq req) {
-        LambdaQueryWrapper<BusQuestionsConfig> lqw = buildQueryWrapper(req);
+    public List<HseQuestionsConfigVo> queryList(HseQuestionsConfigQueryReq req) {
+        LambdaQueryWrapper<HseQuestionsConfig> lqw = buildQueryWrapper(req);
         return this.list(lqw).stream().map(this::getVo).toList();
     }
 
@@ -86,9 +86,9 @@ public class BusQuestionsConfigServiceImpl extends ServiceImpl<BusQuestionsConfi
      * @return 是否新增成功
      */
     @Override
-    public Long insertByBo(QuestionsConfigCreateReq req) {
+    public Long insertByBo(HseQuestionsConfigCreateReq req) {
         // 将实体类和 DTO 进行转换
-        BusQuestionsConfig questionsConfig = new BusQuestionsConfig();
+        HseQuestionsConfig questionsConfig = new HseQuestionsConfig();
         BeanUtils.copyProperties(req, questionsConfig);
         // 数据校验
         validEntityBeforeSave(questionsConfig, true);
@@ -108,14 +108,14 @@ public class BusQuestionsConfigServiceImpl extends ServiceImpl<BusQuestionsConfi
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(QuestionsConfigUpdateReq req) {
+    public Boolean updateByBo(HseQuestionsConfigUpdateReq req) {
         // 将实体类和 DTO 进行转换
-        BusQuestionsConfig questionsConfig = new BusQuestionsConfig();
+        HseQuestionsConfig questionsConfig = new HseQuestionsConfig();
         BeanUtils.copyProperties(req, questionsConfig);
         // 数据校验
         validEntityBeforeSave(questionsConfig, false);
         // 判断是否存在
-        BusQuestionsConfig oldQuestionsConfig = this.getById(questionsConfig.getId());
+        HseQuestionsConfig oldQuestionsConfig = this.getById(questionsConfig.getId());
         if (oldQuestionsConfig == null) {
             throw new ServiceException("修改题库配置失败，数据不存在", HttpStatus.NOT_FOUND);
         }
@@ -126,7 +126,7 @@ public class BusQuestionsConfigServiceImpl extends ServiceImpl<BusQuestionsConfi
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(BusQuestionsConfig entity, Boolean create) {
+    private void validEntityBeforeSave(HseQuestionsConfig entity, Boolean create) {
         // TODO 做一些数据校验,如唯一约束
         Long projectId = entity.getProjectId();
         if (create) {
@@ -150,10 +150,10 @@ public class BusQuestionsConfigServiceImpl extends ServiceImpl<BusQuestionsConfi
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         Long userId = LoginHelper.getUserId();
-        List<BusQuestionsConfig> questionsConfigList = this.listByIds(ids);
+        List<HseQuestionsConfig> questionsConfigList = this.listByIds(ids);
         if (isValid) {
             // TODO 做一些业务上的校验,判断是否需要校验
-            List<Long> projectId = questionsConfigList.stream().map(BusQuestionsConfig::getProjectId).toList();
+            List<Long> projectId = questionsConfigList.stream().map(HseQuestionsConfig::getProjectId).toList();
             projectService.validAuth(projectId, userId);
         }
         return this.removeBatchByIds(ids);
@@ -166,9 +166,9 @@ public class BusQuestionsConfigServiceImpl extends ServiceImpl<BusQuestionsConfi
      * @return 题库配置视图对象
      */
     @Override
-    public BusQuestionsConfigVo getVo(BusQuestionsConfig questionsConfig) {
+    public HseQuestionsConfigVo getVo(HseQuestionsConfig questionsConfig) {
         // 对象转封装类
-        BusQuestionsConfigVo questionsConfigVo = new BusQuestionsConfigVo();
+        HseQuestionsConfigVo questionsConfigVo = new HseQuestionsConfigVo();
         if (questionsConfig == null) {
             return questionsConfigVo;
         }
@@ -183,8 +183,8 @@ public class BusQuestionsConfigServiceImpl extends ServiceImpl<BusQuestionsConfi
      * @return 题库配置查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusQuestionsConfig> buildQueryWrapper(QuestionsConfigQueryReq req) {
-        LambdaQueryWrapper<BusQuestionsConfig> lqw = new LambdaQueryWrapper<>();
+    public LambdaQueryWrapper<HseQuestionsConfig> buildQueryWrapper(HseQuestionsConfigQueryReq req) {
+        LambdaQueryWrapper<HseQuestionsConfig> lqw = new LambdaQueryWrapper<>();
         if (req == null) {
             return lqw;
         }
@@ -200,17 +200,17 @@ public class BusQuestionsConfigServiceImpl extends ServiceImpl<BusQuestionsConfi
         Long passScore = req.getPassScore();
         Long answerTime = req.getAnswerTime();
         // 精准查询
-        lqw.eq(ObjectUtils.isNotEmpty(id), BusQuestionsConfig::getId, id);
-        lqw.eq(ObjectUtils.isNotEmpty(projectId), BusQuestionsConfig::getProjectId, projectId);
-        lqw.eq(ObjectUtils.isNotEmpty(singleChoice), BusQuestionsConfig::getSingleChoice, singleChoice);
-        lqw.eq(ObjectUtils.isNotEmpty(singleScore), BusQuestionsConfig::getSingleScore, singleScore);
-        lqw.eq(ObjectUtils.isNotEmpty(multipleChoice), BusQuestionsConfig::getMultipleChoice, multipleChoice);
-        lqw.eq(ObjectUtils.isNotEmpty(multipleScore), BusQuestionsConfig::getMultipleScore, multipleScore);
-        lqw.eq(ObjectUtils.isNotEmpty(estimate), BusQuestionsConfig::getEstimate, estimate);
-        lqw.eq(ObjectUtils.isNotEmpty(estimateScore), BusQuestionsConfig::getEstimateScore, estimateScore);
-        lqw.eq(ObjectUtils.isNotEmpty(fullMark), BusQuestionsConfig::getFullMark, fullMark);
-        lqw.eq(ObjectUtils.isNotEmpty(passScore), BusQuestionsConfig::getPassScore, passScore);
-        lqw.eq(ObjectUtils.isNotEmpty(answerTime), BusQuestionsConfig::getAnswerTime, answerTime);
+        lqw.eq(ObjectUtils.isNotEmpty(id), HseQuestionsConfig::getId, id);
+        lqw.eq(ObjectUtils.isNotEmpty(projectId), HseQuestionsConfig::getProjectId, projectId);
+        lqw.eq(ObjectUtils.isNotEmpty(singleChoice), HseQuestionsConfig::getSingleChoice, singleChoice);
+        lqw.eq(ObjectUtils.isNotEmpty(singleScore), HseQuestionsConfig::getSingleScore, singleScore);
+        lqw.eq(ObjectUtils.isNotEmpty(multipleChoice), HseQuestionsConfig::getMultipleChoice, multipleChoice);
+        lqw.eq(ObjectUtils.isNotEmpty(multipleScore), HseQuestionsConfig::getMultipleScore, multipleScore);
+        lqw.eq(ObjectUtils.isNotEmpty(estimate), HseQuestionsConfig::getEstimate, estimate);
+        lqw.eq(ObjectUtils.isNotEmpty(estimateScore), HseQuestionsConfig::getEstimateScore, estimateScore);
+        lqw.eq(ObjectUtils.isNotEmpty(fullMark), HseQuestionsConfig::getFullMark, fullMark);
+        lqw.eq(ObjectUtils.isNotEmpty(passScore), HseQuestionsConfig::getPassScore, passScore);
+        lqw.eq(ObjectUtils.isNotEmpty(answerTime), HseQuestionsConfig::getAnswerTime, answerTime);
         return lqw;
     }
 
@@ -221,11 +221,11 @@ public class BusQuestionsConfigServiceImpl extends ServiceImpl<BusQuestionsConfi
      * @return 题库配置分页对象视图
      */
     @Override
-    public Page<BusQuestionsConfigVo> getVoPage(Page<BusQuestionsConfig> questionsConfigPage) {
+    public Page<HseQuestionsConfigVo> getVoPage(Page<HseQuestionsConfig> questionsConfigPage) {
         // 获取分页数据
-        List<BusQuestionsConfig> questionsConfigList = questionsConfigPage.getRecords();
+        List<HseQuestionsConfig> questionsConfigList = questionsConfigPage.getRecords();
         // 添加分页信息
-        Page<BusQuestionsConfigVo> questionsConfigVoPage = new Page<>(
+        Page<HseQuestionsConfigVo> questionsConfigVoPage = new Page<>(
             questionsConfigPage.getCurrent(),
             questionsConfigPage.getSize(),
             questionsConfigPage.getTotal()
@@ -234,7 +234,7 @@ public class BusQuestionsConfigServiceImpl extends ServiceImpl<BusQuestionsConfi
             return questionsConfigVoPage;
         }
         // 对象列表 => 封装对象列表
-        List<BusQuestionsConfigVo> questionsConfigVoList = questionsConfigList.stream().map(this::getVo).toList();
+        List<HseQuestionsConfigVo> questionsConfigVoList = questionsConfigList.stream().map(this::getVo).toList();
         questionsConfigVoPage.setRecords(questionsConfigVoList);
         return questionsConfigVoPage;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyInspectionServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java
similarity index 78%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyInspectionServiceImpl.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java
index 94c5784b..4ea87ce8 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyInspectionServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java
@@ -26,21 +26,21 @@ import org.dromara.project.domain.BusProjectTeam;
 import org.dromara.project.service.IBusConstructionUserService;
 import org.dromara.project.service.IBusProjectService;
 import org.dromara.project.service.IBusProjectTeamService;
-import org.dromara.safety.constant.SafetyConstant;
-import org.dromara.safety.domain.BusSafetyInspection;
-import org.dromara.safety.domain.BusTeamMeeting;
-import org.dromara.safety.domain.enums.SafetyInspectionReviewTypeEnum;
-import org.dromara.safety.domain.enums.SafetyInspectionStatusEnum;
-import org.dromara.safety.domain.req.safetyinspection.SafetyInspectionCreateReq;
-import org.dromara.safety.domain.req.safetyinspection.SafetyInspectionGisReq;
-import org.dromara.safety.domain.req.safetyinspection.SafetyInspectionQueryReq;
-import org.dromara.safety.domain.req.safetyinspection.SafetyInspectionUpdateReq;
-import org.dromara.safety.domain.vo.safetyinspection.BusSafetyInspectionVo;
-import org.dromara.safety.domain.vo.safetyinspection.SafetyInspectionListGisVo;
-import org.dromara.safety.domain.vo.teammeeting.TeamMeetingGis;
-import org.dromara.safety.mapper.BusSafetyInspectionMapper;
-import org.dromara.safety.service.IBusSafetyInspectionService;
-import org.dromara.safety.service.IBusTeamMeetingService;
+import org.dromara.safety.constant.HseSafetyConstant;
+import org.dromara.safety.domain.HseSafetyInspection;
+import org.dromara.safety.domain.HseTeamMeeting;
+import org.dromara.safety.domain.enums.HseSafetyInspectionReviewTypeEnum;
+import org.dromara.safety.domain.enums.HseSafetyInspectionStatusEnum;
+import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionCreateReq;
+import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionGisReq;
+import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionQueryReq;
+import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionUpdateReq;
+import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionVo;
+import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionListGisVo;
+import org.dromara.safety.domain.vo.teammeeting.HseTeamMeetingGis;
+import org.dromara.safety.mapper.HseSafetyInspectionMapper;
+import org.dromara.safety.service.IHseSafetyInspectionService;
+import org.dromara.safety.service.IHseTeamMeetingService;
 import org.dromara.system.domain.vo.SysOssVo;
 import org.dromara.system.domain.vo.SysUserVo;
 import org.dromara.system.service.ISysDictDataService;
@@ -59,6 +59,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
+import java.util.stream.Collectors;
 import java.util.zip.ZipOutputStream;
 
 /**
@@ -69,8 +70,8 @@ import java.util.zip.ZipOutputStream;
  */
 @Slf4j
 @Service
-public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspectionMapper, BusSafetyInspection>
-    implements IBusSafetyInspectionService {
+public class HseSafetyInspectionServiceImpl extends ServiceImpl<HseSafetyInspectionMapper, HseSafetyInspection>
+    implements IHseSafetyInspectionService {
 
     @Resource
     private IBusConstructionUserService constructionUserService;
@@ -91,7 +92,7 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
     private ISysOssService ossService;
 
     @Resource
-    private IBusTeamMeetingService teamMeetingService;
+    private IHseTeamMeetingService teamMeetingService;
 
     /**
      * 查询安全巡检工单
@@ -100,8 +101,8 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
      * @return 安全巡检工单
      */
     @Override
-    public BusSafetyInspectionVo queryById(Long id) {
-        BusSafetyInspection safetyInspection = this.getById(id);
+    public HseSafetyInspectionVo queryById(Long id) {
+        HseSafetyInspection safetyInspection = this.getById(id);
         if (safetyInspection == null) {
             throw new ServiceException("安全巡检工单信息不存在", HttpStatus.NOT_FOUND);
         }
@@ -116,8 +117,8 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
      * @return 安全巡检工单分页列表
      */
     @Override
-    public TableDataInfo<BusSafetyInspectionVo> queryPageList(SafetyInspectionQueryReq req, PageQuery pageQuery) {
-        Page<BusSafetyInspection> result = this.page(pageQuery.build(), buildQueryWrapper(req));
+    public TableDataInfo<HseSafetyInspectionVo> queryPageList(HseSafetyInspectionQueryReq req, PageQuery pageQuery) {
+        Page<HseSafetyInspection> result = this.page(pageQuery.build(), buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
 
@@ -128,8 +129,8 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
      * @return 安全巡检工单列表
      */
     @Override
-    public List<BusSafetyInspectionVo> queryList(SafetyInspectionQueryReq req) {
-        List<BusSafetyInspection> safetyInspection = this.list(this.buildQueryWrapper(req));
+    public List<HseSafetyInspectionVo> queryList(HseSafetyInspectionQueryReq req) {
+        List<HseSafetyInspection> safetyInspection = this.list(this.buildQueryWrapper(req));
         return safetyInspection.stream().map(this::getVo).toList();
     }
 
@@ -140,32 +141,40 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
      * @return 安全信息
      */
     @Override
-    public SafetyInspectionListGisVo queryGisList(SafetyInspectionGisReq req) {
+    public HseSafetyInspectionListGisVo queryGisList(HseSafetyInspectionGisReq req) {
         Long projectId = req.getProjectId();
         if (projectId == null || projectService.getById(projectId) == null) {
             throw new ServiceException("项目信息不存在", HttpStatus.NOT_FOUND);
         }
-        SafetyInspectionListGisVo gisVo = new SafetyInspectionListGisVo();
-        List<BusTeamMeeting> teamMeetings = teamMeetingService.lambdaQuery()
-            .eq(BusTeamMeeting::getProjectId, projectId)
+        HseSafetyInspectionListGisVo gisVo = new HseSafetyInspectionListGisVo();
+        List<HseTeamMeeting> teamMeetings = teamMeetingService.lambdaQuery()
+            .eq(HseTeamMeeting::getProjectId, projectId)
             .list();
         // 获取最新的班组列表
-        List<BusTeamMeeting> topList = teamMeetings.stream()
-            .sorted(Comparator.comparing(BusTeamMeeting::getCreateTime).reversed())
+        List<HseTeamMeeting> topList = teamMeetings.stream()
+            .sorted(Comparator.comparing(HseTeamMeeting::getCreateTime).reversed())
             .limit(req.getPageSize())
             .toList();
-        List<TeamMeetingGis> gisList = topList.stream().map(qualityInspection -> {
-            TeamMeetingGis gis = new TeamMeetingGis();
-            BeanUtils.copyProperties(qualityInspection, gis);
+        List<Long> teamIds = topList.stream().map(HseTeamMeeting::getTeamId).toList();
+        Map<Long, List<BusProjectTeam>> teamMap = projectTeamService.lambdaQuery()
+            .in(BusProjectTeam::getId, teamIds)
+            .list().stream().collect(Collectors.groupingBy(BusProjectTeam::getId));
+        List<HseTeamMeetingGis> gisList = topList.stream().map(teamMeeting -> {
+            HseTeamMeetingGis gis = new HseTeamMeetingGis();
+            BeanUtils.copyProperties(teamMeeting, gis);
+            gis.setName("站班会");
+            if (teamMap.containsKey(teamMeeting.getTeamId())) {
+                gis.setTeamName(teamMap.get(teamMeeting.getTeamId()).get(0).getTeamName());
+            }
             return gis;
         }).toList();
         // 获取整改情况
-        List<BusSafetyInspection> safetyInspectionList = this.lambdaQuery()
-            .eq(BusSafetyInspection::getProjectId, projectId).list();
+        List<HseSafetyInspection> safetyInspectionList = this.lambdaQuery()
+            .eq(HseSafetyInspection::getProjectId, projectId).list();
         long passCount = 0L;
-        for (BusSafetyInspection safetyInspection : safetyInspectionList) {
-            if (SafetyInspectionStatusEnum.REVIEW.getValue().equals(safetyInspection.getStatus())
-                && SafetyInspectionReviewTypeEnum.PASS.getValue().equals(safetyInspection.getReviewType())) {
+        for (HseSafetyInspection safetyInspection : safetyInspectionList) {
+            if (HseSafetyInspectionStatusEnum.REVIEW.getValue().equals(safetyInspection.getStatus())
+                && HseSafetyInspectionReviewTypeEnum.PASS.getValue().equals(safetyInspection.getReviewType())) {
                 passCount++;
             }
         }
@@ -183,9 +192,9 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
      * @return 是否新增成功
      */
     @Override
-    public Long insertByBo(SafetyInspectionCreateReq req) {
+    public Long insertByBo(HseSafetyInspectionCreateReq req) {
         // 将实体类和 DTO 进行转换
-        BusSafetyInspection safetyInspection = new BusSafetyInspection();
+        HseSafetyInspection safetyInspection = new HseSafetyInspection();
         BeanUtils.copyProperties(req, safetyInspection);
         // 数据校验
         validEntityBeforeSave(safetyInspection, true);
@@ -205,14 +214,14 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(SafetyInspectionUpdateReq req) {
+    public Boolean updateByBo(HseSafetyInspectionUpdateReq req) {
         // 将实体类和 DTO 进行转换
-        BusSafetyInspection safetyInspection = new BusSafetyInspection();
+        HseSafetyInspection safetyInspection = new HseSafetyInspection();
         BeanUtils.copyProperties(req, safetyInspection);
         // 数据校验
         validEntityBeforeSave(safetyInspection, false);
         // 判断是否存在
-        BusSafetyInspection oldSafetyInspection = this.getById(safetyInspection.getId());
+        HseSafetyInspection oldSafetyInspection = this.getById(safetyInspection.getId());
         if (oldSafetyInspection == null) {
             throw new ServiceException("修改安全巡检工单信息失败，数据不存在", HttpStatus.NOT_FOUND);
         }
@@ -223,7 +232,7 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(BusSafetyInspection entity, Boolean create) {
+    private void validEntityBeforeSave(HseSafetyInspection entity, Boolean create) {
         // TODO 做一些数据校验,如唯一约束
         Long projectId = entity.getProjectId();
         Long correctorId = entity.getCorrectorId();
@@ -264,7 +273,7 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if (isValid) {
             // TODO 做一些业务上的校验,判断是否需要校验
-            Long count = this.lambdaQuery().in(BusSafetyInspection::getPid, ids).count();
+            Long count = this.lambdaQuery().in(HseSafetyInspection::getPid, ids).count();
             if (count > 0) {
                 throw new ServiceException("所选安全巡检工单包含子数据，不允许删除", HttpStatus.BAD_REQUEST);
             }
@@ -279,9 +288,9 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
      * @return 安全巡检工单视图对象
      */
     @Override
-    public BusSafetyInspectionVo getVo(BusSafetyInspection safetyInspection) {
+    public HseSafetyInspectionVo getVo(HseSafetyInspection safetyInspection) {
         // 对象转封装类
-        BusSafetyInspectionVo safetyInspectionVo = new BusSafetyInspectionVo();
+        HseSafetyInspectionVo safetyInspectionVo = new HseSafetyInspectionVo();
         if (safetyInspection == null) {
             return safetyInspectionVo;
         }
@@ -323,8 +332,8 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
      * @return 安全巡检工单查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusSafetyInspection> buildQueryWrapper(SafetyInspectionQueryReq req) {
-        LambdaQueryWrapper<BusSafetyInspection> lqw = Wrappers.lambdaQuery();
+    public LambdaQueryWrapper<HseSafetyInspection> buildQueryWrapper(HseSafetyInspectionQueryReq req) {
+        LambdaQueryWrapper<HseSafetyInspection> lqw = Wrappers.lambdaQuery();
         if (req == null) {
             return lqw;
         }
@@ -337,14 +346,14 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
         String status = req.getStatus();
         String reviewType = req.getReviewType();
         // 精准查询
-        lqw.eq(ObjectUtils.isNotEmpty(pid), BusSafetyInspection::getPid, pid);
-        lqw.eq(ObjectUtils.isNotEmpty(projectId), BusSafetyInspection::getProjectId, projectId);
-        lqw.eq(ObjectUtils.isNotEmpty(checkType), BusSafetyInspection::getCheckType, checkType);
-        lqw.eq(ObjectUtils.isNotEmpty(violationType), BusSafetyInspection::getViolationType, violationType);
-        lqw.eq(ObjectUtils.isNotEmpty(teamId), BusSafetyInspection::getTeamId, teamId);
-        lqw.eq(ObjectUtils.isNotEmpty(correctorId), BusSafetyInspection::getCorrectorId, correctorId);
-        lqw.eq(ObjectUtils.isNotEmpty(status), BusSafetyInspection::getStatus, status);
-        lqw.eq(ObjectUtils.isNotEmpty(reviewType), BusSafetyInspection::getReviewType, reviewType);
+        lqw.eq(ObjectUtils.isNotEmpty(pid), HseSafetyInspection::getPid, pid);
+        lqw.eq(ObjectUtils.isNotEmpty(projectId), HseSafetyInspection::getProjectId, projectId);
+        lqw.eq(ObjectUtils.isNotEmpty(checkType), HseSafetyInspection::getCheckType, checkType);
+        lqw.eq(ObjectUtils.isNotEmpty(violationType), HseSafetyInspection::getViolationType, violationType);
+        lqw.eq(ObjectUtils.isNotEmpty(teamId), HseSafetyInspection::getTeamId, teamId);
+        lqw.eq(ObjectUtils.isNotEmpty(correctorId), HseSafetyInspection::getCorrectorId, correctorId);
+        lqw.eq(ObjectUtils.isNotEmpty(status), HseSafetyInspection::getStatus, status);
+        lqw.eq(ObjectUtils.isNotEmpty(reviewType), HseSafetyInspection::getReviewType, reviewType);
         return lqw;
     }
 
@@ -355,11 +364,11 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
      * @return 安全巡检工单分页对象视图
      */
     @Override
-    public Page<BusSafetyInspectionVo> getVoPage(Page<BusSafetyInspection> safetyInspectionPage) {
+    public Page<HseSafetyInspectionVo> getVoPage(Page<HseSafetyInspection> safetyInspectionPage) {
         // 获取安全巡检工单
-        List<BusSafetyInspection> safetyInspectionList = safetyInspectionPage.getRecords();
+        List<HseSafetyInspection> safetyInspectionList = safetyInspectionPage.getRecords();
         // 添加分页信息
-        Page<BusSafetyInspectionVo> safetyInspectionVoPage = new Page<>(
+        Page<HseSafetyInspectionVo> safetyInspectionVoPage = new Page<>(
             safetyInspectionPage.getCurrent(),
             safetyInspectionPage.getSize(),
             safetyInspectionPage.getTotal());
@@ -367,7 +376,7 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
             return safetyInspectionVoPage;
         }
         // 对象列表 => 封装对象列表
-        List<BusSafetyInspectionVo> safetyInspectionVoList = safetyInspectionList.stream().map(this::getVo).toList();
+        List<HseSafetyInspectionVo> safetyInspectionVoList = safetyInspectionList.stream().map(this::getVo).toList();
         safetyInspectionVoPage.setRecords(safetyInspectionVoList);
         return safetyInspectionVoPage;
     }
@@ -380,16 +389,16 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
      */
     @Override
     public void exportWordById(Long id, HttpServletResponse response) {
-        BusSafetyInspection safetyInspection = this.getById(id);
+        HseSafetyInspection safetyInspection = this.getById(id);
         if (safetyInspection == null) {
             throw new ServiceException("安全巡检工单不存在");
         }
         Map<String, String> replacementMap = getReplacementMap(safetyInspection);
-        Path targetDir = Paths.get(SafetyConstant.getSafetyInspectionFileUrl(safetyInspection));
+        Path targetDir = Paths.get(HseSafetyConstant.getSafetyInspectionFileUrl(safetyInspection));
         // 如果存在目录则直接返回，不存在则生成文件并返回
         if (!Files.exists(targetDir)) {
             // 清理旧文件
-            String baseUrl = SafetyConstant.SAFETY_INSPECTION_FILE_URL + safetyInspection.getId();
+            String baseUrl = HseSafetyConstant.SAFETY_INSPECTION_FILE_URL + safetyInspection.getId();
             try {
                 Path dirPath = Paths.get(baseUrl);
                 FileUtils.deleteDirectory(dirPath);
@@ -397,7 +406,7 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
                 log.error("文件目录：{}，清理失败", baseUrl, e);
             }
             // 生成文件
-            try (FileInputStream fis = new FileInputStream(SafetyConstant.SAFETY_INSPECTION_TEMPLATE_PATH);
+            try (FileInputStream fis = new FileInputStream(HseSafetyConstant.SAFETY_INSPECTION_TEMPLATE_PATH);
                  XWPFDocument document = new XWPFDocument(fis)) {
                 // 替换段落中的文本
                 for (XWPFParagraph paragraph : document.getParagraphs()) {
@@ -418,7 +427,7 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
                     Files.createDirectories(targetDir);
                 }
                 // 组合目标文件名
-                String fileName = SafetyConstant.getSafetyInspectionFileName(safetyInspection);
+                String fileName = HseSafetyConstant.getSafetyInspectionFileName(safetyInspection);
                 // 保存修改后的文件
                 try (FileOutputStream fos = new FileOutputStream(targetDir.resolve(fileName).toFile())) {
                     document.write(fos);
@@ -443,7 +452,7 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
      * @param safetyInspection 安全巡检工单对象
      * @return Map
      */
-    public Map<String, String> getReplacementMap(BusSafetyInspection safetyInspection) {
+    public Map<String, String> getReplacementMap(HseSafetyInspection safetyInspection) {
         Map<String, String> replacementMap = new HashMap<>();
         String createBy = userService.selectUserById(safetyInspection.getCreateBy()).getNickName();
         replacementMap.put("${createBy}", createBy);
@@ -451,9 +460,9 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
         replacementMap.put("${createTime}", createTime != null ? DateUtils.formatDateTime(createTime) : "");
         String projectName = projectService.getById(safetyInspection.getProjectId()).getProjectName();
         replacementMap.put("${projectName}", projectName);
-        String checkType = dictDataService.selectDictLabel(SafetyConstant.SAFETY_INSPECTION_CHECK_TYPE, safetyInspection.getCheckType());
+        String checkType = dictDataService.selectDictLabel(HseSafetyConstant.SAFETY_INSPECTION_CHECK_TYPE, safetyInspection.getCheckType());
         replacementMap.put("${checkType}", checkType);
-        String violationType = dictDataService.selectDictLabel(SafetyConstant.SAFETY_INSPECTION_VIOLATION_TYPE, safetyInspection.getViolationType());
+        String violationType = dictDataService.selectDictLabel(HseSafetyConstant.SAFETY_INSPECTION_VIOLATION_TYPE, safetyInspection.getViolationType());
         replacementMap.put("${violationType}", violationType);
         Date checkTime = safetyInspection.getCheckTime();
         replacementMap.put("${checkTime}", checkTime != null ? DateUtils.formatDateTime(checkTime) : "");
@@ -462,7 +471,7 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
         replacementMap.put("${replyDate}", safetyInspection.getReplyDate());
         replacementMap.put("${hiddenDanger}", safetyInspection.getHiddenDanger());
         replacementMap.put("${checkFile}", safetyInspection.getCheckFile());
-        String status = dictDataService.selectDictLabel(SafetyConstant.SAFETY_INSPECTION_TYPE, safetyInspection.getStatus());
+        String status = dictDataService.selectDictLabel(HseSafetyConstant.SAFETY_INSPECTION_TYPE, safetyInspection.getStatus());
         replacementMap.put("${status}", status);
         String teamName = projectTeamService.getById(safetyInspection.getTeamId()).getTeamName();
         replacementMap.put("${teamName}", teamName);
@@ -484,7 +493,7 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
      * @param replacements 占位符与替换内容的映射
      * @param document     当前文档，用于插入图片或创建超链接
      */
-    public void replaceInParagraph(XWPFParagraph paragraph, Map<String, String> replacements, XWPFDocument document, BusSafetyInspection safetyInspection) throws InvalidFormatException, IOException {
+    public void replaceInParagraph(XWPFParagraph paragraph, Map<String, String> replacements, XWPFDocument document, HseSafetyInspection safetyInspection) throws InvalidFormatException, IOException {
         // 先拷贝 paragraph 里所有的 run
         List<XWPFRun> runs = new ArrayList<>(paragraph.getRuns());
         // 在拷贝上遍历，修改原 paragraph（增删 run）都不会抛 CME
@@ -509,7 +518,7 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl<BusSafetyInspect
                                 // 获取附件的ossId
                                 List<Long> ossIdList = Arrays.stream(value.split(",")).map(Long::parseLong).toList();
                                 List<SysOssVo> ossVoList = ossService.listByIds(ossIdList);
-                                String baseFile = SafetyConstant.getSafetyInspectionFileUrl(safetyInspection) + "/file";
+                                String baseFile = HseSafetyConstant.getSafetyInspectionFileUrl(safetyInspection) + "/file";
                                 for (SysOssVo ossVo : ossVoList) {
                                     String lowerVal = ossVo.getUrl().toLowerCase();
                                     OssClient storage = OssFactory.instance(ossVo.getService());
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyLogServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyLogServiceImpl.java
similarity index 76%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyLogServiceImpl.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyLogServiceImpl.java
index 620821b7..f4afeb01 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyLogServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyLogServiceImpl.java
@@ -14,13 +14,13 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.service.IBusProjectService;
-import org.dromara.safety.domain.BusSafetyLog;
-import org.dromara.safety.domain.req.safetylog.SafetyLogCreateReq;
-import org.dromara.safety.domain.req.safetylog.SafetyLogQueryReq;
-import org.dromara.safety.domain.req.safetylog.SafetyLogUpdateReq;
-import org.dromara.safety.domain.vo.BusSafetyLogVo;
-import org.dromara.safety.mapper.BusSafetyLogMapper;
-import org.dromara.safety.service.IBusSafetyLogService;
+import org.dromara.safety.domain.HseSafetyLog;
+import org.dromara.safety.domain.req.safetylog.HseSafetyLogCreateReq;
+import org.dromara.safety.domain.req.safetylog.HseSafetyLogQueryReq;
+import org.dromara.safety.domain.req.safetylog.HseSafetyLogUpdateReq;
+import org.dromara.safety.domain.vo.safetylog.HseSafetyLogVo;
+import org.dromara.safety.mapper.HseSafetyLogMapper;
+import org.dromara.safety.service.IHseSafetyLogService;
 import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.vo.SysUserVo;
 import org.dromara.system.mapper.SysUserMapper;
@@ -38,8 +38,8 @@ import java.util.List;
  * @date 2025-03-20
  */
 @Service
-public class BusSafetyLogServiceImpl extends ServiceImpl<BusSafetyLogMapper, BusSafetyLog>
-    implements IBusSafetyLogService {
+public class HseSafetyLogServiceImpl extends ServiceImpl<HseSafetyLogMapper, HseSafetyLog>
+    implements IHseSafetyLogService {
 
     @Resource
     private IBusProjectService projectService;
@@ -54,8 +54,8 @@ public class BusSafetyLogServiceImpl extends ServiceImpl<BusSafetyLogMapper, Bus
      * @return 安全日志
      */
     @Override
-    public BusSafetyLogVo queryById(Long id) {
-        BusSafetyLog safetyLog = this.getById(id);
+    public HseSafetyLogVo queryById(Long id) {
+        HseSafetyLog safetyLog = this.getById(id);
         if (safetyLog == null) {
             throw new ServiceException("安全日志信息不存在", HttpStatus.NOT_FOUND);
         }
@@ -70,8 +70,8 @@ public class BusSafetyLogServiceImpl extends ServiceImpl<BusSafetyLogMapper, Bus
      * @return 安全日志分页列表
      */
     @Override
-    public TableDataInfo<BusSafetyLogVo> queryPageList(SafetyLogQueryReq req, PageQuery pageQuery) {
-        Page<BusSafetyLog> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
+    public TableDataInfo<HseSafetyLogVo> queryPageList(HseSafetyLogQueryReq req, PageQuery pageQuery) {
+        Page<HseSafetyLog> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
 
@@ -82,8 +82,8 @@ public class BusSafetyLogServiceImpl extends ServiceImpl<BusSafetyLogMapper, Bus
      * @return 安全日志列表
      */
     @Override
-    public List<BusSafetyLogVo> queryList(SafetyLogQueryReq req) {
-        List<BusSafetyLog> safetyLogList = this.list(this.buildQueryWrapper(req));
+    public List<HseSafetyLogVo> queryList(HseSafetyLogQueryReq req) {
+        List<HseSafetyLog> safetyLogList = this.list(this.buildQueryWrapper(req));
         return safetyLogList.stream().map(this::getVo).toList();
     }
 
@@ -94,9 +94,9 @@ public class BusSafetyLogServiceImpl extends ServiceImpl<BusSafetyLogMapper, Bus
      * @return 新增id
      */
     @Override
-    public Long insertByBo(SafetyLogCreateReq req) {
+    public Long insertByBo(HseSafetyLogCreateReq req) {
         // 将实体类和 DTO 进行转换
-        BusSafetyLog safetyLog = new BusSafetyLog();
+        HseSafetyLog safetyLog = new HseSafetyLog();
         BeanUtils.copyProperties(req, safetyLog);
         // 数据校验
         validEntityBeforeSave(safetyLog, true);
@@ -116,14 +116,14 @@ public class BusSafetyLogServiceImpl extends ServiceImpl<BusSafetyLogMapper, Bus
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(SafetyLogUpdateReq req) {
+    public Boolean updateByBo(HseSafetyLogUpdateReq req) {
         // 将实体类和 DTO 进行转换
-        BusSafetyLog safetyLog = new BusSafetyLog();
+        HseSafetyLog safetyLog = new HseSafetyLog();
         BeanUtils.copyProperties(req, safetyLog);
         // 数据校验
         validEntityBeforeSave(safetyLog, false);
         // 判断是否存在
-        BusSafetyLog oldSafetyLog = this.getById(safetyLog.getId());
+        HseSafetyLog oldSafetyLog = this.getById(safetyLog.getId());
         if (oldSafetyLog == null) {
             throw new ServiceException("修改安全日志信息失败，数据不存在", HttpStatus.NOT_FOUND);
         }
@@ -134,7 +134,7 @@ public class BusSafetyLogServiceImpl extends ServiceImpl<BusSafetyLogMapper, Bus
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(BusSafetyLog entity, Boolean create) {
+    private void validEntityBeforeSave(HseSafetyLog entity, Boolean create) {
         // TODO 做一些数据校验,如唯一约束
         Long projectId = entity.getProjectId();
         if (create) {
@@ -170,9 +170,9 @@ public class BusSafetyLogServiceImpl extends ServiceImpl<BusSafetyLogMapper, Bus
      * @return 安全日志视图对象
      */
     @Override
-    public BusSafetyLogVo getVo(BusSafetyLog safetyLog) {
+    public HseSafetyLogVo getVo(HseSafetyLog safetyLog) {
         // 对象转封装类
-        BusSafetyLogVo safetyLogVo = new BusSafetyLogVo();
+        HseSafetyLogVo safetyLogVo = new HseSafetyLogVo();
         if (safetyLog == null) {
             return safetyLogVo;
         }
@@ -193,8 +193,8 @@ public class BusSafetyLogServiceImpl extends ServiceImpl<BusSafetyLogMapper, Bus
      * @return 安全日志查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusSafetyLog> buildQueryWrapper(SafetyLogQueryReq req) {
-        LambdaQueryWrapper<BusSafetyLog> lqw = Wrappers.lambdaQuery();
+    public LambdaQueryWrapper<HseSafetyLog> buildQueryWrapper(HseSafetyLogQueryReq req) {
+        LambdaQueryWrapper<HseSafetyLog> lqw = Wrappers.lambdaQuery();
         if (req == null) {
             return lqw;
         }
@@ -209,13 +209,13 @@ public class BusSafetyLogServiceImpl extends ServiceImpl<BusSafetyLogMapper, Bus
             List<SysUserVo> sysUserVos = userMapper.selectUserList(userQueryWrapper);
             if (CollUtil.isNotEmpty(sysUserVos)) {
                 List<Long> userIds = sysUserVos.stream().map(SysUserVo::getUserId).toList();
-                lqw.in(BusSafetyLog::getCreateBy, userIds);
+                lqw.in(HseSafetyLog::getCreateBy, userIds);
             }
         }
         // 精确查询
-        lqw.eq(ObjectUtils.isNotEmpty(id), BusSafetyLog::getId, id);
-        lqw.eq(ObjectUtils.isNotEmpty(projectId), BusSafetyLog::getProjectId, projectId);
-        lqw.eq(ObjectUtils.isNotEmpty(dateOfOccurrence), BusSafetyLog::getDateOfOccurrence, dateOfOccurrence);
+        lqw.eq(ObjectUtils.isNotEmpty(id), HseSafetyLog::getId, id);
+        lqw.eq(ObjectUtils.isNotEmpty(projectId), HseSafetyLog::getProjectId, projectId);
+        lqw.eq(ObjectUtils.isNotEmpty(dateOfOccurrence), HseSafetyLog::getDateOfOccurrence, dateOfOccurrence);
         return lqw;
     }
 
@@ -226,11 +226,11 @@ public class BusSafetyLogServiceImpl extends ServiceImpl<BusSafetyLogMapper, Bus
      * @return 安全日志分页对象视图
      */
     @Override
-    public Page<BusSafetyLogVo> getVoPage(Page<BusSafetyLog> safetyLogPage) {
+    public Page<HseSafetyLogVo> getVoPage(Page<HseSafetyLog> safetyLogPage) {
         // 获取安全日志列表
-        List<BusSafetyLog> safetyLogList = safetyLogPage.getRecords();
+        List<HseSafetyLog> safetyLogList = safetyLogPage.getRecords();
         // 添加分页信息
-        Page<BusSafetyLogVo> safetyLogVoPage = new Page<>(
+        Page<HseSafetyLogVo> safetyLogVoPage = new Page<>(
             safetyLogPage.getCurrent(),
             safetyLogPage.getSize(),
             safetyLogPage.getTotal());
@@ -238,7 +238,7 @@ public class BusSafetyLogServiceImpl extends ServiceImpl<BusSafetyLogMapper, Bus
             return safetyLogVoPage;
         }
         // 对象列表 => 封装对象列表
-        List<BusSafetyLogVo> safetyLogVoList = safetyLogList.stream().map(this::getVo).toList();
+        List<HseSafetyLogVo> safetyLogVoList = safetyLogList.stream().map(this::getVo).toList();
         safetyLogVoPage.setRecords(safetyLogVoList);
         return safetyLogVoPage;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyWeeklyReportServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyWeeklyReportServiceImpl.java
similarity index 73%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyWeeklyReportServiceImpl.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyWeeklyReportServiceImpl.java
index bc4069e9..e8838cf9 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyWeeklyReportServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyWeeklyReportServiceImpl.java
@@ -13,13 +13,13 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.service.IBusProjectService;
-import org.dromara.safety.domain.BusSafetyWeeklyReport;
-import org.dromara.safety.domain.req.safetyweeklyreport.SafetyWeeklyReportCreateReq;
-import org.dromara.safety.domain.req.safetyweeklyreport.SafetyWeeklyReportQueryReq;
-import org.dromara.safety.domain.req.safetyweeklyreport.SafetyWeeklyReportUpdateReq;
-import org.dromara.safety.domain.vo.BusSafetyWeeklyReportVo;
-import org.dromara.safety.mapper.BusSafetyWeeklyReportMapper;
-import org.dromara.safety.service.IBusSafetyWeeklyReportService;
+import org.dromara.safety.domain.HseSafetyWeeklyReport;
+import org.dromara.safety.domain.req.safetyweeklyreport.HseSafetyWeeklyReportCreateReq;
+import org.dromara.safety.domain.req.safetyweeklyreport.HseSafetyWeeklyReportQueryReq;
+import org.dromara.safety.domain.req.safetyweeklyreport.HseSafetyWeeklyReportUpdateReq;
+import org.dromara.safety.domain.vo.safetyweeklyreport.HseSafetyWeeklyReportVo;
+import org.dromara.safety.mapper.HseSafetyWeeklyReportMapper;
+import org.dromara.safety.service.IHseSafetyWeeklyReportService;
 import org.dromara.system.domain.vo.SysOssVo;
 import org.dromara.system.service.ISysOssService;
 import org.springframework.beans.BeanUtils;
@@ -36,8 +36,8 @@ import java.util.List;
  * @date 2025-03-20
  */
 @Service
-public class BusSafetyWeeklyReportServiceImpl extends ServiceImpl<BusSafetyWeeklyReportMapper, BusSafetyWeeklyReport>
-    implements IBusSafetyWeeklyReportService {
+public class HseSafetyWeeklyReportServiceImpl extends ServiceImpl<HseSafetyWeeklyReportMapper, HseSafetyWeeklyReport>
+    implements IHseSafetyWeeklyReportService {
 
     @Resource
     private ISysOssService ossService;
@@ -52,8 +52,8 @@ public class BusSafetyWeeklyReportServiceImpl extends ServiceImpl<BusSafetyWeekl
      * @return 安全周报
      */
     @Override
-    public BusSafetyWeeklyReportVo queryById(Long id) {
-        BusSafetyWeeklyReport safetyWeeklyReport = this.getById(id);
+    public HseSafetyWeeklyReportVo queryById(Long id) {
+        HseSafetyWeeklyReport safetyWeeklyReport = this.getById(id);
         if (safetyWeeklyReport == null) {
             throw new ServiceException("安全周报信息不存在", HttpStatus.NOT_FOUND);
         }
@@ -68,8 +68,8 @@ public class BusSafetyWeeklyReportServiceImpl extends ServiceImpl<BusSafetyWeekl
      * @return 安全周报分页列表
      */
     @Override
-    public TableDataInfo<BusSafetyWeeklyReportVo> queryPageList(SafetyWeeklyReportQueryReq req, PageQuery pageQuery) {
-        Page<BusSafetyWeeklyReport> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
+    public TableDataInfo<HseSafetyWeeklyReportVo> queryPageList(HseSafetyWeeklyReportQueryReq req, PageQuery pageQuery) {
+        Page<HseSafetyWeeklyReport> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
 
@@ -80,8 +80,8 @@ public class BusSafetyWeeklyReportServiceImpl extends ServiceImpl<BusSafetyWeekl
      * @return 安全周报列表
      */
     @Override
-    public List<BusSafetyWeeklyReportVo> queryList(SafetyWeeklyReportQueryReq req) {
-        List<BusSafetyWeeklyReport> safetyWeeklyReportList = this.list(this.buildQueryWrapper(req));
+    public List<HseSafetyWeeklyReportVo> queryList(HseSafetyWeeklyReportQueryReq req) {
+        List<HseSafetyWeeklyReport> safetyWeeklyReportList = this.list(this.buildQueryWrapper(req));
         return safetyWeeklyReportList.stream().map(this::getVo).toList();
     }
 
@@ -92,9 +92,9 @@ public class BusSafetyWeeklyReportServiceImpl extends ServiceImpl<BusSafetyWeekl
      * @return 是否新增成功
      */
     @Override
-    public Long insertByBo(SafetyWeeklyReportCreateReq req) {
+    public Long insertByBo(HseSafetyWeeklyReportCreateReq req) {
         // 将实体类和 DTO 进行转换
-        BusSafetyWeeklyReport safetyWeeklyReport = new BusSafetyWeeklyReport();
+        HseSafetyWeeklyReport safetyWeeklyReport = new HseSafetyWeeklyReport();
         BeanUtils.copyProperties(req, safetyWeeklyReport);
         // 数据校验
         validEntityBeforeSave(safetyWeeklyReport, true);
@@ -114,14 +114,14 @@ public class BusSafetyWeeklyReportServiceImpl extends ServiceImpl<BusSafetyWeekl
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(SafetyWeeklyReportUpdateReq req) {
+    public Boolean updateByBo(HseSafetyWeeklyReportUpdateReq req) {
         // 将实体类和 DTO 进行转换
-        BusSafetyWeeklyReport safetyWeeklyReport = new BusSafetyWeeklyReport();
+        HseSafetyWeeklyReport safetyWeeklyReport = new HseSafetyWeeklyReport();
         BeanUtils.copyProperties(req, safetyWeeklyReport);
         // 数据校验
         validEntityBeforeSave(safetyWeeklyReport, false);
         // 判断是否存在
-        BusSafetyWeeklyReport oldSafetyWeeklyReport = this.getById(safetyWeeklyReport.getId());
+        HseSafetyWeeklyReport oldSafetyWeeklyReport = this.getById(safetyWeeklyReport.getId());
         if (oldSafetyWeeklyReport == null) {
             throw new ServiceException("修改安全周报信息失败，数据不存在", HttpStatus.NOT_FOUND);
         }
@@ -132,7 +132,7 @@ public class BusSafetyWeeklyReportServiceImpl extends ServiceImpl<BusSafetyWeekl
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(BusSafetyWeeklyReport entity, Boolean create) {
+    private void validEntityBeforeSave(HseSafetyWeeklyReport entity, Boolean create) {
         // TODO 做一些数据校验,如唯一约束
         Long projectId = entity.getProjectId();
         if (create) {
@@ -168,9 +168,9 @@ public class BusSafetyWeeklyReportServiceImpl extends ServiceImpl<BusSafetyWeekl
      * @return 安全周报视图对象
      */
     @Override
-    public BusSafetyWeeklyReportVo getVo(BusSafetyWeeklyReport safetyWeeklyReport) {
+    public HseSafetyWeeklyReportVo getVo(HseSafetyWeeklyReport safetyWeeklyReport) {
         // 对象转封装类
-        BusSafetyWeeklyReportVo safetyWeeklyReportVo = new BusSafetyWeeklyReportVo();
+        HseSafetyWeeklyReportVo safetyWeeklyReportVo = new HseSafetyWeeklyReportVo();
         if (safetyWeeklyReport == null) {
             return safetyWeeklyReportVo;
         }
@@ -191,8 +191,8 @@ public class BusSafetyWeeklyReportServiceImpl extends ServiceImpl<BusSafetyWeekl
      * @return 安全周报查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusSafetyWeeklyReport> buildQueryWrapper(SafetyWeeklyReportQueryReq req) {
-        LambdaQueryWrapper<BusSafetyWeeklyReport> lqw = Wrappers.lambdaQuery();
+    public LambdaQueryWrapper<HseSafetyWeeklyReport> buildQueryWrapper(HseSafetyWeeklyReportQueryReq req) {
+        LambdaQueryWrapper<HseSafetyWeeklyReport> lqw = Wrappers.lambdaQuery();
         if (req == null) {
             return lqw;
         }
@@ -203,15 +203,15 @@ public class BusSafetyWeeklyReportServiceImpl extends ServiceImpl<BusSafetyWeekl
         String remark = req.getRemark();
         // 时间范围查询
         if (ObjectUtils.isNotEmpty(scopeDate)) {
-            lqw.ge(BusSafetyWeeklyReport::getScopeEnd, scopeDate.get(0))
-                .le(BusSafetyWeeklyReport::getScope, scopeDate.get(1));
+            lqw.ge(HseSafetyWeeklyReport::getScopeEnd, scopeDate.get(0))
+                .le(HseSafetyWeeklyReport::getScope, scopeDate.get(1));
         }
         // 模糊查询
-        lqw.like(StringUtils.isNotBlank(remark), BusSafetyWeeklyReport::getRemark, remark);
+        lqw.like(StringUtils.isNotBlank(remark), HseSafetyWeeklyReport::getRemark, remark);
         // 精准查询
-        lqw.eq(ObjectUtils.isNotEmpty(id), BusSafetyWeeklyReport::getId, id);
-        lqw.eq(ObjectUtils.isNotEmpty(projectId), BusSafetyWeeklyReport::getProjectId, projectId);
-        lqw.eq(ObjectUtils.isNotEmpty(week), BusSafetyWeeklyReport::getWeek, week);
+        lqw.eq(ObjectUtils.isNotEmpty(id), HseSafetyWeeklyReport::getId, id);
+        lqw.eq(ObjectUtils.isNotEmpty(projectId), HseSafetyWeeklyReport::getProjectId, projectId);
+        lqw.eq(ObjectUtils.isNotEmpty(week), HseSafetyWeeklyReport::getWeek, week);
         return lqw;
     }
 
@@ -222,11 +222,11 @@ public class BusSafetyWeeklyReportServiceImpl extends ServiceImpl<BusSafetyWeekl
      * @return 安全周报分页对象视图
      */
     @Override
-    public Page<BusSafetyWeeklyReportVo> getVoPage(Page<BusSafetyWeeklyReport> safetyWeeklyReportPage) {
+    public Page<HseSafetyWeeklyReportVo> getVoPage(Page<HseSafetyWeeklyReport> safetyWeeklyReportPage) {
         // 获取安全周报列表
-        List<BusSafetyWeeklyReport> safetyWeeklyReportList = safetyWeeklyReportPage.getRecords();
+        List<HseSafetyWeeklyReport> safetyWeeklyReportList = safetyWeeklyReportPage.getRecords();
         // 添加分页信息
-        Page<BusSafetyWeeklyReportVo> safetyWeeklyReportVoPage = new Page<>(
+        Page<HseSafetyWeeklyReportVo> safetyWeeklyReportVoPage = new Page<>(
             safetyWeeklyReportPage.getCurrent(),
             safetyWeeklyReportPage.getSize(),
             safetyWeeklyReportPage.getTotal());
@@ -234,7 +234,7 @@ public class BusSafetyWeeklyReportServiceImpl extends ServiceImpl<BusSafetyWeekl
             return safetyWeeklyReportVoPage;
         }
         // 对象列表 => 封装对象列表
-        List<BusSafetyWeeklyReportVo> safetyWeeklyReportVoList = safetyWeeklyReportList.stream().map(this::getVo).toList();
+        List<HseSafetyWeeklyReportVo> safetyWeeklyReportVoList = safetyWeeklyReportList.stream().map(this::getVo).toList();
         safetyWeeklyReportVoPage.setRecords(safetyWeeklyReportVoList);
         return safetyWeeklyReportVoPage;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusTeamMeetingServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseTeamMeetingServiceImpl.java
similarity index 77%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusTeamMeetingServiceImpl.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseTeamMeetingServiceImpl.java
index d9125281..223e1c8a 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusTeamMeetingServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseTeamMeetingServiceImpl.java
@@ -22,13 +22,13 @@ import org.dromara.project.service.IBusConstructionUserService;
 import org.dromara.project.service.IBusContractorService;
 import org.dromara.project.service.IBusProjectService;
 import org.dromara.project.service.IBusProjectTeamService;
-import org.dromara.safety.domain.BusTeamMeeting;
-import org.dromara.safety.domain.req.teammeeting.TeamMeetingCreateReq;
-import org.dromara.safety.domain.req.teammeeting.TeamMeetingQueryReq;
-import org.dromara.safety.domain.req.teammeeting.TeamMeetingUpdateReq;
-import org.dromara.safety.domain.vo.teammeeting.BusTeamMeetingVo;
-import org.dromara.safety.mapper.BusTeamMeetingMapper;
-import org.dromara.safety.service.IBusTeamMeetingService;
+import org.dromara.safety.domain.HseTeamMeeting;
+import org.dromara.safety.domain.req.teammeeting.HseTeamMeetingCreateReq;
+import org.dromara.safety.domain.req.teammeeting.HseTeamMeetingQueryReq;
+import org.dromara.safety.domain.req.teammeeting.HseTeamMeetingUpdateReq;
+import org.dromara.safety.domain.vo.teammeeting.HseTeamMeetingVo;
+import org.dromara.safety.mapper.HseTeamMeetingMapper;
+import org.dromara.safety.service.IHseTeamMeetingService;
 import org.dromara.system.domain.vo.SysOssVo;
 import org.dromara.system.service.ISysOssService;
 import org.springframework.beans.BeanUtils;
@@ -45,8 +45,8 @@ import java.util.stream.Collectors;
  * @date 2025-03-19
  */
 @Service
-public class BusTeamMeetingServiceImpl extends ServiceImpl<BusTeamMeetingMapper, BusTeamMeeting>
-    implements IBusTeamMeetingService {
+public class HseTeamMeetingServiceImpl extends ServiceImpl<HseTeamMeetingMapper, HseTeamMeeting>
+    implements IHseTeamMeetingService {
 
     @Resource
     private ISysOssService ossService;
@@ -70,8 +70,8 @@ public class BusTeamMeetingServiceImpl extends ServiceImpl<BusTeamMeetingMapper,
      * @return 站班会
      */
     @Override
-    public BusTeamMeetingVo queryById(Long id) {
-        BusTeamMeeting teamMeeting = this.getById(id);
+    public HseTeamMeetingVo queryById(Long id) {
+        HseTeamMeeting teamMeeting = this.getById(id);
         if (teamMeeting == null) {
             throw new ServiceException("站班会信息不存在", HttpStatus.NOT_FOUND);
         }
@@ -86,8 +86,8 @@ public class BusTeamMeetingServiceImpl extends ServiceImpl<BusTeamMeetingMapper,
      * @return 站班会分页列表
      */
     @Override
-    public TableDataInfo<BusTeamMeetingVo> queryPageList(TeamMeetingQueryReq req, PageQuery pageQuery) {
-        Page<BusTeamMeeting> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
+    public TableDataInfo<HseTeamMeetingVo> queryPageList(HseTeamMeetingQueryReq req, PageQuery pageQuery) {
+        Page<HseTeamMeeting> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
         return TableDataInfo.build(this.getVoPage(result));
     }
 
@@ -98,8 +98,8 @@ public class BusTeamMeetingServiceImpl extends ServiceImpl<BusTeamMeetingMapper,
      * @return 站班会列表
      */
     @Override
-    public List<BusTeamMeetingVo> queryList(TeamMeetingQueryReq req) {
-        List<BusTeamMeeting> list = this.list(this.buildQueryWrapper(req));
+    public List<HseTeamMeetingVo> queryList(HseTeamMeetingQueryReq req) {
+        List<HseTeamMeeting> list = this.list(this.buildQueryWrapper(req));
         // 对象列表 => 封装对象列表
         return list.stream().map(this::getVo).toList();
     }
@@ -111,9 +111,9 @@ public class BusTeamMeetingServiceImpl extends ServiceImpl<BusTeamMeetingMapper,
      * @return 是否新增成功
      */
     @Override
-    public Long insertByBo(TeamMeetingCreateReq req) {
+    public Long insertByBo(HseTeamMeetingCreateReq req) {
         // 将实体类和 DTO 进行转换
-        BusTeamMeeting teamMeeting = new BusTeamMeeting();
+        HseTeamMeeting teamMeeting = new HseTeamMeeting();
         BeanUtils.copyProperties(req, teamMeeting);
         // 数据转换
         List<String> participantIdList = req.getParticipantIdList();
@@ -137,9 +137,9 @@ public class BusTeamMeetingServiceImpl extends ServiceImpl<BusTeamMeetingMapper,
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(TeamMeetingUpdateReq req) {
+    public Boolean updateByBo(HseTeamMeetingUpdateReq req) {
         // 将实体类和 DTO 进行转换
-        BusTeamMeeting teamMeeting = new BusTeamMeeting();
+        HseTeamMeeting teamMeeting = new HseTeamMeeting();
         BeanUtils.copyProperties(req, teamMeeting);
         // 数据转换
         List<String> participantIdList = req.getParticipantIdList();
@@ -148,7 +148,7 @@ public class BusTeamMeetingServiceImpl extends ServiceImpl<BusTeamMeetingMapper,
         // 数据校验
         validEntityBeforeSave(teamMeeting, false);
         // 判断是否存在
-        BusTeamMeeting oldTeamMeeting = this.getById(teamMeeting.getId());
+        HseTeamMeeting oldTeamMeeting = this.getById(teamMeeting.getId());
         if (oldTeamMeeting == null) {
             throw new ServiceException("修改站班会信息失败，数据不存在", HttpStatus.NOT_FOUND);
         }
@@ -159,7 +159,7 @@ public class BusTeamMeetingServiceImpl extends ServiceImpl<BusTeamMeetingMapper,
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(BusTeamMeeting entity, Boolean create) {
+    private void validEntityBeforeSave(HseTeamMeeting entity, Boolean create) {
         // TODO 做一些数据校验,如唯一约束
         Long projectId = entity.getProjectId();
         if (create) {
@@ -183,10 +183,10 @@ public class BusTeamMeetingServiceImpl extends ServiceImpl<BusTeamMeetingMapper,
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         Long userId = LoginHelper.getUserId();
-        List<BusTeamMeeting> teamMeetingList = this.listByIds(ids);
+        List<HseTeamMeeting> teamMeetingList = this.listByIds(ids);
         if (isValid) {
             // TODO 做一些业务上的校验,判断是否需要校验
-            List<Long> projectId = teamMeetingList.stream().map(BusTeamMeeting::getProjectId).toList();
+            List<Long> projectId = teamMeetingList.stream().map(HseTeamMeeting::getProjectId).toList();
             projectService.validAuth(projectId, userId);
         }
         return this.removeBatchByIds(ids);
@@ -199,9 +199,9 @@ public class BusTeamMeetingServiceImpl extends ServiceImpl<BusTeamMeetingMapper,
      * @return 站班会视图对象
      */
     @Override
-    public BusTeamMeetingVo getVo(BusTeamMeeting teamMeeting) {
+    public HseTeamMeetingVo getVo(HseTeamMeeting teamMeeting) {
         // 对象转封装类
-        BusTeamMeetingVo teamMeetingVo = new BusTeamMeetingVo();
+        HseTeamMeetingVo teamMeetingVo = new HseTeamMeetingVo();
         if (teamMeeting == null) {
             return teamMeetingVo;
         }
@@ -265,8 +265,8 @@ public class BusTeamMeetingServiceImpl extends ServiceImpl<BusTeamMeetingMapper,
      * @return 站班会查询条件封装
      */
     @Override
-    public LambdaQueryWrapper<BusTeamMeeting> buildQueryWrapper(TeamMeetingQueryReq req) {
-        LambdaQueryWrapper<BusTeamMeeting> lqw = Wrappers.lambdaQuery();
+    public LambdaQueryWrapper<HseTeamMeeting> buildQueryWrapper(HseTeamMeetingQueryReq req) {
+        LambdaQueryWrapper<HseTeamMeeting> lqw = Wrappers.lambdaQuery();
         if (req == null) {
             return lqw;
         }
@@ -282,19 +282,19 @@ public class BusTeamMeetingServiceImpl extends ServiceImpl<BusTeamMeetingMapper,
         // JSON 数组查询
         if (CollUtil.isNotEmpty(participantIdList)) {
             for (String participantId : participantIdList) {
-                lqw.like(BusTeamMeeting::getParticipantId, "\"" + participantId + "\"");
+                lqw.like(HseTeamMeeting::getParticipantId, "\"" + participantId + "\"");
             }
         }
         // 模糊查询
-        lqw.like(StringUtils.isNotBlank(content), BusTeamMeeting::getContent, content);
-        lqw.like(StringUtils.isNotBlank(remark), BusTeamMeeting::getRemark, remark);
+        lqw.like(StringUtils.isNotBlank(content), HseTeamMeeting::getContent, content);
+        lqw.like(StringUtils.isNotBlank(remark), HseTeamMeeting::getRemark, remark);
         // 精准查询
-        lqw.eq(ObjectUtils.isNotEmpty(id), BusTeamMeeting::getId, id);
-        lqw.eq(ObjectUtils.isNotEmpty(projectId), BusTeamMeeting::getProjectId, projectId);
-        lqw.eq(ObjectUtils.isNotEmpty(teamId), BusTeamMeeting::getTeamId, teamId);
-        lqw.eq(ObjectUtils.isNotEmpty(contractorId), BusTeamMeeting::getContractorId, contractorId);
-        lqw.eq(ObjectUtils.isNotEmpty(meetingDate), BusTeamMeeting::getMeetingDate, meetingDate);
-        lqw.eq(ObjectUtils.isNotEmpty(compereId), BusTeamMeeting::getCompereId, compereId);
+        lqw.eq(ObjectUtils.isNotEmpty(id), HseTeamMeeting::getId, id);
+        lqw.eq(ObjectUtils.isNotEmpty(projectId), HseTeamMeeting::getProjectId, projectId);
+        lqw.eq(ObjectUtils.isNotEmpty(teamId), HseTeamMeeting::getTeamId, teamId);
+        lqw.eq(ObjectUtils.isNotEmpty(contractorId), HseTeamMeeting::getContractorId, contractorId);
+        lqw.eq(ObjectUtils.isNotEmpty(meetingDate), HseTeamMeeting::getMeetingDate, meetingDate);
+        lqw.eq(ObjectUtils.isNotEmpty(compereId), HseTeamMeeting::getCompereId, compereId);
         return lqw;
     }
 
@@ -305,41 +305,36 @@ public class BusTeamMeetingServiceImpl extends ServiceImpl<BusTeamMeetingMapper,
      * @return 站班会分页对象视图
      */
     @Override
-    public Page<BusTeamMeetingVo> getVoPage(Page<BusTeamMeeting> teamMeetingPage) {
+    public Page<HseTeamMeetingVo> getVoPage(Page<HseTeamMeeting> teamMeetingPage) {
         // 获取材料数据
-        List<BusTeamMeeting> teamMeetingList = teamMeetingPage.getRecords();
+        List<HseTeamMeeting> teamMeetingList = teamMeetingPage.getRecords();
         // 添加分页信息
-        Page<BusTeamMeetingVo> teamMeetingVoPage = new Page<>(teamMeetingPage.getCurrent(), teamMeetingPage.getSize(), teamMeetingPage.getTotal());
+        Page<HseTeamMeetingVo> teamMeetingVoPage = new Page<>(teamMeetingPage.getCurrent(), teamMeetingPage.getSize(), teamMeetingPage.getTotal());
         if (CollUtil.isEmpty(teamMeetingList)) {
             return teamMeetingVoPage;
         }
         // 获取对应班组
-        Set<Long> teamIdList = teamMeetingList.stream().map(BusTeamMeeting::getTeamId).collect(Collectors.toSet());
+        Set<Long> teamIdList = teamMeetingList.stream().map(HseTeamMeeting::getTeamId).collect(Collectors.toSet());
         Map<Long, List<BusProjectTeam>> teamMap = projectTeamService.listByIds(teamIdList)
             .stream().collect(Collectors.groupingBy(BusProjectTeam::getId));
         // 获取对应分包公司
-        Set<Long> contractorIdList = teamMeetingList.stream().map(BusTeamMeeting::getContractorId).collect(Collectors.toSet());
+        Set<Long> contractorIdList = teamMeetingList.stream().map(HseTeamMeeting::getContractorId).collect(Collectors.toSet());
         Map<Long, List<BusContractor>> contractorMap = contractorService.listByIds(contractorIdList)
             .stream().collect(Collectors.groupingBy(BusContractor::getId));
         // 获取对应参会人
         Set<Long> userIdList = new HashSet<>();
-        for (BusTeamMeeting teamMeeting : teamMeetingList) {
+        for (HseTeamMeeting teamMeeting : teamMeetingList) {
             String participantId = teamMeeting.getParticipantId();
             userIdList.addAll(JSONUtil.toList(participantId, Long.class));
         }
         // 获取对应宣讲人
-        Set<Long> compereIdList = teamMeetingList.stream().map(BusTeamMeeting::getCompereId).collect(Collectors.toSet());
+        Set<Long> compereIdList = teamMeetingList.stream().map(HseTeamMeeting::getCompereId).collect(Collectors.toSet());
         userIdList.addAll(compereIdList);
         Map<Long, List<BusConstructionUser>> userMap = constructionUserService.listByIds(userIdList)
             .stream().collect(Collectors.groupingBy(BusConstructionUser::getId));
-        // 获取对应文件信息
-        Set<Long> ossIdList = teamMeetingList.stream().map(BusTeamMeeting::getPicture).filter(StringUtils::isNotBlank)
-            .flatMap(ossId -> Arrays.stream(ossId.split(",")).map(Long::parseLong)).collect(Collectors.toSet());
-        Map<Long, List<SysOssVo>> ossMap = ossService.listByIds(ossIdList)
-            .stream().collect(Collectors.groupingBy(SysOssVo::getOssId));
         // 对象列表 => 封装对象列表
-        List<BusTeamMeetingVo> teamMeetingVoList = teamMeetingList.stream().map(teamMeeting -> {
-            BusTeamMeetingVo teamMeetingVo = new BusTeamMeetingVo();
+        List<HseTeamMeetingVo> teamMeetingVoList = teamMeetingList.stream().map(teamMeeting -> {
+            HseTeamMeetingVo teamMeetingVo = new HseTeamMeetingVo();
             BeanUtils.copyProperties(teamMeeting, teamMeetingVo);
             // 关联班组信息
             String teamName = null;
@@ -372,16 +367,6 @@ public class BusTeamMeetingServiceImpl extends ServiceImpl<BusTeamMeetingMapper,
                 }
             }
             teamMeetingVo.setParticipantList(participantList);
-            // 关联文件信息
-            List<String> pictureUrlList = new ArrayList<>();
-            List<Long> pictureIdList = Arrays.stream(teamMeeting.getPicture().split(",")).map(Long::parseLong).toList();
-            for (Long pictureId : pictureIdList) {
-                if (ossMap.containsKey(pictureId)) {
-                    SysOssVo sysOssVo = ossMap.get(pictureId).get(0);
-                    pictureUrlList.add(sysOssVo.getUrl());
-                }
-            }
-            teamMeetingVo.setPictureUrlList(pictureUrlList);
             return teamMeetingVo;
         }).toList();
         teamMeetingVoPage.setRecords(teamMeetingVoList);
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/utils/GeoJsonUtils.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/utils/GeoJsonUtils.java
index ec53b9aa..96c580aa 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/utils/GeoJsonUtils.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/utils/GeoJsonUtils.java
@@ -3,7 +3,7 @@ package org.dromara.utils;
 import org.dromara.common.core.constant.HttpStatus;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.constant.GeoJsonConstant;
-import org.dromara.facility.domain.req.geojson.Geometry;
+import org.dromara.facility.domain.req.geojson.FacGeometry;
 import org.locationtech.jts.geom.*;
 
 import java.util.List;
@@ -92,7 +92,7 @@ public class GeoJsonUtils {
      * @param geometry 几何对象
      * @return 二维坐标
      */
-    public static List<List<Double>> getTwoDimensionalCoordinates(Geometry geometry) {
+    public static List<List<Double>> getTwoDimensionalCoordinates(FacGeometry geometry) {
         String type = geometry.getType();
         List<Object> coordinates = geometry.getCoordinates();
         return switch (type) {
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/machinery/BusMachineryDetailMapper.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/machinery/EqpMachineryDetailMapper.xml
similarity index 72%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/machinery/BusMachineryDetailMapper.xml
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/machinery/EqpMachineryDetailMapper.xml
index 0d87e83b..3218846f 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/machinery/BusMachineryDetailMapper.xml
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/machinery/EqpMachineryDetailMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.machinery.mapper.BusMachineryDetailMapper">
+<mapper namespace="org.dromara.machinery.mapper.EqpMachineryDetailMapper">
 
 </mapper>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/machinery/BusMachineryMapper.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/machinery/EqpMachineryMapper.xml
similarity index 71%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/machinery/BusMachineryMapper.xml
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/machinery/EqpMachineryMapper.xml
index 666edb11..62a8c2a9 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/machinery/BusMachineryMapper.xml
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/machinery/EqpMachineryMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.machinery.mapper.BusMachineryMapper">
+<mapper namespace="org.dromara.machinery.mapper.EqpMachineryMapper">
 
 </mapper>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/BusCompanyMapper.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/MatCompanyMapper.xml
similarity index 71%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/BusCompanyMapper.xml
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/MatCompanyMapper.xml
index 93ddafa7..4fe9cd19 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/BusCompanyMapper.xml
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/MatCompanyMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.materials.mapper.BusCompanyMapper">
+<mapper namespace="org.dromara.materials.mapper.MatCompanyMapper">
 
 </mapper>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/BusMaterialsInventoryMapper.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/MatMaterialsInventoryMapper.xml
similarity index 72%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/BusMaterialsInventoryMapper.xml
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/MatMaterialsInventoryMapper.xml
index 6c735313..ddbdaed8 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/BusMaterialsInventoryMapper.xml
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/MatMaterialsInventoryMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.materials.mapper.BusMaterialsInventoryMapper">
+<mapper namespace="org.dromara.materials.mapper.MatMaterialsInventoryMapper">
 
 </mapper>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/BusMaterialsMapper.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/MatMaterialsMapper.xml
similarity index 71%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/BusMaterialsMapper.xml
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/MatMaterialsMapper.xml
index 31b8d44d..16166906 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/BusMaterialsMapper.xml
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/MatMaterialsMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.materials.mapper.BusMaterialsMapper">
+<mapper namespace="org.dromara.materials.mapper.MatMaterialsMapper">
 
 </mapper>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/quality/BusQualityConstructionLogMapper.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/quality/QltQualityConstructionLogMapper.xml
similarity index 73%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/quality/BusQualityConstructionLogMapper.xml
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/quality/QltQualityConstructionLogMapper.xml
index d2a00884..8cba3b79 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/quality/BusQualityConstructionLogMapper.xml
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/quality/QltQualityConstructionLogMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.quality.mapper.BusQualityConstructionLogMapper">
+<mapper namespace="org.dromara.quality.mapper.QltQualityConstructionLogMapper">
 
 </mapper>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/quality/BusQualityInspectionMapper.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/quality/QltQualityInspectionMapper.xml
similarity index 72%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/quality/BusQualityInspectionMapper.xml
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/quality/QltQualityInspectionMapper.xml
index 3858e218..15b179e4 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/quality/BusQualityInspectionMapper.xml
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/quality/QltQualityInspectionMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.quality.mapper.BusQualityInspectionMapper">
+<mapper namespace="org.dromara.quality.mapper.QltQualityInspectionMapper">
 
 </mapper>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusDocumentSafetyMeetingMapper.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseDocumentSafetyMeetingMapper.xml
similarity index 72%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusDocumentSafetyMeetingMapper.xml
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseDocumentSafetyMeetingMapper.xml
index 11fe780a..c419faaf 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusDocumentSafetyMeetingMapper.xml
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseDocumentSafetyMeetingMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.safety.mapper.BusDocumentSafetyMeetingMapper">
+<mapper namespace="org.dromara.safety.mapper.HseDocumentSafetyMeetingMapper">
 
 </mapper>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusQuestionBankMapper.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseQuestionBankMapper.xml
similarity index 71%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusQuestionBankMapper.xml
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseQuestionBankMapper.xml
index c0f7446a..a7131952 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusQuestionBankMapper.xml
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseQuestionBankMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.safety.mapper.BusQuestionBankMapper">
+<mapper namespace="org.dromara.safety.mapper.HseQuestionBankMapper">
 
 </mapper>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusQuestionUserAnswerMapper.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseQuestionUserAnswerMapper.xml
similarity index 72%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusQuestionUserAnswerMapper.xml
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseQuestionUserAnswerMapper.xml
index 67381b0d..8d794e4e 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusQuestionUserAnswerMapper.xml
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseQuestionUserAnswerMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.safety.mapper.BusQuestionUserAnswerMapper">
+<mapper namespace="org.dromara.safety.mapper.HseQuestionUserAnswerMapper">
 
 </mapper>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusQuestionsCategoryMapper.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseQuestionsCategoryMapper.xml
similarity index 72%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusQuestionsCategoryMapper.xml
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseQuestionsCategoryMapper.xml
index c5727486..fc0b961c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusQuestionsCategoryMapper.xml
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseQuestionsCategoryMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.safety.mapper.BusQuestionsCategoryMapper">
+<mapper namespace="org.dromara.safety.mapper.HseQuestionsCategoryMapper">
 
 </mapper>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusQuestionsConfigMapper.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseQuestionsConfigMapper.xml
similarity index 72%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusQuestionsConfigMapper.xml
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseQuestionsConfigMapper.xml
index 336da364..0d8fbded 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusQuestionsConfigMapper.xml
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseQuestionsConfigMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.safety.mapper.BusQuestionsConfigMapper">
+<mapper namespace="org.dromara.safety.mapper.HseQuestionsConfigMapper">
 
 </mapper>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusSafetyInspectionMapper.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseSafetyInspectionMapper.xml
similarity index 72%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusSafetyInspectionMapper.xml
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseSafetyInspectionMapper.xml
index f43e8a4c..184ed8a0 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusSafetyInspectionMapper.xml
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseSafetyInspectionMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.safety.mapper.BusSafetyInspectionMapper">
+<mapper namespace="org.dromara.safety.mapper.HseSafetyInspectionMapper">
 
 </mapper>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusSafetyLogMapper.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseSafetyLogMapper.xml
similarity index 71%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusSafetyLogMapper.xml
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseSafetyLogMapper.xml
index 986f7c98..d0d7496f 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusSafetyLogMapper.xml
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseSafetyLogMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.safety.mapper.BusSafetyLogMapper">
+<mapper namespace="org.dromara.safety.mapper.HseSafetyLogMapper">
 
 </mapper>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusSafetyWeeklyReportMapper.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseSafetyWeeklyReportMapper.xml
similarity index 72%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusSafetyWeeklyReportMapper.xml
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseSafetyWeeklyReportMapper.xml
index 9de0437b..0519d6ca 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusSafetyWeeklyReportMapper.xml
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseSafetyWeeklyReportMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.safety.mapper.BusSafetyWeeklyReportMapper">
+<mapper namespace="org.dromara.safety.mapper.HseSafetyWeeklyReportMapper">
 
 </mapper>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusTeamMeetingMapper.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseTeamMeetingMapper.xml
similarity index 71%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusTeamMeetingMapper.xml
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseTeamMeetingMapper.xml
index 9b4dec8f..59886056 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/BusTeamMeetingMapper.xml
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseTeamMeetingMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.safety.mapper.BusTeamMeetingMapper">
+<mapper namespace="org.dromara.safety.mapper.HseTeamMeetingMapper">
 
 </mapper>
diff --git a/RuoYi-Vue-Plus/script/sql/xinnengyuan.sql b/RuoYi-Vue-Plus/script/sql/xinnengyuan.sql
index e8adfcac..f835ddac 100644
--- a/RuoYi-Vue-Plus/script/sql/xinnengyuan.sql
+++ b/RuoYi-Vue-Plus/script/sql/xinnengyuan.sql
@@ -55,8 +55,8 @@ CREATE TABLE `bus_user_project_relevancy`
   COLLATE = utf8mb4_general_ci comment = '系统用户与项目关联表'
   ROW_FORMAT = DYNAMIC;
 
-DROP TABLE IF EXISTS `bus_company`;
-CREATE TABLE `bus_company`
+DROP TABLE IF EXISTS mat_company;
+CREATE TABLE `mat_company`
 (
     `id`            bigint                               not null auto_increment,
     `company_name`  varchar(64)                          null comment '公司名称',
@@ -77,8 +77,8 @@ CREATE TABLE `bus_company`
   COLLATE = utf8mb4_general_ci comment = '公司表'
   ROW_FORMAT = DYNAMIC;
 
-DROP TABLE IF EXISTS `bus_materials`;
-CREATE TABLE `bus_materials`
+DROP TABLE IF EXISTS mat_materials;
+CREATE TABLE `mat_materials`
 (
     `id`                      bigint                               not null auto_increment,
     `materials_name`          varchar(64)                          null comment '材料名称',
@@ -104,8 +104,8 @@ CREATE TABLE `bus_materials`
   COLLATE = utf8mb4_general_ci comment = '材料名称表'
   ROW_FORMAT = DYNAMIC;
 
-DROP TABLE IF EXISTS `bus_materials_inventory`;
-CREATE TABLE `bus_materials_inventory`
+DROP TABLE IF EXISTS mat_materials_inventory;
+CREATE TABLE `mat_materials_inventory`
 (
     `id`           bigint                               not null auto_increment comment '主键id',
     `materials_id` bigint                               not null comment '材料id',
@@ -237,7 +237,7 @@ CREATE TABLE `bus_project_team_member`
     INDEX `idx_member_id` (`member_id` ASC) USING BTREE comment '施工人员id'
 ) comment = '项目班组下的成员' collate = utf8mb4_unicode_ci;
 
-DROP TABLE IF EXISTS `bus_machinery`;
+DROP TABLE IF EXISTS eqp_machinery;
 CREATE TABLE `bus_machinery`
 (
     `id`               bigint                               not null auto_increment comment '主键id',
@@ -256,7 +256,7 @@ CREATE TABLE `bus_machinery`
     PRIMARY KEY (`id`) USING BTREE
 ) comment = '机械表' collate = utf8mb4_unicode_ci;
 
-DROP TABLE IF EXISTS `bus_machinery_detail`;
+DROP TABLE IF EXISTS eqp_machinery_detail;
 CREATE TABLE `bus_machinery_detail`
 (
     `id`              bigint                               not null auto_increment comment '主键id',
@@ -279,7 +279,7 @@ CREATE TABLE `bus_machinery_detail`
     INDEX `idx_machinery_id` (`machinery_id` ASC) USING BTREE comment '机械主键id'
 ) comment = '机械详情' collate = utf8mb4_unicode_ci;
 
-DROP TABLE IF EXISTS `bus_team_meeting`;
+DROP TABLE IF EXISTS hse_team_meeting;
 CREATE TABLE `bus_team_meeting`
 (
     `id`             bigint                               not null auto_increment comment '主键id',
@@ -302,7 +302,7 @@ CREATE TABLE `bus_team_meeting`
     INDEX `idx_team_id` (`team_id` ASC) USING BTREE comment '班组ID'
 ) comment = '站班会' collate = utf8mb4_unicode_ci;
 
-DROP TABLE IF EXISTS `bus_safety_inspection`;
+DROP TABLE IF EXISTS hse_safety_inspection;
 CREATE TABLE `bus_safety_inspection`
 (
     `id`                 bigint                               not null auto_increment comment '主键ID',
@@ -336,7 +336,7 @@ CREATE TABLE `bus_safety_inspection`
     INDEX `idx_project_id` (`project_id` ASC) USING BTREE
 ) comment = '安全巡检工单' COLLATE = utf8mb4_unicode_ci;
 
-DROP TABLE IF EXISTS `bus_safety_log`;
+DROP TABLE IF EXISTS hse_safety_log;
 CREATE TABLE `bus_safety_log`
 (
     `id`                          bigint                               not null auto_increment comment '主键id',
@@ -366,7 +366,7 @@ CREATE TABLE `bus_safety_log`
     INDEX `idx_project_id` (`project_id` ASC) USING BTREE comment '项目id'
 ) comment = '安全日志' collate = utf8mb4_unicode_ci;
 
-DROP TABLE IF EXISTS `bus_safety_weekly_report`;
+DROP TABLE IF EXISTS hse_safety_weekly_report;
 CREATE TABLE `bus_safety_weekly_report`
 (
     `id`          bigint                               not null auto_increment comment '主键id',
@@ -386,8 +386,8 @@ CREATE TABLE `bus_safety_weekly_report`
     INDEX `idx_project_id` (`project_id` ASC) USING BTREE comment '项目id'
 ) comment = '安全周报' collate = utf8mb4_unicode_ci;
 
-DROP TABLE IF EXISTS `bus_questions_config`;
-CREATE TABLE `bus_questions_config`
+DROP TABLE IF EXISTS hse_questions_config;
+CREATE TABLE `hse_questions_config`
 (
     `id`              bigint        not null auto_increment comment '主键id',
     `single_choice`   int default 0 not null comment '单选题（单位/道）',
@@ -402,8 +402,8 @@ CREATE TABLE `bus_questions_config`
     PRIMARY KEY (`id`) USING BTREE
 ) comment = '题库配置' collate = utf8mb4_unicode_ci;
 
-DROP TABLE IF EXISTS `bus_question_bank`;
-CREATE TABLE `bus_question_bank`
+DROP TABLE IF EXISTS hse_question_bank;
+CREATE TABLE `hse_question_bank`
 (
     `id`               bigint                               not null auto_increment comment '主键id',
     `category_type`    char(1)                              null comment '题目类别',
@@ -421,8 +421,8 @@ CREATE TABLE `bus_question_bank`
     PRIMARY KEY (`id`) USING BTREE
 ) comment = '题库' collate = utf8mb4_unicode_ci;
 
-DROP TABLE IF EXISTS `bus_question_user_answer`;
-CREATE TABLE `bus_question_user_answer`
+DROP TABLE IF EXISTS hse_question_user_answer;
+CREATE TABLE `hse_question_user_answer`
 (
     `id`          bigint                               not null auto_increment comment '主键id',
     `project_id`  bigint                               null comment '项目id',
@@ -656,8 +656,8 @@ CREATE TABLE `bus_daily_piece_item`
     INDEX `idx_report_id` (`report_id` ASC) USING BTREE comment '日报id'
 ) comment = '施工人员日报计件信息' collate = utf8mb4_unicode_ci;
 
-DROP TABLE IF EXISTS `bus_document_safety_meeting`;
-CREATE TABLE `bus_document_safety_meeting`
+DROP TABLE IF EXISTS hse_document_safety_meeting;
+CREATE TABLE `hse_document_safety_meeting`
 (
     `id`            bigint                             not null auto_increment comment '主键id',
     `project_id`    bigint                             null comment '项目id',
@@ -679,8 +679,8 @@ CREATE TABLE `bus_document_safety_meeting`
     INDEX `idx_project_id` (`project_id` ASC) USING BTREE
 ) comment = '安全会议纪要' COLLATE = utf8mb4_unicode_ci;
 
-DROP TABLE IF EXISTS `bus_questions_category`;
-CREATE TABLE `bus_questions_category`
+DROP TABLE IF EXISTS hse_questions_category;
+CREATE TABLE `hse_questions_category`
 (
     `id`            bigint                             not null auto_increment comment '主键id',
     `project_id`    bigint                             not null comment '项目id',
@@ -691,8 +691,8 @@ CREATE TABLE `bus_questions_category`
     INDEX `idx_project_id` (`project_id` ASC) USING BTREE
 ) comment = '题库类别' COLLATE = utf8mb4_unicode_ci;
 
-DROP TABLE IF EXISTS `bus_quality_inspection`;
-CREATE TABLE `bus_quality_inspection`
+DROP TABLE IF EXISTS qlt_quality_inspection;
+CREATE TABLE `qlt_quality_inspection`
 (
     `id`                   bigint                               not null auto_increment comment '主键id',
     `project_id`           bigint                               null comment '项目id',
@@ -723,8 +723,8 @@ CREATE TABLE `bus_quality_inspection`
     INDEX `team_id` (`team_id` ASC) USING BTREE
 ) comment = '质量-检查工单' COLLATE = utf8mb4_unicode_ci;
 
-DROP TABLE IF EXISTS `bus_quality_construction_log`;
-CREATE TABLE `bus_quality_construction_log`
+DROP TABLE IF EXISTS qlt_quality_construction_log;
+CREATE TABLE `qlt_quality_construction_log`
 (
     `id`                 bigint                               not null auto_increment comment '主键id',
     `project_id`         bigint                               null comment '项目id',