feat(property): 添加用电/水/气趋势分析功能

# Conflicts:
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/MeterRecordConsumer.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: 1
+
+      - 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,21 +91,35 @@
             <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>
                 <nacos.password>nacos</nacos.password>
             </properties>
-
         </profile>
+
         <profile>
             <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/pom.xml

@@ -14,6 +14,7 @@
         <module>ruoyi-api-resource</module>
         <module>ruoyi-api-workflow</module>
         <module>property-api</module>
+        <module>sis-api</module>
     </modules>
 
     <artifactId>ruoyi-api</artifactId>

ruoyi-api/property-api/pom.xml

@@ -23,6 +23,11 @@
             <artifactId>ruoyi-common-core</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-dubbo</artifactId>
+        </dependency>
+
 
     </dependencies>
 

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/RemoteBuildingService.java

@@ -0,0 +1,13 @@
+package org.dromara.property.api;
+
+import org.dromara.property.api.domain.vo.RemoteBuildingVo;
+
+/**
+ * 物业楼层远程服务
+ * @author lxj
+ */
+public interface RemoteBuildingService {
+
+    RemoteBuildingVo queryBuildingById(Long id);
+
+}

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

@@ -21,10 +21,10 @@ public interface RemoteFloorService {
     List<TreeNode<Long>> queryTreeList();
 
     /**
-     * 根据单元ID查询楼层
+     * 根据楼层id查询楼层
      *
-     * @param unitId 单元ID
+     * @param buildingId 单元ID
      * @return 楼层
      */
-    List<RemoteFloorVo> queryByUnitId(Long unitId);
+    List<RemoteFloorVo> queryByBuildingId(Long buildingId);
 }

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

@@ -0,0 +1,19 @@
+package org.dromara.property.api;
+
+import org.dromara.property.api.domain.vo.RemoteResidentPersonVo;
+
+import java.util.List;
+
+/**
+ * @author lsm
+ * @apiNote RemoteResidentPersonService
+ * @since 2025/7/26
+ */
+public interface RemoteResidentPersonService {
+
+    // 查询已上传图片，未授权人员
+    List<RemoteResidentPersonVo> queryUnAuthPerson();
+
+    // 更新E8平台id
+    Boolean updateE8Id(Long personId, Long e8Id);
+}

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

@@ -1,13 +0,0 @@
-package org.dromara.property.api;
-
-import org.dromara.property.api.domain.vo.RemoteUnitVo;
-
-/**
- * 物业楼层远程服务
- * @author lxj
- */
-public interface RemoteUnitService {
-
-    RemoteUnitVo queryUnitById(Long id);
-
-}

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/RemoteBuildingVo.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @author lxj
  */
 @Data
-public class RemoteUnitVo implements Serializable {
+public class RemoteBuildingVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -11L;
@@ -21,31 +21,19 @@ public class RemoteUnitVo implements Serializable {
      */
     private Long id;
 
+    /**
+     * 园区id
+     */
     private Long communityId;
 
     /**
      * 建筑名称
      */
-    private Long buildingId;
+    private String buildingName;
 
     /**
-     * 单元名称
+     * 总层数
      */
-    private String unitName;
-
-    /**
-     * 单元层数
-     */
-    private Integer floorCount;
-
-    /**
-     * 单元户数
-     */
-    private Integer householdCount;
-
-    /**
-     * 楼梯数量
-     */
-    private Integer stairCount;
+    private Long floorCount;
 
 }

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

@@ -0,0 +1,39 @@
+package org.dromara.property.api.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author lsm
+ * @apiNote RemoteResidentPersonVo
+ * @since 2025/7/26
+ */
+@Data
+public class RemoteResidentPersonVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    private String ossId;
+
+    private String name;
+
+    private Long gender;
+
+    private String phone;
+
+    private String idCard;
+
+    private Long authGroupId;
+
+    private Date authBegDate;
+
+    private Date authEndDate;
+
+    private Integer rosterType;
+}

ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteFileService.java

@@ -1,6 +1,5 @@
 package org.dromara.resource.api;
 
-import jakarta.servlet.http.HttpServletResponse;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.resource.api.domain.RemoteFile;
 
@@ -22,6 +21,14 @@ public interface RemoteFileService {
      */
     RemoteFile upload(String name, String originalFilename, String contentType, byte[] file) throws ServiceException;
 
+    /**
+     * 文件上传
+     * @param file 文件信息
+     * @return 结果
+     * @throws ServiceException
+     */
+    RemoteFile uploadImg(byte[] file) throws ServiceException;
+
     /**
      * 通过ossId查询对应的url
      *
@@ -41,7 +48,7 @@ public interface RemoteFileService {
     /**
      * 文件下载方法，支持一次性下载完整文件
      *
-     * @param ossId    OSS对象ID
+     * @param ossId OSS对象ID
      * @return byte[] 返回下载的字节数组
      */
     byte[] downloadToByteArray(Long ossId) throws IOException;

ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteFileServiceMock.java

@@ -2,6 +2,7 @@ package org.dromara.resource.api;
 
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.resource.api.domain.RemoteFile;
 
@@ -28,6 +29,18 @@ public class RemoteFileServiceMock implements RemoteFileService {
         return null;
     }
 
+    /**
+     * 文件上传
+     *
+     * @param file 文件信息
+     * @return 结果
+     */
+    @Override
+    public RemoteFile uploadImg(byte[] file) {
+        log.warn("服务调用异常 -> 降级处理");
+        return null;
+    }
+
     /**
      * 通过ossId查询对应的url
      *
@@ -55,7 +68,7 @@ public class RemoteFileServiceMock implements RemoteFileService {
     /**
      * 文件下载方法，支持一次性下载完整文件
      *
-     * @param ossId    OSS对象ID
+     * @param ossId OSS对象ID
      * @return byte[] 返回下载的字节数组
      */
     public byte[] downloadToByteArray(Long ossId) throws IOException {

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

@@ -14,4 +14,5 @@ public interface RemoteConfigService {
      */
     boolean selectRegisterEnabled(String tenantId);
 
+    String  selectQrTimeOut();
 }

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

@@ -26,6 +26,14 @@ public interface RemoteUserService {
      */
     LoginUser getUserInfo(String username, String tenantId) throws UserException;
 
+    /**
+     * 通过用户id查询用户信息
+     *
+     * @param userId 用户id
+     * @return 结果
+     */
+    RemoteUserVo getUserInfoById(Long userId) throws UserException;
+
     /**
      * 通过用户id查询用户信息
      *
@@ -189,4 +197,10 @@ public interface RemoteUserService {
      */
     Map<Long, String> selectPostNamesByIds(List<Long> postIds);
 
+    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/pom.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-api</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>sis-api</artifactId>
+
+    <description>
+        安防api模块
+    </description>
+
+    <dependencies>
+
+        <!-- RuoYi Common Core-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+
+    </dependencies>
+
+</project>

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

@@ -0,0 +1,72 @@
+package org.dromara.sis.api;
+
+import org.dromara.sis.api.domain.RemoteSdkChannel;
+import org.dromara.sis.api.domain.RemoteSisDeviceChannel;
+import org.dromara.sis.api.domain.RemoteSisDeviceManage;
+
+import java.util.List;
+
+public interface RemoteDeviceService {
+
+
+    /**
+     * 查询所有的海康设备信息
+     *
+     * @return 返回海康设备列表
+     */
+    List<RemoteSisDeviceManage> queryHikDevices();
+
+
+    /**
+     * 更新设备在线状态
+     *
+     * @param item 设备信息
+     * @return 返回是否操作成功
+     */
+    Boolean updateDeviceState(RemoteSisDeviceManage item);
+
+    /**
+     * 根据id查询的设备信息
+     *
+     */
+     RemoteSisDeviceManage queryDeviceById(Long id);
+
+    /**
+     * 查询设备通道信息
+     *
+     * @param deviceIp 设备ip
+     * @return 返回通道列表
+     */
+    List<RemoteSisDeviceChannel> queryDeviceChannels(String deviceIp);
+
+    /**
+     * 更新设备通道在线状态
+     *
+     * @param deviceIp 设备ip
+     * @return 返回是否成功
+     */
+    Boolean updateDeviceChannelState(String deviceIp, Integer onLineState);
+
+    /**
+     * 根据ip列表删除设备通道
+     *
+     * @param list ip列表
+     * @return 返回删除条数
+     */
+    Integer deleteByChannelIps(List<String> list);
+
+    /**
+     * 批量写入设备通道
+     *
+     * @param insertData 写入数据
+     * @return 返回写入条数
+     */
+    Boolean insertChannel(List<RemoteSdkChannel> insertData);
+
+    /**
+     * 更新设备通道信息
+     * @param updateData 更新数据
+     * @return 返回更新成功数量
+     */
+    Integer updateChannelInfo(List<RemoteSisDeviceChannel> updateData);
+}

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

@@ -0,0 +1,25 @@
+package org.dromara.sis.api;
+
+import org.dromara.sis.api.domain.RemoteSdkChannel;
+import org.dromara.sis.api.domain.RemoteSisDeviceManage;
+
+import java.util.List;
+
+public interface RemoteHikSdkService {
+
+    /**
+     * 海康sdk 登录操作
+     *
+     * @param item 登录参数
+     * @return 是否登录成功
+     */
+    Boolean deviceLogin(RemoteSisDeviceManage item);
+
+    /**
+     * 获取nvr设备通道信息
+     *
+     * @param deviceIp 设备ip
+     * @return 返回通道信息
+     */
+    List<RemoteSdkChannel> getDeviceChannel(String deviceIp);
+}

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

@@ -0,0 +1,11 @@
+package org.dromara.sis.api;
+
+import org.dromara.sis.api.domain.RemotePrecautionaryVo;
+
+import java.util.List;
+import java.util.Map;
+
+public interface RemotePrecautionary {
+    List<RemotePrecautionaryVo> getList();
+    Map count();
+}

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

@@ -0,0 +1,75 @@
+package org.dromara.sis.api;
+
+import org.dromara.sis.api.domain.RemotePersonAuth;
+
+import java.util.Collection;
+
+/**
+ * @author lsm
+ * @apiNote RemoteSisAuthService
+ * @since 2025/7/24
+ */
+public interface RemoteSisAuthService {
+
+    /**
+     * 人员授权
+     *
+     * @param personAuth 人员授权信息
+     * @return Boolean
+     */
+    Boolean personAuth(RemotePersonAuth personAuth);
+
+    /**
+     * 删除人员授权信息
+     *
+     * @param personIds 入驻员工ids
+     * @param e8Ids     e8平台人员id是
+     * @return Boolean
+     */
+    Boolean deletePersonAuth(Collection<Long> personIds, Collection<Long> e8Ids);
+
+    /**
+     * 查询人员授权信息
+     *
+     * @param authGroupId 权限组id
+     * @param personId    人员id
+     * @return Boolean
+     */
+    Boolean queryPersonAuth(Long authGroupId, Long personId);
+
+    /**
+     * 通过MD5，查询华为盒子id
+     *
+     * @param imgMd5 图片MD5
+     * @return Long
+     */
+    Long queryHuaweiBoxIdByImgMd5(String imgMd5);
+
+    /**
+     * 图片写入华为盒子
+     *
+     * @param person  人员信息
+     * @param imgByte 图片字节数组
+     * @return Long 图片id
+     */
+    Long syncHuaweiBox(RemotePersonAuth person, byte[] imgByte);
+
+    /**
+     * 更新人像信息
+     *
+     * @param id          入驻员工id
+     * @param huaweiBoxId 华为盒子id
+     * @param md5Str      图片MD5
+     * @return Boolean
+     */
+    Boolean updateImgByPersonId(Long id, Long huaweiBoxId, String md5Str);
+
+    /**
+     * 图片写入E8平台
+     *
+     * @param person  人员信息
+     * @param imgByte 图片字节数组
+     * @return Long e8平台id
+     */
+    Long syncE8Plat(RemotePersonAuth person, byte[] imgByte);
+}

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

@@ -0,0 +1,12 @@
+package org.dromara.sis.api;
+
+import org.dromara.sis.api.domain.RemoteAlarmRecord;
+
+import java.util.List;
+import java.util.Map;
+
+public interface RemoteSos {
+    List<RemoteAlarmRecord> getSoslist();
+
+    Map sosCount();
+}

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/RemoteAlarmRecord.java

@@ -0,0 +1,201 @@
+package org.dromara.sis.api.domain;
+
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 报警记录实体类，对应数据库表 alarm_record
+ * 存储系统中的报警事件信息，包括设备信息、时间信息、处理状态等
+ */
+@Data
+public class RemoteAlarmRecord implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 报警记录唯一标识，对应 API 返回的 Id 字段
+     * 采用 INPUT 策略，使用 API 返回的实际 ID 值
+     */
+    private Long id;
+
+    /**
+     * 任务编码，用于标识特定的报警任务
+     */
+    private String taskCode;
+
+    /**
+     * 设备ID，关联具体的报警设备
+     */
+    private Integer deviceId;
+
+    /**
+     * 设备名称，如 "7楼办公室"
+     */
+    private String deviceName;
+
+    /**
+     * 设备许可证ID，用于唯一标识设备
+     */
+    private String deviceLicenseId;
+
+    /**
+     * 设备SIP号码，用于通信
+     */
+    private String deviceSipNum;
+
+    /**
+     * 设备所在经度
+     */
+    private Double deviceLng;
+
+    /**
+     * 设备所在纬度
+     */
+    private Double deviceLat;
+
+    /**
+     * 会议ID，关联报警处理过程中的会议
+     */
+    private Long conferenceId;
+
+    /**
+     * 会议SIP编码
+     */
+    private String confSipCode;
+
+    /**
+     * 报警状态，如 "finished"（已完成）、"noAnswer"（未接听）等
+     */
+    private String state;
+
+    /**
+     * 报警开始时间（Java Date 类型）
+     */
+    private Date startTime;
+
+    /**
+     * 报警开始时间的 Unix 时间戳（毫秒）
+     */
+    private Long startTimeUnix;
+
+    /**
+     * 报警结束时间（Java Date 类型）
+     */
+    private Date finishTime;
+
+    /**
+     * 报警结束时间的 Unix 时间戳（毫秒）
+     */
+    private Long finishTimeUnix;
+
+    /**
+     * 响铃开始时间（Java Date 类型）
+     */
+    private Date ringingTime;
+
+    /**
+     * 响铃开始时间的 Unix 时间戳（毫秒）
+     */
+    private Long ringingTimeUnix;
+
+    /**
+     * 过期时间（Java Date 类型）
+     */
+    private Date expireTime;
+
+    /**
+     * 过期时间的 Unix 时间戳（毫秒）
+     */
+    private Long expireTimeUnix;
+
+    /**
+     * 呼叫过期时间（Java Date 类型）
+     */
+    private Date callExpireTime;
+
+    /**
+     * 呼叫过期时间的 Unix 时间戳（毫秒）
+     */
+    private Long callExpireTimeUnix;
+
+    /**
+     * 呼叫开始时间（Java Date 类型）
+     */
+    private Date callTime;
+
+    /**
+     * 呼叫开始时间的 Unix 时间戳（毫秒）
+     */
+    private Long callTimeUnix;
+
+    /**
+     * 设备是否带有摄像头（0-不带，1-带）
+     */
+    private Integer deviceWithCamera;
+
+    /**
+     * 公司编码，标识所属公司
+     */
+    private String companyCode;
+
+    /**
+     * 报警类型，如 "button"（按钮报警）
+     */
+    private String alarmType;
+
+    /**
+     * 业务类型，如 "normal"（正常业务）
+     */
+    private String businessType;
+
+    /**
+     * 分组ID，用于对设备进行分组管理
+     */
+    private Integer groupId;
+
+    /**
+     * 报告通知级别
+     */
+    private Integer reportNotifyLevel;
+
+    /**
+     * 是否挂起（0-未挂起，1-挂起）
+     */
+    private Integer isHold;
+
+    /**
+     * 显示的报警类型（可能为空）
+     */
+    private String displayAlarmType;
+
+    /**
+     * 接收类型（可能为空）
+     */
+    private String acceptType;
+
+    /**
+     * 分组名称（可能为空）
+     */
+    private String groupName;
+
+    /**
+     * 设备联系人（可能为空）
+     */
+    private String deviceLinkman;
+
+    /**
+     * 设备联系电话（可能为空）
+     */
+    private String devicePhoneNum;
+
+    /**
+     * 记录创建时间，由数据库自动填充
+     * 使用 MyBatis-Plus 的自动填充功能，插入时自动设置为当前时间
+     */
+    private Date createTime;
+}

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

@@ -0,0 +1,48 @@
+package org.dromara.sis.api.domain;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author lsm
+ * @apiNote RemotePersonAuth
+ * @since 2025/7/24
+ */
+@Data
+public class RemotePersonAuth implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    private String name;
+
+    private Integer sex;
+
+    private String phone;
+
+    private String email;
+
+    private Long e8Id;
+
+    private Integer cardType = 1;
+
+    private String idCardNumber;
+
+    private String ossId;
+
+    private String carNumber;
+
+    private Long authGroupId;
+
+    private Date authBegDate;
+
+    private Date authEndDate;
+
+    private Integer rosterType;
+
+}

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

@@ -0,0 +1,63 @@
+package org.dromara.sis.api.domain;
+
+import lombok.Data;
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 预警视图对象 precautionary
+ *
+ * @author mocheng
+ * @date 2025-08-01
+ */
+@Data
+public class RemotePrecautionaryVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 预警类型
+     */
+
+    private Long type;
+
+    /**
+     * 时间
+     */
+
+    private Date time;
+
+    /**
+     * 位置
+     */
+
+    private String address;
+
+    /**
+     * 预警内容
+     */
+
+    private String msg;
+
+    /**
+     * 状态
+     */
+
+    private Long status;
+
+    /**
+     * 详情id
+     */
+
+    private Long taskId;
+
+
+}

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

@@ -0,0 +1,60 @@
+package org.dromara.sis.api.domain;
+
+import lombok.Data;
+
+@Data
+public class RemoteSdkChannel {
+
+
+    private Long deviceId;
+
+    private String nvrIp;
+
+    private Integer nvrPort;
+
+    private String nvrAccount;
+
+    private String nvrPwd;
+
+    private String nvrFactoryNo;
+
+    private Long groupId;
+
+    private String tenantId;
+
+    /**
+     * 通道id
+     */
+    private Integer channelId;
+
+    /**
+     * 通道名称
+     */
+    private String channelName;
+
+    /**
+     * 通道设备ip
+     */
+    private String channelIp;
+
+    /**
+     * 通道设备端口
+     */
+    private Short channelPort;
+
+    /**
+     * 通道账号
+     */
+    private String channelAccount;
+
+    /**
+     * 通道密码
+     */
+    private String channelPwd;
+
+    /**
+     * 通过状态 1: 在线，2：离线
+     */
+    private Integer channelStatus;
+
+}

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

@@ -0,0 +1,95 @@
+package org.dromara.sis.api.domain;
+
+import lombok.Data;
+
+@Data
+public class RemoteSisDeviceChannel {
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    private Long deviceId;
+
+    /**
+     * 设备名称
+     */
+    private String channelName;
+
+    /**
+     * 通道分组组id
+     */
+    private Long groupId;
+
+    /**
+     * 设备ip
+     */
+    private String deviceIp;
+
+    /**
+     * 设备端口
+     */
+    private Integer devicePort;
+
+    private String factoryNo;
+
+    /**
+     * 设备账号
+     */
+    private String deviceAccount;
+
+    /**
+     * 设备密码
+     */
+    private String devicePwd;
+
+    /**
+     * 设备
+     */
+    private String deviceMac;
+
+    /**
+     * 设备通道编号
+     */
+    private String channelNo;
+
+    /**
+     * 通道状态.0-离线；1-在线
+     */
+    private Integer channelState;
+
+    /**
+     * nvr 设备厂商编号
+     */
+    private String nvrFactoryNo;
+
+    /**
+     * nvr设备ip
+     */
+    private String nvrIp;
+
+    /**
+     * nvr 端口
+     */
+    private Integer nvrPort;
+
+    /**
+     * nvr 账号
+     */
+    private String nvrAccount;
+
+    /**
+     * nvr 密码
+     */
+    private String nvrPwd;
+
+    /**
+     * nvr 通道编号
+     */
+    private String nvrChannelNo;
+
+}

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

@@ -0,0 +1,94 @@
+package org.dromara.sis.api.domain;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 设备远程调用对象
+ */
+@Data
+public class RemoteSisDeviceManage implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备ip
+     */
+    private String deviceIp;
+
+    /**
+     * 设备端口
+     */
+    private Integer devicePort;
+
+    /**
+     * 设备
+     */
+    private String deviceMac;
+
+    /**
+     * 设备在线状态 0:离线 1:在线 2:未知
+     */
+    private Integer deviceStatus;
+
+    /**
+     * 设备账号
+     */
+    private String deviceAccount;
+
+    /**
+     * 设备密码
+     */
+    private String devicePwd;
+
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+
+    /**
+     * 设备厂商编号
+     */
+    private String factoryNo;
+
+    /**
+     * 设备组id
+     */
+    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-api/sis-api/src/main/java/org/dromara/sis/api/enums/DeviceTypeEnum.java

@@ -0,0 +1,21 @@
+package org.dromara.sis.api.enums;
+
+import lombok.Getter;
+
+/**
+ * 设备类型枚举
+ * @author lxj
+ */
+@Getter
+public enum DeviceTypeEnum {
+    IPC(1),
+    NVR(2),
+    DVR(3);
+
+    private final Integer type;
+
+    DeviceTypeEnum(Integer type) {
+        this.type = type;
+    }
+
+}

ruoyi-api/sis-api/src/main/java/org/dromara/sis/api/enums/FactoryNoEnum.java

@@ -0,0 +1,21 @@
+package org.dromara.sis.api.enums;
+
+import lombok.Getter;
+
+/**
+ * 设备厂商类型枚举
+ * @author lxj
+ */
+@Getter
+public enum FactoryNoEnum {
+
+    HIK("1"),
+    DAHUA("2");
+
+    private final String code;
+
+    FactoryNoEnum(String code) {
+        this.code = code;
+    }
+
+}

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-auth/src/main/java/org/dromara/auth/controller/TokenController.java

@@ -116,6 +116,11 @@ public class TokenController {
         return R.ok(loginVo);
     }
 
+    /**
+     * 校验token
+     * @param token
+     * @return
+     */
     @RequestMapping("/token/check")
     public R<LoginUser> checkToken(String token) {
         return R.ok(LoginHelper.getLoginUser(token));

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/ContentTypeEnum.java

@@ -0,0 +1,76 @@
+package org.dromara.common.core.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author lsm
+ * @apiNote ContentTypeEnum
+ * @since 2025/8/4
+ */
+@Getter
+@AllArgsConstructor
+public enum ContentTypeEnum {
+
+    /**
+     * JPEG图片类型
+     */
+    JPG("jpg", "image/jpeg"),
+
+    /**
+     * JPEG图片类型
+     */
+    JPEG("jpeg", "image/jpeg"),
+
+    /**
+     * PNG图片类型
+     */
+    PNG("png", "image/png"),
+
+    /**
+     * GIF图片类型
+     */
+    GIF("gif", "image/gif"),
+
+    WEBP("webp", "image/webp"),
+
+    SVG("svg", "image/svg+xml"),
+
+    ;
+
+    private final String extension;
+    private final String contentType;
+
+    /**
+     * 根据文件扩展名获取内容类型
+     *
+     * @param extension 文件扩展名
+     * @return 对应的内容类型，如果未找到则返回null
+     */
+    public static ContentTypeEnum ContentTypeEnum(String extension) {
+        for (ContentTypeEnum type : values()) {
+            if (type.extension.equalsIgnoreCase(extension)) {
+                return type;
+            }
+        }
+        return JPG;
+    }
+
+    /**
+     * 获取文件扩展名
+     *
+     * @return 文件扩展名
+     */
+    public String getExtension() {
+        return extension;
+    }
+
+    /**
+     * 获取内容类型
+     *
+     * @return 内容类型
+     */
+    public String getContentType() {
+        return contentType;
+    }
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/ImageType.java

@@ -0,0 +1,70 @@
+package org.dromara.common.core.enums;
+
+/**
+ * 常用文件的文件头如下：(以前六位为准)
+ *      JPEG (jpg)，文件头：FFD8FF
+ *      PNG (png)，文件头：89504E47
+ *      GIF (gif)，文件头：47494638
+ *      TIFF (tif)，文件头：49492A00
+ *      Windows Bitmap (bmp)，文件头：424D
+ *      CAD (dwg)，文件头：41433130
+ *      Adobe Photoshop (psd)，文件头：38425053
+ *      Rich Text Format (rtf)，文件头：7B5C727466
+ *      XML (xml)，文件头：3C3F786D6C
+ *      HTML (html)，文件头：68746D6C3E
+ *      Email [thorough only] (eml)，文件头：44656C69766572792D646174653A
+ *      Outlook Express (dbx)，文件头：CFAD12FEC5FD746F
+ *      Outlook (pst)，文件头：2142444E
+ *      MS Word/Excel (xls.or.doc)，文件头：D0CF11E0
+ *      MS Access (mdb)，文件头：5374616E64617264204A
+ *      WordPerfect (wpd)，文件头：FF575043
+ *      Postscript (eps.or.ps)，文件头：252150532D41646F6265
+ *      Adobe Acrobat (pdf)，文件头：255044462D312E
+ *      Quicken (qdf)，文件头：AC9EBD8F
+ *      Windows Password (pwl)，文件头：E3828596
+ *      ZIP Archive (zip)，文件头：504B0304
+ *      RAR Archive (rar)，文件头：52617221
+ *      Wave (wav)，文件头：57415645
+ *      AVI (avi)，文件头：41564920
+ *      Real Audio (ram)，文件头：2E7261FD
+ *      Real Media (rm)，文件头：2E524D46
+ *      MPEG (mpg)，文件头：000001BA
+ *      MPEG (mpg)，文件头：000001B3
+ *      Quicktime (mov)，文件头：6D6F6F76
+ *      Windows Media (asf)，文件头：3026B2758E66CF11
+ *      MIDI (mid)，文件头：4D546864
+ */
+public enum ImageType {
+    JPEG("jpg", "FFD8FF"),
+    PNG("png","89504E47"),
+    Windows_Bitmap("bmp","424D"),
+
+    GIF("gif","47494638"),
+    TIFF("tif","49492A00"),
+    CAD("dwg","41433130"),
+    Adobe_Photoshop("psd","38425053"),
+    XML("xml","3C3F786D6C"),
+    HTML("html","68746D6C3E"),
+    Adobe_Acrobat("pdf","255044462D312E"),
+    ZIP_Archive("zip","504B0304"),
+    RAR_Archive("rar","52617221"),
+    Wave("wav","57415645"),
+    AVI("avi","41564920");
+
+    private final String suffix;
+    private final String headCode;
+
+    ImageType(String suffix, String headCode) {
+        this.suffix = suffix;
+        this.headCode = headCode;
+    }
+
+    public String getSuffix() {
+        return suffix;
+    }
+
+    public String getHeadCode() {
+        return headCode;
+    }
+
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Base64Utils.java

@@ -0,0 +1,147 @@
+package org.dromara.common.core.utils;
+
+import cn.hutool.core.io.IoUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.enums.ImageType;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Base64;
+
+/**
+ * [base64 加密解密工具类]
+ *
+ * @author : [lxj]
+ * @version : [v1.0]
+ * @createTime : [2021/4/27 12:54]
+ */
+@Slf4j
+public class Base64Utils {
+
+
+    public Base64Utils(){}
+    /**
+     * 文件路径转base64
+     * @param path 文件路径
+     * @return 如果成功返回base64 字符串，否则返回null
+     */
+    public static String file2Base64(String path){
+        File f = new File(path);
+        if(f.exists()){
+            return file2Base64(f);
+        }
+        return null;
+    }
+
+    /**
+     * 文件转base64
+     * @param filePath 文件对象
+     * @return 如果成功返回base64 字符串，否则返回null
+     */
+    public static String file2Base64(File filePath){
+        return file2Base64(filePath.toPath());
+    }
+
+    /**
+     * 文件转base64
+     * @param p Path 对象
+     * @return 如果成功返回base64 字符串，否则返回null
+     */
+    public static String file2Base64(Path p) {
+        try {
+            byte[] b = Files.readAllBytes(p);
+            return byte2Base64(b);
+        } catch (IOException e) {
+            log.error("文件转base64失败, msg:" + e.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * 输入流转base64
+     * @param inputStream 输入流
+     * @return 如果成功返回base64 字符串，否则返回null
+     */
+    public static String stream2Base64(InputStream inputStream){
+        try {
+            byte [] b = IoUtil.readBytes(inputStream);
+            return byte2Base64(b);
+        } catch (Exception e) {
+            log.error("输入流转base64失败, msg:" + e.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * 字节数组转base64
+     * @param b 字节数组
+     * @return
+     */
+    public static String byte2Base64(byte [] b){
+        assert b != null && b.length > 0;
+        return Base64.getEncoder().encodeToString(b);
+    }
+
+    /**
+     * 通过文件的base计算文件的格式
+     * @param base64 文件的base64
+     * @return
+     */
+    public static String getType(String base64){
+        byte[] b = Base64.getDecoder().decode(base64);
+        return getType(b);
+    }
+
+    public static String getType(byte [] b){
+        try {
+            String xxx = bytesToHexString(b);
+            assert xxx != null && !xxx.isEmpty();
+            ImageType[] types = ImageType.values();
+            String suffix = null;
+            for (ImageType type: types) {
+                if(xxx.toUpperCase().startsWith(type.getHeadCode())){
+                    suffix = type.getSuffix();
+                    break;
+                }
+            }
+            return suffix;
+        }catch (Exception e) {
+            return null;
+        }
+    }
+
+
+    /**
+     * 判断文件格式 取前6个字符来进行判断
+     * @param src 文件字节数组
+     * @return 返回文件字节数组前6位编码
+     */
+    public static String bytesToHexString(byte[] src) {
+        StringBuilder stringBuilder = new StringBuilder();
+        int pifNum = 10;
+        if (src == null || src.length <= pifNum) {
+            return null;
+        }
+        for (int i = 0; i < pifNum; i ++) {
+            int v = src[i] & 0xFF;
+            String hv = Integer.toHexString(v);
+            if (hv.length() < 2) {
+                stringBuilder.append(0);
+            }
+            stringBuilder.append(hv);
+        }
+        return stringBuilder.toString();
+    }
+
+    public static String handleBase64Header(String webBase64Code){
+        String [] s = webBase64Code.split("base64,");
+        if(s.length == 2){
+            return s[1];
+        }
+        return webBase64Code;
+    }
+
+}

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

@@ -17,13 +17,6 @@
 
     <dependencies>
 
-<!--        <dependency>-->
-<!--            <groupId>cn.hutool</groupId>-->
-<!--            <artifactId>hutool-all</artifactId>-->
-<!--            <version>5.5.8</version>-->
-<!--        </dependency>-->
-
-
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-nacos</artifactId>
@@ -122,6 +115,21 @@
             <artifactId>property-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <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>
 
     <build>

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

@@ -90,7 +90,13 @@ public class ApplicationController extends BaseController {
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody ApplicationBo bo) {
         return toAjax(applicationService.updateByBo(bo));
     }
-
+    /**
+     * 审核通过
+     */
+    @PostMapping("/verified")
+    public R<Void> verified(@Validated(EditGroup.class) @RequestBody ApplicationBo bo) {
+        return toAjax(applicationService.verifiedByBo(bo));
+    }
     /**
      * 删除资产领用
      *

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

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

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

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,17 +62,27 @@ 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) {
         return R.ok(costMeterWaterService.queryById(id));
     }
+    /**
+     * 获取上月费用详情
+     *
+     *
+     */
 
+    @GetMapping("/ultimoWater/{roomId}")
+    public R<CostMeterWaterVo> getUltimoWater(@NotNull(message = "房间id不能为空")
+                                                  @PathVariable("roomId") Long roomId) {
+        return R.ok(costMeterWaterService.getUltimoWater(roomId));
+    }
     /**
      * 新增费用-水电抄
      */
-    @SaCheckPermission("system:meterWater:add")
+    @SaCheckPermission("property:costMeterWater:add")
     @Log(title = "费用-水电抄", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -83,7 +93,7 @@ public class CostMeterWaterController extends BaseController {
     /**
      * 修改费用-水电抄
      */
-    @SaCheckPermission("system:meterWater:edit")
+    @SaCheckPermission("property:costMeterWater:edit")
     @Log(title = "费用-水电抄", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -96,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/CustomerContingenPlanController.java

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

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

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

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

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

@@ -0,0 +1,32 @@
+package org.dromara.property.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.property.domain.vo.ServiceWorkOrderAnalysisVo;
+import org.dromara.property.service.IServiceWorkOrdersService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author:yuyongle
+ * @Date:2025/7/21 15:25
+ * @Description:工单看板控制器
+ **/
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/customerServece")
+public class CustomerServeceController extends BaseController {
+    private final IServiceWorkOrdersService serviceWorkOrdersService;
+    /**
+     * 查询客户服务工单看板统计
+     */
+    @GetMapping("/counts")
+    public R<ServiceWorkOrderAnalysisVo> counts() {
+        return R.ok(serviceWorkOrdersService.counts());
+    }
+
+}

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

@@ -40,7 +40,7 @@ public class DepotLogController extends BaseController {
     /**
      * 查询仓库记录列表
      */
-    @SaCheckPermission("property:log:list")
+    //@SaCheckPermission("property:log:list")
     @GetMapping("/list")
     public TableDataInfo<DepotLogVo> list(DepotLogBo bo, PageQuery pageQuery) {
         return depotLogService.queryPageList(bo, pageQuery);
@@ -62,7 +62,7 @@ public class DepotLogController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("property:log:query")
+   // @SaCheckPermission("property:log:query")
     @GetMapping("/{id}")
     public R<DepotLogVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {

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

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -28,8 +29,19 @@ public class EnumFetcherController {
      */
 
     @GetMapping("/enum-values/{name}")
-    public R<Map<Object, Object>> getEnumValues(@PathVariable("name") String name) {
-        Map<Object, Object> map = enumFetcherService.getEnumValues(name);
+    public R<List<Map<Object, Object>>> getEnumValues(@PathVariable("name") String name) {
+        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/MaintainKnowledgeController.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.MaintainKnowledgeVo;
+import org.dromara.property.domain.bo.MaintainKnowledgeBo;
+import org.dromara.property.service.IMaintainKnowledgeService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 维保知识
+ * 前端访问路由地址为:/domain/knowledge
+ *
+ * @author mocheng
+ * @date 2025-07-24
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/knowledge")
+public class MaintainKnowledgeController extends BaseController {
+
+    private final IMaintainKnowledgeService maintainKnowledgeService;
+
+    /**
+     * 查询维保知识列表
+     */
+    @SaCheckPermission("domain:knowledge:list")
+    @GetMapping("/list")
+    public TableDataInfo<MaintainKnowledgeVo> list(MaintainKnowledgeBo bo, PageQuery pageQuery) {
+        return maintainKnowledgeService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出维保知识列表
+     */
+    @SaCheckPermission("domain:knowledge:export")
+    @Log(title = "维保知识", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(MaintainKnowledgeBo bo, HttpServletResponse response) {
+        List<MaintainKnowledgeVo> list = maintainKnowledgeService.queryList(bo);
+        ExcelUtil.exportExcel(list, "维保知识", MaintainKnowledgeVo.class, response);
+    }
+
+    /**
+     * 获取维保知识详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("domain:knowledge:query")
+    @GetMapping("/{id}")
+    public R<MaintainKnowledgeVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(maintainKnowledgeService.queryById(id));
+    }
+
+    /**
+     * 新增维保知识
+     */
+    @SaCheckPermission("domain:knowledge:add")
+    @Log(title = "维保知识", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody MaintainKnowledgeBo bo) {
+        return toAjax(maintainKnowledgeService.insertByBo(bo));
+    }
+
+    /**
+     * 修改维保知识
+     */
+    @SaCheckPermission("domain:knowledge:edit")
+    @Log(title = "维保知识", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody MaintainKnowledgeBo bo) {
+        return toAjax(maintainKnowledgeService.updateByBo(bo));
+    }
+
+    /**
+     * 删除维保知识
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("domain:knowledge:remove")
+    @Log(title = "维保知识", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(maintainKnowledgeService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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/ResidentPersonController.java

@@ -1,11 +1,20 @@
 package org.dromara.property.controller;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import cn.dev33.satoken.stp.StpUtil;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.excel.core.ExcelResult;
+import org.dromara.property.domain.vo.ResidentPersonImportVo;
+import org.dromara.property.listener.ResidentPersonImportListener;
+import org.dromara.property.utils.UploadFaceUtil;
+import org.springframework.http.MediaType;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -21,14 +30,16 @@ import org.dromara.property.domain.vo.ResidentPersonVo;
 import org.dromara.property.domain.bo.ResidentPersonBo;
 import org.dromara.property.service.IResidentPersonService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 入驻员工
  * 前端访问路由地址为:/property/person
  *
  * @author mocheng
- * @date 2025-06-19
+ * @since 2025-06-19
  */
+@Slf4j
 @Validated
 @RequiredArgsConstructor
 @RestController
@@ -37,6 +48,8 @@ public class ResidentPersonController extends BaseController {
 
     private final IResidentPersonService residentPersonService;
 
+    private final UploadFaceUtil uploadFaceUtil;
+
     /**
      * 查询入驻员工列表
      */
@@ -65,7 +78,7 @@ public class ResidentPersonController extends BaseController {
     @SaCheckPermission("property:person:query")
     @GetMapping("/{id}")
     public R<ResidentPersonVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable("id") Long id) {
+                                       @PathVariable("id") Long id) {
         return R.ok(residentPersonService.queryById(id));
     }
 
@@ -103,4 +116,59 @@ public class ResidentPersonController extends BaseController {
                           @PathVariable("ids") Long[] ids) {
         return toAjax(residentPersonService.deleteWithValidByIds(List.of(ids), true));
     }
+
+    /**
+     * 导入数据
+     *
+     * @param file          导入文件
+     * @param updateSupport 是否更新已存在数据
+     * @param unitId        单位id
+     */
+    @Log(title = "入驻员工", businessType = BusinessType.IMPORT)
+    @SaCheckPermission("property:person:import")
+    @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public R<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport, Long unitId) throws Exception {
+        asyncImportExcel(StpUtil.getTokenValue(), file, updateSupport, unitId);
+        return R.ok("文件上传成功，请等待处理！");
+    }
+
+    @Async
+    public void asyncImportExcel(String tokenValue, MultipartFile file, Boolean updateSupport, Long unitId) {
+        try {
+            StpUtil.setTokenValueToStorage(tokenValue);
+            ExcelUtil.importExcel(file.getInputStream(), ResidentPersonImportVo.class, new ResidentPersonImportListener(updateSupport, unitId));
+        } catch (Exception e) {
+            log.info("处理导入入驻员工Excel文件时出错！");
+        }
+    }
+
+    /**
+     * 获取导入模板
+     */
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil.exportExcel(new ArrayList<>(), "入驻员工", ResidentPersonImportVo.class, response);
+    }
+
+    /**
+     * 导入人脸数据
+     *
+     * @param file   导入文件
+     * @param unitId 单位ID
+     */
+    @PostMapping(value = "/importFace", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public R<Void> importFace(@RequestPart("file") MultipartFile file, Long unitId) {
+        asyncImportFace(StpUtil.getTokenValue(), file, unitId);
+        return R.ok("文件上传成功，请等待处理！");
+    }
+
+    @Async
+    public void asyncImportFace(String tokenValue, MultipartFile file, Long unitId) {
+        try {
+            StpUtil.setTokenValueToStorage(tokenValue);
+            uploadFaceUtil.processFaceZip(file, unitId);
+        } catch (Exception e) {
+            log.info("处理人脸压缩包时出错");
+        }
+    }
 }

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,17 +62,17 @@ 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) {
+                                              @PathVariable("id") Long id) {
         return R.ok(serviceWorkOrdersTypeService.queryById(id));
     }
 
     /**
      * 新增【工单类型】
      */
-    @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,11 +96,30 @@ 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 = "主键不能为空")
                           @PathVariable("ids") Long[] ids) {
         return toAjax(serviceWorkOrdersTypeService.deleteWithValidByIds(List.of(ids), true));
     }
+
+    /**
+     * 查询【工单类型】树结构
+     */
+    @GetMapping("/typeTree")
+    public R<List<ServiceWorkOrdersTypeVo>> typeTree() {
+        return R.ok(serviceWorkOrdersTypeService.typeTree());
+    }
+
+    /**
+     * 工单类型不分页查询
+     *
+     * @param bo 工单类型
+     * @return 工单类型列表
+     */
+    @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/TbCommunityController.java

@@ -66,7 +66,8 @@ public class TbCommunityController extends BaseController {
         LoginUser loginUser = LoginHelper.getLoginUser();
         Assert.notNull(loginUser, "获取账户信息失败!");
         Assert.notEmpty(loginUser.getTenantId(), "获取租户信息失败");
-        return R.ok(tbCommunityService.tree(level, loginUser.getTenantId()));
+        List<TreeNode<Long>> tree = tbCommunityService.tree(level, loginUser.getTenantId());
+        return R.ok(tree);
     }
 
 

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

@@ -105,14 +105,14 @@ public class TbFloorController extends BaseController {
     }
 
     /**
-     * 根据单元ID查询楼层
+     * 根据楼层id查询楼层
      *
-     * @param unitId 单元ID
+     * @param buildingId 单元ID
      * @return 楼层
      */
-    @GetMapping("/queryByUnitId/{unitId}")
-    public R<List<TbFloorVo>> queryByUnitId(@NotNull(message = "单元ID不能为空")
-                                            @PathVariable("unitId") Long unitId) {
-        return R.ok(tbFloorService.queryByUnitId(unitId));
+    @GetMapping("/queryByBuildingId/{buildingId}")
+    public R<List<TbFloorVo>> queryByBuildingId(@NotNull(message = "楼层ID不能为空")
+                                            @PathVariable("buildingId") Long buildingId) {
+        return R.ok(tbFloorService.queryByBuildingId(buildingId));
     }
 }

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

@@ -1,11 +1,27 @@
 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;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -36,6 +52,11 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 public class TbVisitorManagementController extends BaseController {
 
     private final ITbVisitorManagementService tbVisitorManagementService;
+    @DubboReference
+    private final RemoteConfigService remoteConfigService;
+
+
+
 
     /**
      * 查询访客管理列表
@@ -46,6 +67,49 @@ public class TbVisitorManagementController extends BaseController {
         return tbVisitorManagementService.queryPageList(bo, pageQuery);
     }
 
+    /**
+     * 获取二维码uuid
+     * @param qrCodeInfo
+     * @return
+     */
+    @PostMapping("/getcode")
+    public R<String> getcode(QrCodeInfo qrCodeInfo) {
+        String userid =StpUtil.getLoginId().toString();
+        String[] split = userid.split(":");
+        Long s1 = Long.valueOf(split[1]);
+        qrCodeInfo.setUserid(s1);
+        String s = remoteConfigService.selectQrTimeOut();
+        int i = Integer.parseInt(s);
+        UUID value = UUID.randomUUID();
+        RedisUtils.setCacheObject(GlobalConstants.CAPTCHA_CODE_KEY+"Qrcode"+value, qrCodeInfo, Duration.ofSeconds(i));
+        return R.ok(value.toString());
+    }
+
+    /**
+     * 推送二维码被扫信息
+     * @param qrcode
+     * @return
+     */
+    @GetMapping("/useqr")
+    public R<String> useqr(String 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);
+        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("二维码可用");
+
+    }
+
     /**
      * 导出访客管理列表
      */
@@ -70,16 +134,52 @@ public class TbVisitorManagementController extends BaseController {
     }
 
     /**
-     * 新增访客管理
+     * 小程序新增访客管理
      */
-    @SaCheckPermission("property:visitorManagement:add")
+//    @SaCheckPermission("property:visitorManagement:add")
     @Log(title = "访客管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-    @PostMapping()
+    @PostMapping("/add")
     public R<Void> add(@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.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")
+    @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,28 +1,25 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.attendance;
 
-import java.util.List;
-
-import cn.hutool.core.date.DateTime;
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.format.annotation.DateTimeFormat;
-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.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.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
-import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.property.domain.vo.AttendanceArrangementVo;
-import org.dromara.property.domain.bo.AttendanceArrangementBo;
-import org.dromara.property.service.IAttendanceArrangementService;
+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.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.*;
+
+import java.util.List;
 
 /**
  * 排班
@@ -40,7 +37,7 @@ public class AttendanceArrangementController extends BaseController {
     private final IAttendanceArrangementService attendanceArrangementService;
 
     /**
-     * 查询排班列表
+     * 查询排班详情列表
      */
     @SaCheckPermission("Property:arrangement:list")
     @GetMapping("/list")
@@ -48,17 +45,29 @@ public class AttendanceArrangementController extends BaseController {
         return attendanceArrangementService.queryPageList(bo, pageQuery);
     }
 
+
+
+
     /**
-     * 导出排班列表
+     * 查询某个月的日历排班信息的排班列表
      */
-    @SaCheckPermission("Property:arrangement:export")
-    @Log(title = "排班", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(AttendanceArrangementBo bo, HttpServletResponse response) {
-        List<AttendanceArrangementVo> list = attendanceArrangementService.queryList(bo);
-        ExcelUtil.exportExcel(list, "排班", AttendanceArrangementVo.class, response);
+    @SaCheckPermission("Property:arrangement:explore")
+    @GetMapping("/explore")
+    public TableDataInfo<AttendanceArrangementVo> list(AttendanceArrangementBo bo) {
+        return attendanceArrangementService.queryList(bo);
     }
 
+//    /**
+//     * 导出排班列表
+//     */
+//    @SaCheckPermission("Property:arrangement:export")
+//    @Log(title = "排班", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(AttendanceArrangementBo bo, HttpServletResponse response) {
+//        List<AttendanceArrangementVo> list = attendanceArrangementService.queryList(bo);
+//        ExcelUtil.exportExcel(list, "排班", AttendanceArrangementVo.class, response);
+//    }
+
     /**
      * 获取排班详细信息
      *
@@ -71,18 +80,6 @@ public class AttendanceArrangementController extends BaseController {
         return R.ok(attendanceArrangementService.queryById(id));
     }
 
-    /**
-     * 根据时间段查询排班列表
-     */
-    @SaCheckPermission("Property:arrangement:query")
-    @GetMapping("/queryByTime")
-    public R<AttendanceArrangementVo> queryByTime(@NotNull(message = "开始时间不能为空")
-                                                  @DateTimeFormat(pattern = "yyyy-MM-dd") @RequestParam("startTime") DateTime startTime) {
-        return R.ok(attendanceArrangementService.queryByTime(startTime));
-    }
-
-
-
     /**
      * 新增排班
      */

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,26 +1,27 @@
-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.AttendanceFixedScheduleVo;
-import org.dromara.property.domain.bo.AttendanceFixedScheduleBo;
-import org.dromara.property.service.IAttendanceFixedScheduleService;
+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.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.*;
+
+import java.util.List;
 
 /**
  * 固定班制表

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/cockpit/BookingController.java

@@ -0,0 +1,66 @@
+package org.dromara.property.controller.cockpit;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.dromara.common.core.domain.R;
+import org.dromara.property.domain.vo.TbVisitorManagementVo;
+import org.dromara.property.service.ITbVisitorManagementService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 大屏预约接口
+ */
+@RestController
+@RequestMapping("/cockpit")
+public class BookingController {
+    @Resource
+    private ITbVisitorManagementService tbVisitorManagementService;
+
+    @RequestMapping("visitor")
+    public R<Map> visitor() {
+        // 创建查询条件包装器
+        QueryWrapper<TbVisitorManagementVo> queryWrapper = new QueryWrapper<>();
+
+        // 添加时间条件，查询近七天的数据
+        LocalDateTime sevenDaysAgo = LocalDateTime.now().minusDays(7);
+        queryWrapper.ge("create_time", sevenDaysAgo); // 假设创建时间字段为create_time
+
+        // 执行查询
+        List<TbVisitorManagementVo> tbVisitorManagementVos = tbVisitorManagementService.queryListByWapper(queryWrapper);
+
+        // 按天分组统计
+        Map<String, Long> typeCountMap = tbVisitorManagementVos.stream()
+            .collect(Collectors.groupingBy(
+                vo -> {
+                    // 如果 getVisitingBeginTime() 返回 Date 类型
+                    return vo.getVisitingBeginTime().toInstant()
+                        .atZone(ZoneId.systemDefault())
+                        .toLocalDate()
+                        .toString();
+                },
+                Collectors.counting()
+            ));
+        ArrayList<String> keys = new ArrayList<>();
+        ArrayList<String> values = new ArrayList<>();
+        for (String s : typeCountMap.keySet()) {
+            keys.add(s);
+        }
+        for (Long value : typeCountMap.values()) {
+            values.add(value.toString());
+        }
+        HashMap<String, List> stringListHashMap = new HashMap<>();
+        stringListHashMap.put("keys",keys);
+        stringListHashMap.put("values",values);
+        return R.ok(stringListHashMap);
+    }
+
+}

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

@@ -0,0 +1,13 @@
+package org.dromara.property.controller.cockpit;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 大屏设备接口
+ */
+@RestController
+@RequestMapping("/cockpit")
+public class DriverController {
+
+}

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

@@ -0,0 +1,15 @@
+package org.dromara.property.controller.cockpit;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 大屏能耗接口
+ */
+@RestController
+@RequestMapping("/cockpit")
+public class EnergyConsumptionController {
+
+
+
+}

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

@@ -0,0 +1,12 @@
+package org.dromara.property.controller.cockpit;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 大屏事件接口
+ */
+@RestController
+@RequestMapping("/cockpit")
+public class EventController {
+}