修复打包失败

# Conflicts:
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/RocketMqConstants.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/FaceCaptureConsumer.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/FaceCompareConsumer.java

.gitea/workflows/dev.yml

@@ -1,51 +0,0 @@
-name: Gitea Actions Demo
-run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
-on:
-  push:
-    branches: [ master ]  # 当main分支有推送时触发
-jobs:
-  Explore-Gitea-Actions:
-    runs-on: ubuntu-latest
-    steps:
-      
-      - name: Checkout code
-        uses: http://47.109.37.87:3000/bichangxiong/checkout@v4 # 使用 Gitea 镜像
-        with:
-          fetch-depth: 1  # 只拉取最新一次提交
-      # - name: Checkout code
-      #   uses: actions/checkout@v4  # 拉取代码到工作目录
-      - name: Set up JDK 17
-        uses: http://47.109.37.87:3000/bichangxiong/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: maven
-      - name: Set up Maven
-        uses: stCarolas/setup-maven@v5
-        with:
-          maven-version: 3.8.2
-
-      - name: Install dependencies
-        run: mvn clean package -DskipTests -Dmaven.repo.local=/home/runner/maven-repo
-      - name: copy file via ssh password
-        uses: appleboy/scp-action@v0.1.7
-        with:
-          host: 192.168.1.3
-          username: root
-          password: by@2025!
-          port: 22
-          source: "ruoyi-modules/Property/target/Property.jar,ruoyi-modules/Property/docker-compose.yml,ruoyi-modules/Property/Dockerfile"
-          target: "/project/runner/plus/"
-      - name: Deploy to server via SSH
-        uses: appleboy/ssh-action@v0.1.7
-        with:
-          host: 192.168.1.3
-          username: root
-          password: by@2025!
-          port: 22
-          script: |
-            cd /project/runner/plus/ruoyi-modules/Property
-            docker-compose up -d --force-recreate
-
-
-      - run: echo "🍏 This job's status is ${{ job.status }}."

.gitea/workflows/master.yml

@@ -0,0 +1,94 @@
+name: Build and Push to Target Registry
+
+# 监听master分支的推送事件
+on:
+  push:
+    branches: [ prod ]
+
+jobs:
+  build-and-deploy:
+    name: 构建并推送镜像到目标仓库
+    runs-on: ubuntu
+    timeout-minutes: 30
+
+    steps:
+      - name: 拉取代码
+        uses: http://git.missmoc.top/mocheng/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: 使用Maven构建项目
+        run: |
+          echo "===== 开始Maven构建 ====="
+          /maven/apache-maven-3.9.11/bin/mvn clean package -DskipTests
+
+          echo "===== Maven构建完成 ====="
+
+      - name: 构建并推送Docker镜像
+        env:
+          # 替换为你的Docker Registry地址（例如：localhost:5000 或 192.168.1.100:5000）
+          TARGET_REGISTRY: 127.0.0.1:5000
+          # 目标仓库中的项目名称
+          TARGET_PROJECT: smartparks
+        run: |
+          echo "===== 环境信息 ====="
+          echo "目标仓库: $TARGET_REGISTRY/$TARGET_PROJECT"
+
+          # 【删除登录步骤】因为仓库无认证，无需登录
+
+          echo "===== 查找项目中的Dockerfile ====="
+          dockerfiles=$(find . -type f -name "Dockerfile" ! -path "./.git/*")
+          if [ -z "$dockerfiles" ]; then
+            echo "警告：未找到任何Dockerfile"
+            exit 0
+          fi
+
+          # 处理每个Dockerfile（后续构建、推送逻辑与之前类似，保持不变）
+          echo "$dockerfiles" | while read -r dockerfile; do
+            echo "===== 处理Dockerfile: $dockerfile ====="
+
+            docker_context=$(dirname "$dockerfile")
+            image_tag=$(echo "$docker_context" | sed 's|./||g' | tr '/' '-' | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9_-]//g')
+            full_image_name="$TARGET_REGISTRY/$TARGET_PROJECT:$image_tag-${{ github.sha }}"
+            echo "镜像名称: $full_image_name"
+
+            # 检查JAR包是否存在
+            echo "===== 检查JAR包 ====="
+            jar_files=$(find "$docker_context" -name "*.jar" -type f)
+            if [ -z "$jar_files" ]; then
+              echo "警告：在 $docker_context 目录中未找到JAR包"
+              continue
+            fi
+            echo "找到JAR包："
+            echo "$jar_files"
+
+            echo "===== 构建镜像 ====="
+            if ! docker build -t "$full_image_name" -f "$dockerfile" "$docker_context"; then
+              echo "错误：构建镜像失败"
+              exit 1
+            fi
+
+            echo "===== 推送镜像到仓库 ====="
+            if ! docker push "$full_image_name"; then
+              echo "错误：推送镜像失败，请检查仓库是否可访问"
+              exit 1
+            fi
+
+            # 推送latest标签（逻辑保持不变）
+            latest_image="$TARGET_REGISTRY/$TARGET_PROJECT:$image_tag-latest"
+            echo "===== 推送最新标签: $latest_image ====="
+            docker tag "$full_image_name" "$latest_image"
+            if ! docker push "$latest_image"; then
+              echo "错误：推送latest标签失败"
+              exit 1
+            fi
+          done
+
+          echo "===== 清理操作 ====="
+          docker system prune -f
+          echo "===== 所有操作完成 ===="
+
+      - name: 重启服务
+        run: |
+          kubectl rollout restart deployment sis -n smartparks
+          kubectl rollout restart deployment property -n smartparks

pom.xml

@@ -74,8 +74,8 @@
             <properties>
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <profiles.active>dev</profiles.active>
-                <nacos.server>127.0.0.1:8848</nacos.server>
-                <logstash.address>127.0.0.1:4560</logstash.address>
+                <nacos.server>10.20.1.65:8848</nacos.server>
+                <logstash.address>10.20.1.65:4560</logstash.address>
                 <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
                 <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
                 <nacos.username>nacos</nacos.username>
@@ -91,8 +91,22 @@
             <properties>
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <profiles.active>dev</profiles.active>
-                <nacos.server>by.missmoc.top:8848</nacos.server>
-                <logstash.address>by.missmoc.top:4560</logstash.address>
+                <nacos.server>113.249.101.254:8848</nacos.server>
+                <logstash.address>113.249.101.254: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>by@2025??</nacos.password>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>test</id>
+            <properties>
+                <!-- 环境标识，需要与配置文件的名称相对应 -->
+                <profiles.active>test</profiles.active>
+                <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>
@@ -104,8 +118,8 @@
             <id>prod</id>
             <properties>
                 <profiles.active>prod</profiles.active>
-                <nacos.server>10.20.1.185:8848</nacos.server>
-                <logstash.address>10.20.1.185:4560</logstash.address>
+                <nacos.server>127.0.0.1:8848</nacos.server>
+                <logstash.address>127.0.0.1:4560</logstash.address>
                 <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
                 <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
                 <nacos.username>nacos</nacos.username>

ruoyi-api/property-api/src/main/java/org/dromara/property/api/RemoteAttendanceService.java

@@ -0,0 +1,23 @@
+package org.dromara.property.api;
+
+import org.dromara.property.api.domain.vo.RemoteAttendanceUserGroupVo;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 排班远程服务调用
+ *
+ * @author lxj
+ */
+public interface RemoteAttendanceService {
+
+    /**
+     * 查询指定天数的排班信息
+     *
+     * @param date 查询时间
+     * @return 返回排班人员信息
+     */
+    public List<RemoteAttendanceUserGroupVo> queryAttendPersonInfo(Date date);
+
+}

ruoyi-api/property-api/src/main/java/org/dromara/property/api/RemoteVisitoreGetCodeInfoService.java

@@ -0,0 +1,5 @@
+package org.dromara.property.api;
+
+public interface RemoteVisitoreGetCodeInfoService {
+    String getCodeInfo(String code);
+}

ruoyi-api/property-api/src/main/java/org/dromara/property/api/domain/vo/RemoteAttendanceUserGroupVo.java

@@ -0,0 +1,53 @@
+package org.dromara.property.api.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * 排班人员信息
+ *
+ * @author lxj
+ * @since 2025-08-17
+ */
+@Data
+public class RemoteAttendanceUserGroupVo implements Serializable {
+
+    /**
+     * 排班ID
+     */
+    private Long scheduleId;
+
+    /**
+     * 员工ID
+     */
+    private Long employeeId;
+
+    /**
+     * 员工姓名
+     */
+    private String employeeName;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 开始日期
+     */
+    private LocalDate startDate;
+
+    /**
+     * 结束日期(仅date_type=3时有效)
+     */
+    private LocalDate endDate;
+
+
+}

ruoyi-api/property-api/src/main/java/org/dromara/property/api/domain/vo/RemoteResidentPersonVo.java

@@ -34,4 +34,6 @@ public class RemoteResidentPersonVo implements Serializable {
     private Date authBegDate;
 
     private Date authEndDate;
+
+    private Integer rosterType;
 }

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDeptService.java

@@ -34,4 +34,10 @@ public interface RemoteDeptService {
      */
     List<RemoteDeptVo> selectDeptsByList();
 
+    /**
+     * 根据部门id查询部门信息
+     * @param deptId 部门id
+     * @return 返回部门信息
+     */
+    RemoteDeptVo selectDeptVoById(Long deptId);
 }

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteUserService.java

@@ -25,6 +25,7 @@ public interface RemoteUserService {
      * @return 结果
      */
     LoginUser getUserInfo(String username, String tenantId) throws UserException;
+
     /**
      * 通过用户id查询用户信息
      *
@@ -196,6 +197,10 @@ public interface RemoteUserService {
      */
     Map<Long, String> selectPostNamesByIds(List<Long> postIds);
 
-    Map<String ,Integer> seelectOrgcount();
+    Map<String, Integer> seelectOrgcount();
 
+    /**
+     * 查询用户列表
+     */
+    List<RemoteUserVo> selectUserList(List<Long> userIds);
 }

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteUserVo.java

@@ -25,6 +25,11 @@ public class RemoteUserVo implements Serializable {
      */
     private Long userId;
 
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+
     /**
      * 部门ID
      */

ruoyi-api/sis-api/src/main/java/org/dromara/sis/api/RemoteDeviceService.java

@@ -25,6 +25,12 @@ public interface RemoteDeviceService {
      */
     Boolean updateDeviceState(RemoteSisDeviceManage item);
 
+    /**
+     * 根据id查询的设备信息
+     *
+     */
+     RemoteSisDeviceManage queryDeviceById(Long id);
+
     /**
      * 查询设备通道信息
      *

ruoyi-api/sis-api/src/main/java/org/dromara/sis/api/RemoteHikSdkService.java

@@ -9,6 +9,7 @@ public interface RemoteHikSdkService {
 
     /**
      * 海康sdk 登录操作
+     *
      * @param item 登录参数
      * @return 是否登录成功
      */
@@ -16,6 +17,7 @@ public interface RemoteHikSdkService {
 
     /**
      * 获取nvr设备通道信息
+     *
      * @param deviceIp 设备ip
      * @return 返回通道信息
      */

ruoyi-api/sis-api/src/main/java/org/dromara/sis/api/RemoteSisAuthService.java

@@ -38,12 +38,12 @@ public interface RemoteSisAuthService {
     Boolean queryPersonAuth(Long authGroupId, Long personId);
 
     /**
-     * 通过MD5，查询图片id
+     * 通过MD5，查询华为盒子id
      *
      * @param imgMd5 图片MD5
      * @return Long
      */
-    Long queryImgIdByImgMd5(String imgMd5);
+    Long queryHuaweiBoxIdByImgMd5(String imgMd5);
 
     /**
      * 图片写入华为盒子

ruoyi-api/sis-api/src/main/java/org/dromara/sis/api/RemoteVisitorService.java

@@ -0,0 +1,19 @@
+package org.dromara.sis.api;
+
+import org.dromara.sis.api.domain.RemoteVisitor;
+
+/**
+ * @author lsm
+ * @apiNote RemoteVisitorService
+ * @since 2025/8/18
+ */
+public interface RemoteVisitorService {
+
+    /**
+     * 访客信息写入E8平台
+     *
+     * @param visitor 访客信息
+     * @return 访客ID
+     */
+    Long syncE8PlatVisitor(RemoteVisitor visitor);
+}

ruoyi-api/sis-api/src/main/java/org/dromara/sis/api/domain/RemotePersonAuth.java

@@ -43,4 +43,6 @@ public class RemotePersonAuth implements Serializable {
 
     private Date authEndDate;
 
+    private Integer rosterType;
+
 }

ruoyi-api/sis-api/src/main/java/org/dromara/sis/api/domain/RemoteSisDeviceManage.java

@@ -2,11 +2,17 @@ package org.dromara.sis.api.domain;
 
 import lombok.Data;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * 设备远程调用对象
  */
 @Data
-public class RemoteSisDeviceManage {
+public class RemoteSisDeviceManage implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键id
@@ -63,8 +69,26 @@ public class RemoteSisDeviceManage {
      */
     private Long groupId;
 
-    /**
-     * 租户编号
-     */
     private String tenantId;
+
+    /**
+     * 楼层id
+     */
+    private Long floorId;
+
+    /**
+     * 是否支持人脸比对
+     */
+    private Boolean isComparison;
+
+    /**
+     * 设备经度
+     */
+    private Double lon;
+
+    /**
+     * 设备维度
+     */
+    private Double lat;
+
 }

ruoyi-api/sis-api/src/main/java/org/dromara/sis/api/domain/RemoteVisitor.java

@@ -0,0 +1,48 @@
+package org.dromara.sis.api.domain;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author lsm
+ * @apiNote RemoteVisitor
+ * @since 2025/8/18
+ */
+@Data
+public class RemoteVisitor implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 访客名称
+     */
+    private String visitorName;
+
+    /**
+     * 手机号码
+     */
+    private String mobilePhone;
+
+    /**
+     * 被访人手机号
+     */
+    private String intervieweeMobile;
+
+    /**
+     * 授权开始时间
+     */
+    private String visitorStartTime;
+
+    /**
+     * 授权结束时间
+     */
+    private String vistorEndTime;
+
+    /**
+     * 访客人脸照
+     */
+    private String visitorFaceImg;
+}

ruoyi-auth/Dockerfile

@@ -1,6 +1,9 @@
 # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/
-FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
+#FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
+#FROM registry.cn-hangzhou.aliyuncs.com/aliyun_openjdk/openjdk:17-jdk-slim
 #FROM bellsoft/liberica-openjdk-debian:21.0.5-cds
+#FROM 127.0.0.1:5000/smartparks/base-images/liberica-openjdk-debian
+FROM 127.0.0.1:5000/smartparks/base-images/liberica-openjdk-debian:17.0.11-cds
 #FROM findepi/graalvm:java17-native
 
 LABEL maintainer="Lion Li"

ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java

@@ -35,6 +35,7 @@ public class PlusWebSocketHandler extends AbstractWebSocketHandler {
         }
         WebSocketSessionHolder.addSession(loginUser.getUserId(), session);
         log.info("[connect] sessionId: {},userId:{},userType:{}", session.getId(), loginUser.getUserId(), loginUser.getUserType());
+        System.out.println(WebSocketSessionHolder.getSessions(loginUser.getUserId()));
     }
 
     /**

ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java

@@ -26,8 +26,10 @@ public class WebSocketSessionHolder {
      * @param session    要添加的WebSocket会话
      */
     public static void addSession(Long sessionKey, WebSocketSession session) {
+        System.out.println(USER_SESSION_MAP);
         removeSession(sessionKey);
         USER_SESSION_MAP.put(sessionKey, session);
+        System.out.println(USER_SESSION_MAP);
     }
 
     /**
@@ -36,6 +38,7 @@ public class WebSocketSessionHolder {
      * @param sessionKey 要移除的会话键
      */
     public static void removeSession(Long sessionKey) {
+        System.out.println(USER_SESSION_MAP);
         WebSocketSession session = USER_SESSION_MAP.remove(sessionKey);
         try {
             session.close(CloseStatus.BAD_DATA);
@@ -50,6 +53,7 @@ public class WebSocketSessionHolder {
      * @return 与给定会话键对应的WebSocket会话，如果不存在则返回null
      */
     public static WebSocketSession getSessions(Long sessionKey) {
+        System.out.println(USER_SESSION_MAP);
         return USER_SESSION_MAP.get(sessionKey);
     }
 

ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java

@@ -36,6 +36,7 @@ public class WebSocketUtils {
      */
     public static void sendMessage(Long sessionKey, String message) {
         WebSocketSession session = WebSocketSessionHolder.getSessions(sessionKey);
+
         sendMessage(session, message);
     }
 

ruoyi-modules/Property/Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/Property/logs \
 
 WORKDIR /ruoyi/Property
 
-ENV SERVER_PORT=9201 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
+ENV SERVER_PORT=9201 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Duser.timezone=Asia/Shanghai"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-modules/Property/pom.xml

@@ -120,6 +120,15 @@
             <artifactId>sis-api</artifactId>
             <version>2.4.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-websocket</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-spring-boot-starter</artifactId>
+        </dependency>
 
     </dependencies>
 

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

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

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

@@ -62,7 +62,7 @@ public class ApplicationController extends BaseController {
      *
      * @param id 主键
      */
-    //@SaCheckPermission("property:application:query")
+    @SaCheckPermission("property:application:query")
     @GetMapping("/{id}")
     public R<ApplicationVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {

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

@@ -24,7 +24,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**
  * 资产申请
- * 前端访问路由地址为:/domain/application
+ * 前端访问路由地址为:/domain/procurementApplication
  *
  * @author mocheng
  * @date 2025-07-25
@@ -40,7 +40,7 @@ public class CapitalApplicationController extends BaseController {
     /**
      * 查询资产申请列表
      */
-   // @SaCheckPermission("domain:application:list")
+    @SaCheckPermission("domain:procurementApplication:list")
     @GetMapping("/list")
     public TableDataInfo<CapitalApplicationVo> list(CapitalApplicationBo bo, PageQuery pageQuery) {
         return capitalApplicationService.queryPageList(bo, pageQuery);
@@ -49,7 +49,7 @@ public class CapitalApplicationController extends BaseController {
     /**
      * 导出资产申请列表
      */
-    @SaCheckPermission("domain:application:export")
+    @SaCheckPermission("domain:procurementApplication:export")
     @Log(title = "资产申请", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(CapitalApplicationBo bo, HttpServletResponse response) {
@@ -62,7 +62,7 @@ public class CapitalApplicationController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("domain:application:query")
+    @SaCheckPermission("domain:procurementApplication:query")
     @GetMapping("/{id}")
     public R<CapitalApplicationVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {
@@ -72,7 +72,7 @@ public class CapitalApplicationController extends BaseController {
     /**
      * 新增资产申请
      */
-   // @SaCheckPermission("domain:application:add")
+   // @SaCheckPermission("domain:procurementApplication:add")
     @Log(title = "资产申请", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -83,7 +83,7 @@ public class CapitalApplicationController extends BaseController {
     /**
      * 修改资产申请
      */
-    @SaCheckPermission("domain:application:edit")
+    @SaCheckPermission("domain:procurementApplication:edit")
     @Log(title = "资产申请", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -96,7 +96,7 @@ public class CapitalApplicationController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("domain:application:remove")
+    @SaCheckPermission("domain:procurementApplication:remove")
     @Log(title = "资产申请", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -40,7 +40,7 @@ public class CostItemsController extends BaseController {
     /**
      * 查询费用项设置列表
      */
-    @SaCheckPermission("property:costItems:list")
+    @SaCheckPermission("property:costItemSetting:list")
     @GetMapping("/list")
     public TableDataInfo<CostItemsVo> list(CostItemsBo bo, PageQuery pageQuery) {
         return costItemsService.queryPageList(bo, pageQuery);
@@ -49,7 +49,7 @@ public class CostItemsController extends BaseController {
     /**
      * 导出费用项设置列表
      */
-    @SaCheckPermission("property:costItems:export")
+    @SaCheckPermission("property:costItemSetting:export")
     @Log(title = "费用项设置", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(CostItemsBo bo, HttpServletResponse response) {
@@ -62,7 +62,7 @@ public class CostItemsController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("property:costItems:query")
+    @SaCheckPermission("property:costItemSetting:query")
     @GetMapping("/{id}")
     public R<CostItemsVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {
@@ -72,7 +72,7 @@ public class CostItemsController extends BaseController {
     /**
      * 新增费用项设置
      */
-    @SaCheckPermission("property:costItems:add")
+    @SaCheckPermission("property:costItemSetting:add")
     @Log(title = "费用项设置", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -83,7 +83,7 @@ public class CostItemsController extends BaseController {
     /**
      * 修改费用项设置
      */
-    @SaCheckPermission("property:costItems:edit")
+    @SaCheckPermission("property:costItemSetting:edit")
     @Log(title = "费用项设置", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -96,7 +96,7 @@ public class CostItemsController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("property:costItems:remove")
+    @SaCheckPermission("property:costItemSetting:remove")
     @Log(title = "费用项设置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -40,7 +40,7 @@ public class CostMeterWaterController extends BaseController {
     /**
      * 查询费用-水电抄列表
      */
-    @SaCheckPermission("system:meterWater:list")
+    @SaCheckPermission("property:costMeterWater:list")
     @GetMapping("/list")
     public TableDataInfo<CostMeterWaterVo> list(CostMeterWaterBo bo, PageQuery pageQuery) {
         return costMeterWaterService.queryPageList(bo, pageQuery);
@@ -49,7 +49,7 @@ public class CostMeterWaterController extends BaseController {
     /**
      * 导出费用-水电抄列表
      */
-    @SaCheckPermission("system:meterWater:export")
+    @SaCheckPermission("property:costMeterWater:export")
     @Log(title = "费用-水电抄", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(CostMeterWaterBo bo, HttpServletResponse response) {
@@ -62,7 +62,7 @@ public class CostMeterWaterController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:meterWater:query")
+    @SaCheckPermission("property:costMeterWater:query")
     @GetMapping("/{id}")
     public R<CostMeterWaterVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {
@@ -82,7 +82,7 @@ public class CostMeterWaterController extends BaseController {
     /**
      * 新增费用-水电抄
      */
-    @SaCheckPermission("system:meterWater:add")
+    @SaCheckPermission("property:costMeterWater:add")
     @Log(title = "费用-水电抄", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -93,7 +93,7 @@ public class CostMeterWaterController extends BaseController {
     /**
      * 修改费用-水电抄
      */
-    @SaCheckPermission("system:meterWater:edit")
+    @SaCheckPermission("property:costMeterWater:edit")
     @Log(title = "费用-水电抄", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -106,7 +106,7 @@ public class CostMeterWaterController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:meterWater:remove")
+    @SaCheckPermission("property:costMeterWater:remove")
     @Log(title = "费用-水电抄", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -40,7 +40,7 @@ public class CostPayFeeAuditController extends BaseController {
     /**
      * 查询费用-缴费审核列表
      */
-   // @SaCheckPermission("system:payFeeAudit:list")
+    @SaCheckPermission("property:payFeeAudit:list")
     @GetMapping("/list")
     public TableDataInfo<CostPayFeeAuditVo> list(CostPayFeeAuditBo bo, PageQuery pageQuery) {
         return costPayFeeAuditService.queryPageList(bo, pageQuery);
@@ -49,7 +49,7 @@ public class CostPayFeeAuditController extends BaseController {
     /**
      * 导出费用-缴费审核列表
      */
-    @SaCheckPermission("system:payFeeAudit:export")
+    @SaCheckPermission("property:payFeeAudit:export")
     @Log(title = "费用-缴费审核", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(CostPayFeeAuditBo bo, HttpServletResponse response) {
@@ -62,7 +62,7 @@ public class CostPayFeeAuditController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:payFeeAudit:query")
+    @SaCheckPermission("property:payFeeAudit:query")
     @GetMapping("/{id}")
     public R<CostPayFeeAuditVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {
@@ -72,7 +72,7 @@ public class CostPayFeeAuditController extends BaseController {
     /**
      * 新增费用-缴费审核
      */
-    @SaCheckPermission("system:payFeeAudit:add")
+    @SaCheckPermission("property:payFeeAudit:add")
     @Log(title = "费用-缴费审核", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -83,7 +83,7 @@ public class CostPayFeeAuditController extends BaseController {
     /**
      * 修改费用-缴费审核
      */
-    @SaCheckPermission("system:payFeeAudit:edit")
+    @SaCheckPermission("property:payFeeAudit:edit")
     @Log(title = "费用-缴费审核", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -96,7 +96,7 @@ public class CostPayFeeAuditController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:payFeeAudit:remove")
+    @SaCheckPermission("property:payFeeAudit:remove")
     @Log(title = "费用-缴费审核", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -24,7 +24,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**
  * 费用-抄类型
- * 前端访问路由地址为:/system/returnPayFee
+ * 前端访问路由地址为:/property/returnPayFee
  *
  * @author mocheng
  * @date 2025-07-17
@@ -40,7 +40,7 @@ public class CostReturnPayFeeController extends BaseController {
     /**
      * 查询费用-抄类型列表
      */
-    //@SaCheckPermission("system:returnPayFee:list")
+    @SaCheckPermission("property:returnPayFee:list")
     @GetMapping("/list")
     public TableDataInfo<CostReturnPayFeeVo> list(CostReturnPayFeeBo bo, PageQuery pageQuery) {
         return costReturnPayFeeService.queryPageList(bo, pageQuery);
@@ -49,7 +49,7 @@ public class CostReturnPayFeeController extends BaseController {
     /**
      * 导出费用-抄类型列表
      */
-    @SaCheckPermission("system:returnPayFee:export")
+    @SaCheckPermission("property:returnPayFee:export")
     @Log(title = "费用-抄类型", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(CostReturnPayFeeBo bo, HttpServletResponse response) {
@@ -62,7 +62,7 @@ public class CostReturnPayFeeController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:returnPayFee:query")
+    @SaCheckPermission("property:returnPayFee:query")
     @GetMapping("/{id}")
     public R<CostReturnPayFeeVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {
@@ -72,7 +72,7 @@ public class CostReturnPayFeeController extends BaseController {
     /**
      * 新增费用-抄类型
      */
-    @SaCheckPermission("system:returnPayFee:add")
+    @SaCheckPermission("property:returnPayFee:add")
     @Log(title = "费用-抄类型", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -83,7 +83,7 @@ public class CostReturnPayFeeController extends BaseController {
     /**
      * 修改费用-抄类型
      */
-    @SaCheckPermission("system:returnPayFee:edit")
+    @SaCheckPermission("property:returnPayFee:edit")
     @Log(title = "费用-抄类型", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -96,7 +96,7 @@ public class CostReturnPayFeeController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:returnPayFee:remove")
+    @SaCheckPermission("property:returnPayFee:remove")
     @Log(title = "费用-抄类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -40,7 +40,7 @@ public class CustomerFeedbacksController extends BaseController {
     /**
      * 查询客户服务-意见反馈列表
      */
-    @SaCheckPermission("system:feedbacks:list")
+   // @SaCheckPermission("system:feedbacks:list")
     @GetMapping("/list")
     public TableDataInfo<CustomerFeedbacksVo> list(CustomerFeedbacksBo bo, PageQuery pageQuery) {
         return customerFeedbacksService.queryPageList(bo, pageQuery);
@@ -62,7 +62,9 @@ public class CustomerFeedbacksController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:feedbacks:query")
+    //
+    //
+    // @SaCheckPermission("system:feedbacks:query")
     @GetMapping("/{id}")
     public R<CustomerFeedbacksVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {

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

@@ -33,4 +33,15 @@ public class EnumFetcherController {
         List<Map<Object, Object>> map = enumFetcherService.getEnumValues(name);
         return R.ok(map);
     }
+
+    /**
+     * 根据工单类型或部门下的排班人员
+     * @param type
+     * @return
+     */
+    @GetMapping("/enum-getShiftScheduler/{type}")
+    public R<List<Map<Object, Object>>> getShiftScheduler(@PathVariable("type") String type) {
+        List<Map<Object, Object>> map = enumFetcherService.getShiftScheduler(type);
+        return R.ok(map);
+    }
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/FaqManagementController.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.FaqManagementVo;
+import org.dromara.property.domain.bo.FaqManagementBo;
+import org.dromara.property.service.IFaqManagementService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 常见问题管理
+ * 前端访问路由地址为:/property/faqManagement
+ *
+ * @author LionLi
+ * @date 2025-08-18
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/faqManagement")
+public class FaqManagementController extends BaseController {
+
+    private final IFaqManagementService faqManagementService;
+
+    /**
+     * 查询常见问题管理列表
+     */
+    @SaCheckPermission("property:faqManagement:list")
+    @GetMapping("/list")
+    public TableDataInfo<FaqManagementVo> list(FaqManagementBo bo, PageQuery pageQuery) {
+        return faqManagementService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出常见问题管理列表
+     */
+    @SaCheckPermission("property:faqManagement:export")
+    @Log(title = "常见问题管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(FaqManagementBo bo, HttpServletResponse response) {
+        List<FaqManagementVo> list = faqManagementService.queryList(bo);
+        ExcelUtil.exportExcel(list, "常见问题管理", FaqManagementVo.class, response);
+    }
+
+    /**
+     * 获取常见问题管理详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("property:faqManagement:query")
+    @GetMapping("/{id}")
+    public R<FaqManagementVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(faqManagementService.queryById(id));
+    }
+
+    /**
+     * 新增常见问题管理
+     */
+    @SaCheckPermission("property:faqManagement:add")
+    @Log(title = "常见问题管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody FaqManagementBo bo) {
+        return toAjax(faqManagementService.insertByBo(bo));
+    }
+
+    /**
+     * 修改常见问题管理
+     */
+    @SaCheckPermission("property:faqManagement:edit")
+    @Log(title = "常见问题管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody FaqManagementBo bo) {
+        return toAjax(faqManagementService.updateByBo(bo));
+    }
+
+    /**
+     * 删除常见问题管理
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("property:faqManagement:remove")
+    @Log(title = "常见问题管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(faqManagementService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -40,7 +40,7 @@ public class InspectionItemController extends BaseController {
     /**
      * 查询巡检项目列表
      */
-    @SaCheckPermission("system:item:list")
+    @SaCheckPermission("property:inspectionItem:list")
     @GetMapping("/list")
     public TableDataInfo<InspectionItemVo> list(InspectionItemBo bo, PageQuery pageQuery) {
         return inspectionItemService.queryPageList(bo, pageQuery);
@@ -49,7 +49,7 @@ public class InspectionItemController extends BaseController {
     /**
      * 导出巡检项目列表
      */
-    @SaCheckPermission("system:item:export")
+    @SaCheckPermission("property:inspectionItem:export")
     @Log(title = "巡检项目", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(InspectionItemBo bo, HttpServletResponse response) {
@@ -62,7 +62,7 @@ public class InspectionItemController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:item:query")
+    @SaCheckPermission("property:inspectionItem:query")
     @GetMapping("/{id}")
     public R<InspectionItemVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {
@@ -72,7 +72,7 @@ public class InspectionItemController extends BaseController {
     /**
      * 新增巡检项目
      */
-    @SaCheckPermission("system:item:add")
+    @SaCheckPermission("property:inspectionItem:add")
     @Log(title = "巡检项目", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -83,7 +83,7 @@ public class InspectionItemController extends BaseController {
     /**
      * 修改巡检项目
      */
-    @SaCheckPermission("system:item:edit")
+    @SaCheckPermission("property:inspectionItem:edit")
     @Log(title = "巡检项目", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -96,7 +96,7 @@ public class InspectionItemController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:item:remove")
+    @SaCheckPermission("property:inspectionItem:remove")
     @Log(title = "巡检项目", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -40,7 +40,7 @@ public class InspectionPointController extends BaseController {
     /**
      * 查询巡检点列表
      */
-    @SaCheckPermission("system:point:list")
+    @SaCheckPermission("property:inspectionPoint:list")
     @GetMapping("/list")
     public TableDataInfo<InspectionPointVo> list(InspectionPointBo bo, PageQuery pageQuery) {
         return inspectionPointService.queryPageList(bo, pageQuery);
@@ -49,7 +49,7 @@ public class InspectionPointController extends BaseController {
     /**
      * 导出巡检点列表
      */
-    @SaCheckPermission("system:point:export")
+    @SaCheckPermission("property:inspectionPoint:export")
     @Log(title = "巡检点", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(InspectionPointBo bo, HttpServletResponse response) {
@@ -62,7 +62,7 @@ public class InspectionPointController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:point:query")
+    @SaCheckPermission("property:inspectionPoint:query")
     @GetMapping("/{id}")
     public R<InspectionPointVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {
@@ -72,7 +72,7 @@ public class InspectionPointController extends BaseController {
     /**
      * 新增巡检点
      */
-    @SaCheckPermission("system:point:add")
+    @SaCheckPermission("property:inspectionPoint:add")
     @Log(title = "巡检点", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -83,7 +83,7 @@ public class InspectionPointController extends BaseController {
     /**
      * 修改巡检点
      */
-    @SaCheckPermission("system:point:edit")
+    @SaCheckPermission("property:inspectionPoint:edit")
     @Log(title = "巡检点", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -96,7 +96,7 @@ public class InspectionPointController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:point:remove")
+    @SaCheckPermission("property:inspectionPoint:remove")
     @Log(title = "巡检点", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -40,7 +40,7 @@ public class InspectionRouteController extends BaseController {
     /**
      * 查询巡检路线列表
      */
-    //@SaCheckPermission("system:route:list")
+    @SaCheckPermission("property:inspectionRoute:list")
     @GetMapping("/list")
     public TableDataInfo<InspectionRouteVo> list(InspectionRouteBo bo, PageQuery pageQuery) {
         return inspectionRouteService.queryPageList(bo, pageQuery);
@@ -49,7 +49,7 @@ public class InspectionRouteController extends BaseController {
     /**
      * 导出巡检路线列表
      */
-    @SaCheckPermission("system:route:export")
+    @SaCheckPermission("property:inspectionRoute:export")
     @Log(title = "巡检路线", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(InspectionRouteBo bo, HttpServletResponse response) {
@@ -62,7 +62,7 @@ public class InspectionRouteController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:route:query")
+    @SaCheckPermission("property:inspectionRoute:query")
     @GetMapping("/{id}")
     public R<InspectionRouteVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {
@@ -72,7 +72,7 @@ public class InspectionRouteController extends BaseController {
     /**
      * 新增巡检路线
      */
-    @SaCheckPermission("system:route:add")
+    @SaCheckPermission("property:inspectionRoute:add")
     @Log(title = "巡检路线", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -83,7 +83,7 @@ public class InspectionRouteController extends BaseController {
     /**
      * 修改巡检路线
      */
-    @SaCheckPermission("system:route:edit")
+    @SaCheckPermission("property:inspectionRoute:edit")
     @Log(title = "巡检路线", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -96,7 +96,7 @@ public class InspectionRouteController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:route:remove")
+    @SaCheckPermission("property:inspectionRoute:remove")
     @Log(title = "巡检路线", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -6,9 +6,6 @@ import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.dromara.property.domain.bo.InspectionTaskDetailBo;
-import org.dromara.property.domain.vo.InspectionTaskDetailVo;
-import org.dromara.property.service.IInspectionTaskDetailService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -20,14 +17,17 @@ 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.InspectionTaskDetailVo;
+import org.dromara.property.domain.bo.InspectionTaskDetailBo;
+import org.dromara.property.service.IInspectionTaskDetailService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**
  * 巡检明细
- * 前端访问路由地址为:/system/taskDetail
+ * 前端访问路由地址为:/property/taskDetail
  *
  * @author mocheng
- * @date 2025-07-15
+ * @date 2025-08-08
  */
 @Validated
 @RequiredArgsConstructor
@@ -40,7 +40,7 @@ public class InspectionTaskDetailController extends BaseController {
     /**
      * 查询巡检明细列表
      */
-    //@SaCheckPermission("system:taskDetail:list")
+    @SaCheckPermission("property:taskDetail:list")
     @GetMapping("/list")
     public TableDataInfo<InspectionTaskDetailVo> list(InspectionTaskDetailBo bo, PageQuery pageQuery) {
         return inspectionTaskDetailService.queryPageList(bo, pageQuery);
@@ -49,7 +49,7 @@ public class InspectionTaskDetailController extends BaseController {
     /**
      * 导出巡检明细列表
      */
-    @SaCheckPermission("system:taskDetail:export")
+    @SaCheckPermission("property:taskDetail:export")
     @Log(title = "巡检明细", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(InspectionTaskDetailBo bo, HttpServletResponse response) {
@@ -62,7 +62,7 @@ public class InspectionTaskDetailController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:taskDetail:query")
+    @SaCheckPermission("property:taskDetail:query")
     @GetMapping("/{id}")
     public R<InspectionTaskDetailVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {
@@ -72,7 +72,7 @@ public class InspectionTaskDetailController extends BaseController {
     /**
      * 新增巡检明细
      */
-    @SaCheckPermission("system:taskDetail:add")
+    @SaCheckPermission("property:taskDetail:add")
     @Log(title = "巡检明细", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -83,7 +83,7 @@ public class InspectionTaskDetailController extends BaseController {
     /**
      * 修改巡检明细
      */
-    @SaCheckPermission("system:taskDetail:edit")
+    @SaCheckPermission("property:taskDetail:edit")
     @Log(title = "巡检明细", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -96,7 +96,7 @@ public class InspectionTaskDetailController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:taskDetail:remove")
+    @SaCheckPermission("property:taskDetail:remove")
     @Log(title = "巡检明细", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -40,7 +40,7 @@ public class MachineMaintainPlanController extends BaseController {
     /**
      * 查询设备保养计划列表
      */
-    @SaCheckPermission("system:maintainPlan:list")
+    @SaCheckPermission("property:maintainPlan:list")
     @GetMapping("/list")
     public TableDataInfo<MachineMaintainPlanVo> list(MachineMaintainPlanBo bo, PageQuery pageQuery) {
         return machineMaintainPlanService.queryPageList(bo, pageQuery);
@@ -49,7 +49,7 @@ public class MachineMaintainPlanController extends BaseController {
     /**
      * 导出设备保养计划列表
      */
-    @SaCheckPermission("system:maintainPlan:export")
+    @SaCheckPermission("property:maintainPlan:export")
     @Log(title = "设备保养计划", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(MachineMaintainPlanBo bo, HttpServletResponse response) {
@@ -62,7 +62,7 @@ public class MachineMaintainPlanController extends BaseController {
      *
      * @param id 主键
      */
-    //@SaCheckPermission("system:maintainPlan:query")
+    @SaCheckPermission("property:maintainPlan:query")
     @GetMapping("/{id}")
     public R<MachineMaintainPlanVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {
@@ -72,7 +72,7 @@ public class MachineMaintainPlanController extends BaseController {
     /**
      * 新增设备保养计划
      */
-    @SaCheckPermission("system:maintainPlan:add")
+    @SaCheckPermission("property:maintainPlan:add")
     @Log(title = "设备保养计划", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -83,7 +83,7 @@ public class MachineMaintainPlanController extends BaseController {
     /**
      * 修改设备保养计划
      */
-    @SaCheckPermission("system:maintainPlan:edit")
+    @SaCheckPermission("property:maintainPlan:edit")
     @Log(title = "设备保养计划", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -96,7 +96,7 @@ public class MachineMaintainPlanController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:maintainPlan:remove")
+    @SaCheckPermission("property:maintainPlan:remove")
     @Log(title = "设备保养计划", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -24,7 +24,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**
  * 设备保养任务明细
- * 前端访问路由地址为:/domain/maintainTaskDetail
+ * 前端访问路由地址为:/property/maintainTaskDetail
  *
  * @author mocheng
  * @date 2025-07-16
@@ -40,7 +40,7 @@ public class MachineMaintainTaskDetailController extends BaseController {
     /**
      * 查询设备保养任务明细列表
      */
-    @SaCheckPermission("domain:maintainTaskDetail:list")
+    @SaCheckPermission("property:maintainTaskDetail:list")
     @GetMapping("/list")
     public TableDataInfo<MachineMaintainTaskDetailVo> list(MachineMaintainTaskDetailBo bo, PageQuery pageQuery) {
         return machineMaintainTaskDetailService.queryPageList(bo, pageQuery);
@@ -49,7 +49,7 @@ public class MachineMaintainTaskDetailController extends BaseController {
     /**
      * 导出设备保养任务明细列表
      */
-    @SaCheckPermission("domain:maintainTaskDetail:export")
+    @SaCheckPermission("property:maintainTaskDetail:export")
     @Log(title = "设备保养任务明细", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(MachineMaintainTaskDetailBo bo, HttpServletResponse response) {
@@ -62,7 +62,7 @@ public class MachineMaintainTaskDetailController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("domain:maintainTaskDetail:query")
+    @SaCheckPermission("property:maintainTaskDetail:query")
     @GetMapping("/{id}")
     public R<MachineMaintainTaskDetailVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {
@@ -72,7 +72,7 @@ public class MachineMaintainTaskDetailController extends BaseController {
     /**
      * 新增设备保养任务明细
      */
-    @SaCheckPermission("domain:maintainTaskDetail:add")
+    @SaCheckPermission("property:maintainTaskDetail:add")
     @Log(title = "设备保养任务明细", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -83,7 +83,7 @@ public class MachineMaintainTaskDetailController extends BaseController {
     /**
      * 修改设备保养任务明细
      */
-    @SaCheckPermission("domain:maintainTaskDetail:edit")
+    @SaCheckPermission("property:maintainTaskDetail:edit")
     @Log(title = "设备保养任务明细", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -96,7 +96,7 @@ public class MachineMaintainTaskDetailController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("domain:maintainTaskDetail:remove")
+    @SaCheckPermission("property:maintainTaskDetail:remove")
     @Log(title = "设备保养任务明细", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -40,7 +40,7 @@ public class MeetAttachController extends BaseController {
     /**
      * 查询分页会议室增值服务列表
      */
-   // @SaCheckPermission("property:attach:list")
+    @SaCheckPermission("property:conferenceAddServices:list")
     @GetMapping("/list")
     public TableDataInfo<MeetAttachVo> pageList(MeetAttachBo bo, PageQuery pageQuery) {
         return meetAttachService.queryPageList(bo, pageQuery);
@@ -57,7 +57,7 @@ public class MeetAttachController extends BaseController {
      *
      * @param id 主键
      */
-    //@SaCheckPermission("property:attach:query")
+    @SaCheckPermission("property:conferenceAddServices:query")
     @GetMapping("/{id}")
     public R<MeetAttachVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {
@@ -67,7 +67,7 @@ public class MeetAttachController extends BaseController {
     /**
      * 新增会议室增值服务
      */
-    @SaCheckPermission("property:attach:add")
+    @SaCheckPermission("property:conferenceAddServices:add")
     @Log(title = "会议室增值服务", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -78,7 +78,7 @@ public class MeetAttachController extends BaseController {
     /**
      * 修改会议室增值服务
      */
-   // @SaCheckPermission("property:attach:edit")
+    @SaCheckPermission("property:conferenceAddServices:edit")
     @Log(title = "会议室增值服务", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -91,7 +91,7 @@ public class MeetAttachController extends BaseController {
      *
      * @param ids 主键串
      */
-   // @SaCheckPermission("property:attach:remove")
+    @SaCheckPermission("property:conferenceAddServices:remove")
     @Log(title = "会议室增值服务", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -1,5 +1,6 @@
 package org.dromara.property.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
@@ -40,7 +41,7 @@ public class MeetBookingController extends BaseController {
     /**
      * 查询会议预约记录列表
      */
-    //@SaCheckPermission("property:meetbooking:list")
+    @SaCheckPermission("property:meetbooking:list")
     @GetMapping("/list")
     public TableDataInfo<MeetBookingVo> list(MeetBookingBo bo, PageQuery pageQuery) {
         return meetBookingService.queryPageList(bo, pageQuery);
@@ -64,7 +65,7 @@ public class MeetBookingController extends BaseController {
      *
      * @param id 主键
      */
-    //@SaCheckPermission("property:meetbooking:query")
+    @SaCheckPermission("property:meetbooking:query")
     @GetMapping("/{id}")
     public R<MeetBookingDetailVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {
@@ -74,7 +75,7 @@ public class MeetBookingController extends BaseController {
     /**
      * 新增会议预约
      */
-    //@SaCheckPermission("property:meetbooking:add")
+    @SaCheckPermission("property:meetbooking:add")
     @Log(title = "会议预约", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -85,7 +86,7 @@ public class MeetBookingController extends BaseController {
     /**
      * 修改会议预约
      */
-   // @SaCheckPermission("property:meetbooking:edit")
+    @SaCheckPermission("property:meetbooking:edit")
     @Log(title = "会议预约", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()

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

@@ -43,7 +43,7 @@ public class MeetController extends BaseController {
     /**
      * 查询会议室管理列表
      */
-   // @SaCheckPermission("property:meet:list")
+    @SaCheckPermission("property:meet:list")
     @Operation
     @GetMapping("/list")
     public TableDataInfo<MeetVo> list(MeetBo bo, PageQuery pageQuery) {
@@ -66,7 +66,7 @@ public class MeetController extends BaseController {
      *
      * @param id 主键
      */
-    //@SaCheckPermission("property:meet:query")
+    @SaCheckPermission("property:meet:query")
     @Operation
     @GetMapping("/{id}")
     public R<MeetVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) {

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/PopularActivitiesController.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.PopularActivitiesVo;
+import org.dromara.property.domain.bo.PopularActivitiesBo;
+import org.dromara.property.service.IPopularActivitiesService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 热门活动
+ * 前端访问路由地址为:/property/activities
+ *
+ * @author LionLi
+ * @date 2025-08-19
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/activities")
+public class PopularActivitiesController extends BaseController {
+
+    private final IPopularActivitiesService popularActivitiesService;
+
+    /**
+     * 查询热门活动列表
+     */
+   // @SaCheckPermission("property:activities:list")
+    @GetMapping("/list")
+    public TableDataInfo<PopularActivitiesVo> list(PopularActivitiesBo bo, PageQuery pageQuery) {
+        return popularActivitiesService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出热门活动列表
+     */
+    @SaCheckPermission("property:activities:export")
+    @Log(title = "热门活动", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(PopularActivitiesBo bo, HttpServletResponse response) {
+        List<PopularActivitiesVo> list = popularActivitiesService.queryList(bo);
+        ExcelUtil.exportExcel(list, "热门活动", PopularActivitiesVo.class, response);
+    }
+
+    /**
+     * 获取热门活动详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("property:activities:query")
+    @GetMapping("/{id}")
+    public R<PopularActivitiesVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(popularActivitiesService.queryById(id));
+    }
+
+    /**
+     * 新增热门活动
+     */
+    @SaCheckPermission("property:activities:add")
+    @Log(title = "热门活动", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody PopularActivitiesBo bo) {
+        return toAjax(popularActivitiesService.insertByBo(bo));
+    }
+
+    /**
+     * 修改热门活动
+     */
+    @SaCheckPermission("property:activities:edit")
+    @Log(title = "热门活动", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody PopularActivitiesBo bo) {
+        return toAjax(popularActivitiesService.updateByBo(bo));
+    }
+
+    /**
+     * 删除热门活动
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("property:activities:remove")
+    @Log(title = "热门活动", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(popularActivitiesService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -0,0 +1,95 @@
+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.QuestionnaireVo;
+import org.dromara.property.domain.bo.QuestionnaireBo;
+import org.dromara.property.service.IQuestionnaireService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 调查问卷
+ * 前端访问路由地址为:/property/questionnaire
+ *
+ * @author LionLi
+ * @date 2025-08-14
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/questionnaire")
+public class QuestionnaireController extends BaseController {
+
+    private final IQuestionnaireService questionnaireService;
+
+    /**
+     * 查询调查问卷列表
+     */
+    @SaCheckPermission("property:questionnaire:list")
+    @GetMapping("/list")
+    public TableDataInfo<QuestionnaireVo> list(QuestionnaireBo bo, PageQuery pageQuery) {
+        return questionnaireService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取调查问卷详细信息
+     *
+     * @param id 主键
+     */
+   // @SaCheckPermission("property:questionnaire:query")
+    @GetMapping("/{id}")
+    public R<QuestionnaireVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(questionnaireService.queryById(id));
+    }
+
+    /**
+     * 新增调查问卷
+     */
+    @SaCheckPermission("property:questionnaire:add")
+    @Log(title = "调查问卷", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody QuestionnaireBo bo) {
+        return toAjax(questionnaireService.insertByBo(bo));
+    }
+
+    /**
+     * 修改调查问卷
+     */
+    @SaCheckPermission("property:questionnaire:edit")
+    @Log(title = "调查问卷", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody QuestionnaireBo bo) {
+        return toAjax(questionnaireService.updateByBo(bo));
+    }
+
+    /**
+     * 删除调查问卷
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("property:questionnaire:remove")
+    @Log(title = "调查问卷", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(questionnaireService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -26,7 +26,7 @@ import java.util.List;
 
 /**
  * 【业务管理-工单处理】
- * 前端访问路由地址为:/system/workOrders
+ * 前端访问路由地址为:/property/workOrders
  *
  * @author mocheng
  * @date 2025-07-07
@@ -42,7 +42,7 @@ public class ServiceWorkOrdersController extends BaseController {
     /**
      * 查询【工单处理】列表
      */
-    //@SaCheckPermission("system:workOrders:list")
+    @SaCheckPermission("property:workOrders:list")
     @GetMapping("/list")
     public TableDataInfo<ServiceWorkOrdersVo> list(ServiceWorkOrdersBo bo, PageQuery pageQuery) {
         return serviceWorkOrdersService.queryPageList(bo, pageQuery);
@@ -51,7 +51,7 @@ public class ServiceWorkOrdersController extends BaseController {
     /**
      * 导出【工单处理】列表
      */
-   // @SaCheckPermission("system:workOrders:export")
+    @SaCheckPermission("property:workOrders:export")
     @Log(title = "【工单处理】", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ServiceWorkOrdersBo bo, HttpServletResponse response) {
@@ -64,7 +64,7 @@ public class ServiceWorkOrdersController extends BaseController {
      *
      * @param id 主键
      */
-   // @SaCheckPermission("system:workOrders:query")
+    @SaCheckPermission("property:workOrders:query")
     @GetMapping("/{id}")
     public R<ServiceWorkOrdersInfoVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {
@@ -74,7 +74,7 @@ public class ServiceWorkOrdersController extends BaseController {
     /**
      * 新增【工单处理】
      */
-   // @SaCheckPermission("system:workOrders:add")
+    @SaCheckPermission("property:workOrders:add")
     @Log(title = "【工单处理】", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -85,20 +85,40 @@ public class ServiceWorkOrdersController extends BaseController {
     /**
      * 修改【工单处理】
      */
-    //@SaCheckPermission("system:workOrders:edit")
+    @SaCheckPermission("property:workOrders:edit")
     @Log(title = "【工单处理】", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody ServiceWorkOrdersBo bo) {
         return toAjax(serviceWorkOrdersService.updateByBo(bo));
     }
+    /**
+     * 派单【工单处理】
+     */
+    @SaCheckPermission("property:workOrders:dispatch")
+    @Log(title = "【工单处理】", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/dispatch")
+    public R<Void> dispatch(@Validated(EditGroup.class) @RequestBody ServiceWorkOrdersBo bo) {
+        return toAjax(serviceWorkOrdersService.updateByBo(bo));
+    }
 
+    /**
+     * 抢单【工单处理】
+     */
+    @SaCheckPermission("property:workOrders:grab")
+    @Log(title = "【工单处理】", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("grab")
+    public R<Void> grab(@Validated(EditGroup.class) @RequestBody ServiceWorkOrdersBo bo) {
+        return toAjax(serviceWorkOrdersService.updateByBo(bo));
+    }
     /**
      * 删除【工单处理】
      *
      * @param ids 主键串
      */
-   // @SaCheckPermission("system:workOrders:remove")
+    @SaCheckPermission("property:workOrders:remove")
     @Log(title = "【工单处理】", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -24,7 +24,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**
  * 【工单类型】
- * 前端访问路由地址为:/system/workOrdersType
+ * 前端访问路由地址为:/property/workOrdersType
  *
  * @author mocheng
  * @date 2025-07-09
@@ -40,7 +40,7 @@ public class ServiceWorkOrdersTypeController extends BaseController {
     /**
      * 查询【工单类型】列表
      */
-    @SaCheckPermission("system:workOrdersType:list")
+    @SaCheckPermission("property:workOrdersType:list")
     @GetMapping("/list")
     public TableDataInfo<ServiceWorkOrdersTypeVo> list(ServiceWorkOrdersTypeBo bo, PageQuery pageQuery) {
         return serviceWorkOrdersTypeService.queryPageList(bo, pageQuery);
@@ -49,7 +49,7 @@ public class ServiceWorkOrdersTypeController extends BaseController {
     /**
      * 导出【工单类型】列表
      */
-    @SaCheckPermission("system:workOrdersType:export")
+    @SaCheckPermission("property:workOrdersType:export")
     @Log(title = "【导出工单类型】", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ServiceWorkOrdersTypeBo bo, HttpServletResponse response) {
@@ -62,7 +62,7 @@ public class ServiceWorkOrdersTypeController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:workOrdersType:query")
+    @SaCheckPermission("property:workOrdersType:query")
     @GetMapping("/{id}")
     public R<ServiceWorkOrdersTypeVo> getInfo(@NotNull(message = "主键不能为空")
                                               @PathVariable("id") Long id) {
@@ -72,7 +72,7 @@ public class ServiceWorkOrdersTypeController extends BaseController {
     /**
      * 新增【工单类型】
      */
-    @SaCheckPermission("system:workOrdersType:add")
+    @SaCheckPermission("property:workOrdersType:add")
     @Log(title = "【新增工单类型】", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -83,7 +83,7 @@ public class ServiceWorkOrdersTypeController extends BaseController {
     /**
      * 修改【工单类型】
      */
-    @SaCheckPermission("system:workOrdersType:edit")
+    @SaCheckPermission("property:workOrdersType:edit")
     @Log(title = "【工单类型】", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -96,7 +96,7 @@ public class ServiceWorkOrdersTypeController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:workOrdersType:remove")
+    @SaCheckPermission("property:workOrdersType:remove")
     @Log(title = "【工单类型】", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
@@ -107,7 +107,6 @@ public class ServiceWorkOrdersTypeController extends BaseController {
     /**
      * 查询【工单类型】树结构
      */
-    @SaCheckPermission("system:workOrdersType:list")
     @GetMapping("/typeTree")
     public R<List<ServiceWorkOrdersTypeVo>> typeTree() {
         return R.ok(serviceWorkOrdersTypeService.typeTree());
@@ -119,7 +118,6 @@ public class ServiceWorkOrdersTypeController extends BaseController {
      * @param bo 工单类型
      * @return 工单类型列表
      */
-    @SaCheckPermission("system:workOrdersType:list")
     @GetMapping("/queryList")
     public R<List<ServiceWorkOrdersTypeVo>> queryList(ServiceWorkOrdersTypeBo bo) {
         return R.ok(serviceWorkOrdersTypeService.queryList(bo));

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

@@ -1,17 +1,23 @@
 package org.dromara.property.controller;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.UUID;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.api.config.ConfigService;
+
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.common.core.constant.GlobalConstants;
 import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.websocket.dto.WebSocketMessageDto;
+import org.dromara.common.websocket.holder.WebSocketSessionHolder;
+import org.dromara.common.websocket.utils.WebSocketUtils;
 import org.dromara.property.domain.bo.QrCodeInfo;
 import org.dromara.resource.api.RemoteMessageService;
 import org.dromara.system.api.RemoteConfigService;
@@ -49,8 +55,6 @@ public class TbVisitorManagementController extends BaseController {
     @DubboReference
     private final RemoteConfigService remoteConfigService;
 
-    @DubboReference(stub = "true")
-    private final RemoteMessageService remoteMessageService;
 
 
 
@@ -77,8 +81,7 @@ public class TbVisitorManagementController extends BaseController {
         String s = remoteConfigService.selectQrTimeOut();
         int i = Integer.parseInt(s);
         UUID value = UUID.randomUUID();
-        RedisUtils.setCacheObject("Qrcode"+value, qrCodeInfo);
-        RedisUtils.expire("Qrcode", i);
+        RedisUtils.setCacheObject(GlobalConstants.CAPTCHA_CODE_KEY+"Qrcode"+value, qrCodeInfo, Duration.ofSeconds(i));
         return R.ok(value.toString());
     }
 
@@ -87,16 +90,22 @@ public class TbVisitorManagementController extends BaseController {
      * @param qrcode
      * @return
      */
-    @PostMapping("/useqr")
+    @GetMapping("/useqr")
     public R<String> useqr(String qrcode) {
-        QrCodeInfo qrCodeInfo = RedisUtils.getCacheObject("Qrcode" + qrcode);
+        QrCodeInfo qrCodeInfo = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY +"Qrcode" + qrcode);
         if (qrCodeInfo==null) {
             return R.fail("二维码已过期");
         }
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("type","qrcode");
         jsonObject.put("date",qrcode);
-        remoteMessageService.publishMessage(List.of(qrCodeInfo.getUserid()),jsonObject.toString());
+        System.out.println(WebSocketSessionHolder.getSessions(1L));
+        System.out.println(WebSocketSessionHolder.getSessionsAll());
+        WebSocketMessageDto webSocketMessage = new WebSocketMessageDto();
+        webSocketMessage.setMessage(jsonObject.toString());
+        webSocketMessage.setSessionKeys(List.of(qrCodeInfo.getUserid()));
+        WebSocketUtils.publishMessage(webSocketMessage);
+//        WebSocketUtils.sendMessage(qrCodeInfo.getUserid(),jsonObject.toString());
         return R.ok("二维码可用");
 
     }
@@ -127,26 +136,46 @@ public class TbVisitorManagementController extends BaseController {
     /**
      * 小程序新增访客管理
      */
-    @SaCheckPermission("property:visitorManagement:add")
+//    @SaCheckPermission("property:visitorManagement:add")
     @Log(title = "访客管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/add")
     public R<Void> add(@Validated(AddGroup.class) @RequestBody TbVisitorManagementBo bo) {
-        QrCodeInfo info = RedisUtils.getCacheObject("Qrcode" + bo.getQrCodeId());
+        QrCodeInfo info = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY +"Qrcode" + bo.getQrCodeId());
         if (info==null){
             return R.fail("请确认Qr码有效");
         }
+        bo.setType(0);
         return toAjax(tbVisitorManagementService.insertByBo(bo));
     }
 
+    /**
+     * h5端新增访客管理
+     * @param bo
+     * @return
+     */
+    @SaCheckPermission("property:visitorManagement:addH5VistorManagement")
+    @Log(title = "访客管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/addH5VistorManagement")
+    public R<Void> addH5VistorManagement(@Validated(AddGroup.class) @RequestBody TbVisitorManagementBo bo) {
+        QrCodeInfo info = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY +"Qrcode" + bo.getQrCodeId());
+        if (info==null){
+            return R.fail("请确认Qr码有效");
+        }
+        bo.setType(0);
+        return toAjax(tbVisitorManagementService.insertH5ByBo(bo));
+    }
+
     /**
      * pc端新增访客管理
      */
-    @SaCheckPermission("property:visitorManagement::addVisitorManagement")
+    @SaCheckPermission("property:visitorManagement:addVisitorManagement")
     @Log(title = "访客管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping
     public R<Void> addVistorManagement(@Validated(AddGroup.class) @RequestBody TbVisitorManagementBo bo) {
+        bo.setType(1);
         return toAjax(tbVisitorManagementService.insertVistorManagementByBo(bo));
     }
 

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

@@ -0,0 +1,106 @@
+package org.dromara.property.controller.attendance;
+
+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.attendanceVo.AttendanceAreaVo;
+import org.dromara.property.domain.bo.attendanceBo.AttendanceAreaBo;
+import org.dromara.property.service.attendanceService.IAttendanceAreaService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 区域区域管理
+ * 前端访问路由地址为:/property/attendanceArea
+ *
+ * @author LionLi
+ * @date 2025-08-13
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/attendanceArea")
+public class AttendanceAreaController extends BaseController {
+
+    private final IAttendanceAreaService attendanceAreaService;
+
+    /**
+     * 查询区域区域管理列表
+     */
+    @SaCheckPermission("property:attendanceArea:list")
+    @GetMapping("/list")
+    public TableDataInfo<AttendanceAreaVo> list(AttendanceAreaBo bo, PageQuery pageQuery) {
+        return attendanceAreaService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出区域区域管理列表
+     */
+    @SaCheckPermission("property:attendanceArea:export")
+    @Log(title = "区域区域管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(AttendanceAreaBo bo, HttpServletResponse response) {
+        List<AttendanceAreaVo> list = attendanceAreaService.queryList(bo);
+        ExcelUtil.exportExcel(list, "区域区域管理", AttendanceAreaVo.class, response);
+    }
+
+    /**
+     * 获取区域区域管理详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("property:attendanceArea:query")
+    @GetMapping("/{id}")
+    public R<AttendanceAreaVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(attendanceAreaService.queryById(id));
+    }
+
+    /**
+     * 新增区域区域管理
+     */
+    @SaCheckPermission("property:attendanceArea:add")
+    @Log(title = "区域区域管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody AttendanceAreaBo bo) {
+        return toAjax(attendanceAreaService.insertByBo(bo));
+    }
+
+    /**
+     * 修改区域区域管理
+     */
+    @SaCheckPermission("property:attendanceArea:edit")
+    @Log(title = "区域区域管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody AttendanceAreaBo bo) {
+        return toAjax(attendanceAreaService.updateByBo(bo));
+    }
+
+    /**
+     * 删除区域区域管理
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("property:attendanceArea:remove")
+    @Log(title = "区域区域管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(attendanceAreaService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -0,0 +1,106 @@
+package org.dromara.property.controller.attendance;
+
+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.attendanceVo.AttendanceAreaDeviceVo;
+import org.dromara.property.domain.bo.attendanceBo.AttendanceAreaDeviceBo;
+import org.dromara.property.service.attendanceService.IAttendanceAreaDeviceService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 摄像头区域中间
+ * 前端访问路由地址为:/property/areaDevice
+ *
+ * @author LionLi
+ * @date 2025-08-17
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/areaDevice")
+public class AttendanceAreaDeviceController extends BaseController {
+
+    private final IAttendanceAreaDeviceService attendanceAreaDeviceService;
+
+    /**
+     * 查询摄像头区域中间列表
+     */
+    @SaCheckPermission("property:areaDevice:list")
+    @GetMapping("/list")
+    public TableDataInfo<AttendanceAreaDeviceVo> list(AttendanceAreaDeviceBo bo, PageQuery pageQuery) {
+        return attendanceAreaDeviceService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出摄像头区域中间列表
+     */
+    @SaCheckPermission("property:areaDevice:export")
+    @Log(title = "摄像头区域中间", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(AttendanceAreaDeviceBo bo, HttpServletResponse response) {
+        List<AttendanceAreaDeviceVo> list = attendanceAreaDeviceService.queryList(bo);
+        ExcelUtil.exportExcel(list, "摄像头区域中间", AttendanceAreaDeviceVo.class, response);
+    }
+
+    /**
+     * 获取摄像头区域中间详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("property:areaDevice:query")
+    @GetMapping("/{id}")
+    public R<AttendanceAreaDeviceVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(attendanceAreaDeviceService.queryById(id));
+    }
+
+    /**
+     * 新增摄像头区域中间
+     */
+    @SaCheckPermission("property:areaDevice:add")
+    @Log(title = "摄像头区域中间", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody AttendanceAreaDeviceBo bo) {
+        return toAjax(attendanceAreaDeviceService.insertByBo(bo));
+    }
+
+    /**
+     * 修改摄像头区域中间
+     */
+    @SaCheckPermission("property:areaDevice:edit")
+    @Log(title = "摄像头区域中间", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody AttendanceAreaDeviceBo bo) {
+        return toAjax(attendanceAreaDeviceService.updateByBo(bo));
+    }
+
+    /**
+     * 删除摄像头区域中间
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("property:areaDevice:remove")
+    @Log(title = "摄像头区域中间", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(attendanceAreaDeviceService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -0,0 +1,106 @@
+package org.dromara.property.controller.attendance;
+
+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.attendanceVo.AttendanceArrangementAreaVo;
+import org.dromara.property.domain.bo.attendanceBo.AttendanceArrangementAreaBo;
+import org.dromara.property.service.attendanceService.IAttendanceArrangementAreaService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 区域排班中间
+ * 前端访问路由地址为:/property/arrangementArea
+ *
+ * @author LionLi
+ * @date 2025-08-18
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/arrangementArea")
+public class AttendanceArrangementAreaController extends BaseController {
+
+    private final IAttendanceArrangementAreaService attendanceArrangementAreaService;
+
+    /**
+     * 查询区域排班中间列表
+     */
+    @SaCheckPermission("property:arrangementArea:list")
+    @GetMapping("/list")
+    public TableDataInfo<AttendanceArrangementAreaVo> list(AttendanceArrangementAreaBo bo, PageQuery pageQuery) {
+        return attendanceArrangementAreaService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出区域排班中间列表
+     */
+    @SaCheckPermission("property:arrangementArea:export")
+    @Log(title = "区域排班中间", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(AttendanceArrangementAreaBo bo, HttpServletResponse response) {
+        List<AttendanceArrangementAreaVo> list = attendanceArrangementAreaService.queryList(bo);
+        ExcelUtil.exportExcel(list, "区域排班中间", AttendanceArrangementAreaVo.class, response);
+    }
+
+    /**
+     * 获取区域排班中间详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("property:arrangementArea:query")
+    @GetMapping("/{id}")
+    public R<AttendanceArrangementAreaVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(attendanceArrangementAreaService.queryById(id));
+    }
+
+    /**
+     * 新增区域排班中间
+     */
+    @SaCheckPermission("property:arrangementArea:add")
+    @Log(title = "区域排班中间", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody AttendanceArrangementAreaBo bo) {
+        return toAjax(attendanceArrangementAreaService.insertByBo(bo));
+    }
+
+    /**
+     * 修改区域排班中间
+     */
+    @SaCheckPermission("property:arrangementArea:edit")
+    @Log(title = "区域排班中间", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody AttendanceArrangementAreaBo bo) {
+        return toAjax(attendanceArrangementAreaService.updateByBo(bo));
+    }
+
+    /**
+     * 删除区域排班中间
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("property:arrangementArea:remove")
+    @Log(title = "区域排班中间", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(attendanceArrangementAreaService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -1,4 +1,4 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.attendance;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.validation.constraints.NotEmpty;
@@ -13,9 +13,9 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.property.domain.bo.AttendanceArrangementBo;
-import org.dromara.property.domain.vo.AttendanceArrangementVo;
-import org.dromara.property.service.IAttendanceArrangementService;
+import org.dromara.property.domain.bo.attendanceBo.AttendanceArrangementBo;
+import org.dromara.property.domain.vo.attendanceVo.AttendanceArrangementVo;
+import org.dromara.property.service.attendanceService.IAttendanceArrangementService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -45,6 +45,9 @@ public class AttendanceArrangementController extends BaseController {
         return attendanceArrangementService.queryPageList(bo, pageQuery);
     }
 
+
+
+
     /**
      * 查询某个月的日历排班信息的排班列表
      */

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

@@ -1,4 +1,4 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.attendance;
 
 import java.util.List;
 
@@ -17,9 +17,9 @@ 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.AttendanceClockDateVo;
-import org.dromara.property.domain.bo.AttendanceClockDateBo;
-import org.dromara.property.service.IAttendanceClockDateService;
+import org.dromara.property.domain.vo.attendanceVo.AttendanceClockDateVo;
+import org.dromara.property.domain.bo.attendanceBo.AttendanceClockDateBo;
+import org.dromara.property.service.attendanceService.IAttendanceClockDateService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**

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

@@ -1,4 +1,4 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.attendance;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.servlet.http.HttpServletResponse;
@@ -15,9 +15,9 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.property.domain.bo.AttendanceFixedScheduleBo;
-import org.dromara.property.domain.vo.AttendanceFixedScheduleVo;
-import org.dromara.property.service.IAttendanceFixedScheduleService;
+import org.dromara.property.domain.bo.attendanceBo.AttendanceFixedScheduleBo;
+import org.dromara.property.domain.vo.attendanceVo.AttendanceFixedScheduleVo;
+import org.dromara.property.service.attendanceService.IAttendanceFixedScheduleService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -1,4 +1,4 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.attendance;
 
 import java.util.List;
 
@@ -17,9 +17,9 @@ 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.AttendanceGroupVo;
-import org.dromara.property.domain.bo.AttendanceGroupBo;
-import org.dromara.property.service.IAttendanceGroupService;
+import org.dromara.property.domain.vo.attendanceVo.AttendanceGroupVo;
+import org.dromara.property.domain.bo.attendanceBo.AttendanceGroupBo;
+import org.dromara.property.service.attendanceService.IAttendanceGroupService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**

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

@@ -1,4 +1,4 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.attendance;
 
 import java.util.List;
 
@@ -17,9 +17,9 @@ 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.AttendanceScheduleCycleVo;
-import org.dromara.property.domain.bo.AttendanceScheduleCycleBo;
-import org.dromara.property.service.IAttendanceScheduleCycleService;
+import org.dromara.property.domain.vo.attendanceVo.AttendanceScheduleCycleVo;
+import org.dromara.property.domain.bo.attendanceBo.AttendanceScheduleCycleBo;
+import org.dromara.property.service.attendanceService.IAttendanceScheduleCycleService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**

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

@@ -1,4 +1,4 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.attendance;
 
 import java.util.List;
 
@@ -17,9 +17,9 @@ 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.AttendanceShiftVo;
-import org.dromara.property.domain.bo.AttendanceShiftBo;
-import org.dromara.property.service.IAttendanceShiftService;
+import org.dromara.property.domain.vo.attendanceVo.AttendanceShiftVo;
+import org.dromara.property.domain.bo.attendanceBo.AttendanceShiftBo;
+import org.dromara.property.service.attendanceService.IAttendanceShiftService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**

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

@@ -1,4 +1,4 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.attendance;
 
 import java.util.List;
 
@@ -17,9 +17,9 @@ 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.AttendanceShiftScheduleVo;
-import org.dromara.property.domain.bo.AttendanceShiftScheduleBo;
-import org.dromara.property.service.IAttendanceShiftScheduleService;
+import org.dromara.property.domain.vo.attendanceVo.AttendanceShiftScheduleVo;
+import org.dromara.property.domain.bo.attendanceBo.AttendanceShiftScheduleBo;
+import org.dromara.property.service.attendanceService.IAttendanceShiftScheduleService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**

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

@@ -1,26 +1,28 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.attendance;
 
-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 jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
 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.AttendanceUserGroupVo;
-import org.dromara.property.domain.bo.AttendanceUserGroupBo;
-import org.dromara.property.service.IAttendanceUserGroupService;
+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.property.domain.bo.attendanceBo.AttendanceUserGroupBo;
+import org.dromara.property.domain.vo.attendanceVo.AttendanceUserGroupVo;
+import org.dromara.property.service.attendanceService.IAttendanceUserGroupService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * 排班明细
@@ -65,7 +67,7 @@ public class AttendanceUserGroupController extends BaseController {
     @SaCheckPermission("Property:userGroup:query")
     @GetMapping("/{id}")
     public R<AttendanceUserGroupVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable("id") Long id) {
+                                            @PathVariable("id") Long id) {
         return R.ok(attendanceUserGroupService.queryById(id));
     }
 
@@ -103,4 +105,25 @@ public class AttendanceUserGroupController extends BaseController {
                           @PathVariable("ids") Long[] ids) {
         return toAjax(attendanceUserGroupService.deleteWithValidByIds(List.of(ids), true));
     }
+
+    /**
+     * 查询排班的班表视图
+     */
+    @SaCheckPermission("Property:userGroup:queryScheduleView")
+    @GetMapping("/queryScheduleView")
+    public TableDataInfo<AttendanceUserGroupVo> queryScheduleView(AttendanceUserGroupBo bo, PageQuery pageQuery) {
+        return attendanceUserGroupService.queryScheduleView(bo, pageQuery);
+    }
+
+    /**
+     * 查询今天的排班人员信息
+     *
+     * @return 返回排班人员信息
+     */
+    @GetMapping("/query/currentDay")
+    public R<List<AttendanceUserGroupVo>> queryCurrentSchedu() {
+        return R.ok(attendanceUserGroupService.queryAttendPersonInfo(new Date()));
+    }
+
+
 }

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

@@ -1,4 +1,4 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.attendance;
 
 import java.util.List;
 
@@ -17,9 +17,9 @@ 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.AttendanceWeekSetVo;
-import org.dromara.property.domain.bo.AttendanceWeekSetBo;
-import org.dromara.property.service.IAttendanceWeekSetService;
+import org.dromara.property.domain.vo.attendanceVo.AttendanceWeekSetVo;
+import org.dromara.property.domain.bo.attendanceBo.AttendanceWeekSetBo;
+import org.dromara.property.service.attendanceService.IAttendanceWeekSetService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**

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

@@ -1,4 +1,4 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.attendance;
 
 import java.util.List;
 
@@ -17,9 +17,9 @@ 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.AttendanceWeeksetShiftVo;
-import org.dromara.property.domain.bo.AttendanceWeeksetShiftBo;
-import org.dromara.property.service.IAttendanceWeeksetShiftService;
+import org.dromara.property.domain.vo.attendanceVo.AttendanceWeeksetShiftVo;
+import org.dromara.property.domain.bo.attendanceBo.AttendanceWeeksetShiftBo;
+import org.dromara.property.service.attendanceService.IAttendanceWeeksetShiftService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**

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

@@ -1,4 +1,4 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.cleanOrder;
 
 import java.util.List;
 
@@ -17,9 +17,9 @@ 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.CleanVo;
-import org.dromara.property.domain.bo.CleanBo;
-import org.dromara.property.service.ICleanService;
+import org.dromara.property.domain.vo.cleanOrderVo.CleanVo;
+import org.dromara.property.domain.bo.cleanOrderBo.CleanBo;
+import org.dromara.property.service.cleanOrderService.ICleanService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**

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

@@ -1,8 +1,7 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.cleanOrder;
 
 import java.util.List;
 
-import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
@@ -18,9 +17,9 @@ 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.CleanOrderVo;
-import org.dromara.property.domain.bo.CleanOrderBo;
-import org.dromara.property.service.ICleanOrderService;
+import org.dromara.property.domain.vo.cleanOrderVo.CleanOrderVo;
+import org.dromara.property.domain.bo.cleanOrderBo.CleanOrderBo;
+import org.dromara.property.service.cleanOrderService.ICleanOrderService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**
@@ -41,7 +40,7 @@ public class CleanOrderController extends BaseController {
     /**
      * 查询保洁订单列表
      */
-    @SaCheckPermission("property:clean_order:list")
+    //@SaCheckPermission("property:clean_order:list")
     @GetMapping("/list")
     public TableDataInfo<CleanOrderVo> list(CleanOrderBo bo, PageQuery pageQuery) {
         return cleanOrderService.queryPageList(bo, pageQuery);

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

@@ -1,4 +1,4 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.cleanOrder;
 
 import java.util.List;
 
@@ -17,9 +17,9 @@ 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.CleanserverOrderVo;
-import org.dromara.property.domain.bo.CleanserverOrderBo;
-import org.dromara.property.service.ICleanserverOrderService;
+import org.dromara.property.domain.vo.cleanOrderVo.CleanserverOrderVo;
+import org.dromara.property.domain.bo.cleanOrderBo.CleanserverOrderBo;
+import org.dromara.property.service.cleanOrderService.ICleanserverOrderService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**

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

@@ -0,0 +1,47 @@
+package org.dromara.property.controller.mobile;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+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.property.domain.bo.InspectionPointBo;
+import org.dromara.property.domain.vo.InspectionPointVo;
+import org.dromara.property.service.IInspectionPointService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 巡检点
+ * 前端访问路由地址为:/property/point
+ *
+ * @author mocheng
+ * @date 2025-07-11
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/mobile/point")
+public class MInspectionPointController extends BaseController {
+
+    private final IInspectionPointService inspectionPointService;
+    /**
+     * 扫码签到
+     */
+    @PostMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody InspectionPointBo bo) {
+        return toAjax(inspectionPointService.updateByBo(bo));
+    }
+}

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

@@ -0,0 +1,59 @@
+package org.dromara.property.controller.mobile;
+
+import lombok.RequiredArgsConstructor;
+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.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.property.domain.bo.ServiceWorkOrdersBo;
+import org.dromara.property.domain.bo.mobile.MServiceWorkOrdersBo;
+import org.dromara.property.domain.vo.ServiceWorkOrdersVo;
+import org.dromara.property.domain.vo.mobile.MServiceWorkOrdersVo;
+import org.dromara.property.service.IServiceWorkOrdersService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 【业务管理-工单处理】
+ *
+ * @author mocheng
+ * @date 2025-07-07
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/mobile/workOrders")
+public class MServiceWorkOrdersController extends BaseController {
+
+    private final IServiceWorkOrdersService serviceWorkOrdersService;
+
+    /**
+     * 小程序新增【工单处理】
+     */
+    @Log(title = "【小程序新增工单处理】", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody MServiceWorkOrdersBo bo) {
+        return toAjax(serviceWorkOrdersService.insertMServiceWorkOrdersBo(bo));
+    }
+    /**
+     * 小程序查询【工单处理】
+     */
+    @GetMapping("/list")
+    public TableDataInfo<MServiceWorkOrdersVo> list(ServiceWorkOrdersBo bo, PageQuery pageQuery) {
+        return serviceWorkOrdersService.queryMobilePageList(bo, pageQuery);
+    }
+    /**
+     * 修改【工单处理】
+     */
+    @Log(title = "【工单处理】", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ServiceWorkOrdersBo bo) {
+        return toAjax(serviceWorkOrdersService.updateByBo(bo));
+    }
+}

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

@@ -0,0 +1,116 @@
+package org.dromara.property.controller.smartDevicesController;
+
+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.smartDevicesVo.TbLightInfoVo;
+import org.dromara.property.domain.bo.smartDevicesBo.TbLightInfoBo;
+import org.dromara.property.service.smartDevicesService.ITbLightInfoService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 灯控开关信息
+ * 前端访问路由地址为:/property/lightInfo
+ *
+ * @author lsm
+ * @since 2025-08-19
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/lightInfo")
+public class TbLightInfoController extends BaseController {
+
+    private final ITbLightInfoService tbLightInfoService;
+
+    /**
+     * 查询灯控开关信息列表
+     */
+    @SaCheckPermission("property:lightInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo<TbLightInfoVo> list(TbLightInfoBo bo, PageQuery pageQuery) {
+        return tbLightInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出灯控开关信息列表
+     */
+    @SaCheckPermission("property:lightInfo:export")
+    @Log(title = "灯控开关信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TbLightInfoBo bo, HttpServletResponse response) {
+        List<TbLightInfoVo> list = tbLightInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "灯控开关信息", TbLightInfoVo.class, response);
+    }
+
+    /**
+     * 获取灯控开关信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("property:lightInfo:query")
+    @GetMapping("/{id}")
+    public R<TbLightInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                    @PathVariable("id") Long id) {
+        return R.ok(tbLightInfoService.queryById(id));
+    }
+
+    /**
+     * 新增灯控开关信息
+     */
+    @SaCheckPermission("property:lightInfo:add")
+    @Log(title = "灯控开关信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TbLightInfoBo bo) {
+        return toAjax(tbLightInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改灯控开关信息
+     */
+    @SaCheckPermission("property:lightInfo:edit")
+    @Log(title = "灯控开关信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TbLightInfoBo bo) {
+        return toAjax(tbLightInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除灯控开关信息
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("property:lightInfo:remove")
+    @Log(title = "灯控开关信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(tbLightInfoService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 灯开关控制
+     *
+     * @param bo bean
+     */
+    @PostMapping("/switch")
+    public R<Void> switchSingleLight(@RequestBody TbLightInfoBo bo) {
+        return toAjax(tbLightInfoService.switchSingleLight(bo));
+    }
+}

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

@@ -1,4 +1,4 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.smartDevicesController;
 
 import java.util.List;
 
@@ -17,9 +17,9 @@ 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.TbMeterConfigVo;
-import org.dromara.property.domain.bo.TbMeterConfigBo;
-import org.dromara.property.service.ITbMeterConfigService;
+import org.dromara.property.domain.vo.smartDevicesVo.TbMeterConfigVo;
+import org.dromara.property.domain.bo.smartDevicesBo.TbMeterConfigBo;
+import org.dromara.property.service.smartDevicesService.ITbMeterConfigService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**

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

@@ -1,4 +1,4 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.smartDevicesController;
 
 import java.util.List;
 
@@ -17,9 +17,9 @@ 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.TbMeterInfoVo;
-import org.dromara.property.domain.bo.TbMeterInfoBo;
-import org.dromara.property.service.ITbMeterInfoService;
+import org.dromara.property.domain.vo.smartDevicesVo.TbMeterInfoVo;
+import org.dromara.property.domain.bo.smartDevicesBo.TbMeterInfoBo;
+import org.dromara.property.service.smartDevicesService.ITbMeterInfoService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**

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

@@ -1,4 +1,4 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.smartDevicesController;
 
 import java.util.List;
 
@@ -17,9 +17,9 @@ 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.TbMeterRecordVo;
-import org.dromara.property.domain.bo.TbMeterRecordBo;
-import org.dromara.property.service.ITbMeterRecordService;
+import org.dromara.property.domain.vo.smartDevicesVo.TbMeterRecordVo;
+import org.dromara.property.domain.bo.smartDevicesBo.TbMeterRecordBo;
+import org.dromara.property.service.smartDevicesService.ITbMeterRecordService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**

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

@@ -1,4 +1,4 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.smartDevicesController;
 
 import java.util.List;
 
@@ -17,9 +17,9 @@ 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.TbMeterRoomVo;
-import org.dromara.property.domain.bo.TbMeterRoomBo;
-import org.dromara.property.service.ITbMeterRoomService;
+import org.dromara.property.domain.vo.smartDevicesVo.TbMeterRoomVo;
+import org.dromara.property.domain.bo.smartDevicesBo.TbMeterRoomBo;
+import org.dromara.property.service.smartDevicesService.ITbMeterRoomService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**

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

@@ -0,0 +1,67 @@
+package org.dromara.property.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.io.Serial;
+
+/**
+ * APP功能列表对象 app_fun_list
+ *
+ * @author mocheng
+ * @date 2025-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("app_fun_list")
+public class AppFunList extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 角色id
+     */
+    private Long roleid;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * icon
+     */
+    private String icon;
+
+    /**
+     * url
+     */
+    private String url;
+
+    /**
+     * 创建人id
+     */
+    private Long createById;
+
+    /**
+     * 更新人id
+     */
+    private Long updateById;
+
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
+
+}

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

@@ -0,0 +1,46 @@
+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;
+
+/**
+ * 区域区域管理对象 attendance_area
+ *
+ * @author LionLi
+ * @date 2025-08-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("attendance_area")
+public class AttendanceArea extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+//    /**
+//     * 摄像机id
+//     */
+//    private Long deviceManageId;
+
+    /**
+     * 区域
+     */
+    private String area;
+
+    /**
+     * 备注
+     */
+    private String reamark;
+
+
+}

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

@@ -0,0 +1,41 @@
+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;
+
+/**
+ * 摄像头区域中间对象 attendance_area_device
+ *
+ * @author LionLi
+ * @date 2025-08-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("attendance_area_device")
+public class AttendanceAreaDevice extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 区域id
+     */
+    private Long areaId;
+
+    /**
+     * 摄像机id
+     */
+    private Long deviceManageId;
+
+
+}

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

@@ -8,8 +8,6 @@ import org.dromara.common.tenant.core.TenantEntity;
 
 import java.io.Serial;
 import java.time.LocalDate;
-import java.util.Date;
-import java.util.List;
 
 /**
  * 排班对象 attendance_arrangement
@@ -41,6 +39,11 @@ public class AttendanceArrangement extends TenantEntity {
      */
     private Long groupId;
 
+//    /**
+//     * 区域id
+//     */
+//    private Long areaId;
+
     /**
      * 排班类型：1-固定班制，2-排班制
      */

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

@@ -0,0 +1,41 @@
+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;
+
+/**
+ * 区域排班中间对象 attendance_arrangement_area
+ *
+ * @author LionLi
+ * @date 2025-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("attendance_arrangement_area")
+public class AttendanceArrangementArea extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 区域id
+     */
+    private Long areaId;
+
+    /**
+     * 排班id
+     */
+    private Long shceduleId;
+
+
+}

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

@@ -5,7 +5,6 @@ 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;
 

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

@@ -6,7 +6,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
-import java.util.List;
 
 /**
  * 考勤组基本信息对象 attendance_group

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

@@ -1,15 +1,11 @@
 package org.dromara.property.domain;
 
-import cn.hutool.core.date.DateTime;
 import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serial;
 

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

@@ -1,11 +1,13 @@
 package org.dromara.property.domain;
 
-import org.dromara.common.tenant.core.TenantEntity;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
 
 import java.io.Serial;
+import java.time.LocalDate;
 
 /**
  * 排班明细对象 attendance_user_group
@@ -22,7 +24,7 @@ public class AttendanceUserGroup extends TenantEntity {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private Long id;
@@ -37,20 +39,32 @@ public class AttendanceUserGroup extends TenantEntity {
      */
     private Long employeeId;
 
-    /**
-     * 员工姓名
-     */
-    private String employeeName;
+//    /**
+//     * 员工姓名
+//     */
+//    private String employeeName;
 
     /**
      * 部门ID
      */
     private Long deptId;
 
+//    /**
+//     * 部门名称
+//     */
+//    private String deptName;
+
     /**
-     * 部门名称
+     * 开始日期
      */
-    private String deptName;
+    private LocalDate startDate;
+
+    /**
+     * 结束日期(仅date_type=3时有效)
+     */
+    private LocalDate endDate;
+
+//    private SysUser sysUser;
 
 
 }

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

@@ -60,6 +60,14 @@ public class CleanOrder extends TenantEntity {
      * 保洁类型
      */
     private String type;
+    /**
+     * 签到方式(1现场拍照2摄像头签到)
+     */
+    private String signType;
+    /**
+     * 签到图片
+     */
+    private String signImgUrl;
     /**
      * 评价
      */
@@ -69,7 +77,7 @@ public class CleanOrder extends TenantEntity {
      */
     private String serviceEvaluaText;
     /**
-     * 图片
+     * 评价图片
      */
     private String imgUrl;
     /**

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

@@ -30,7 +30,7 @@ public class CustomerFeedbacks extends TenantEntity {
     /**
      * 反馈类型(0保修1保洁2会议)
      */
-    private String feedbackType;
+    private Long feedbackType;
 
     /**
      * 反馈人
@@ -58,7 +58,7 @@ public class CustomerFeedbacks extends TenantEntity {
     private String feedbackImg;
 
     /**
-     * 是否转至工单
+     * 工单id
      */
     private Long orderId;
     /**

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

@@ -0,0 +1,61 @@
+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;
+
+/**
+ * 常见问题管理对象 faq_management
+ *
+ * @author LionLi
+ * @date 2025-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("faq_management")
+public class FaqManagement extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 标题
+     */
+    private String head;
+
+    /**
+     * 分类
+     */
+    private String type;
+
+    /**
+     * 浏览量
+     */
+    private Long pageView;
+
+    /**
+     * 内容
+     */
+    private String contents;
+
+    /**
+     * 状态(1草稿 2已发布)
+     */
+    private String status;
+
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
+
+}

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

@@ -1,5 +1,7 @@
 package org.dromara.property.domain;
 
+import jakarta.validation.constraints.NotNull;
+import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
@@ -55,9 +57,10 @@ public class InspectionRoutePoint extends TenantEntity {
     private String remark;
 
     /**
-     * 搜索值
+     * 排序
      */
-    private String searchValue;
+    @NotNull(message = "排序不能为空", groups = { EditGroup.class })
+    private Integer sort;
 
 
 }

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

@@ -4,8 +4,10 @@ import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.common.translation.annotation.Translation;
 import java.util.Date;
-
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.common.translation.constant.TransConstant;
 
 import java.io.Serial;
 
@@ -13,7 +15,7 @@ import java.io.Serial;
  * 巡检明细对象 inspection_task_detail
  *
  * @author mocheng
- * @date 2025-07-15
+ * @date 2025-08-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -55,20 +57,60 @@ public class InspectionTaskDetail extends TenantEntity {
     private String patrolType;
 
     /**
-     * 签到类型
+     * 签到类型(1.现场拍照、2.摄像头签到、3.现场扫码)
      */
     private String signType;
 
+    /**
+     * 实际巡检时间
+     */
+    private Date actualInspectionTime;
+
+    /**
+     * 实际签到状态(1已签到2.未签到)
+     */
+    private String actualSignState;
+
     /**
      * 巡检状态(0未完成,1已完成)
      */
     private String inspectionState;
 
     /**
-     * 巡检照片
+     * 巡检图片
      */
     private String inspectionImage;
 
+    /**
+     * 计划巡检人
+     */
+    private String planInspectionPerson;
+
+    /**
+     * 实际巡检人
+     */
+    private String actualInspectionPerson;
+
+    /**
+     * 任务状态
+     */
+    private String taskStatus;
+
+    /**
+     * 巡检结果
+     */
+    private String inspectionResults;
+
+    /**
+     * 巡检描述
+     */
+    private String inspectionDesc;
+
+    /**
+     * 巡检位置
+     */
+    private String inspectionLocation;
+
     /**
      * 实际巡检时间
      */
@@ -89,4 +131,10 @@ public class InspectionTaskDetail extends TenantEntity {
      */
     private Date pointEndTime;
 
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
+
 }

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

@@ -94,9 +94,18 @@ public class Meet extends TenantEntity {
     private String appointmentTime;
 
     /**
-     * 开放时段
+     * 图片
      */
-    private String openHours;
+    private String picture;
+
+    /**
+     * 开放开始时段
+     */
+    private String openStartHours;
+    /**
+     * 开放结束时段
+     */
+    private String openEndHours;
 
     /**
      * 状态(0启用,1禁用)

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

@@ -0,0 +1,68 @@
+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;
+
+/**
+ * 热门活动对象 popular_activities
+ *
+ * @author LionLi
+ * @date 2025-08-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("popular_activities")
+public class PopularActivities extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 头部照片
+     */
+    private String headImgUrl;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 活动内容
+     */
+    private String activeContent;
+
+    /**
+     * 状态（1.未开始 2.进行中 3.已结束）
+     */
+    private String status;
+
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
+
+}

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

@@ -0,0 +1,61 @@
+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 java.io.Serial;
+
+/**
+ * 调查问卷对象 questionnaire
+ *
+ * @author LionLi
+ * @date 2025-08-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("questionnaire")
+public class Questionnaire extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 标题
+     */
+    private String head;
+
+    /**
+     * 描述
+     */
+    private String depict;
+
+    /**
+     * 是否匿名收集
+     */
+    private String isAnonyCollec;
+
+    /**
+     * 是否多次提交
+     */
+    private String isCommit;
+
+    /**
+     * 截止日期
+     */
+    private Date deadline;
+
+    /**
+     * 状态(1草稿2已发布3未发布)
+     */
+    private String status;
+
+}

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

@@ -0,0 +1,61 @@
+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;
+
+/**
+ * 调查问卷问题对象 questionnaire_question
+ *
+ * @author LionLi
+ * @date 2025-08-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("questionnaire_question")
+public class QuestionnaireQuestion extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 调查问卷id
+     */
+    private Long questionnaireId;
+
+    /**
+     * 标题
+     */
+    private String head;
+
+    /**
+     * 问题类型(1单行文本2多行文本3单选题4多选题5评分题6日期选择)
+     */
+    private String type;
+
+    /**
+     * 是否必填(1不必填2必填)
+     */
+    private String isRequired;
+
+    /**
+     * 描述
+     */
+    private String depict;
+
+    /**
+     * 排序
+     */
+    private Long sort;
+
+
+}

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

@@ -0,0 +1,51 @@
+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;
+
+/**
+ * 调查问卷问题选项对象 questionnaire_question_item
+ *
+ * @author LionLi
+ * @date 2025-08-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("questionnaire_question_item")
+public class QuestionnaireQuestionItem extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 问题id
+     */
+    private Long questionId;
+
+    /**
+     * 选项内容
+     */
+    private String itemContent;
+
+    /**
+     * 排序
+     */
+    private Long sort;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

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

@@ -108,6 +108,12 @@ public class ResidentPerson extends TenantEntity {
      * e8平台id
      */
     private Long eEightId;
+
+    /**
+     * 人员标签类型
+     */
+    private Integer rosterType;
+
     /**
      * 创建人id
      */

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

@@ -1,6 +1,4 @@
 package org.dromara.property.domain;
-
-import cn.idev.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -40,7 +38,7 @@ public class ServiceWorkOrders extends TenantEntity {
      */
     private String orderName;
     /**
-     * 权重
+     * 权重(1一般2紧急3危急)
      */
     private String processingWeight;
     /**
@@ -49,7 +47,7 @@ public class ServiceWorkOrders extends TenantEntity {
     private  Long type;
 
     /**
-     * 状态
+     * 状态(0创建工单,1已派单2已抢单3处理中,4已完成,5已评价)
      */
     private String  status;
 
@@ -67,11 +65,11 @@ public class ServiceWorkOrders extends TenantEntity {
     /**
      * 处理人姓名
      */
-    private long handler;
+    private Long handler;
     /**
      * 抄送人
      */
-    private long ccPeople;
+    private Long ccPeople;
 
     /**
      * 地址
@@ -105,6 +103,10 @@ public class ServiceWorkOrders extends TenantEntity {
      * 工单图片
      */
     private String orderImgUrl;
+    /**
+     * 上报类型(1电话上报2现场上报,3系统上报)
+     */
+    private String reportingType;
     /**
      * 备注
      */

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

@@ -38,7 +38,7 @@ public class ServiceWorkOrdersType extends TenantEntity {
     private String orderTypeName;
 
     /**
-     * 运作模式
+     * 运作模式(0派单+抢单,1派单,2自动派单)
      */
     private String operationMode;
 
@@ -56,7 +56,10 @@ public class ServiceWorkOrdersType extends TenantEntity {
      * 是否支持转单(0支持,1不支持)
      */
     private Integer  isTransfers;
-
+    /**
+     * 权重(1一般2紧急3危急)
+     */
+    private String processingWeight;
     /**
      * 搜索值
      */

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

@@ -43,6 +43,10 @@ public class TbVisitorManagement extends TenantEntity {
      * 访客电话
      */
     private String visitorPhone;
+    /**
+     * 身份证/军
+     */
+    private String idCard;
 
     /**
      * 拜访事由
@@ -114,5 +118,8 @@ public class TbVisitorManagement extends TenantEntity {
      */
     private String searchValue;
 
-
+    /**
+     * e8平台id
+     */
+    private Long eEightId;
 }

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

@@ -0,0 +1,49 @@
+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.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.property.domain.AppFunList;
+
+/**
+ * APP功能列表业务对象 app_fun_list
+ *
+ * @author mocheng
+ * @date 2025-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = AppFunList.class, reverseConvertGenerate = false)
+public class AppFunListBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 角色id
+     */
+    private Long roleid;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * icon
+     */
+    private String icon;
+
+    /**
+     * url
+     */
+    private String url;
+
+
+}

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

@@ -50,6 +50,11 @@ public class CostCarChargeBo extends BaseEntity {
      * 车位
      */
     private String location;
+    /**
+     * 车位名称
+     */
+    private String locationName;
+
     /**
      * 缴费状态
      */

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

@@ -97,7 +97,9 @@ public class CostItemsBo extends BaseEntity {
     /**
      * 计费单价
      */
-    @NotBlank(message = "计费单价", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "计费单价不能为空", groups = { AddGroup.class, EditGroup.class })
+    @DecimalMin(value = "0.00", inclusive = false, message = "计费单价必须大于0")
+    @ExcelProperty("计费单价")
     private BigDecimal unitPrice;
 
     /**

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

@@ -29,8 +29,8 @@ public class CustomerFeedbacksBo extends BaseEntity {
     /**
      * 反馈类型(0保修1保洁2会议)
      */
-    @NotBlank(message = "反馈类型(0保修1保洁2会议)不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String feedbackType;
+    @NotNull (message = "反馈类型(0保修1保洁2会议)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long feedbackType;
 
     /**
      * 反馈人

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

@@ -0,0 +1,64 @@
+package org.dromara.property.domain.bo;
+
+import org.dromara.property.domain.FaqManagement;
+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.*;
+
+/**
+ * 常见问题管理业务对象 faq_management
+ *
+ * @author LionLi
+ * @date 2025-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = FaqManagement.class, reverseConvertGenerate = false)
+public class FaqManagementBo extends BaseEntity {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 标题
+     */
+    @NotBlank(message = "标题不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String head;
+
+    /**
+     * 分类
+     */
+    @NotBlank(message = "分类不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String type;
+
+    /**
+     * 浏览量
+     */
+    private Long pageView;
+
+    /**
+     * 内容
+     */
+    @NotBlank(message = "内容不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String contents;
+
+    /**
+     * 状态(1草稿 2已发布)
+     */
+    @NotBlank(message = "状态(1草稿 2已发布)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String status;
+
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
+
+}

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

@@ -33,6 +33,11 @@ public class InspectionRoutePointBo extends BaseEntity {
      */
    // @NotNull(message = "巡检路线id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long routeId;
+    /**
+     * 排序
+     */
+    @NotNull(message = "排序不能为空", groups = { EditGroup.class })
+    private Integer sort;
 
     /**
      * 巡检点id

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

@@ -1,5 +1,6 @@
 package org.dromara.property.domain.bo;
 
+import org.dromara.property.domain.InspectionTaskDetail;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
@@ -7,14 +8,16 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
-import org.dromara.property.domain.InspectionTaskDetail;
-
+import org.dromara.common.translation.annotation.Translation;
 import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.common.translation.constant.TransConstant;
+
 /**
  * 巡检明细业务对象 inspection_task_detail
  *
  * @author mocheng
- * @date 2025-07-15
+ * @date 2025-08-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -55,20 +58,60 @@ public class InspectionTaskDetailBo extends BaseEntity {
     private String patrolType;
 
     /**
-     * 签到类型
+     * 签到类型(1.现场拍照、2.摄像头签到、3.现场扫码)
      */
     private String signType;
 
+    /**
+     * 实际巡检时间
+     */
+    private Date actualInspectionTime;
+
+    /**
+     * 实际签到状态(1已签到2.未签到)
+     */
+    private String actualSignState;
+
     /**
      * 巡检状态(0未完成,1已完成)
      */
     private String inspectionState;
 
     /**
-     * 巡检照片
+     * 巡检图片
      */
     private String inspectionImage;
 
+    /**
+     * 计划巡检人
+     */
+    private String planInspectionPerson;
+
+    /**
+     * 实际巡检人
+     */
+    private String actualInspectionPerson;
+
+    /**
+     * 任务状态
+     */
+    private String taskStatus;
+
+    /**
+     * 巡检结果
+     */
+    private String inspectionResults;
+
+    /**
+     * 巡检描述
+     */
+    private String inspectionDesc;
+
+    /**
+     * 巡检位置
+     */
+    private String inspectionLocation;
+
     /**
      * 实际巡检时间
      */