Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

pom.xml

@@ -91,13 +91,12 @@
             <properties>
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <profiles.active>dev</profiles.active>
-                <nacos.server>192.168.110.207:8848</nacos.server>
-                <logstash.address>192.168.110.207:4560</logstash.address>
+                <nacos.server>192.168.24.101:8848</nacos.server>
+                <logstash.address>192.168.24.101:4560</logstash.address>
                 <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
                 <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
                 <nacos.username>nacos</nacos.username>
                 <nacos.password>nacos</nacos.password>
-                <!--                <logstash.address>127.0.0.1:4560</logstash.address>-->
             </properties>
 
         </profile>
@@ -105,8 +104,6 @@
             <id>prod</id>
             <properties>
                 <profiles.active>prod</profiles.active>
-                <!--                <nacos.server>127.0.0.1:8848</nacos.server>-->
-                <!--                <logstash.address>127.0.0.1:4560</logstash.address>-->
                 <nacos.server>47.109.37.87:8848</nacos.server>
                 <logstash.address>47.109.37.87:4560</logstash.address>
                 <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>

ruoyi-common/ruoyi-common-mybatis/pom.xml

@@ -49,6 +49,11 @@
             <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
             <version>${dynamic-ds.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.yulichang</groupId>
+            <artifactId>mybatis-plus-join</artifactId>
+            <version>1.2.4</version>
+        </dependency>
 
         <!-- Mysql Connector -->
         <dependency>

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionItemController.java

@@ -0,0 +1,106 @@
+package org.dromara.property.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.property.domain.bo.InspectionItemBo;
+import org.dromara.property.domain.vo.InspectionItemVo;
+import org.dromara.property.service.IInspectionItemService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 巡检项目
+ * 前端访问路由地址为:/property/item
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/item")
+public class InspectionItemController extends BaseController {
+
+    private final IInspectionItemService inspectionItemService;
+
+    /**
+     * 查询巡检项目列表
+     */
+    @SaCheckPermission("system:item:list")
+    @GetMapping("/list")
+    public TableDataInfo<InspectionItemVo> list(InspectionItemBo bo, PageQuery pageQuery) {
+        return inspectionItemService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出巡检项目列表
+     */
+    @SaCheckPermission("system:item:export")
+    @Log(title = "巡检项目", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(InspectionItemBo bo, HttpServletResponse response) {
+        List<InspectionItemVo> list = inspectionItemService.queryList(bo);
+        ExcelUtil.exportExcel(list, "巡检项目", InspectionItemVo.class, response);
+    }
+
+    /**
+     * 获取巡检项目详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:item:query")
+    @GetMapping("/{id}")
+    public R<InspectionItemVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(inspectionItemService.queryById(id));
+    }
+
+    /**
+     * 新增巡检项目
+     */
+    @SaCheckPermission("system:item:add")
+    @Log(title = "巡检项目", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody InspectionItemBo bo) {
+        return toAjax(inspectionItemService.insertByBo(bo));
+    }
+
+    /**
+     * 修改巡检项目
+     */
+    @SaCheckPermission("system:item:edit")
+    @Log(title = "巡检项目", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody InspectionItemBo bo) {
+        return toAjax(inspectionItemService.updateByBo(bo));
+    }
+
+    /**
+     * 删除巡检项目
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:item:remove")
+    @Log(title = "巡检项目", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(inspectionItemService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionPlanController.java

@@ -0,0 +1,107 @@
+package org.dromara.property.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.property.domain.vo.InspectionPlanDetailVo;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.property.domain.vo.InspectionPlanVo;
+import org.dromara.property.domain.bo.InspectionPlanBo;
+import org.dromara.property.service.IInspectionPlanService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 巡检计划
+ * 前端访问路由地址为:/property/inspectionPlan
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/inspectionPlan")
+public class InspectionPlanController extends BaseController {
+
+    private final IInspectionPlanService inspectionPlanService;
+
+    /**
+     * 查询巡检计划列表
+     */
+    //@SaCheckPermission("property:inspectionPlan:list")
+    @GetMapping("/list")
+    public TableDataInfo<InspectionPlanVo> list(InspectionPlanBo bo, PageQuery pageQuery) {
+        return inspectionPlanService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出巡检计划列表
+     */
+    //@SaCheckPermission("property:inspectionPlan:export")
+    @Log(title = "巡检计划", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(InspectionPlanBo bo, HttpServletResponse response) {
+        List<InspectionPlanVo> list = inspectionPlanService.queryList(bo);
+        ExcelUtil.exportExcel(list, "巡检计划", InspectionPlanVo.class, response);
+    }
+
+    /**
+     * 获取巡检计划详细信息
+     *
+     * @param id 主键
+     */
+  //  @SaCheckPermission("property:inspectionPlan:query")
+    @GetMapping("/{id}")
+    public R<InspectionPlanDetailVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(inspectionPlanService.queryById(id));
+    }
+
+    /**
+     * 新增巡检计划
+     */
+    @SaCheckPermission("property:inspectionPlan:add")
+    @Log(title = "巡检计划", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody InspectionPlanBo bo) {
+        return toAjax(inspectionPlanService.insertByBo(bo));
+    }
+
+    /**
+     * 修改巡检计划
+     */
+    @SaCheckPermission("property:inspectionPlan:edit")
+    @Log(title = "巡检计划", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody InspectionPlanBo bo) {
+        return toAjax(inspectionPlanService.updateByBo(bo));
+    }
+
+    /**
+     * 删除巡检计划
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("property:inspectionPlan:remove")
+    @Log(title = "巡检计划", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(inspectionPlanService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionPlanStaffController.java

@@ -0,0 +1,106 @@
+package org.dromara.property.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.property.domain.bo.InspectionPlanStaffBo;
+import org.dromara.property.domain.vo.InspectionPlanStaffVo;
+import org.dromara.property.service.IInspectionPlanStaffService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 执行计划人信息
+ * 前端访问路由地址为:/system/planStaff
+ *
+ * @author mocheng
+ * @date 2025-07-14
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/planStaff")
+public class InspectionPlanStaffController extends BaseController {
+
+    private final IInspectionPlanStaffService inspectionPlanStaffService;
+
+    /**
+     * 查询执行计划人信息列表
+     */
+    @SaCheckPermission("system:planStaff:list")
+    @GetMapping("/list")
+    public TableDataInfo<InspectionPlanStaffVo> list(InspectionPlanStaffBo bo, PageQuery pageQuery) {
+        return inspectionPlanStaffService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出执行计划人信息列表
+     */
+    @SaCheckPermission("system:planStaff:export")
+    @Log(title = "执行计划人信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(InspectionPlanStaffBo bo, HttpServletResponse response) {
+        List<InspectionPlanStaffVo> list = inspectionPlanStaffService.queryList(bo);
+        ExcelUtil.exportExcel(list, "执行计划人信息", InspectionPlanStaffVo.class, response);
+    }
+
+    /**
+     * 获取执行计划人信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:planStaff:query")
+    @GetMapping("/{id}")
+    public R<InspectionPlanStaffVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(inspectionPlanStaffService.queryById(id));
+    }
+
+    /**
+     * 新增执行计划人信息
+     */
+    @SaCheckPermission("system:planStaff:add")
+    @Log(title = "执行计划人信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody InspectionPlanStaffBo bo) {
+        return toAjax(inspectionPlanStaffService.insertByBo(bo));
+    }
+
+    /**
+     * 修改执行计划人信息
+     */
+    @SaCheckPermission("system:planStaff:edit")
+    @Log(title = "执行计划人信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody InspectionPlanStaffBo bo) {
+        return toAjax(inspectionPlanStaffService.updateByBo(bo));
+    }
+
+    /**
+     * 删除执行计划人信息
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:planStaff:remove")
+    @Log(title = "执行计划人信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(inspectionPlanStaffService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionPointController.java

@@ -0,0 +1,106 @@
+package org.dromara.property.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.property.domain.bo.InspectionPointBo;
+import org.dromara.property.domain.vo.InspectionPointVo;
+import org.dromara.property.service.IInspectionPointService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 巡检点
+ * 前端访问路由地址为:/property/point
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/point")
+public class InspectionPointController extends BaseController {
+
+    private final IInspectionPointService inspectionPointService;
+
+    /**
+     * 查询巡检点列表
+     */
+    @SaCheckPermission("system:point:list")
+    @GetMapping("/list")
+    public TableDataInfo<InspectionPointVo> list(InspectionPointBo bo, PageQuery pageQuery) {
+        return inspectionPointService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出巡检点列表
+     */
+    @SaCheckPermission("system:point:export")
+    @Log(title = "巡检点", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(InspectionPointBo bo, HttpServletResponse response) {
+        List<InspectionPointVo> list = inspectionPointService.queryList(bo);
+        ExcelUtil.exportExcel(list, "巡检点", InspectionPointVo.class, response);
+    }
+
+    /**
+     * 获取巡检点详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:point:query")
+    @GetMapping("/{id}")
+    public R<InspectionPointVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(inspectionPointService.queryById(id));
+    }
+
+    /**
+     * 新增巡检点
+     */
+    @SaCheckPermission("system:point:add")
+    @Log(title = "巡检点", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody InspectionPointBo bo) {
+        return toAjax(inspectionPointService.insertByBo(bo));
+    }
+
+    /**
+     * 修改巡检点
+     */
+    @SaCheckPermission("system:point:edit")
+    @Log(title = "巡检点", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody InspectionPointBo bo) {
+        return toAjax(inspectionPointService.updateByBo(bo));
+    }
+
+    /**
+     * 删除巡检点
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:point:remove")
+    @Log(title = "巡检点", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(inspectionPointService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionRouteController.java

@@ -0,0 +1,106 @@
+package org.dromara.property.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.property.domain.bo.InspectionRouteBo;
+import org.dromara.property.domain.vo.InspectionRouteVo;
+import org.dromara.property.service.IInspectionRouteService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 巡检路线
+ * 前端访问路由地址为:/property/route
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/route")
+public class InspectionRouteController extends BaseController {
+
+    private final IInspectionRouteService inspectionRouteService;
+
+    /**
+     * 查询巡检路线列表
+     */
+    //@SaCheckPermission("system:route:list")
+    @GetMapping("/list")
+    public TableDataInfo<InspectionRouteVo> list(InspectionRouteBo bo, PageQuery pageQuery) {
+        return inspectionRouteService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出巡检路线列表
+     */
+    @SaCheckPermission("system:route:export")
+    @Log(title = "巡检路线", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(InspectionRouteBo bo, HttpServletResponse response) {
+        List<InspectionRouteVo> list = inspectionRouteService.queryList(bo);
+        ExcelUtil.exportExcel(list, "巡检路线", InspectionRouteVo.class, response);
+    }
+
+    /**
+     * 获取巡检路线详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:route:query")
+    @GetMapping("/{id}")
+    public R<InspectionRouteVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(inspectionRouteService.queryById(id));
+    }
+
+    /**
+     * 新增巡检路线
+     */
+    @SaCheckPermission("system:route:add")
+    @Log(title = "巡检路线", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody InspectionRouteBo bo) {
+        return toAjax(inspectionRouteService.insertByBo(bo));
+    }
+
+    /**
+     * 修改巡检路线
+     */
+    @SaCheckPermission("system:route:edit")
+    @Log(title = "巡检路线", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody InspectionRouteBo bo) {
+        return toAjax(inspectionRouteService.updateByBo(bo));
+    }
+
+    /**
+     * 删除巡检路线
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:route:remove")
+    @Log(title = "巡检路线", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(inspectionRouteService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionStaffController.java

@@ -0,0 +1,106 @@
+package org.dromara.property.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.property.domain.bo.InspectionStaffBo;
+import org.dromara.property.domain.vo.InspectionStaffVo;
+import org.dromara.property.service.IInspectionStaffService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 执行计划人信息
+ * 前端访问路由地址为:/system/staff
+ *
+ * @author mocheng
+ * @date 2025-07-14
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/staff")
+public class InspectionStaffController extends BaseController {
+
+    private final IInspectionStaffService inspectionStaffService;
+
+    /**
+     * 查询执行计划人信息列表
+     */
+    @SaCheckPermission("system:staff:list")
+    @GetMapping("/list")
+    public TableDataInfo<InspectionStaffVo> list(InspectionStaffBo bo, PageQuery pageQuery) {
+        return inspectionStaffService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出执行计划人信息列表
+     */
+    @SaCheckPermission("system:staff:export")
+    @Log(title = "执行计划人信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(InspectionStaffBo bo, HttpServletResponse response) {
+        List<InspectionStaffVo> list = inspectionStaffService.queryList(bo);
+        ExcelUtil.exportExcel(list, "执行计划人信息", InspectionStaffVo.class, response);
+    }
+
+    /**
+     * 获取执行计划人信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:staff:query")
+    @GetMapping("/{id}")
+    public R<InspectionStaffVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(inspectionStaffService.queryById(id));
+    }
+
+    /**
+     * 新增执行计划人信息
+     */
+    @SaCheckPermission("system:staff:add")
+    @Log(title = "执行计划人信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody InspectionStaffBo bo) {
+        return toAjax(inspectionStaffService.insertByBo(bo));
+    }
+
+    /**
+     * 修改执行计划人信息
+     */
+    @SaCheckPermission("system:staff:edit")
+    @Log(title = "执行计划人信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody InspectionStaffBo bo) {
+        return toAjax(inspectionStaffService.updateByBo(bo));
+    }
+
+    /**
+     * 删除执行计划人信息
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:staff:remove")
+    @Log(title = "执行计划人信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(inspectionStaffService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionTaskController.java

@@ -0,0 +1,106 @@
+package org.dromara.property.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.property.domain.vo.InspectionTaskVo;
+import org.dromara.property.domain.bo.InspectionTaskBo;
+import org.dromara.property.service.IInspectionTaskService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 巡检任务
+ * 前端访问路由地址为:/property/inspectionTask
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/inspectionTask")
+public class InspectionTaskController extends BaseController {
+
+    private final IInspectionTaskService inspectionTaskService;
+
+    /**
+     * 查询巡检任务列表
+     */
+   // @SaCheckPermission("property:inspectionTask:list")
+    @GetMapping("/list")
+    public TableDataInfo<InspectionTaskVo> list(InspectionTaskBo bo, PageQuery pageQuery) {
+        return inspectionTaskService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出巡检任务列表
+     */
+    @SaCheckPermission("property:inspectionTask:export")
+    @Log(title = "巡检任务", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(InspectionTaskBo bo, HttpServletResponse response) {
+        List<InspectionTaskVo> list = inspectionTaskService.queryList(bo);
+        ExcelUtil.exportExcel(list, "巡检任务", InspectionTaskVo.class, response);
+    }
+
+    /**
+     * 获取巡检任务详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("property:inspectionTask:query")
+    @GetMapping("/{id}")
+    public R<InspectionTaskVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(inspectionTaskService.queryById(id));
+    }
+
+    /**
+     * 新增巡检任务
+     */
+    @SaCheckPermission("property:inspectionTask:add")
+    @Log(title = "巡检任务", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody InspectionTaskBo bo) {
+        return toAjax(inspectionTaskService.insertByBo(bo));
+    }
+
+    /**
+     * 修改巡检任务
+     */
+    @SaCheckPermission("property:inspectionTask:edit")
+    @Log(title = "巡检任务", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody InspectionTaskBo bo) {
+        return toAjax(inspectionTaskService.updateByBo(bo));
+    }
+
+    /**
+     * 删除巡检任务
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("property:inspectionTask:remove")
+    @Log(title = "巡检任务", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(inspectionTaskService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java

@@ -98,7 +98,7 @@ public class CleanOrder extends TenantEntity {
     /**
      * 状态
      */
-    private int state;
+    private Integer state;
 
     /**
      * 联系电话
@@ -113,7 +113,7 @@ public class CleanOrder extends TenantEntity {
     /**
      * 是否退订（0：否，1：是）
      */
-    private int isUnbooking;
+    private Integer isUnbooking;
 
     /**
      * 更新人id

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/InspectionItem.java

@@ -0,0 +1,40 @@
+package org.dromara.property.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 巡检项目对象 inspection_item
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("inspection_item")
+public class InspectionItem extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 项目名称
+     */
+    private String itemName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/InspectionPlan.java

@@ -0,0 +1,102 @@
+package org.dromara.property.domain;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+import java.io.Serial;
+
+/**
+ * 巡检计划对象 inspection_plan
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("inspection_plan")
+public class InspectionPlan extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 巡检计划名称
+     */
+    private String planName;
+
+    /**
+     * 巡检路线id
+     */
+    private Long inspectionRouteId;
+
+    /**
+     * 巡检周期
+     */
+    private String inspectionPlanPeriod;
+    /**
+     * 任务提前分组
+     */
+    private Integer beforeTime;
+
+    /**
+     * 巡检月
+     */
+    private String inspectionMonth;
+    /**
+     * 巡检日
+     */
+    private String inspectionDay;
+    /**
+     * 巡检周
+     */
+    private String inspectionWorkday;
+
+    /**
+     * 开始日期
+     */
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    private Date endDate;
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+
+    /**
+     * 签到方式(0现场拍照（默认定位）,1现场定位)
+     */
+    private String signType;
+
+    /**
+     * 允许补检(0允许1不允许)
+     */
+    private String canReexamine;
+
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 状态(0启用1停用)
+     */
+    private String state;
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/InspectionPlanStaff.java

@@ -0,0 +1,58 @@
+package org.dromara.property.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 执行计划人信息对象 inspection_plan_staff
+ *
+ * @author mocheng
+ * @date 2025-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("inspection_plan_staff")
+public class InspectionPlanStaff extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 执行计划人id
+     */
+    private Long userId;
+
+    /**
+     * 计划id
+     */
+    private Long inspectionPlanId;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/InspectionPoint.java

@@ -0,0 +1,56 @@
+package org.dromara.property.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 巡检点对象 inspection_point
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("inspection_point")
+public class InspectionPoint extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 巡检项目id
+     */
+    private Long itemId;
+
+    /**
+     * 巡检点名称
+     */
+    private String pointName;
+
+    /**
+     * 巡检点类型
+     */
+    private String pointType;
+
+    /**
+     * nfc编码
+     */
+    private String nfcCode;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/InspectionRoute.java

@@ -0,0 +1,44 @@
+package org.dromara.property.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 巡检路线对象 inspection_route
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("inspection_route")
+public class InspectionRoute extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 路线名称
+     */
+    private String routeName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/InspectionStaff.java

@@ -0,0 +1,58 @@
+package org.dromara.property.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 执行计划人信息对象 inspection_staff
+ *
+ * @author mocheng
+ * @date 2025-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("inspection_staff")
+public class InspectionStaff extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 实际巡检人id
+     */
+    private Long userId;
+
+    /**
+     * 计划id
+     */
+    private Long inspectionPlanId;
+
+    /**
+     * 实际巡检开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 实际巡检结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/InspectionTask.java

@@ -0,0 +1,77 @@
+package org.dromara.property.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 巡检任务对象 inspection_task
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("inspection_task")
+public class InspectionTask extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 巡检计划id
+     */
+    private Long inspectionPlanId;
+
+    /**
+     * 实际巡检时间
+     */
+    private Date actInsTime;
+
+    /**
+     * 当前巡检人
+     */
+    private Long actUserId;
+
+    /**
+     * 巡检方式
+     */
+    private String taskType;
+
+    /**
+     * 转移描述
+     */
+    private String transferDesc;
+
+    /**
+     * 巡检状态
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 计划巡检时间范围
+     */
+    private String planInsTime;
+
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/MeetAttach.java

@@ -62,20 +62,5 @@ public class MeetAttach extends TenantEntity {
      */
     private String  picture;
 
-    /**
-     * 创建人id
-     */
-    private Long createById;
-
-    /**
-     * 更新人id
-     */
-    private Long updateById;
-
-    /**
-     * 搜索值
-     */
-    private String searchValue;
-
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/MeetAttachOrder.java

@@ -42,20 +42,5 @@ public class MeetAttachOrder extends TenantEntity {
      */
     private Long quantity;
 
-    /**
-     * 创建人id
-     */
-    private Long createById;
-
-    /**
-     * 更新人id
-     */
-    private Long updateById;
-
-    /**
-     * 搜索值
-     */
-    private String searchValue;
-
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/MeetBooking.java

@@ -105,20 +105,4 @@ public class MeetBooking extends TenantEntity {
      */
     private String descs;
 
-    /**
-     * 创建人id
-     */
-    private Long createById;
-
-    /**
-     * 更新人id
-     */
-    private Long updateById;
-
-    /**
-     * 搜索值
-     */
-    private String searchValue;
-
-
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanBo.java

@@ -86,7 +86,7 @@ public class CleanBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java

@@ -114,12 +114,12 @@ public class CleanOrderBo extends BaseEntity {
     /**
      * 是否退订（0：否，1：是）
      */
-    private int isUnbooking;
+    private Integer isUnbooking;
 
     /**
      * 状态
      */
-    private int state;
+    private Integer state;
 
     @NotEmpty(message = "订单详情不能为空", groups = {AddGroup.class})
     private List<Clean> cleanList;

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/InspectionItemBo.java

@@ -0,0 +1,40 @@
+package org.dromara.property.domain.bo;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import org.dromara.property.domain.InspectionItem;
+
+/**
+ * 巡检项目业务对象 inspection_item
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = InspectionItem.class, reverseConvertGenerate = false)
+public class InspectionItemBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 项目名称
+     */
+    @NotBlank(message = "项目名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String itemName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/InspectionPlanBo.java

@@ -0,0 +1,116 @@
+package org.dromara.property.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.property.domain.InspectionPlan;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 巡检计划业务对象 inspection_plan
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = InspectionPlan.class, reverseConvertGenerate = false)
+public class InspectionPlanBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 巡检计划名称
+     */
+    @NotBlank(message = "巡检计划名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String planName;
+
+    /**
+     * 巡检路线id
+     */
+    @NotNull(message = "巡检路线id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long inspectionRouteId;
+
+    /**
+     * 巡检周期
+     */
+    @NotBlank(message = "巡检周期不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String inspectionPlanPeriod;
+
+    /**
+     * 任务提前分组
+     */
+    @NotNull(message = "任务提前分组不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Integer  beforeTime;
+
+    /**
+     * 开始日期
+     */
+    @NotNull(message = "开始日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    @NotNull(message = "结束日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date endDate;
+    /**
+     * 开始时间
+     */
+    @NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    @NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String endTime;
+
+    /**
+     * 签到方式(0现场拍照（默认定位）,1现场定位)
+     */
+    @NotBlank(message = "签到方式(0现场拍照（默认定位）,1现场定位)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String signType;
+
+    /**
+     * 允许补检(0允许1不允许)
+     */
+    @NotBlank(message = "允许补检(0允许1不允许)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String canReexamine;
+
+    /**
+     * 巡检月
+     */
+    private String inspectionMonth;
+    /**
+     * 巡检日
+     */
+    private String inspectionDay;
+    /**
+     * 巡检周
+     */
+    private String inspectionWorkday;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 状态(0启用1停用)
+     */
+    private String state;
+
+    private List<InspectionPlanStaffBo> inspectionPlanStaffBoList;
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/InspectionPlanStaffBo.java

@@ -0,0 +1,56 @@
+package org.dromara.property.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.property.domain.InspectionPlanStaff;
+
+import java.util.Date;
+
+/**
+ * 执行计划人信息业务对象 inspection_plan_staff
+ *
+ * @author mocheng
+ * @date 2025-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = InspectionPlanStaff.class, reverseConvertGenerate = false)
+public class InspectionPlanStaffBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 执行计划人id
+     */
+    @NotNull(message = "执行计划人id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long userId;
+
+    /**
+     * 计划id
+     */
+    @NotNull(message = "计划id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long inspectionPlanId;
+
+    /**
+     * 开始时间
+     */
+    @NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date endTime;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/InspectionPointBo.java

@@ -0,0 +1,58 @@
+package org.dromara.property.domain.bo;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import org.dromara.property.domain.InspectionPoint;
+
+/**
+ * 巡检点业务对象 inspection_point
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = InspectionPoint.class, reverseConvertGenerate = false)
+public class InspectionPointBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 巡检项目id
+     */
+    @NotNull(message = "巡检项目id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long itemId;
+
+    /**
+     * 巡检点名称
+     */
+    @NotBlank(message = "巡检点名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String pointName;
+
+    /**
+     * 巡检点类型
+     */
+    @NotBlank(message = "巡检点类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String pointType;
+
+    /**
+     * nfc编码
+     */
+    private String nfcCode;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/InspectionRouteBo.java

@@ -0,0 +1,44 @@
+package org.dromara.property.domain.bo;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import org.dromara.property.domain.InspectionRoute;
+
+/**
+ * 巡检路线业务对象 inspection_route
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = InspectionRoute.class, reverseConvertGenerate = false)
+public class InspectionRouteBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 路线名称
+     */
+    @NotBlank(message = "路线名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String routeName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 排序
+     */
+    @NotNull(message = "排序不能为空", groups = { EditGroup.class })
+    private Integer sort;
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/InspectionStaffBo.java

@@ -0,0 +1,57 @@
+package org.dromara.property.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.property.domain.InspectionStaff;
+
+import java.util.Date;
+
+/**
+ * 执行计划人信息业务对象 inspection_staff
+ *
+ * @author mocheng
+ * @date 2025-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = InspectionStaff.class, reverseConvertGenerate = false)
+public class InspectionStaffBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 实际巡检人id
+     */
+    @NotNull(message = "实际巡检人id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long userId;
+
+    /**
+     * 计划id
+     */
+    @NotNull(message = "计划id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long inspectionPlanId;
+
+    /**
+     * 实际巡检开始时间
+     */
+    @NotNull(message = "实际巡检开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date startTime;
+
+    /**
+     * 实际巡检结束时间
+     */
+    @NotNull(message = "实际巡检结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date endTime;
+
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/InspectionTaskBo.java

@@ -0,0 +1,69 @@
+package org.dromara.property.domain.bo;
+
+import org.dromara.property.domain.InspectionTask;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 巡检任务业务对象 inspection_task
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = InspectionTask.class, reverseConvertGenerate = false)
+public class InspectionTaskBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 巡检计划id
+     */
+    private Long inspectionPlanId;
+
+    /**
+     * 实际巡检时间
+     */
+    private Date actInsTime;
+
+    /**
+     * 当前巡检人
+     */
+    private Long actUserId;
+
+    /**
+     * 巡检方式
+     */
+    private String taskType;
+
+    /**
+     * 转移描述
+     */
+    private String transferDesc;
+
+    /**
+     * 巡检状态
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 计划巡检时间范围
+     */
+    private String planInsTime;
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/MeetAttachOrderBo.java

@@ -34,20 +34,5 @@ public class MeetAttachOrderBo extends BaseEntity {
      */
     private Integer quantity;
 
-    /**
-     * 创建人id
-     */
-    private Long createById;
-
-    /**
-     * 更新人id
-     */
-    private Long updateById;
-
-    /**
-     * 搜索值
-     */
-    private String searchValue;
-
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ResidentUnitBo.java

@@ -74,7 +74,7 @@ public class ResidentUnitBo extends BaseEntity {
      * 状态
      */
 //    @NotNull(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long state=1l;
+    private Long state;
 
     /**
      * 员工人数

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/enums/InspectionPlanPeriodEnum.java

@@ -0,0 +1,38 @@
+package org.dromara.property.domain.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author:yuyongle
+ * @Date:2025/7/4 10:35
+ * @Description:巡检周期枚举
+ **/
+@Getter
+public enum InspectionPlanPeriodEnum {
+    /**
+     * 月/天
+     */
+    MONTHANDDAY("月/天", "1"),
+    /**
+     * 月/天
+     */
+    WEEK("周", "2");
+
+
+    private final String name;
+    private final String value;
+
+    InspectionPlanPeriodEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java

@@ -116,7 +116,7 @@ public class CleanOrderVo implements Serializable {
     /**
      * 是否退订（0：否，1：是）
      */
-    private int isUnbooking;
+    private Integer isUnbooking;
 
     /**
      * 联系电话

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/InspectionItemVo.java

@@ -0,0 +1,60 @@
+package org.dromara.property.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.property.domain.InspectionItem;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 巡检项目视图对象 inspection_item
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = InspectionItem.class)
+public class InspectionItemVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 项目名称
+     */
+    @ExcelProperty(value = "项目名称")
+    private String itemName;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+
+    /**
+     * 搜索值
+     */
+    @ExcelProperty(value = "搜索值")
+    private String searchValue;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/InspectionPlanDetailVo.java

@@ -0,0 +1,113 @@
+package org.dromara.property.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+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.property.domain.InspectionPlan;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author:yuyongle
+ * @Date:2025/7/11 17:10
+ * @Description:
+ **/
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = InspectionPlan.class)
+public class InspectionPlanDetailVo implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 巡检计划名称
+     */
+    @ExcelProperty(value = "巡检计划名称")
+    private String planName;
+
+    /**
+     * 巡检路线id
+     */
+    @ExcelProperty(value = "巡检路线id")
+    private Long inspectionRouteId;
+
+    /**
+     * 巡检周期
+     */
+    @ExcelProperty(value = "巡检周期")
+    private String inspectionPlanPeriod;
+
+    /**
+     * 任务提前分组
+     */
+    @ExcelProperty(value = "任务提前分组")
+    private Integer beforeTime;
+
+    /**
+     * 开始日期
+     */
+    @ExcelProperty(value = "开始日期")
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    @ExcelProperty(value = "结束日期")
+    private Date endDate;
+
+    /**
+     * 签到方式(0现场拍照（默认定位）,1现场定位)
+     */
+    @ExcelProperty(value = "签到方式(0现场拍照", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "默=认定位")
+    private String signType;
+
+    /**
+     * 允许补检(0允许1不允许)
+     */
+    @ExcelProperty(value = "允许补检(0允许1不允许)")
+    private String canReexamine;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+    /**
+     * 巡检月
+     */
+    private String inspectionMonth;
+    /**
+     * 巡检日
+     */
+    private String inspectionDay;
+    /**
+     * 巡检周
+     */
+    private String inspectionWorkday;
+    /**
+     * 巡检人员
+     */
+    private List<InspectionPlanStaffVo>  inspectionPlanStaffVoList;
+    /**
+     * 状态(0启用1停用)
+     */
+    private String state;
+    /**
+     * 搜索值
+     */
+    @ExcelProperty(value = "搜索值")
+    private String searchValue;
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/InspectionPlanStaffVo.java

@@ -0,0 +1,71 @@
+package org.dromara.property.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.property.domain.InspectionPlanStaff;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 执行计划人信息视图对象 inspection_plan_staff
+ *
+ * @author mocheng
+ * @date 2025-07-14
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = InspectionPlanStaff.class)
+public class InspectionPlanStaffVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 执行计划人id
+     */
+    @ExcelProperty(value = "执行计划人id")
+    private Long userId;
+    /**
+     * 执行计划人姓名
+     */
+    @ExcelProperty(value = "执行计划人姓名")
+    private String userName;
+
+    /**
+     * 计划id
+     */
+    @ExcelProperty(value = "计划id")
+    private Long inspectionPlanId;
+
+    /**
+     * 开始时间
+     */
+    @ExcelProperty(value = "开始时间")
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @ExcelProperty(value = "结束时间")
+    private Date endTime;
+
+    /**
+     * 搜索值
+     */
+    @ExcelProperty(value = "搜索值")
+    private String searchValue;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/InspectionPlanVo.java

@@ -0,0 +1,127 @@
+package org.dromara.property.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.NotNull;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.property.domain.InspectionPlan;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.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;
+
+
+
+/**
+ * 巡检计划视图对象 inspection_plan
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = InspectionPlan.class)
+public class InspectionPlanVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 巡检计划名称
+     */
+    @ExcelProperty(value = "巡检计划名称")
+    private String planName;
+
+    /**
+     * 巡检路线id
+     */
+    @ExcelProperty(value = "巡检路线id")
+    private Long inspectionRouteId;
+
+    /**
+     * 巡检周期
+     */
+    @ExcelProperty(value = "巡检周期")
+    private String inspectionPlanPeriod;
+
+    /**
+     * 任务提前分组
+     */
+    @ExcelProperty(value = "任务提前分组")
+    private Integer beforeTime;
+
+    /**
+     * 开始日期
+     */
+    @ExcelProperty(value = "开始日期")
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    @ExcelProperty(value = "结束日期")
+    private Date endDate;
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+
+    /**
+     * 签到方式(0现场拍照（默认定位）,1现场定位)
+     */
+    @ExcelProperty(value = "签到方式(0现场拍照", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "默=认定位")
+    private String signType;
+
+    /**
+     * 允许补检(0允许1不允许)
+     */
+    @ExcelProperty(value = "允许补检(0允许1不允许)")
+    private String canReexamine;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+    /**
+     * 巡检月
+     */
+    private String inspectionMonth;
+    /**
+     * 巡检日
+     */
+    private String inspectionDay;
+    /**
+     * 巡检周
+     */
+    private String inspectionWorkday;
+    /**
+     * 状态(0启用1停用)
+     */
+    private String state;
+    /**
+     * 搜索值
+     */
+    @ExcelProperty(value = "搜索值")
+    private String searchValue;
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/InspectionPointVo.java

@@ -0,0 +1,83 @@
+package org.dromara.property.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.property.domain.InspectionPoint;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 巡检点视图对象 inspection_point
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = InspectionPoint.class)
+public class InspectionPointVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 巡检项目id
+     */
+    @ExcelProperty(value = "巡检项目id")
+    private Long itemId;
+
+    /**
+     * 巡检项目id
+     */
+    @ExcelProperty(value = "巡检项目id")
+    private Long itemName;
+
+    /**
+     * 巡检点名称
+     */
+    @ExcelProperty(value = "巡检点名称")
+    private String pointName;
+
+    /**
+     * 巡检点类型
+     */
+    @ExcelProperty(value = "巡检点类型")
+    private String pointType;
+
+    /**
+     * nfc编码
+     */
+    @ExcelProperty(value = "nfc编码")
+    private String nfcCode;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 搜索值
+     */
+    @ExcelProperty(value = "搜索值")
+    private String searchValue;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/InspectionRouteVo.java

@@ -0,0 +1,62 @@
+package org.dromara.property.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.property.domain.InspectionRoute;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 巡检路线视图对象 inspection_route
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = InspectionRoute.class)
+public class InspectionRouteVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 路线名称
+     */
+    @ExcelProperty(value = "路线名称")
+    private String routeName;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+    /**
+     * 排序
+     */
+    @ExcelProperty(value = "排序")
+    private Integer sort;
+    /**
+     * 搜索值
+     */
+    @ExcelProperty(value = "搜索值")
+    private String searchValue;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/InspectionStaffVo.java

@@ -0,0 +1,66 @@
+package org.dromara.property.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.property.domain.InspectionStaff;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 执行计划人信息视图对象 inspection_staff
+ *
+ * @author mocheng
+ * @date 2025-07-14
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = InspectionStaff.class)
+public class InspectionStaffVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 实际巡检人id
+     */
+    @ExcelProperty(value = "实际巡检人id")
+    private Long userId;
+
+    /**
+     * 计划id
+     */
+    @ExcelProperty(value = "计划id")
+    private Long inspectionPlanId;
+
+    /**
+     * 实际巡检开始时间
+     */
+    @ExcelProperty(value = "实际巡检开始时间")
+    private Date startTime;
+
+    /**
+     * 实际巡检结束时间
+     */
+    @ExcelProperty(value = "实际巡检结束时间")
+    private Date endTime;
+
+    /**
+     * 搜索值
+     */
+    @ExcelProperty(value = "搜索值")
+    private String searchValue;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/InspectionTaskVo.java

@@ -0,0 +1,102 @@
+package org.dromara.property.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.property.domain.InspectionTask;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.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;
+
+
+
+/**
+ * 巡检任务视图对象 inspection_task
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = InspectionTask.class)
+public class InspectionTaskVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 巡检计划id
+     */
+    @ExcelProperty(value = "巡检计划id")
+    private Long inspectionPlanId;
+
+    /**
+     * 巡检计划名称
+     */
+    private String planName;
+
+    /**
+     * 实际巡检时间
+     */
+    @ExcelProperty(value = "实际巡检时间")
+    private Date actInsTime;
+
+    /**
+     * 当前巡检人
+     */
+    @ExcelProperty(value = "当前巡检人")
+    private Long actUserId;
+
+    /**
+     * 巡检人名称
+     */
+    @ExcelProperty(value = "巡检人名称")
+    private Long actUserName;
+
+    /**
+     * 巡检方式
+     */
+    @ExcelProperty(value = "巡检方式")
+    private String taskType;
+
+    /**
+     * 转移描述
+     */
+    @ExcelProperty(value = "转移描述")
+    private String transferDesc;
+
+    /**
+     * 巡检状态
+     */
+    @ExcelProperty(value = "巡检状态")
+    private String status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+    /**
+     * 计划巡检时间范围
+     */
+    private String planInsTime;
+    /**
+     * 搜索值
+     */
+    @ExcelProperty(value = "搜索值")
+    private String searchValue;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/InspectionItemMapper.java

@@ -0,0 +1,17 @@
+package org.dromara.property.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.property.domain.InspectionItem;
+import org.dromara.property.domain.vo.InspectionItemVo;
+
+/**
+ * 巡检项目Mapper接口
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Mapper
+public interface InspectionItemMapper extends BaseMapperPlus<InspectionItem, InspectionItemVo> {
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/InspectionPlanMapper.java

@@ -0,0 +1,17 @@
+package org.dromara.property.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.property.domain.InspectionPlan;
+import org.dromara.property.domain.vo.InspectionPlanVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 巡检计划Mapper接口
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Mapper
+public interface InspectionPlanMapper extends BaseMapperPlus<InspectionPlan, InspectionPlanVo> {
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/InspectionPlanStaffMapper.java

@@ -0,0 +1,16 @@
+package org.dromara.property.mapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.property.domain.InspectionPlanStaff;
+import org.dromara.property.domain.vo.InspectionPlanStaffVo;
+
+/**
+ * 执行计划人信息Mapper接口
+ *
+ * @author mocheng
+ * @date 2025-07-14
+ */
+@Mapper
+public interface InspectionPlanStaffMapper extends BaseMapperPlus<InspectionPlanStaff, InspectionPlanStaffVo> {
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/InspectionPointMapper.java

@@ -0,0 +1,17 @@
+package org.dromara.property.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.property.domain.InspectionPoint;
+import org.dromara.property.domain.vo.InspectionPointVo;
+
+/**
+ * 巡检点Mapper接口
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Mapper
+public interface InspectionPointMapper extends BaseMapperPlus<InspectionPoint, InspectionPointVo> {
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/InspectionRouteMapper.java

@@ -0,0 +1,17 @@
+package org.dromara.property.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.property.domain.InspectionRoute;
+import org.dromara.property.domain.vo.InspectionRouteVo;
+
+/**
+ * 巡检路线Mapper接口
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Mapper
+public interface InspectionRouteMapper extends BaseMapperPlus<InspectionRoute, InspectionRouteVo> {
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/InspectionStaffMapper.java

@@ -0,0 +1,17 @@
+package org.dromara.property.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.property.domain.InspectionStaff;
+import org.dromara.property.domain.vo.InspectionStaffVo;
+
+/**
+ * 执行计划人信息Mapper接口
+ *
+ * @author mocheng
+ * @date 2025-07-14
+ */
+@Mapper
+public interface InspectionStaffMapper extends BaseMapperPlus<InspectionStaff, InspectionStaffVo> {
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/InspectionTaskMapper.java

@@ -0,0 +1,17 @@
+package org.dromara.property.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.property.domain.InspectionTask;
+import org.dromara.property.domain.vo.InspectionTaskVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 巡检任务Mapper接口
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Mapper
+public interface InspectionTaskMapper extends BaseMapperPlus<InspectionTask, InspectionTaskVo> {
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/mapperMPJ/InspectionTaskMPJMapper.java

@@ -0,0 +1,18 @@
+package org.dromara.property.mapperMPJ;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.property.domain.InspectionTask;
+import org.dromara.property.domain.vo.InspectionTaskVo;
+
+/**
+ * 巡检任务Mapper接口
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Mapper
+public interface InspectionTaskMPJMapper extends MPJBaseMapper<InspectionTask> {
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/IInspectionItemService.java

@@ -0,0 +1,68 @@
+package org.dromara.property.service;
+
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.property.domain.bo.InspectionItemBo;
+import org.dromara.property.domain.vo.InspectionItemVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 巡检项目Service接口
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+public interface IInspectionItemService {
+
+    /**
+     * 查询巡检项目
+     *
+     * @param id 主键
+     * @return 巡检项目
+     */
+    InspectionItemVo queryById(Long id);
+
+    /**
+     * 分页查询巡检项目列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 巡检项目分页列表
+     */
+    TableDataInfo<InspectionItemVo> queryPageList(InspectionItemBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的巡检项目列表
+     *
+     * @param bo 查询条件
+     * @return 巡检项目列表
+     */
+    List<InspectionItemVo> queryList(InspectionItemBo bo);
+
+    /**
+     * 新增巡检项目
+     *
+     * @param bo 巡检项目
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(InspectionItemBo bo);
+
+    /**
+     * 修改巡检项目
+     *
+     * @param bo 巡检项目
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(InspectionItemBo bo);
+
+    /**
+     * 校验并批量删除巡检项目信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/IInspectionPlanService.java

@@ -0,0 +1,69 @@
+package org.dromara.property.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.property.domain.bo.InspectionPlanBo;
+import org.dromara.property.domain.vo.InspectionPlanDetailVo;
+import org.dromara.property.domain.vo.InspectionPlanVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 巡检计划Service接口
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+public interface IInspectionPlanService {
+
+    /**
+     * 查询巡检计划
+     *
+     * @param id 主键
+     * @return 巡检计划
+     */
+    InspectionPlanDetailVo queryById(Long id);
+
+    /**
+     * 分页查询巡检计划列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 巡检计划分页列表
+     */
+    TableDataInfo<InspectionPlanVo> queryPageList(InspectionPlanBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的巡检计划列表
+     *
+     * @param bo 查询条件
+     * @return 巡检计划列表
+     */
+    List<InspectionPlanVo> queryList(InspectionPlanBo bo);
+
+    /**
+     * 新增巡检计划
+     *
+     * @param bo 巡检计划
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(InspectionPlanBo bo);
+
+    /**
+     * 修改巡检计划
+     *
+     * @param bo 巡检计划
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(InspectionPlanBo bo);
+
+    /**
+     * 校验并批量删除巡检计划信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/IInspectionPlanStaffService.java

@@ -0,0 +1,68 @@
+package org.dromara.property.service;
+
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.property.domain.bo.InspectionPlanStaffBo;
+import org.dromara.property.domain.vo.InspectionPlanStaffVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 执行计划人信息Service接口
+ *
+ * @author mocheng
+ * @date 2025-07-14
+ */
+public interface IInspectionPlanStaffService {
+
+    /**
+     * 查询执行计划人信息
+     *
+     * @param id 主键
+     * @return 执行计划人信息
+     */
+    InspectionPlanStaffVo queryById(Long id);
+
+    /**
+     * 分页查询执行计划人信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 执行计划人信息分页列表
+     */
+    TableDataInfo<InspectionPlanStaffVo> queryPageList(InspectionPlanStaffBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的执行计划人信息列表
+     *
+     * @param bo 查询条件
+     * @return 执行计划人信息列表
+     */
+    List<InspectionPlanStaffVo> queryList(InspectionPlanStaffBo bo);
+
+    /**
+     * 新增执行计划人信息
+     *
+     * @param bo 执行计划人信息
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(InspectionPlanStaffBo bo);
+
+    /**
+     * 修改执行计划人信息
+     *
+     * @param bo 执行计划人信息
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(InspectionPlanStaffBo bo);
+
+    /**
+     * 校验并批量删除执行计划人信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/IInspectionPointService.java

@@ -0,0 +1,67 @@
+package org.dromara.property.service;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.property.domain.bo.InspectionPointBo;
+import org.dromara.property.domain.vo.InspectionPointVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 巡检点Service接口
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+public interface IInspectionPointService {
+
+    /**
+     * 查询巡检点
+     *
+     * @param id 主键
+     * @return 巡检点
+     */
+    InspectionPointVo queryById(Long id);
+
+    /**
+     * 分页查询巡检点列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 巡检点分页列表
+     */
+    TableDataInfo<InspectionPointVo> queryPageList(InspectionPointBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的巡检点列表
+     *
+     * @param bo 查询条件
+     * @return 巡检点列表
+     */
+    List<InspectionPointVo> queryList(InspectionPointBo bo);
+
+    /**
+     * 新增巡检点
+     *
+     * @param bo 巡检点
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(InspectionPointBo bo);
+
+    /**
+     * 修改巡检点
+     *
+     * @param bo 巡检点
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(InspectionPointBo bo);
+
+    /**
+     * 校验并批量删除巡检点信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/IInspectionRouteService.java

@@ -0,0 +1,69 @@
+package org.dromara.property.service;
+
+
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.property.domain.bo.InspectionRouteBo;
+import org.dromara.property.domain.vo.InspectionRouteVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 巡检路线Service接口
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+public interface IInspectionRouteService {
+
+    /**
+     * 查询巡检路线
+     *
+     * @param id 主键
+     * @return 巡检路线
+     */
+    InspectionRouteVo queryById(Long id);
+
+    /**
+     * 分页查询巡检路线列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 巡检路线分页列表
+     */
+    TableDataInfo<InspectionRouteVo> queryPageList(InspectionRouteBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的巡检路线列表
+     *
+     * @param bo 查询条件
+     * @return 巡检路线列表
+     */
+    List<InspectionRouteVo> queryList(InspectionRouteBo bo);
+
+    /**
+     * 新增巡检路线
+     *
+     * @param bo 巡检路线
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(InspectionRouteBo bo);
+
+    /**
+     * 修改巡检路线
+     *
+     * @param bo 巡检路线
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(InspectionRouteBo bo);
+
+    /**
+     * 校验并批量删除巡检路线信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/IInspectionStaffService.java

@@ -0,0 +1,68 @@
+package org.dromara.property.service;
+
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.property.domain.bo.InspectionStaffBo;
+import org.dromara.property.domain.vo.InspectionStaffVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 执行计划人信息Service接口
+ *
+ * @author mocheng
+ * @date 2025-07-14
+ */
+public interface IInspectionStaffService {
+
+    /**
+     * 查询执行计划人信息
+     *
+     * @param id 主键
+     * @return 执行计划人信息
+     */
+    InspectionStaffVo queryById(Long id);
+
+    /**
+     * 分页查询执行计划人信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 执行计划人信息分页列表
+     */
+    TableDataInfo<InspectionStaffVo> queryPageList(InspectionStaffBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的执行计划人信息列表
+     *
+     * @param bo 查询条件
+     * @return 执行计划人信息列表
+     */
+    List<InspectionStaffVo> queryList(InspectionStaffBo bo);
+
+    /**
+     * 新增执行计划人信息
+     *
+     * @param bo 执行计划人信息
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(InspectionStaffBo bo);
+
+    /**
+     * 修改执行计划人信息
+     *
+     * @param bo 执行计划人信息
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(InspectionStaffBo bo);
+
+    /**
+     * 校验并批量删除执行计划人信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/IInspectionTaskService.java

@@ -0,0 +1,68 @@
+package org.dromara.property.service;
+
+import org.dromara.property.domain.vo.InspectionTaskVo;
+import org.dromara.property.domain.bo.InspectionTaskBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 巡检任务Service接口
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+public interface IInspectionTaskService {
+
+    /**
+     * 查询巡检任务
+     *
+     * @param id 主键
+     * @return 巡检任务
+     */
+    InspectionTaskVo queryById(Long id);
+
+    /**
+     * 分页查询巡检任务列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 巡检任务分页列表
+     */
+    TableDataInfo<InspectionTaskVo> queryPageList(InspectionTaskBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的巡检任务列表
+     *
+     * @param bo 查询条件
+     * @return 巡检任务列表
+     */
+    List<InspectionTaskVo> queryList(InspectionTaskBo bo);
+
+    /**
+     * 新增巡检任务
+     *
+     * @param bo 巡检任务
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(InspectionTaskBo bo);
+
+    /**
+     * 修改巡检任务
+     *
+     * @param bo 巡检任务
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(InspectionTaskBo bo);
+
+    /**
+     * 校验并批量删除巡检任务信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java

@@ -102,7 +102,8 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
     public TableDataInfo<CleanOrderVo> queryPageList(CleanOrderBo bo, PageQuery pageQuery) {
         // 构造条件查询器，返回的是一个集合
         LambdaQueryWrapper<CleanOrder> lqw = buildQueryWrapper(bo);
-        Page<CleanOrderVo> result = baseMapper.selectForPage(pageQuery.build(), lqw);
+        Page<CleanOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw,CleanOrderVo.class);
+//        Page<CleanOrderVo> result = baseMapper.selectForPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -133,10 +134,12 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
         lqw.eq(bo.getStarTime() != null, CleanOrder::getStarTime, bo.getStarTime());
         lqw.eq(bo.getEndTime() != null, CleanOrder::getEndTime, bo.getEndTime());
         lqw.eq(bo.getUnitId() != null, CleanOrder::getUnitId, bo.getUnitId());
-//        lqw.eq(StringUtils.isNotBlank(bo.getUnit()), CleanOrder::getState, bo.getState());
+        lqw.eq(bo.getState() != null, CleanOrder::getState, bo.getState());
 //        lqw.eq(StringUtils.isNotBlank(bo.getUnit()), CleanOrder::getUnit, bo.getUnit());
         lqw.eq(StringUtils.isNotBlank(bo.getPersion()), CleanOrder::getPersion, bo.getPersion());
         lqw.eq(StringUtils.isNotBlank(bo.getPhone()), CleanOrder::getPhone, bo.getPhone());
+        //将lqw中的所有条件都封装到一个params对象中集合中
+
 
         return lqw;
     }

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionItemServiceImpl.java

@@ -0,0 +1,133 @@
+package org.dromara.property.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.InspectionItem;
+import org.dromara.property.domain.bo.InspectionItemBo;
+import org.dromara.property.domain.vo.InspectionItemVo;
+import org.dromara.property.mapper.InspectionItemMapper;
+import org.dromara.property.service.IInspectionItemService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 巡检项目Service业务层处理
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class InspectionItemServiceImpl implements IInspectionItemService {
+
+    private final InspectionItemMapper baseMapper;
+
+    /**
+     * 查询巡检项目
+     *
+     * @param id 主键
+     * @return 巡检项目
+     */
+    @Override
+    public InspectionItemVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询巡检项目列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 巡检项目分页列表
+     */
+    @Override
+    public TableDataInfo<InspectionItemVo> queryPageList(InspectionItemBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<InspectionItem> lqw = buildQueryWrapper(bo);
+        Page<InspectionItemVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的巡检项目列表
+     *
+     * @param bo 查询条件
+     * @return 巡检项目列表
+     */
+    @Override
+    public List<InspectionItemVo> queryList(InspectionItemBo bo) {
+        LambdaQueryWrapper<InspectionItem> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<InspectionItem> buildQueryWrapper(InspectionItemBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<InspectionItem> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(InspectionItem::getId);
+        lqw.like(StringUtils.isNotBlank(bo.getItemName()), InspectionItem::getItemName, bo.getItemName());
+        lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), InspectionItem::getSearchValue, bo.getSearchValue());
+        return lqw;
+    }
+
+    /**
+     * 新增巡检项目
+     *
+     * @param bo 巡检项目
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(InspectionItemBo bo) {
+        InspectionItem add = MapstructUtils.convert(bo, InspectionItem.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改巡检项目
+     *
+     * @param bo 巡检项目
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(InspectionItemBo bo) {
+        InspectionItem update = MapstructUtils.convert(bo, InspectionItem.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(InspectionItem entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除巡检项目信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPlanServiceImpl.java

@@ -0,0 +1,184 @@
+package org.dromara.property.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+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.property.domain.InspectionPlan;
+import org.dromara.property.domain.InspectionPlanStaff;
+import org.dromara.property.domain.bo.InspectionPlanBo;
+import org.dromara.property.domain.bo.InspectionPlanStaffBo;
+import org.dromara.property.domain.vo.InspectionPlanDetailVo;
+import org.dromara.property.domain.vo.InspectionPlanStaffVo;
+import org.dromara.property.domain.vo.InspectionPlanVo;
+import org.dromara.property.domain.vo.ResidentPersonVo;
+import org.dromara.property.mapper.InspectionPlanMapper;
+import org.dromara.property.mapper.InspectionPlanStaffMapper;
+import org.dromara.property.mapper.ResidentPersonMapper;
+import org.dromara.property.service.IInspectionPlanService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 巡检计划Service业务层处理
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class InspectionPlanServiceImpl implements IInspectionPlanService {
+
+    private final InspectionPlanMapper baseMapper;
+    private final ResidentPersonMapper residentPersonMapper;
+    private final InspectionPlanStaffMapper inspectionPlanStaffMapper;
+
+    /**
+     * 查询巡检计划
+     *
+     * @param id 主键
+     * @return 巡检计划
+     */
+    @Override
+    public InspectionPlanDetailVo queryById(Long id){
+        InspectionPlanVo inspectionPlanVo = baseMapper.selectVoById(id);
+        InspectionPlanDetailVo inspectionPlanDetailVo = BeanUtil.copyProperties(inspectionPlanVo, InspectionPlanDetailVo.class);
+        LambdaQueryWrapper<InspectionPlanStaff> staffQueryWrapper= new LambdaQueryWrapper<>();
+         staffQueryWrapper.eq(InspectionPlanStaff::getInspectionPlanId, id);
+        List<InspectionPlanStaffVo> inspectionPlanStaffVos =inspectionPlanStaffMapper.selectVoList(staffQueryWrapper);
+        List<Long> userIdlist =  inspectionPlanStaffVos.stream()
+            .map(vo -> vo.getUserId())
+            .distinct()
+            .collect(Collectors.toList());
+        if(CollectionUtil.isNotEmpty(userIdlist)){
+            new  ServiceException("执行计划人不存在");
+        }
+        List<ResidentPersonVo>  residentPersonVolist = residentPersonMapper.selectVoByIds(userIdlist);
+        if(CollectionUtil.isNotEmpty(residentPersonVolist)){
+            inspectionPlanStaffVos.stream().forEach(s->{
+                ResidentPersonVo residentPersonVo = residentPersonVolist.stream()
+                    .filter(vo -> vo.getId() != null && vo.getId().equals(s.getUserId())).findFirst().orElse(null);
+                s.setUserName(residentPersonVo.getUserName());
+            });
+            inspectionPlanDetailVo.setInspectionPlanStaffVoList(inspectionPlanStaffVos);
+        }
+
+        return inspectionPlanDetailVo;
+    }
+
+    /**
+     * 分页查询巡检计划列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 巡检计划分页列表
+     */
+    @Override
+    public TableDataInfo<InspectionPlanVo> queryPageList(InspectionPlanBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<InspectionPlan> lqw = buildQueryWrapper(bo);
+        Page<InspectionPlanVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的巡检计划列表
+     *
+     * @param bo 查询条件
+     * @return 巡检计划列表
+     */
+    @Override
+    public List<InspectionPlanVo> queryList(InspectionPlanBo bo) {
+        LambdaQueryWrapper<InspectionPlan> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<InspectionPlan> buildQueryWrapper(InspectionPlanBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<InspectionPlan> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(InspectionPlan::getId);
+        lqw.like(StringUtils.isNotBlank(bo.getPlanName()), InspectionPlan::getPlanName, bo.getPlanName());
+        lqw.eq(bo.getInspectionRouteId() != null, InspectionPlan::getInspectionRouteId, bo.getInspectionRouteId());
+        lqw.eq(StringUtils.isNotBlank(bo.getInspectionPlanPeriod()), InspectionPlan::getInspectionPlanPeriod, bo.getInspectionPlanPeriod());
+        lqw.eq(bo.getStartDate() != null, InspectionPlan::getStartDate, bo.getStartDate());
+        lqw.eq(bo.getEndDate() != null, InspectionPlan::getEndDate, bo.getEndDate());
+        lqw.eq(StringUtils.isNotBlank(bo.getSignType()), InspectionPlan::getSignType, bo.getSignType());
+        lqw.eq(StringUtils.isNotBlank(bo.getCanReexamine()), InspectionPlan::getCanReexamine, bo.getCanReexamine());
+        lqw.like(StringUtils.isNotBlank(bo.getState()), InspectionPlan::getState, bo.getState());
+        lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), InspectionPlan::getSearchValue, bo.getSearchValue());
+        return lqw;
+    }
+
+    /**
+     * 新增巡检计划
+     *
+     * @param bo 巡检计划
+     * @return 是否新增成功
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(InspectionPlanBo bo) {
+        InspectionPlan add = MapstructUtils.convert(bo, InspectionPlan.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+            List<InspectionPlanStaffBo> inspectionPlanStaffBoList = bo.getInspectionPlanStaffBoList();
+            if(CollectionUtil.isNotEmpty(inspectionPlanStaffBoList)){
+                for (InspectionPlanStaffBo staffBo : inspectionPlanStaffBoList) {
+                    staffBo.setInspectionPlanId(add.getId());
+                }
+                inspectionPlanStaffMapper.insertBatch(BeanUtil.copyToList(inspectionPlanStaffBoList, InspectionPlanStaff.class ));
+            }
+        }
+        return flag;
+    }
+
+    /**
+     * 修改巡检计划
+     *
+     * @param bo 巡检计划
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(InspectionPlanBo bo) {
+        InspectionPlan update = MapstructUtils.convert(bo, InspectionPlan.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(InspectionPlan entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除巡检计划信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPlanStaffServiceImpl.java

@@ -0,0 +1,136 @@
+package org.dromara.property.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.InspectionPlanStaff;
+import org.dromara.property.domain.bo.InspectionPlanStaffBo;
+import org.dromara.property.domain.vo.InspectionPlanStaffVo;
+import org.dromara.property.mapper.InspectionPlanStaffMapper;
+import org.dromara.property.service.IInspectionPlanStaffService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 执行计划人信息Service业务层处理
+ *
+ * @author mocheng
+ * @date 2025-07-14
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class InspectionPlanStaffServiceImpl implements IInspectionPlanStaffService {
+
+    private final InspectionPlanStaffMapper baseMapper;
+
+    /**
+     * 查询执行计划人信息
+     *
+     * @param id 主键
+     * @return 执行计划人信息
+     */
+    @Override
+    public InspectionPlanStaffVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询执行计划人信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 执行计划人信息分页列表
+     */
+    @Override
+    public TableDataInfo<InspectionPlanStaffVo> queryPageList(InspectionPlanStaffBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<InspectionPlanStaff> lqw = buildQueryWrapper(bo);
+        Page<InspectionPlanStaffVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的执行计划人信息列表
+     *
+     * @param bo 查询条件
+     * @return 执行计划人信息列表
+     */
+    @Override
+    public List<InspectionPlanStaffVo> queryList(InspectionPlanStaffBo bo) {
+        LambdaQueryWrapper<InspectionPlanStaff> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<InspectionPlanStaff> buildQueryWrapper(InspectionPlanStaffBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<InspectionPlanStaff> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(InspectionPlanStaff::getId);
+        lqw.eq(bo.getUserId() != null, InspectionPlanStaff::getUserId, bo.getUserId());
+        lqw.eq(bo.getInspectionPlanId() != null, InspectionPlanStaff::getInspectionPlanId, bo.getInspectionPlanId());
+        lqw.eq(bo.getStartTime() != null, InspectionPlanStaff::getStartTime, bo.getStartTime());
+        lqw.eq(bo.getEndTime() != null, InspectionPlanStaff::getEndTime, bo.getEndTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), InspectionPlanStaff::getSearchValue, bo.getSearchValue());
+        return lqw;
+    }
+
+    /**
+     * 新增执行计划人信息
+     *
+     * @param bo 执行计划人信息
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(InspectionPlanStaffBo bo) {
+        InspectionPlanStaff add = MapstructUtils.convert(bo, InspectionPlanStaff.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改执行计划人信息
+     *
+     * @param bo 执行计划人信息
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(InspectionPlanStaffBo bo) {
+        InspectionPlanStaff update = MapstructUtils.convert(bo, InspectionPlanStaff.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(InspectionPlanStaff entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除执行计划人信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPointServiceImpl.java

@@ -0,0 +1,151 @@
+package org.dromara.property.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.InspectionPoint;
+import org.dromara.property.domain.bo.InspectionPointBo;
+import org.dromara.property.domain.vo.InspectionPlanVo;
+import org.dromara.property.domain.vo.InspectionPointVo;
+import org.dromara.property.mapper.InspectionPlanMapper;
+import org.dromara.property.mapper.InspectionPointMapper;
+import org.dromara.property.service.IInspectionPointService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+/**
+ * 巡检点Service业务层处理
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class InspectionPointServiceImpl implements IInspectionPointService {
+
+    private final InspectionPointMapper baseMapper;
+    private final InspectionPlanMapper inspectionPlanMapper;
+
+    /**
+     * 查询巡检点
+     *
+     * @param id 主键
+     * @return 巡检点
+     */
+    @Override
+    public InspectionPointVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询巡检点列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 巡检点分页列表
+     */
+    @Override
+    public TableDataInfo<InspectionPointVo> queryPageList(InspectionPointBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<InspectionPoint> lqw = buildQueryWrapper(bo);
+        Page<InspectionPointVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        if (CollectionUtil.isEmpty(result.getRecords())) {
+            return TableDataInfo.build(result);
+        }
+        List<Long> itemIdList = result.getRecords().stream()
+            .map(vo -> vo.getItemId())
+            .distinct()
+            .collect(Collectors.toList());
+        List<InspectionPlanVo> inspectionPlanVos = inspectionPlanMapper.selectVoByIds(itemIdList);
+
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的巡检点列表
+     *
+     * @param bo 查询条件
+     * @return 巡检点列表
+     */
+    @Override
+    public List<InspectionPointVo> queryList(InspectionPointBo bo) {
+        LambdaQueryWrapper<InspectionPoint> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<InspectionPoint> buildQueryWrapper(InspectionPointBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<InspectionPoint> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(InspectionPoint::getId);
+        lqw.eq(bo.getItemId() != null, InspectionPoint::getItemId, bo.getItemId());
+        lqw.like(StringUtils.isNotBlank(bo.getPointName()), InspectionPoint::getPointName, bo.getPointName());
+        lqw.eq(StringUtils.isNotBlank(bo.getPointType()), InspectionPoint::getPointType, bo.getPointType());
+        lqw.eq(StringUtils.isNotBlank(bo.getNfcCode()), InspectionPoint::getNfcCode, bo.getNfcCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), InspectionPoint::getSearchValue, bo.getSearchValue());
+        return lqw;
+    }
+
+    /**
+     * 新增巡检点
+     *
+     * @param bo 巡检点
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(InspectionPointBo bo) {
+        InspectionPoint add = MapstructUtils.convert(bo, InspectionPoint.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改巡检点
+     *
+     * @param bo 巡检点
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(InspectionPointBo bo) {
+        InspectionPoint update = MapstructUtils.convert(bo, InspectionPoint.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(InspectionPoint entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除巡检点信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionRouteServiceImpl.java

@@ -0,0 +1,133 @@
+package org.dromara.property.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.InspectionRoute;
+import org.dromara.property.domain.bo.InspectionRouteBo;
+import org.dromara.property.domain.vo.InspectionRouteVo;
+import org.dromara.property.mapper.InspectionRouteMapper;
+import org.dromara.property.service.IInspectionRouteService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 巡检路线Service业务层处理
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class InspectionRouteServiceImpl implements IInspectionRouteService {
+
+    private final InspectionRouteMapper baseMapper;
+
+    /**
+     * 查询巡检路线
+     *
+     * @param id 主键
+     * @return 巡检路线
+     */
+    @Override
+    public InspectionRouteVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询巡检路线列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 巡检路线分页列表
+     */
+    @Override
+    public TableDataInfo<InspectionRouteVo> queryPageList(InspectionRouteBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<InspectionRoute> lqw = buildQueryWrapper(bo);
+        Page<InspectionRouteVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的巡检路线列表
+     *
+     * @param bo 查询条件
+     * @return 巡检路线列表
+     */
+    @Override
+    public List<InspectionRouteVo> queryList(InspectionRouteBo bo) {
+        LambdaQueryWrapper<InspectionRoute> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<InspectionRoute> buildQueryWrapper(InspectionRouteBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<InspectionRoute> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(InspectionRoute::getId);
+        lqw.like(StringUtils.isNotBlank(bo.getRouteName()), InspectionRoute::getRouteName, bo.getRouteName());
+        lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), InspectionRoute::getSearchValue, bo.getSearchValue());
+        return lqw;
+    }
+
+    /**
+     * 新增巡检路线
+     *
+     * @param bo 巡检路线
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(InspectionRouteBo bo) {
+        InspectionRoute add = MapstructUtils.convert(bo, InspectionRoute.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改巡检路线
+     *
+     * @param bo 巡检路线
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(InspectionRouteBo bo) {
+        InspectionRoute update = MapstructUtils.convert(bo, InspectionRoute.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(InspectionRoute entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除巡检路线信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionStaffServiceImpl.java

@@ -0,0 +1,136 @@
+package org.dromara.property.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.InspectionStaff;
+import org.dromara.property.domain.bo.InspectionStaffBo;
+import org.dromara.property.domain.vo.InspectionStaffVo;
+import org.dromara.property.mapper.InspectionStaffMapper;
+import org.dromara.property.service.IInspectionStaffService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 执行计划人信息Service业务层处理
+ *
+ * @author mocheng
+ * @date 2025-07-14
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class InspectionStaffServiceImpl implements IInspectionStaffService {
+
+    private final InspectionStaffMapper baseMapper;
+
+    /**
+     * 查询执行计划人信息
+     *
+     * @param id 主键
+     * @return 执行计划人信息
+     */
+    @Override
+    public InspectionStaffVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询执行计划人信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 执行计划人信息分页列表
+     */
+    @Override
+    public TableDataInfo<InspectionStaffVo> queryPageList(InspectionStaffBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<InspectionStaff> lqw = buildQueryWrapper(bo);
+        Page<InspectionStaffVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的执行计划人信息列表
+     *
+     * @param bo 查询条件
+     * @return 执行计划人信息列表
+     */
+    @Override
+    public List<InspectionStaffVo> queryList(InspectionStaffBo bo) {
+        LambdaQueryWrapper<InspectionStaff> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<InspectionStaff> buildQueryWrapper(InspectionStaffBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<InspectionStaff> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(InspectionStaff::getId);
+        lqw.eq(bo.getUserId() != null, InspectionStaff::getUserId, bo.getUserId());
+        lqw.eq(bo.getInspectionPlanId() != null, InspectionStaff::getInspectionPlanId, bo.getInspectionPlanId());
+        lqw.eq(bo.getStartTime() != null, InspectionStaff::getStartTime, bo.getStartTime());
+        lqw.eq(bo.getEndTime() != null, InspectionStaff::getEndTime, bo.getEndTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), InspectionStaff::getSearchValue, bo.getSearchValue());
+        return lqw;
+    }
+
+    /**
+     * 新增执行计划人信息
+     *
+     * @param bo 执行计划人信息
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(InspectionStaffBo bo) {
+        InspectionStaff add = MapstructUtils.convert(bo, InspectionStaff.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改执行计划人信息
+     *
+     * @param bo 执行计划人信息
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(InspectionStaffBo bo) {
+        InspectionStaff update = MapstructUtils.convert(bo, InspectionStaff.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(InspectionStaff entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除执行计划人信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionTaskServiceImpl.java

@@ -0,0 +1,159 @@
+package org.dromara.property.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.MapstructUtils;
+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.property.domain.InspectionPlan;
+import org.dromara.property.domain.InspectionTask;
+import org.dromara.property.domain.bo.InspectionTaskBo;
+import org.dromara.property.domain.vo.InspectionTaskVo;
+import org.dromara.property.mapper.InspectionPlanMapper;
+import org.dromara.property.mapper.InspectionTaskMapper;
+import org.dromara.property.service.IInspectionTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static java.util.stream.Collectors.toMap;
+import static java.util.stream.Collectors.toSet;
+
+/**
+ * 巡检任务Service业务层处理
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class InspectionTaskServiceImpl implements IInspectionTaskService {
+
+    private final InspectionTaskMapper baseMapper;
+    @Autowired
+    private final InspectionPlanMapper inspectionPlanMapper;
+
+    /**
+     * 查询巡检任务
+     *
+     * @param id 主键
+     * @return 巡检任务
+     */
+    @Override
+    public InspectionTaskVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询巡检任务列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 巡检任务分页列表
+     */
+    @Override
+    public TableDataInfo<InspectionTaskVo> queryPageList(InspectionTaskBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<InspectionTask> lqw = buildQueryWrapper(bo);
+        Page<InspectionTaskVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        if (result.getRecords().size() > 0) {
+            addPlanNameInfo(result);
+        }
+        return TableDataInfo.build(result);
+    }
+    private void addPlanNameInfo(Page<InspectionTaskVo> inspectionTaskVoPage) {
+        // 提取用户userId，方便批量查询
+        Set<Long> planIds = inspectionTaskVoPage.getRecords().stream().map(InspectionTaskVo::getInspectionPlanId).collect(toSet());
+        // 根据planId查询planName
+        List<InspectionPlan> inspectionPlanList = inspectionPlanMapper.selectList(Wrappers.lambdaQuery(InspectionPlan.class).in(InspectionPlan::getId, planIds));
+        // 构造映射关系，方便匹配planId与planName
+        Map<Long, String> hashMap = inspectionPlanList.stream().collect(toMap(InspectionPlan::getId, InspectionPlan::getPlanName));
+        // 将查询补充的信息添加到Vo中
+        inspectionTaskVoPage.getRecords().forEach(e -> e.setPlanName(hashMap.get(e.getInspectionPlanId())));
+    }
+    /**
+     * 查询符合条件的巡检任务列表
+     *
+     * @param bo 查询条件
+     * @return 巡检任务列表
+     */
+    @Override
+    public List<InspectionTaskVo> queryList(InspectionTaskBo bo) {
+        LambdaQueryWrapper<InspectionTask> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<InspectionTask> buildQueryWrapper(InspectionTaskBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<InspectionTask> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(InspectionTask::getId);
+        lqw.eq(bo.getInspectionPlanId() != null, InspectionTask::getInspectionPlanId, bo.getInspectionPlanId());
+        lqw.eq(bo.getActInsTime() != null, InspectionTask::getActInsTime, bo.getActInsTime());
+        lqw.eq(bo.getActUserId() != null, InspectionTask::getActUserId, bo.getActUserId());
+        lqw.eq(StringUtils.isNotBlank(bo.getTaskType()), InspectionTask::getTaskType, bo.getTaskType());
+        lqw.eq(StringUtils.isNotBlank(bo.getTransferDesc()), InspectionTask::getTransferDesc, bo.getTransferDesc());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), InspectionTask::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), InspectionTask::getSearchValue, bo.getSearchValue());
+        return lqw;
+    }
+
+    /**
+     * 新增巡检任务
+     *
+     * @param bo 巡检任务
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(InspectionTaskBo bo) {
+        InspectionTask add = MapstructUtils.convert(bo, InspectionTask.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改巡检任务
+     *
+     * @param bo 巡检任务
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(InspectionTaskBo bo) {
+        InspectionTask update = MapstructUtils.convert(bo, InspectionTask.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(InspectionTask entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除巡检任务信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetServiceImpl.java

@@ -141,11 +141,12 @@ public class MeetServiceImpl implements IMeetService {
         LambdaQueryWrapper<Meet> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(Meet::getId);
         lqw.like(StringUtils.isNotBlank(bo.getName()), Meet::getName, bo.getName());
-        lqw.eq(StringUtils.isNotBlank(bo.getLocation()), Meet::getLocation, bo.getLocation());
-        lqw.eq(bo.getPersonNumber() != null, Meet::getPersonNumber, bo.getPersonNumber());
-        lqw.eq(bo.getBaseService() != null, Meet::getBaseService, bo.getBaseService());
-        lqw.eq(bo.getBasePrice() != null, Meet::getBasePrice, bo.getBasePrice());
-        lqw.eq(bo.getAttach() != null, Meet::getAttach, bo.getAttach());
+//        lqw.eq(StringUtils.isNotBlank(bo.getLocation()), Meet::getLocation, bo.getLocation());
+//        lqw.eq(bo.getPersonNumber() != null, Meet::getPersonNumber, bo.getPersonNumber());
+//        lqw.eq(bo.getBaseService() != null, Meet::getBaseService, bo.getBaseService());
+//        lqw.eq(bo.getBasePrice() != null, Meet::getBasePrice, bo.getBasePrice());
+        lqw.eq(bo.getPrincipals() != null, Meet::getPrincipals, bo.getPrincipals());
+        lqw.eq(bo.getStatus() != null, Meet::getStatus, bo.getStatus());
         return lqw;
     }
 

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersTypeServiceImpl.java

@@ -74,7 +74,7 @@ public class ServiceWorkOrdersTypeServiceImpl implements IServiceWorkOrdersTypeS
     private LambdaQueryWrapper<ServiceWorkOrdersType> buildQueryWrapper(ServiceWorkOrdersTypeBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ServiceWorkOrdersType> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(ServiceWorkOrdersType::getId);
+        lqw.orderByAsc(ServiceWorkOrdersType::getSort);
         lqw.eq(StringUtils.isNotBlank(bo.getOrderTypeNo()), ServiceWorkOrdersType::getOrderTypeNo, bo.getOrderTypeNo());
         lqw.like(StringUtils.isNotBlank(bo.getOrderTypeName()), ServiceWorkOrdersType::getOrderTypeName, bo.getOrderTypeName());
         lqw.eq(StringUtils.isNotBlank(bo.getOperationMode()), ServiceWorkOrdersType::getOperationMode, bo.getOperationMode());

ruoyi-modules/Property/src/main/java/org/dromara/property/tasks/InspectionTasks.java

@@ -0,0 +1,139 @@
+
+package org.dromara.property.tasks;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import org.dromara.property.domain.InspectionTask;
+import org.dromara.property.domain.bo.InspectionPlanBo;
+import org.dromara.property.domain.vo.InspectionPlanVo;
+import org.dromara.property.mapper.InspectionTaskMapper;
+import org.dromara.property.service.IInspectionPlanService;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.PostConstruct;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+import static org.dromara.common.mybatis.core.mapper.BaseMapperPlus.log;
+import static org.dromara.property.domain.enums.InspectionPlanPeriodEnum.MONTHANDDAY;
+import static org.dromara.property.domain.enums.InspectionPlanPeriodEnum.WEEK;
+
+/**
+ * @Author:yuyongle
+ * @Date:2025/7/11 15:28
+ * @Description: 巡检任务定时处理器
+ **/
+@Component
+@RequiredArgsConstructor
+//@Validated
+//@RequiredArgsConstructor
+//@RestController
+//@RequestMapping("/task")
+public class InspectionTasks {
+
+    private final IInspectionPlanService inspectionPlanService;
+    private final InspectionTaskMapper inspectionTaskMapper;
+
+    // 通过巡检计划定时生成巡检任务
+    @Scheduled(cron = "0 0 2 * * ?")
+    @PostConstruct
+    //@GetMapping("/taskId")
+    @Transactional(rollbackFor = Exception.class)
+    public void doInspectionPianTask() {
+        // 查询所有启用状态的巡检计划
+        InspectionPlanBo inspectionPlanBo = new InspectionPlanBo();
+        inspectionPlanBo.setState("0");
+        List<InspectionPlanVo> inspectionPlanVoList = inspectionPlanService.queryList(inspectionPlanBo);
+        // 如果没有有效计划，直接返回
+        if (ObjectUtil.isEmpty(inspectionPlanVoList)) {
+            return;
+        }
+        // 处理每个巡检计划
+        inspectionPlanVoList.forEach(plan -> {
+            LambdaQueryWrapper<InspectionTask>inspectionTaskWrapper = new LambdaQueryWrapper<>();
+            inspectionTaskWrapper.eq(InspectionTask::getInspectionPlanId,plan.getId());
+            inspectionTaskWrapper.eq(InspectionTask::getInspectionPlanId,plan.getId());
+            boolean exists = inspectionTaskMapper.exists(inspectionTaskWrapper);
+            if(!exists){
+                // 根据不同的巡检周期执行相应处理
+                switch (plan.getInspectionPlanPeriod()) {
+                    case "1":
+                        // 处理按月/天的巡检计划
+                        handleMonthlyDailyPlan(plan);
+                        break;
+
+                    case "2":
+                        // 处理按周的巡检计划
+                        handleWeeklyDailyPlan(plan);
+                        break;
+                    default:
+                        // 对于未知的巡检周期类型，记录警告日志
+                        log.warn("未知类型");
+                        break;
+                }
+            }
+
+        });
+    }
+
+    /**
+     * 处理按月/天的巡检计划
+     * @param plan 巡检计划信息
+     */
+    private void handleMonthlyDailyPlan(InspectionPlanVo plan) {
+
+        // 使用Optional安全处理可能为null的对象
+        Optional.ofNullable(plan).ifPresent(p -> {
+            DateTime today = DateUtil.date();
+            DateTime startDate = DateUtil.date(plan.getStartDate());
+            DateTime endDate = DateUtil.date(plan.getEndDate());
+            String day = DateUtil.today().split("-")[2];
+            List<String> inspectionDayList = Arrays.asList(p.getInspectionDay().split(","));
+            if(DateUtil.isIn(today, startDate, endDate)&&inspectionDayList.contains(day)){
+                InspectionTask task = new InspectionTask();
+                task.setInspectionPlanId(p.getId());
+                task.setInspectionPlanId(p.getId());
+                task.setTaskType(plan.getSignType());
+                task.setPlanInsTime(startDate+"~"+p.getEndTime());
+                task.setStatus("0");
+                inspectionTaskMapper.insert(task);
+          }
+        });
+    }
+    /**
+     * 处理按周的巡检计划
+     * @param plan 巡检计划信息
+     */
+    private void handleWeeklyDailyPlan(InspectionPlanVo plan) {
+
+        // 使用Optional安全处理可能为null的对象
+        Optional.ofNullable(plan).ifPresent(p -> {
+            DateTime today = DateUtil.date();
+            DateTime startDate = DateUtil.date(plan.getStartDate());
+            DateTime endDate = DateUtil.date(plan.getEndDate());
+            String week = String.valueOf(DateUtil.dayOfWeek(DateUtil.date()));
+            List<String> inspectionWorkdayList = Arrays.asList(p.getInspectionWorkday().split(","));
+            if(DateUtil.isIn(today, startDate, endDate)&&inspectionWorkdayList.contains(week)) {
+                InspectionTask task = new InspectionTask();
+                task.setInspectionPlanId(p.getId());
+                task.setInspectionPlanId(p.getId());
+                task.setTaskType(plan.getSignType());
+                task.setPlanInsTime(startDate+"~"+p.getEndTime());
+                task.setStatus("0");
+                inspectionTaskMapper.insert(task);
+
+            }
+        });
+    }
+}

ruoyi-modules/Property/src/main/resources/mapper/Property/CleanOrderMapper.xml

@@ -6,14 +6,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectForPage" resultType="org.dromara.property.domain.vo.CleanOrderVo">
         SELECT
-            co.*,
-            c.*,
-            cr.areas,
-            cr.sum_price
+        co.*,
+        c.*,
+        cr.areas,
+        cr.sum_price
         FROM
-            clean_order co
-                LEFT JOIN clean c ON co.clean_id = c.id
-                LEFT JOIN clean_relation cr ON c.id = cr.clean_id;
+        clean_order co
+        LEFT JOIN clean c ON co.clean_id = c.id
+        LEFT JOIN clean_relation cr ON c.id = cr.clean_id
+<!--        <where>-->
+<!--            <if test="payState != null and payState!= ''">-->
+<!--                co.pay_state = #{payState}-->
+<!--            </if>-->
+<!--            <if test="persion != null and persion!= ''">-->
+<!--                co.persion = #{persion}-->
+<!--            </if>-->
+<!--            <if test="state != null and state!= ''">-->
+<!--                co.state = #{state}-->
+<!--            </if>-->
+<!--        </where>-->
     </select>
 <!--    <select id="selectforDetail" resultType="org.dromara.property.domain.vo.CleanOrderVo"-->
 <!--            parameterType="java.lang.Long">-->

ruoyi-modules/Property/src/main/resources/mapper/Property/InspectionTaskMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.property.mapper.InspectionTaskMapper">
+
+</mapper>

ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAccessControlController.java

@@ -116,5 +116,14 @@ public class SisAccessControlController extends BaseController {
         return R.ok(sisAccessControlService.queryAcTree());
     }
 
+    /**
+     * 同步门禁设备
+     *
+     * @return boolean
+     */
+    @GetMapping("/sync")
+    public R<Boolean> sync() {
+        return R.ok(sisAccessControlService.syncE8());
+    }
 
 }

ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAuthRecordController.java

@@ -1,37 +1,35 @@
 package org.dromara.sis.controller;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import java.util.List;
+
 import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.common.core.domain.TreeNode;
+import org.dromara.sis.domain.SisAuthRecord;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.excel.utils.ExcelUtil;
-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.mybatis.core.page.PageQuery;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.sis.domain.SisAuthRecord;
-import org.dromara.sis.domain.bo.AuthLibBo;
-import org.dromara.sis.domain.bo.SingleAuthRecordBo;
-import org.dromara.sis.domain.bo.SisAuthRecordBo;
+import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.sis.domain.vo.SisAuthRecordVo;
+import org.dromara.sis.domain.bo.SisAuthRecordBo;
 import org.dromara.sis.service.ISisAuthRecordService;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**
  * 授权记录
  * 前端访问路由地址为:/sis/authRecord
  *
  * @author lsm
- * @since 2025-06-28
+ * @since 2025-07-14
  */
 @Validated
 @RequiredArgsConstructor
@@ -77,25 +75,13 @@ public class SisAuthRecordController extends BaseController {
      * 新增授权记录
      */
     @SaCheckPermission("sis:authRecord:add")
-    @Log(title = "授权记录", businessType = BusinessType.INSERT)
+    @Log(title = "人员库授权", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-    @PostMapping("/add")
+    @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody SisAuthRecordBo bo) {
         return toAjax(sisAuthRecordService.insertByBo(bo));
     }
 
-    /**
-     * 新增授权记录
-     */
-    @SaCheckPermission("sis:authRecord:add")
-    @Log(title = "单个人像授权", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping("/auth/single")
-    public R<Void> singleAuth(@Validated(AddGroup.class) @RequestBody SingleAuthRecordBo bo) {
-        return toAjax(sisAuthRecordService.singleAuth(bo));
-    }
-
-
     /**
      * 修改授权记录
      */
@@ -121,19 +107,22 @@ public class SisAuthRecordController extends BaseController {
     }
 
     /**
-     * 删除授权记录
+     * 查询库id授权的设备
      *
-     * @param bo 授权信息
+     * @param libId 人像库id
      */
-    @SaCheckPermission("sis:authRecord:authLib")
-    @Log(title = "人员库授权", businessType = BusinessType.INSERT)
-    @PostMapping("/authLib")
-    public R<Void> authLib(@Validated @RequestBody AuthLibBo bo) {
-        return toAjax(sisAuthRecordService.authLib(bo));
-    }
-
     @GetMapping("/authDevice/{libId}")
     public R<List<SisAuthRecord>> queryAuthDevice(@PathVariable("libId") String libId) {
         return R.ok(sisAuthRecordService.queryAuthDevice(libId));
     }
+
+    /**
+     * 查询所有可授权设备
+     *
+     * @return List<TreeNode < Long>>
+     */
+    @GetMapping("/authDevice/tree")
+    public R<List<TreeNode<Long>>> tree() {
+        return R.ok(sisAuthRecordService.authDeviceTree());
+    }
 }

ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisElevatorFloorRefController.java

@@ -0,0 +1,106 @@
+package org.dromara.sis.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.sis.domain.vo.SisElevatorFloorRefVo;
+import org.dromara.sis.domain.bo.SisElevatorFloorRefBo;
+import org.dromara.sis.service.ISisElevatorFloorRefService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 电梯⇄楼层关联
+ * 前端访问路由地址为:/sis/elevatorFloorRef
+ *
+ * @author lsm
+ * @since 2025-07-15
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/elevatorFloorRef")
+public class SisElevatorFloorRefController extends BaseController {
+
+    private final ISisElevatorFloorRefService sisElevatorFloorRefService;
+
+    /**
+     * 查询电梯⇄楼层关联列表
+     */
+    @SaCheckPermission("sis:elevatorFloorRef:list")
+    @GetMapping("/list")
+    public TableDataInfo<SisElevatorFloorRefVo> list(SisElevatorFloorRefBo bo, PageQuery pageQuery) {
+        return sisElevatorFloorRefService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出电梯⇄楼层关联列表
+     */
+    @SaCheckPermission("sis:elevatorFloorRef:export")
+    @Log(title = "电梯⇄楼层关联", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SisElevatorFloorRefBo bo, HttpServletResponse response) {
+        List<SisElevatorFloorRefVo> list = sisElevatorFloorRefService.queryList(bo);
+        ExcelUtil.exportExcel(list, "电梯⇄楼层关联", SisElevatorFloorRefVo.class, response);
+    }
+
+    /**
+     * 获取电梯⇄楼层关联详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("sis:elevatorFloorRef:query")
+    @GetMapping("/{id}")
+    public R<SisElevatorFloorRefVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(sisElevatorFloorRefService.queryById(id));
+    }
+
+    /**
+     * 新增电梯⇄楼层关联
+     */
+    @SaCheckPermission("sis:elevatorFloorRef:add")
+    @Log(title = "电梯⇄楼层关联", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SisElevatorFloorRefBo bo) {
+        return toAjax(sisElevatorFloorRefService.insertByBo(bo));
+    }
+
+    /**
+     * 修改电梯⇄楼层关联
+     */
+    @SaCheckPermission("sis:elevatorFloorRef:edit")
+    @Log(title = "电梯⇄楼层关联", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SisElevatorFloorRefBo bo) {
+        return toAjax(sisElevatorFloorRefService.updateByBo(bo));
+    }
+
+    /**
+     * 删除电梯⇄楼层关联
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("sis:elevatorFloorRef:remove")
+    @Log(title = "电梯⇄楼层关联", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(sisElevatorFloorRefService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisFloorInfoController.java

@@ -0,0 +1,106 @@
+package org.dromara.sis.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.sis.domain.vo.SisFloorInfoVo;
+import org.dromara.sis.domain.bo.SisFloorInfoBo;
+import org.dromara.sis.service.ISisFloorInfoService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 建筑物楼层信息
+ * 前端访问路由地址为:/sis/floorInfo
+ *
+ * @author lsm
+ * @since 2025-07-15
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/floorInfo")
+public class SisFloorInfoController extends BaseController {
+
+    private final ISisFloorInfoService sisFloorInfoService;
+
+    /**
+     * 查询建筑物楼层信息列表
+     */
+    @SaCheckPermission("sis:floorInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo<SisFloorInfoVo> list(SisFloorInfoBo bo, PageQuery pageQuery) {
+        return sisFloorInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出建筑物楼层信息列表
+     */
+    @SaCheckPermission("sis:floorInfo:export")
+    @Log(title = "建筑物楼层信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SisFloorInfoBo bo, HttpServletResponse response) {
+        List<SisFloorInfoVo> list = sisFloorInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "建筑物楼层信息", SisFloorInfoVo.class, response);
+    }
+
+    /**
+     * 获取建筑物楼层信息详细信息
+     *
+     * @param floorId 主键
+     */
+    @SaCheckPermission("sis:floorInfo:query")
+    @GetMapping("/{floorId}")
+    public R<SisFloorInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("floorId") Long floorId) {
+        return R.ok(sisFloorInfoService.queryById(floorId));
+    }
+
+    /**
+     * 新增建筑物楼层信息
+     */
+    @SaCheckPermission("sis:floorInfo:add")
+    @Log(title = "建筑物楼层信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SisFloorInfoBo bo) {
+        return toAjax(sisFloorInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改建筑物楼层信息
+     */
+    @SaCheckPermission("sis:floorInfo:edit")
+    @Log(title = "建筑物楼层信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SisFloorInfoBo bo) {
+        return toAjax(sisFloorInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除建筑物楼层信息
+     *
+     * @param floorIds 主键串
+     */
+    @SaCheckPermission("sis:floorInfo:remove")
+    @Log(title = "建筑物楼层信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{floorIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("floorIds") Long[] floorIds) {
+        return toAjax(sisFloorInfoService.deleteWithValidByIds(List.of(floorIds), true));
+    }
+}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisPersonLibController.java

@@ -98,7 +98,7 @@ public class SisPersonLibController extends BaseController {
      */
     @SaCheckPermission("sis:personLib:remove")
     @Log(title = "人像库", businessType = BusinessType.DELETE)
-    @DeleteMapping("del/{ids}")
+    @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable("ids") Long[] ids) {
         return toAjax(tbPersonLibService.deleteWithValidByIds(List.of(ids), true));

ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/e8/AccessControlController.java

@@ -1,108 +0,0 @@
-package org.dromara.sis.controller.e8;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.domain.R;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.sis.sdk.e8.AccessControlService;
-import org.dromara.sis.sdk.e8.domain.QueryDto;
-import org.dromara.sis.sdk.e8.domain.accessControl.req.CustomerAuthAddReq;
-import org.dromara.sis.sdk.e8.domain.accessControl.req.RemoteOpenDoorReq;
-import org.dromara.sis.sdk.e8.domain.accessControl.res.AccessRecordFindRes;
-import org.dromara.sis.sdk.e8.domain.accessControl.res.CustomerAuthFindRes;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author lsm
- * @apiNote AccessControlController
- * @since 2025/6/24
- */
-@Slf4j
-@RestController
-@RequiredArgsConstructor
-@RequestMapping("/e8AccessControl")
-public class AccessControlController {
-
-    private final AccessControlService accessControlService;
-
-    /**
-     * 远程开门
-     *
-     * @param req 传参
-     * @return Boolean
-     */
-    @PostMapping("/remoteOpenDoor")
-    public R<Boolean> remoteOpenDoor(@RequestBody RemoteOpenDoorReq req) {
-        log.info("E8远程开门 入参：{}", req);
-
-        Boolean flag = accessControlService.remoteOpenDoor(req);
-
-        if (flag) {
-            return R.ok();
-        } else {
-            return R.fail("E8远程开门，调用失败！");
-        }
-    }
-
-    /**
-     * 获取门禁记录列表
-     *
-     * @param dto 查询参数
-     * @return IPage<AccessRecordFindRes>
-     * @apiNote 获取参数示例 {"maxResultCount":10,"pageIndex":1,"queryDto":{"isViewFullData":false}}
-     */
-    @PostMapping("/getPageAccessRecordList")
-    public R<TableDataInfo<AccessRecordFindRes>> getPageAccessRecordList(@RequestBody QueryDto dto) {
-        log.info("E8获取门禁记录列表 入参：{}", dto);
-        TableDataInfo<AccessRecordFindRes> page = accessControlService.getPageAccessRecordList(dto);
-        if (page == null) {
-            return R.fail("E8获取门禁记录列表，调用失败！");
-        } else {
-            return R.ok(page);
-        }
-    }
-
-    /**
-     * 人员授权
-     *
-     * @param req 传参
-     * @return Boolean
-     * @apiNote 参数示例 {"accessAuthModel":0,"authData":[{"floors":[],"gatewayType":1,"id":528705580163141,"type":0}],"authType":0,"elevatorAuthModel":1,"endTime":"2025-07-2511: 23: 39","personIds":[539696740646981],"scheduleId":1,"startTime":"2025-06-2511: 23: 39"}
-     */
-    @PostMapping("/addCustomerAuth")
-    public R<Boolean> addCustomerAuth(@RequestBody CustomerAuthAddReq req) {
-        log.info("E8人员授权 入参：{}", req);
-
-        Boolean flag = accessControlService.addCustomerAuth(req);
-
-        if (flag) {
-            return R.ok();
-        } else {
-            return R.fail("E8人员授权，调用失败！");
-        }
-    }
-
-    /**
-     * 获取人员权限分页列表
-     *
-     * @param dto 获取参数
-     * @return TableDataInfo<CustomerAuthFindRes>
-     * @apiNote 获取参数示例 {"maxResultCount":10,"pageIndex":1,"queryDto":{"isViewFullData":false}}
-     */
-    @PostMapping("getPageCustomerAuth")
-    public R<TableDataInfo<CustomerAuthFindRes>> getPageCustomerAuth(@RequestBody QueryDto dto) {
-        log.info("E8获取人员权限分页列表 入参：{}", dto);
-
-        TableDataInfo<CustomerAuthFindRes> page = accessControlService.getPageCustomerAuth(dto);
-
-        if (page == null) {
-            return R.fail("E8获取人员权限分页列表，调用失败！");
-        } else {
-            return R.ok(page);
-        }
-    }
-
-}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/e8/DoorDeviceController.java

@@ -1,115 +0,0 @@
-package org.dromara.sis.controller.e8;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.domain.R;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.sis.sdk.e8.DoorDeviceService;
-import org.dromara.sis.sdk.e8.domain.door.req.DoorDeviceAddReq;
-import org.dromara.sis.sdk.e8.domain.door.req.DoorDeviceUpdateReq;
-import org.dromara.sis.sdk.e8.domain.door.res.DoorDeviceAddRes;
-import org.dromara.sis.sdk.e8.domain.door.res.DoorDeviceFindRes;
-import org.dromara.sis.sdk.e8.domain.QueryDto;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author lsm
- * @apiNote DoorDeviceController
- * @since 2025/6/23
- */
-@Slf4j
-@RestController
-@RequiredArgsConstructor
-@RequestMapping("/e8DoorDevice")
-public class DoorDeviceController {
-
-    private final DoorDeviceService doorDeviceService;
-
-    /**
-     * 查询门禁信息
-     *
-     * @param id 入参
-     * @return Result
-     */
-    @PostMapping("/findDoorDevice/{id}")
-    public R<DoorDeviceFindRes> findDoorDevice(@PathVariable Long id) {
-        log.info("E8接口 查询门禁信息 入参={}", id);
-        DoorDeviceFindRes doorDeviceInfo = doorDeviceService.findDoorDevice(id);
-        if (doorDeviceInfo == null) {
-            return R.fail("E8接口查询门禁信息，调用失败！");
-        } else {
-            return R.ok(doorDeviceInfo);
-        }
-    }
-
-    /**
-     * 新增门禁信息
-     *
-     * @param addReq 入参
-     * @return Boolean
-     */
-    @PostMapping("/addDoorDevice")
-    public R<DoorDeviceAddRes> addDoorDevice(@RequestBody DoorDeviceAddReq addReq) {
-        log.info("E8接口新增门禁信息 入参={}", addReq);
-
-        DoorDeviceAddRes doorDevice = doorDeviceService.addDoorDevice(addReq);
-
-        if (doorDevice == null) {
-            return R.fail("E8接口新增门禁信息，调用失败！");
-        } else {
-            return R.ok(doorDevice);
-        }
-    }
-
-    /**
-     * 门禁信息修改
-     *
-     * @param updateReq 入参
-     * @return Boolean
-     */
-    @PostMapping("/updateDoorDevice")
-    public R<Boolean> updateDoorDevice(@RequestBody DoorDeviceUpdateReq updateReq) {
-        log.info("E8接口门禁信息修改 入参={}", updateReq);
-
-        Boolean flag = doorDeviceService.updateDoorDevice(updateReq);
-
-        if (flag) {
-            return R.ok();
-        } else {
-            return R.fail("E8接口门禁信息修改，调用失败！");
-        }
-    }
-
-    /**
-     * 删除门禁信息
-     *
-     * @param id 入参
-     * @return Boolean
-     */
-    @PostMapping("/deleteDoorDevice/{id}")
-    public R<Boolean> deleteDoorDevice(@PathVariable Long id) {
-        log.info("E8接口删除门禁信息 入参={}", id);
-
-        Boolean flag = doorDeviceService.deleteDoorDevice(id);
-
-        return flag ? R.ok() : R.fail("E8接口删除门禁信息，调用失败！");
-    }
-
-    /**
-     * 查询门禁信息列表
-     *
-     * @param dto 入参
-     * @return IPage<DoorDeviceFindRes>
-     */
-    @PostMapping("/findDoorDeviceList")
-    public R<TableDataInfo<DoorDeviceFindRes>> findDoorDeviceList(@RequestBody QueryDto dto) {
-        log.info("E8接口查询门禁信息列表 入参={}", dto);
-        TableDataInfo<DoorDeviceFindRes> doorDeviceList = doorDeviceService.findDoorDeviceList(dto);
-        if (ObjectUtils.isEmpty(doorDeviceList)) {
-            return R.fail("E8接口查询门禁信息列表，调用失败！");
-        } else {
-            return R.ok(doorDeviceList);
-        }
-    }
-}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/e8/VoucherControlController.java

@@ -1,113 +0,0 @@
-package org.dromara.sis.controller.e8;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.domain.R;
-import org.dromara.sis.sdk.e8.VoucherControlService;
-import org.dromara.sis.sdk.e8.domain.voucher.req.ChangeCardReq;
-import org.dromara.sis.sdk.e8.domain.voucher.req.IssueVoucherReq;
-import org.dromara.sis.sdk.e8.domain.voucher.req.OperateVoucherReq;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-
-/**
- * @author lsm
- * @apiNote VoucherControlController
- * @since 2025/6/25
- */
-@Slf4j
-@RestController
-@RequiredArgsConstructor
-@RequestMapping("/e8VoucherControl")
-public class VoucherControlController {
-
-    private final VoucherControlService voucherControlService;
-
-    /**
-     * 发行凭证
-     *
-     * @param req 入参
-     * @return 是否成功
-     */
-    @PostMapping("/issueVoucher")
-    public R<Boolean> issueVoucher(@RequestBody IssueVoucherReq req) {
-        log.info("E8发行凭证入参：{}", req);
-
-        Long flag = voucherControlService.issueVoucher(req);
-
-        if (flag != null) {
-            return R.ok();
-        } else {
-            return R.fail("E8发行凭证，调用失败！");
-        }
-    }
-
-    /**
-     * 操作凭证
-     *
-     * @param req 入参
-     * @return Boolean
-     */
-    @PostMapping("/operateVoucher")
-    public R<Boolean> operateVoucher(@RequestBody OperateVoucherReq req) {
-        log.info("E8操作凭证入参：{}", req);
-
-        Boolean flag = voucherControlService.operateVoucher(req);
-
-        if (flag) {
-            return R.ok();
-        } else {
-            return R.fail("E8操作凭证，调用失败！");
-        }
-    }
-
-    /**
-     * 换卡补卡
-     *
-     * @param req 入参
-     * @return Boolean
-     */
-    @PostMapping("/changeCard")
-    public R<Boolean> changeCard(@RequestBody ChangeCardReq req) {
-        log.info("E8换卡补卡入参：{}", req);
-
-        Boolean flag = voucherControlService.changeCard(req);
-
-        if (flag) {
-            return R.ok();
-        } else {
-            return R.fail("E8换卡补卡，调用失败！");
-        }
-    }
-
-    /**
-     * 上传人脸
-     *
-     * @param file 入参
-     * @return imageUrl 人脸图片地址
-     */
-    @PostMapping("/uploadFace")
-    public R<String> uploadFace(@RequestParam("file") MultipartFile file) {
-        log.info("E8上传人脸入参：{}", file.getOriginalFilename());
-
-        // 获取文件字节数组
-        byte[] imageByte;
-        try {
-            imageByte = file.getBytes();
-        } catch (IOException e) {
-            log.error("获取上传文件字节失败：{}", e.getMessage());
-            return R.fail("E8上传人脸，获取文件字节失败！");
-        }
-
-        String imageUrl = voucherControlService.uploadFace(imageByte);
-
-        if (imageUrl != null) {
-            return R.ok(imageUrl);
-        } else {
-            return R.fail("E8上传人脸，调用失败！");
-        }
-    }
-
-}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControl.java

@@ -93,4 +93,9 @@ public class SisAccessControl extends TenantEntity {
      */
     private String outCode;
 
+    /**
+     * 外部门编码
+     */
+    private String outDoorCode;
+
 }

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthRecord.java

@@ -11,7 +11,7 @@ import java.io.Serial;
  * 授权记录对象 sis_auth_record
  *
  * @author lsm
- * @since 2025-06-28
+ * @since 2025-07-14
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -33,29 +33,14 @@ public class SisAuthRecord extends TenantEntity {
     private Long libId;
 
     /**
-     * 图片id
-     */
-    private Long imgId;
-
-    /**
-     * 门禁id
-     */
-    private Long acId;
-
-    /**
-     * 设备id
-     */
-    private Long eqbId;
-
-    /*
-        门id
-     */
-    private Long doorId;
-
-    /**
-     * 设备id
+     * 设备id（门禁/电梯）
      */
     private Long deviceId;
 
+    /**
+     * 设备类型：1-门禁 2-电梯
+     */
+    private Integer deviceType;
+
 
 }

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisElevatorFloorRef.java

@@ -0,0 +1,41 @@
+package org.dromara.sis.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 电梯⇄楼层关联对象 sis_elevator_floor_ref
+ *
+ * @author lsm
+ * @since 2025-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sis_elevator_floor_ref")
+public class SisElevatorFloorRef extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 电梯id
+     */
+    private Long elevatorId;
+
+    /**
+     * 楼层层数
+     */
+    private Long layerNum;
+
+
+}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisFloorInfo.java

@@ -0,0 +1,50 @@
+package org.dromara.sis.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 建筑物楼层信息对象 sis_floor_info
+ *
+ * @author lsm
+ * @since 2025-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sis_floor_info")
+public class SisFloorInfo extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 楼层唯一标识
+     */
+    @TableId(value = "floor_id")
+    private Long floorId;
+
+    /**
+     * 最低层
+     */
+    private Long minLayer;
+
+    /**
+     * 最高层
+     */
+    private Long maxLayer;
+
+    /**
+     * 园区id
+     */
+    private Long communityId;
+
+    /**
+     * 建筑id
+     */
+    private Long buildingId;
+
+}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibImgRef.java

@@ -0,0 +1,42 @@
+package org.dromara.sis.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 人像库-人像图片关联对象 sis_lib_img_ref
+ *
+ * @author lsm
+ * @since 2025-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sis_lib_img_ref")
+public class SisLibImgRef extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 人像库id
+     */
+    private Long libId;
+
+    /**
+     * 人像id
+     */
+    private Long imgId;
+
+
+}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLibImg.java

@@ -28,11 +28,6 @@ public class SisPersonLibImg extends TenantEntity {
     @TableId(value = "id")
     private Long id;
 
-    /**
-     * 人员库编码
-     */
-    private Long libId;
-
     /**
      * 人像名称
      */

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/AuthLibBo.java

@@ -1,22 +0,0 @@
-package org.dromara.sis.domain.bo;
-
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 人像库授权
- *
- * @author lxj
- */
-@Data
-public class AuthLibBo {
-
-    @NotNull(message = "人像库id不能为空")
-    private Long libId;
-
-    @NotNull(message = "设备列表不能为空")
-    private List<Long> deviceIds;
-
-}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SingleAuthRecordBo.java

@@ -1,44 +0,0 @@
-package org.dromara.sis.domain.bo;
-
-import io.github.linpeilie.annotations.AutoMapper;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.sis.domain.SisAuthRecord;
-
-import java.util.List;
-
-/**
- * 授权记录业务对象 sis_auth_record
- *
- * @author lxj
- * @since 2025-06-28
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = SisAuthRecord.class, reverseConvertGenerate = false)
-public class SingleAuthRecordBo extends BaseEntity {
-
-
-    /**
-     * 图像库Id
-     */
-    @NotNull(message = "图像库Id不能为空", groups = {AddGroup.class, EditGroup.class})
-    private Long libId;
-
-    /**
-     * 图像id列表
-     */
-    @NotNull(message = "图像id列表不能为空", groups = {AddGroup.class, EditGroup.class})
-    private Long imgId;
-
-    /**
-     * 门禁id列表
-     */
-    @NotNull(message = "门禁id列表能为空", groups = {AddGroup.class, EditGroup.class})
-    private List<Long> acIds;
-
-}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthRecordBo.java

@@ -1,21 +1,21 @@
 package org.dromara.sis.domain.bo;
 
-import io.github.linpeilie.annotations.AutoMapper;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import org.dromara.sis.domain.SisAuthRecord;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.sis.domain.SisAuthRecord;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
 
-import java.util.List;
+import java.util.Collection;
 
 /**
  * 授权记录业务对象 sis_auth_record
  *
  * @author lsm
- * @since 2025-06-28
+ * @since 2025-07-14
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -23,26 +23,20 @@ import java.util.List;
 public class SisAuthRecordBo extends BaseEntity {
 
     /**
-     * 图像库Id
+     * 主键id
      */
-    @NotNull(message = "图像库Id不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotNull(message = "主键id不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 图像库id
+     */
+    @NotNull(message = "图像库id不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long libId;
 
     /**
-     * 图像id列表
+     * 授权设备idList
      */
-    @NotNull(message = "图像id列表不能为空", groups = {AddGroup.class, EditGroup.class})
-    private List<Long> imgIds;
-
-    /**
-     * 门禁id列表
-     */
-    @NotNull(message = "门禁id列表能为空", groups = {AddGroup.class, EditGroup.class})
-    private List<Long> acIds;
-
-    /**
-     * 是否将图片下发到宇视盒子
-     */
-    private Boolean issue = false;
-
+    @NotEmpty(message = "授权设备idList不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Collection<Long> deviceIds;
 }

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorFloorRefBo.java

@@ -0,0 +1,42 @@
+package org.dromara.sis.domain.bo;
+
+import org.dromara.sis.domain.SisElevatorFloorRef;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 电梯⇄楼层关联业务对象 sis_elevator_floor_ref
+ *
+ * @author lsm
+ * @since 2025-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SisElevatorFloorRef.class, reverseConvertGenerate = false)
+public class SisElevatorFloorRefBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 电梯id
+     */
+    @NotNull(message = "电梯id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long elevatorId;
+
+    /**
+     * 楼层层数
+     */
+    @NotNull(message = "楼层层数不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long layerNum;
+
+
+}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisFloorInfoBo.java

@@ -0,0 +1,53 @@
+package org.dromara.sis.domain.bo;
+
+import org.dromara.sis.domain.SisFloorInfo;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 建筑物楼层信息业务对象 sis_floor_info
+ *
+ * @author lsm
+ * @since 2025-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SisFloorInfo.class, reverseConvertGenerate = false)
+public class SisFloorInfoBo extends BaseEntity {
+
+    /**
+     * 楼层唯一标识
+     */
+    @NotNull(message = "楼层唯一标识不能为空", groups = { EditGroup.class })
+    private Long floorId;
+
+    /**
+     * 最低层
+     */
+    @NotNull(message = "最低层不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long minLayer;
+
+    /**
+     * 最高层
+     */
+    @NotNull(message = "最高层不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long maxLayer;
+
+    /**
+     * 园区id
+     */
+    @NotNull(message = "园区id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long communityId;
+
+    /**
+     * 建筑id
+     */
+    @NotNull(message = "建筑id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long buildingId;
+
+}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibImgRefBo.java

@@ -0,0 +1,42 @@
+package org.dromara.sis.domain.bo;
+
+import org.dromara.sis.domain.SisLibImgRef;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 人像库-人像图片关联业务对象 sis_lib_img_ref
+ *
+ * @author lsm
+ * @since 2025-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SisLibImgRef.class, reverseConvertGenerate = false)
+public class SisLibImgRefBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 人像库id
+     */
+    @NotNull(message = "人像库id不能为空", groups = {EditGroup.class, AddGroup.class})
+    private Long libId;
+
+    /**
+     * 人像id
+     */
+    @NotNull(message = "人像id不能为空", groups = {EditGroup.class, AddGroup.class})
+    private Long imgId;
+
+
+}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java

@@ -9,6 +9,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 
+import java.util.Collection;
+
 /**
  * 人像信息业务对象 tb_person_lib_img
  *
@@ -29,8 +31,8 @@ public class SisPersonLibImgBo extends BaseEntity {
     /**
      * 人员库编码
      */
-    @NotNull(message = "人像库id不能为空", groups = {AddGroup.class, EditGroup.class})
-    private Long libId;
+    @NotEmpty(message = "人像库id不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Collection<Long> libIds;
 
     /**
      * 人像名称
@@ -74,14 +76,14 @@ public class SisPersonLibImgBo extends BaseEntity {
      */
     private String birthDate;
 
-    /**
-     * 同步E8
-     */
-    private Boolean isSyncE8;
-
     /**
      * 远程库图像ID
      */
     private Long remoteImgId;
 
+    /**
+     * 同步E8
+     */
+    private Boolean isSyncE8;
+
 }

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlVo.java

@@ -105,6 +105,12 @@ public class SisAccessControlVo implements Serializable {
     @ExcelProperty(value = "外部编码")
     private String outCode;
 
+    /**
+     * 外部门编码
+     */
+    @ExcelProperty(value = "外部编码")
+    private String outDoorCode;
+
     private String bindDeviceId;
 
     private String bindDeviceIp;

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAuthRecordVo.java

@@ -3,19 +3,20 @@ package org.dromara.sis.domain.vo;
 import org.dromara.sis.domain.SisAuthRecord;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.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.List;
 
 
 /**
  * 授权记录视图对象 sis_auth_record
  *
  * @author lsm
- * @since 2025-06-28
+ * @since 2025-07-14
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -32,41 +33,23 @@ public class SisAuthRecordVo implements Serializable {
     private Long id;
 
     /**
-     * 图像库Id
+     * 图像库id
      */
-    @ExcelProperty(value = "图像库Id")
+    @ExcelProperty(value = "图像库id")
     private Long libId;
 
     /**
-     * 人像id
-     */
-    @ExcelProperty(value = "人像id")
-    private Long imgId;
-
-    /**
-     * 门禁id
-     */
-    @ExcelProperty(value = "门禁id")
-    private Long acId;
-
-    /**
-     * 设备id
-     */
-    @ExcelProperty(value = "设备id")
-    private Long eqbId;
-
-    /**
-     * E8权限ID
-     */
-    private Long remoteAuthId;
-
-    /*
-        门id
-     */
-    private Long doorId;
-
-    /**
-     * 设备id
+     * 设备id（门禁/电梯）
      */
+    @ExcelProperty(value = "设备id", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "门禁/电梯")
     private Long deviceId;
+
+    /**
+     * 设备类型：1-门禁 2-电梯
+     */
+    @ExcelProperty(value = "设备类型：1-门禁 2-电梯")
+    private Integer deviceType;
+
+
 }

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorFloorRefVo.java

@@ -0,0 +1,50 @@
+package org.dromara.sis.domain.vo;
+
+import org.dromara.sis.domain.SisElevatorFloorRef;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.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;
+
+
+
+/**
+ * 电梯⇄楼层关联视图对象 sis_elevator_floor_ref
+ *
+ * @author lsm
+ * @since 2025-07-15
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SisElevatorFloorRef.class)
+public class SisElevatorFloorRefVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 电梯id
+     */
+    @ExcelProperty(value = "电梯id")
+    private Long elevatorId;
+
+    /**
+     * 楼层层数
+     */
+    @ExcelProperty(value = "楼层层数")
+    private Long layerNum;
+
+
+}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisFloorInfoVo.java

@@ -0,0 +1,61 @@
+package org.dromara.sis.domain.vo;
+
+import org.dromara.sis.domain.SisFloorInfo;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.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;
+
+
+
+/**
+ * 建筑物楼层信息视图对象 sis_floor_info
+ *
+ * @author lsm
+ * @since 2025-07-15
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SisFloorInfo.class)
+public class SisFloorInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 楼层唯一标识
+     */
+    @ExcelProperty(value = "楼层唯一标识")
+    private Long floorId;
+
+    /**
+     * 最低层
+     */
+    @ExcelProperty(value = "最低层")
+    private Long minLayer;
+
+    /**
+     * 最高层
+     */
+    @ExcelProperty(value = "最高层")
+    private Long maxLayer;
+
+    /**
+     * 园区id
+     */
+    @ExcelProperty(value = "园区id")
+    private Long communityId;
+
+    /**
+     * 建筑id
+     */
+    @ExcelProperty(value = "建筑id")
+    private Long buildingId;
+
+}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibImgRefVo.java

@@ -0,0 +1,47 @@
+package org.dromara.sis.domain.vo;
+
+import org.dromara.sis.domain.SisLibImgRef;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+
+/**
+ * 人像库-人像图片关联视图对象 sis_lib_img_ref
+ *
+ * @author lsm
+ * @since 2025-07-14
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SisLibImgRef.class)
+public class SisLibImgRefVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 人像库id
+     */
+    @ExcelProperty(value = "人像库id")
+    private Long libId;
+
+    /**
+     * 人像id
+     */
+    @ExcelProperty(value = "人像id")
+    private Long imgId;
+
+
+}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java

@@ -8,7 +8,7 @@ import org.dromara.sis.domain.SisPersonLibImg;
 
 import java.io.Serial;
 import java.io.Serializable;
-
+import java.util.Collection;
 
 
 /**
@@ -31,12 +31,6 @@ public class SisPersonLibImgVo implements Serializable {
     @ExcelProperty(value = "主键id")
     private Long id;
 
-    /**
-     * 人员库编码
-     */
-    @ExcelProperty(value = "人员库Id")
-    private Long libId;
-
     /**
      * 人像名称
      */
@@ -50,8 +44,7 @@ public class SisPersonLibImgVo implements Serializable {
     private Long imgOssId;
 
     /**
-     * 性别 1：男
-2：女 99：未说明
+     * 性别 1：男 2：女 99：未说明
      */
     @ExcelProperty(value = "性别")
     private Integer sex;
@@ -69,9 +62,7 @@ public class SisPersonLibImgVo implements Serializable {
     private String tel;
 
     /**
-     * 证件类型
-1：身份证 2：护照
-3：行驶证 99：其它
+     * 证件类型 1：身份证 2：护照 3：行驶证 99：其它
      */
     @ExcelProperty(value = "证件类型")
     private Integer certificateType;
@@ -93,4 +84,10 @@ public class SisPersonLibImgVo implements Serializable {
      */
     @ExcelProperty(value = "远程库图像ID")
     private Long remoteImgId;
+
+    /**
+     * 人像库id
+     */
+    @ExcelProperty(value = "人像库id")
+    private Collection<Long> libIds;
 }

ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAuthRecordMapper.java

@@ -1,17 +1,17 @@
 package org.dromara.sis.mapper;
 
-import org.apache.ibatis.annotations.Param;
 import org.dromara.sis.domain.SisAuthRecord;
 import org.dromara.sis.domain.vo.SisAuthRecordVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+import java.util.List;
+
 /**
  * 授权记录Mapper接口
  *
  * @author lsm
- * @date 2025-06-28
+ * @since 2025-07-14
  */
 public interface SisAuthRecordMapper extends BaseMapperPlus<SisAuthRecord, SisAuthRecordVo> {
-
-    SisAuthRecordVo checkAuth(@Param("personId") Integer personId,@Param("accessControlId") Long accessControlId);
+        List<SisAuthRecordVo> checkAuth(Long personId);
 }

ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisElevatorFloorRefMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.sis.mapper;
+
+import org.dromara.sis.domain.SisElevatorFloorRef;
+import org.dromara.sis.domain.vo.SisElevatorFloorRefVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 电梯⇄楼层关联Mapper接口
+ *
+ * @author lsm
+ * @date 2025-07-15
+ */
+public interface SisElevatorFloorRefMapper extends BaseMapperPlus<SisElevatorFloorRef, SisElevatorFloorRefVo> {
+
+}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisFloorInfoMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.sis.mapper;
+
+import org.dromara.sis.domain.SisFloorInfo;
+import org.dromara.sis.domain.vo.SisFloorInfoVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 建筑物楼层信息Mapper接口
+ *
+ * @author lsm
+ * @date 2025-07-15
+ */
+public interface SisFloorInfoMapper extends BaseMapperPlus<SisFloorInfo, SisFloorInfoVo> {
+
+}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibImgRefMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.sis.mapper;
+
+import org.dromara.sis.domain.SisLibImgRef;
+import org.dromara.sis.domain.vo.SisLibImgRefVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 人像库-人像图片关联Mapper接口
+ *
+ * @author lsm
+ * @since 2025-07-14
+ */
+public interface SisLibImgRefMapper extends BaseMapperPlus<SisLibImgRef, SisLibImgRefVo> {
+
+}