Merge remote-tracking branch 'origin/updateMenu' into updateMenu

xinnengyuan/.gitignore

@@ -53,3 +53,5 @@ logs/
 docs
 /file
 .idea/
+chat-memory/
+queries/

xinnengyuan/pom.xml

@@ -18,7 +18,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>21</java.version>
         <mybatis.version>3.5.16</mybatis.version>
-        <springdoc.version>2.8.4</springdoc.version>
+        <springdoc.version>2.3.0</springdoc.version>
         <therapi-javadoc.version>0.15.0</therapi-javadoc.version>
         <easyexcel.version>4.0.3</easyexcel.version>
         <velocity.version>2.3</velocity.version>
@@ -86,6 +86,15 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
         </profile>
+        <profile>
+            <id>menu</id>
+            <properties>
+                <profiles.active>menu</profiles.active>
+                <logging.level>info</logging.level>
+                <monitor.username>ruoyi</monitor.username>
+                <monitor.password>123456</monitor.password>
+            </properties>
+        </profile>
         <profile>
             <id>prod</id>
             <properties>

xinnengyuan/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java

@@ -5,6 +5,8 @@ import cn.hutool.captcha.AbstractCaptcha;
 import cn.hutool.captcha.generator.CodeGenerator;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.RandomUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -76,7 +78,7 @@ public class CaptchaController {
         SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, map);
         if (!smsResponse.isSuccess()) {
             log.error("验证码短信发送异常 => {}", smsResponse);
-            return R.fail(smsResponse.getData().toString());
+            return R.fail(parseData(smsResponse));
         }
         return R.ok();
     }
@@ -140,4 +142,35 @@ public class CaptchaController {
         return R.ok(captchaVo);
     }
 
+
+
+
+    public static String parseData(SmsResponse smsResponse ) {
+        try {
+            JSONObject json = JSONUtil.parseObj(smsResponse.getData());
+            // 核心：用 JsonUtil 解析 data，通过键路径 "Response.SendStatusSet[0].Code" 提取字段
+            // 键路径规则：层级用 "." 分隔，列表索引用 "[0]" 表示（第 1 个元素）
+            String code = json.getByPath("Response.SendStatusSet[0].Code", String.class);
+            System.out.println("错误码：" + code); // 输出：FailedOperation.InsufficientBalanceInSmsPackage
+            return convert(code);
+        } catch (Exception e) {
+            return "短信发送未知错误";
+        }
+    }
+
+
+    public static String convert(String code) {
+        return switch (code) {
+            case "FailedOperation.InsufficientBalanceInSmsPackage" -> "套餐包余量不足，请购买套餐包";
+            case "InternalError.SendAndRecvFail" -> "短信收发超时，请检查您的网络是否有波动";
+            case "InvalidParameterValue.IncorrectPhoneNumber" -> "手机号格式错误";
+            case "LimitExceeded.AppCountryOrRegionDailyLimit" -> "业务短信国家/地区日下发条数超过设定的上限";
+            case "LimitExceeded.AppDailyLimit" -> "业务短信日下发条数超过设定的上限";
+            case "LimitExceeded.PhoneNumberDailyLimit" -> "单个手机号日下发短信条数超过设定的上限";
+            case "UnauthorizedOperation.ServiceSuspendDueToArrears" -> "欠费被停止服务";
+            case "UnsupportedOperation.UnsupportedRegion" -> "不支持该地区短信下发";
+            default -> "短信发送未知错误";
+        };
+    }
+
 }

xinnengyuan/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java

@@ -92,7 +92,7 @@ public class SysRegisterService {
 //        if (!isValid) {
 //            throw new UserException("注册失败，密码需满足8–18位，包含大小写字母、数字、特殊字符中的至少三种组合");
 //        }
-        // 验证码开关
+
         SysUserBo sysUser = new SysUserBo();
         sysUser.setUserName(username);
         sysUser.setNickName(username);
@@ -101,16 +101,24 @@ public class SysRegisterService {
         sysUser.setUserType(userType);
         sysUser.setEmail(registerBody.getEmail());
 
-        boolean exist = TenantHelper.dynamic(tenantId, () -> {
-            return userMapper.exists(new LambdaQueryWrapper<SysUser>()
-                .eq(SysUser::getPhonenumber, sysUser.getPhonenumber()));
-        });
-        if (exist) {
-            throw new UserException("user.register.save.error", username);
-        }
-        boolean regFlag = userService.registerUser(sysUser, tenantId);
-        if (!regFlag) {
-            throw new UserException("user.register.error");
+        SysUser sysUserByPhonenumber = userMapper.selectDefFlagUser(username);
+        if(sysUserByPhonenumber != null){
+            sysUser.setUserId(sysUserByPhonenumber.getUserId());
+            userMapper.updateDefFlag(sysUser);
+            userMapper.updateConstructionUser(sysUserByPhonenumber.getUserId());
+        }else {
+
+            boolean exist = TenantHelper.dynamic(tenantId, () -> {
+                return userMapper.exists(new LambdaQueryWrapper<SysUser>()
+                    .eq(SysUser::getPhonenumber, sysUser.getPhonenumber()));
+            });
+            if (exist) {
+                throw new UserException("user.register.save.error", username);
+            }
+            boolean regFlag = userService.registerUser(sysUser, tenantId);
+            if (!regFlag) {
+                throw new UserException("user.register.error");
+            }
         }
 
         recordLogininfor(tenantId, username, Constants.REGISTER, MessageUtils.message("user.register.success"));

xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml

@@ -1,3 +1,7 @@
+# 开发环境配置
+server:
+  # 服务器的HTTP端口，默认为8080
+  port: 8899
 --- # 监控中心配置
 spring.boot.admin.client:
   # 增加客户端开关
@@ -32,6 +36,12 @@ snail-job:
 
 --- # 数据源配置
 spring:
+  ai:
+    dashscope:
+      api-key: sk-8d8df92fcbac4bd2922edba30b0bb8fa
+      chat:
+        options:
+          model: qwen3-max
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
@@ -52,28 +62,38 @@ spring:
           url: jdbc:mysql://192.168.110.2:13386/xinnengyuandev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
           username: xinnengyuandev
           password: StRWCZdZirysNSs2
+          #          url: jdbc:mysql://192.168.110.2:13386/xinnengyuan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          #          username: xinnengyuan
+          #          password: mEZPC5Sdf3r2HENi
           # 从库数据源
-        slave:
-          lazy: true
-          type: ${spring.datasource.type}
-          driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://192.168.110.2:13386/zmkgc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
-          username: zmkgc
-          password: nWKDKRNRT48tFBdh
-        slave1:
-          lazy: true
-          type: ${spring.datasource.type}
-          driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://192.168.110.2:13386/zmkgprod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
-          username: zmkgprod
-          password: MaY8nehwWkJriWPm
-        slave2:
-          lazy: true
-          type: ${spring.datasource.type}
-          driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://192.168.110.2:13386/zmkgdev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
-          username: zmkgdev
-          password: JhYxREf25AXdy3h8
+      #        slave:
+      #          lazy: true
+      #          type: ${spring.datasource.type}
+      #          driverClassName: com.mysql.cj.jdbc.Driver
+      #          url: jdbc:mysql://192.168.110.2:13386/zmkgc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+      #          username: zmkgc
+      #          password: nWKDKRNRT48tFBdh
+      #        slave1:
+      #          lazy: true
+      #          type: ${spring.datasource.type}
+      #          driverClassName: com.mysql.cj.jdbc.Driver
+      #          url: jdbc:mysql://192.168.110.2:13386/zmkgprod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+      #          username: zmkgprod
+      #          password: MaY8nehwWkJriWPm
+      #        slave2:
+      #          lazy: true
+      #          type: ${spring.datasource.type}
+      #          driverClassName: com.mysql.cj.jdbc.Driver
+      #          url: jdbc:mysql://192.168.110.2:13386/zmkgc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+      #          username: zmkgc
+      #          password: nWKDKRNRT48tFBdh
+      #        slave:
+      #          lazy: true
+      #          type: ${spring.datasource.type}
+      #          driverClassName: com.mysql.cj.jdbc.Driver
+      #          url: jdbc:mysql://192.168.110.2:13386/zmkgprod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+      #          username: zmkgprod
+      #          password: MaY8nehwWkJriWPm
       #        oracle:
       #          type: ${spring.datasource.type}
       #          driverClassName: oracle.jdbc.OracleDriver
@@ -116,7 +136,7 @@ spring.data:
     # 端口，默认为6379
     port: 9287
     # 数据库索引
-    database: 10
+    database: 16
     # redis 密码必须配置
     password: syar23rdsaagdrsa
     # 连接超时时间
@@ -175,7 +195,7 @@ sms:
   # 配置源类型用于标定配置来源(interface,yaml)
   config-type: yaml
   # 用于标定yml中的配置是否开启短信拦截，接口配置不受此限制
-  restricted: true
+  restricted: false
   # 短信拦截限制单手机号每分钟最大发送，只对开启了拦截的配置有效
   minute-max: 1
   # 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效
@@ -324,6 +344,7 @@ ys7:
   app-secret: 09e29c70ae1161fbc3ce2030fc09ba2e
   job:
     capture-enabled: false   # 控制是否启用萤石抓拍任务
+    device-sync-enabled: false # 控制是否同步萤石设备
 #ys7:
 #  app-key: 081b0d6d5f7f4de8bc5c7fa350fb26ec
 #  app-secret: caa37b9f60ef02deb57e563bc190e6db
@@ -343,3 +364,18 @@ qrCode:
 # 无人机大图
 drone:
   url: http://192.168.110.2:9512
+# 聊天服务
+chat:
+  server:
+    port: 19099
+# rabbitmq 配置
+rabbitmq:
+  exchange-name: dev-normal-exchange
+  queue-name: dev-normal-queue
+  routing-key: dev.normal.routing.key
+  delay-exchange-name: dev-delay-queue
+  delay-queue-name: dev-delay-exchange
+  delay-routing-key: dev.delay.routing.key
+  dead-letter-exchange: dev-dlx-exchange
+  dead-letter-queue: dev-dlx-queue
+  dead-letter-routing-key: dev.dlx.routing.key

xinnengyuan/ruoyi-admin/src/main/resources/application-local.yml

@@ -1,3 +1,7 @@
+# 开发环境配置
+server:
+  # 服务器的HTTP端口，默认为8080
+  port: 9918
 --- # 临时文件存储位置 避免临时文件被系统清理报错
 spring.servlet.multipart.location: /ruoyi/server/temp
 
@@ -35,6 +39,12 @@ snail-job:
 
 --- # 数据源配置
 spring:
+  ai:
+    dashscope:
+      api-key: sk-8d8df92fcbac4bd2922edba30b0bb8fa
+      chat:
+        options:
+          model: qwen3-max
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
@@ -105,7 +115,7 @@ spring.data:
     # 端口，默认为6379
     port: 9287
     # 数据库索引
-    database: 6
+    database: 17
     # redis 密码必须配置
     password: syar23rdsaagdrsa
     # 连接超时时间
@@ -164,7 +174,7 @@ sms:
   # 配置源类型用于标定配置来源(interface,yaml)
   config-type: yaml
   # 用于标定yml中的配置是否开启短信拦截，接口配置不受此限制
-  restricted: true
+  restricted: false
   # 短信拦截限制单手机号每分钟最大发送，只对开启了拦截的配置有效
   minute-max: 1
   # 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效
@@ -183,12 +193,45 @@ sms:
       signature: 您的短信签名
       sdk-app-id: 您的sdkAppId
     config2:
-      # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
+      # 登录
       supplier: tencent
-      access-key-id: 您的accessKey
-      access-key-secret: 您的accessKeySecret
-      signature: 您的短信签名
-      sdk-app-id: 您的sdkAppId
+      access-key-id: AKIDb3JK5dx4wa0DCxWqvxlKejvysZ3ITVJv
+      access-key-secret: c5LPFsJI8k7GDxTkoeFj4A1ukQr66rPi
+      signature: 重庆远界大数据研究院
+      sdk-app-id: 1401018866
+      template-id: 2491779
+    config3:
+      # 注册
+      supplier: tencent
+      access-key-id: AKIDb3JK5dx4wa0DCxWqvxlKejvysZ3ITVJv
+      access-key-secret: c5LPFsJI8k7GDxTkoeFj4A1ukQr66rPi
+      signature: 重庆远界大数据研究院
+      sdk-app-id: 1401018866
+      template-id: 2491776
+    config4:
+      # 质量工单逾期
+      supplier: tencent
+      access-key-id: AKIDb3JK5dx4wa0DCxWqvxlKejvysZ3ITVJv
+      access-key-secret: c5LPFsJI8k7GDxTkoeFj4A1ukQr66rPi
+      signature: 重庆远界大数据研究院
+      sdk-app-id: 1401018866
+      template-id: 2534747
+    config5:
+      # 设计图纸
+      supplier: tencent
+      access-key-id: AKIDb3JK5dx4wa0DCxWqvxlKejvysZ3ITVJv
+      access-key-secret: c5LPFsJI8k7GDxTkoeFj4A1ukQr66rPi
+      signature: 重庆远界大数据研究院
+      sdk-app-id: 1401018866
+      template-id: 2534750
+    config6:
+      # 安全工单
+      supplier: tencent
+      access-key-id: AKIDb3JK5dx4wa0DCxWqvxlKejvysZ3ITVJv
+      access-key-secret: c5LPFsJI8k7GDxTkoeFj4A1ukQr66rPi
+      signature: 重庆远界大数据研究院
+      sdk-app-id: 1401018866
+      template-id: 2534848
 
 --- # 三方授权
 justauth:
@@ -275,8 +318,11 @@ weather:
 dxf2GeoJson:
   file-name: main
 ys7:
-  app-key: 3acf9f1a43dc4209841e0893003db0a2
-  app-secret: 4bbf3e9394f55d3af6e3af27b2d3db36
+  app-key: xxx
+  app-secret: xxx
+  job:
+    capture-enabled: false   # 控制是否启用萤石抓拍任务
+    device-sync-enabled: false # 控制是否同步萤石设备
 # 斯巴达算法
 sparta:
   url: http://119.3.204.120:8040
@@ -286,10 +332,25 @@ sparta:
 id-card:
   encrypt-key: 7ae260d150a14027d2238a1cf80a48ef
 recognizer:
-  url: http://192.168.110.5:50070
+  url: http://192.168.110.5:50071
 
 qrCode:
-  url: http://xny.yj-3d.com:7171
+  url: http://xny.yj-3d.com:7788
 # 无人机大图
 drone:
   url: http://192.168.110.2:9512
+# 聊天服务
+chat:
+  server:
+    port: 18088
+# rabbitmq 配置
+rabbitmq:
+  exchange-name: local-normal-exchange
+  queue-name: local-normal-queue
+  routing-key: local.normal.routing.key
+  delay-exchange-name: local-delay-queue
+  delay-queue-name: local-delay-exchange
+  delay-routing-key: local.delay.routing.key
+  dead-letter-exchange: local-dlx-exchange
+  dead-letter-queue: local-dlx-queue
+  dead-letter-routing-key: local.dlx.routing.key

xinnengyuan/ruoyi-admin/src/main/resources/application-menu.yml

@@ -0,0 +1,356 @@
+# 开发环境配置
+server:
+  # 服务器的HTTP端口，默认为8080
+  port: 9528
+--- # 临时文件存储位置 避免临时文件被系统清理报错
+spring.servlet.multipart.location: /ruoyi/server/temp
+
+--- # 监控中心配置
+spring.boot.admin.client:
+  # 增加客户端开关
+  enabled: false
+  url: http://localhost:9090/admin
+  instance:
+    service-host-type: IP
+    metadata:
+      username: ${spring.boot.admin.client.username}
+      userpassword: ${spring.boot.admin.client.password}
+  username: @monitor.username@
+  password: @monitor.password@
+
+--- # snail-job 配置
+snail-job:
+  enabled: false
+  # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
+  group: "ruoyi_group"
+  # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config`表
+  token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
+  server:
+    host: 127.0.0.1
+    port: 17888
+  # 命名空间UUID 详见 script/sql/ry_job.sql `sj_namespace`表`unique_id`字段
+  namespace: ${spring.profiles.active}
+  # 随主应用端口漂移
+  port: 2${server.port}
+  # 客户端ip指定
+  host:
+  # RPC类型: netty, grpc
+  rpc-type: grpc
+
+--- # 数据源配置
+spring:
+  ai:
+    dashscope:
+      api-key: sk-8d8df92fcbac4bd2922edba30b0bb8fa
+      chat:
+        options:
+          model: qwen3-max
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
+    dynamic:
+      # 性能分析插件(有性能损耗 不建议生产环境使用)
+      p6spy: false
+      # 设置默认的数据源或者数据源组,默认值即为 master
+      primary: master
+      # 严格模式 匹配不到数据源则报错
+      strict: true
+      datasource:
+        # 主库数据源
+        master:
+          type: ${spring.datasource.type}
+          driverClassName: com.mysql.cj.jdbc.Driver
+          # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
+          # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
+          url: jdbc:mysql://192.168.110.2:13386/xinnengyuanmenu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          username: xinnengyuanmenu
+          password: 2RkXFG8ZE6r5LL7B
+      #        # 从库数据源
+      #        slave:
+      #          lazy: true
+      #          type: ${spring.datasource.type}
+      #          driverClassName: com.mysql.cj.jdbc.Driver
+      #          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+      #          username:
+      #          password:
+      #        oracle:
+      #          type: ${spring.datasource.type}
+      #          driverClassName: oracle.jdbc.OracleDriver
+      #          url: jdbc:oracle:thin:@//localhost:1521/XE
+      #          username: ROOT
+      #          password: root
+      #        postgres:
+      #          type: ${spring.datasource.type}
+      #          driverClassName: org.postgresql.Driver
+      #          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
+      #          username: root
+      #          password: root
+      #        sqlserver:
+      #          type: ${spring.datasource.type}
+      #          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+      #          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true
+      #          username: SA
+      #          password: root
+      hikari:
+        # 最大连接池数量
+        maxPoolSize: 20
+        # 最小空闲线程数量
+        minIdle: 10
+        # 配置获取连接等待超时的时间
+        connectionTimeout: 30000
+        # 校验超时时间
+        validationTimeout: 5000
+        # 空闲连接存活最大时间，默认10分钟
+        idleTimeout: 600000
+        # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟
+        maxLifetime: 1800000
+        # 多久检查一次连接的活性
+        keepaliveTime: 30000
+
+--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
+spring.data:
+  redis:
+    # 地址
+    host: 192.168.110.2
+    # 端口，默认为6379
+    port: 9287
+    # 数据库索引
+    database: 21
+    # redis 密码必须配置
+    password: syar23rdsaagdrsa
+    # 连接超时时间
+    timeout: 10s
+    # 是否开启ssl
+    ssl.enabled: false
+
+# redisson 配置
+redisson:
+  # redis key前缀
+  keyPrefix:
+  # 线程池数量
+  threads: 16
+  # Netty线程池数量
+  nettyThreads: 32
+  # 单节点配置
+  singleServerConfig:
+    # 客户端名称
+    clientName: ${ruoyi.name}
+    # 最小空闲连接数
+    connectionMinimumIdleSize: 32
+    # 连接池大小
+    connectionPoolSize: 64
+    # 连接空闲超时，单位：毫秒
+    idleConnectionTimeout: 10000
+    # 命令等待超时，单位：毫秒
+    timeout: 3000
+    # 发布和订阅连接池大小
+    subscriptionConnectionPoolSize: 50
+
+--- # mail 邮件发送
+mail:
+  enabled: false
+  host: smtp.163.com
+  port: 465
+  # 是否需要用户名密码验证
+  auth: true
+  # 发送方，遵循RFC-822标准
+  from: xxx@163.com
+  # 用户名（注意：如果使用foxmail邮箱，此处user为qq号）
+  user: xxx@163.com
+  # 密码（注意，某些邮箱需要为SMTP服务单独设置密码，详情查看相关帮助）
+  pass: xxxxxxxxxx
+  # 使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。
+  starttlsEnable: true
+  # 使用SSL安全连接
+  sslEnable: true
+  # SMTP超时时长，单位毫秒，缺省值不超时
+  timeout: 0
+  # Socket连接超时值，单位毫秒，缺省值不超时
+  connectionTimeout: 0
+
+--- # sms 短信 支持 阿里云 腾讯云 云片 等等各式各样的短信服务商
+# https://sms4j.com/doc3/ 差异配置文档地址 支持单厂商多配置，可以配置多个同时使用
+sms:
+  # 配置源类型用于标定配置来源(interface,yaml)
+  config-type: yaml
+  # 用于标定yml中的配置是否开启短信拦截，接口配置不受此限制
+  restricted: false
+  # 短信拦截限制单手机号每分钟最大发送，只对开启了拦截的配置有效
+  minute-max: 1
+  # 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效
+  account-max: 30
+  # 以下配置来自于 org.dromara.sms4j.provider.config.BaseConfig类中
+  blends:
+    # 唯一ID 用于发送短信寻找具体配置 随便定义别用中文即可
+    # 可以同时存在两个相同厂商 例如: ali1 ali2 两个不同的阿里短信账号 也可用于区分租户
+    config1:
+      # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
+      supplier: alibaba
+      # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。
+      access-key-id: 您的accessKey
+      # 称为accessSecret有些称之为apiSecret
+      access-key-secret: 您的accessKeySecret
+      signature: 您的短信签名
+      sdk-app-id: 您的sdkAppId
+    config2:
+      # 登录
+      supplier: tencent
+      access-key-id: AKIDb3JK5dx4wa0DCxWqvxlKejvysZ3ITVJv
+      access-key-secret: c5LPFsJI8k7GDxTkoeFj4A1ukQr66rPi
+      signature: 重庆远界大数据研究院
+      sdk-app-id: 1401018866
+      template-id: 2491779
+    config3:
+      # 注册
+      supplier: tencent
+      access-key-id: AKIDb3JK5dx4wa0DCxWqvxlKejvysZ3ITVJv
+      access-key-secret: c5LPFsJI8k7GDxTkoeFj4A1ukQr66rPi
+      signature: 重庆远界大数据研究院
+      sdk-app-id: 1401018866
+      template-id: 2491776
+    config4:
+      # 质量工单逾期
+      supplier: tencent
+      access-key-id: AKIDb3JK5dx4wa0DCxWqvxlKejvysZ3ITVJv
+      access-key-secret: c5LPFsJI8k7GDxTkoeFj4A1ukQr66rPi
+      signature: 重庆远界大数据研究院
+      sdk-app-id: 1401018866
+      template-id: 2534747
+    config5:
+      # 设计图纸
+      supplier: tencent
+      access-key-id: AKIDb3JK5dx4wa0DCxWqvxlKejvysZ3ITVJv
+      access-key-secret: c5LPFsJI8k7GDxTkoeFj4A1ukQr66rPi
+      signature: 重庆远界大数据研究院
+      sdk-app-id: 1401018866
+      template-id: 2534750
+    config6:
+      # 安全工单
+      supplier: tencent
+      access-key-id: AKIDb3JK5dx4wa0DCxWqvxlKejvysZ3ITVJv
+      access-key-secret: c5LPFsJI8k7GDxTkoeFj4A1ukQr66rPi
+      signature: 重庆远界大数据研究院
+      sdk-app-id: 1401018866
+      template-id: 2534848
+
+--- # 三方授权
+justauth:
+  # 前端外网访问地址
+  address: http://localhost:80
+  type:
+    maxkey:
+      # maxkey 服务器地址
+      # 注意 如下均配置均不需要修改 maxkey 已经内置好了数据
+      server-url: http://sso.maxkey.top
+      client-id: 876892492581044224
+      client-secret: x1Y5MTMwNzIwMjMxNTM4NDc3Mzche8
+      redirect-uri: ${justauth.address}/social-callback?source=maxkey
+    topiam:
+      # topiam 服务器地址
+      server-url: http://127.0.0.1:1989/api/v1/authorize/y0q************spq***********8ol
+      client-id: 449c4*********937************759
+      client-secret: ac7***********1e0************28d
+      redirect-uri: ${justauth.address}/social-callback?source=topiam
+      scopes: [ openid, email, phone, profile ]
+    qq:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=qq
+      union-id: false
+    weibo:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=weibo
+    gitee:
+      client-id: 91436b7940090d09c72c7daf85b959cfd5f215d67eea73acbf61b6b590751a98
+      client-secret: 02c6fcfd70342980cd8dd2f2c06c1a350645d76c754d7a264c4e125f9ba915ac
+      redirect-uri: ${justauth.address}/social-callback?source=gitee
+    dingtalk:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=dingtalk
+    baidu:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=baidu
+    csdn:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=csdn
+    coding:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=coding
+      coding-group-name: xx
+    oschina:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=oschina
+    alipay_wallet:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=alipay_wallet
+      alipay-public-key: MIIB**************DAQAB
+    wechat_open:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=wechat_open
+    wechat_mp:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=wechat_mp
+    wechat_enterprise:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=wechat_enterprise
+      agent-id: 1000002
+    gitlab:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=gitlab
+# 和风天气 https://dev.qweather.com/
+weather:
+  key-id: T65EAABUXC
+  project-id: 2JTHPUQ5YY
+  private-key: MC4CAQAwBQYDK2VwBCIEIMAglX7IsxYiTeM+FXXnvCUsIggajeP4s8gAllewm6BN
+  api-host: n35rk53njv.re.qweatherapi.com
+# dxf转 geojson 执行文件名
+dxf2GeoJson:
+  file-name: main
+ys7:
+  app-key: xxx
+  app-secret: xxx
+  job:
+    capture-enabled: false   # 控制是否启用萤石抓拍任务
+    device-sync-enabled: false # 控制是否同步萤石设备
+# 斯巴达算法
+sparta:
+  url: http://119.3.204.120:8040
+  client-id: test
+  client-secret: 115fcb08fa6742a1b086d9bb80a6ad59
+# 身份证加密密钥（32 位）
+id-card:
+  encrypt-key: 7ae260d150a14027d2238a1cf80a48ef
+recognizer:
+  url: http://192.168.110.5:50071
+
+qrCode:
+  url: http://xny.yj-3d.com:7788
+# 无人机大图
+drone:
+  url: http://192.168.110.2:9512
+# 聊天服务
+chat:
+  server:
+    port: 17077
+# rabbitmq 配置
+rabbitmq:
+  exchange-name: menu-normal-exchange
+  queue-name: menu-normal-queue
+  routing-key: menu.normal.routing.key
+  delay-exchange-name: menu-delay-queue
+  delay-queue-name: menu-delay-exchange
+  delay-routing-key: menu.delay.routing.key
+  dead-letter-exchange: menu-dlx-exchange
+  dead-letter-queue: menu-dlx-queue
+  dead-letter-routing-key: menu.dlx.routing.key

xinnengyuan/ruoyi-admin/src/main/resources/application-prod.yml

@@ -1,3 +1,7 @@
+# 开发环境配置
+server:
+  # 服务器的HTTP端口，默认为8080
+  port: 8899
 --- # 临时文件存储位置 避免临时文件被系统清理报错
 spring.servlet.multipart.location: /ruoyi/server/temp
 
@@ -35,6 +39,12 @@ snail-job:
 
 --- # 数据源配置
 spring:
+  ai:
+    dashscope:
+      api-key: sk-8d8df92fcbac4bd2922edba30b0bb8fa
+      chat:
+        options:
+          model: qwen3-max
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
@@ -55,21 +65,21 @@ spring:
           url: jdbc:mysql://192.168.110.2:13386/xinnengyuan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           username: xinnengyuan
           password: mEZPC5Sdf3r2HENi
-        # 从库数据源
-        slave:
-          lazy: true
-          type: ${spring.datasource.type}
-          driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://192.168.110.2:13386/zmkgc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
-          username: zmkgc
-          password: nWKDKRNRT48tFBdh
-        slave1:
-          lazy: true
-          type: ${spring.datasource.type}
-          driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://192.168.110.2:13386/zmkgprod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
-          username: zmkgprod
-          password: MaY8nehwWkJriWPm
+      #        # 从库数据源
+      #        slave:
+      #          lazy: true
+      #          type: ${spring.datasource.type}
+      #          driverClassName: com.mysql.cj.jdbc.Driver
+      #          url: jdbc:mysql://192.168.110.2:13386/zmkgc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+      #          username: zmkgc
+      #          password: nWKDKRNRT48tFBdh
+      #        slave1:
+      #          lazy: true
+      #          type: ${spring.datasource.type}
+      #          driverClassName: com.mysql.cj.jdbc.Driver
+      #          url: jdbc:mysql://192.168.110.2:13386/zmkgprod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+      #          username: zmkgprod
+      #          password: MaY8nehwWkJriWPm
       #        # 从库数据源
       #        slave:
       #          lazy: true
@@ -179,7 +189,7 @@ sms:
   # 配置源类型用于标定配置来源(interface,yaml)
   config-type: yaml
   # 用于标定yml中的配置是否开启短信拦截，接口配置不受此限制
-  restricted: true
+  restricted: false
   # 短信拦截限制单手机号每分钟最大发送，只对开启了拦截的配置有效
   minute-max: 1
   # 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效
@@ -321,12 +331,13 @@ weather:
   api-host: n35rk53njv.re.qweatherapi.com
 # dxf转 geojson 执行文件名
 dxf2GeoJson:
-  file-name: main.exe
+  file-name: main
 ys7:
   app-key: 3acf9f1a43dc4209841e0893003db0a2
-  app-secret: 4bbf3e9394f55d3af6e3af27b2d3db36
+  app-secret: 09e29c70ae1161fbc3ce2030fc09ba2e
   job:
     capture-enabled: true   # 控制是否启用萤石抓拍任务
+    device-sync-enabled: true # 控制是否同步萤石设备
 # 斯巴达算法
 sparta:
   url: http://119.3.204.120:8040
@@ -343,3 +354,18 @@ qrCode:
 # 无人机大图
 drone:
   url: http://192.168.110.2:9512
+# 聊天服务
+chat:
+  server:
+    port: 19099
+# rabbitmq 配置
+rabbitmq:
+  exchange-name: prod-normal-exchange
+  queue-name: prod-normal-queue
+  routing-key: prod.normal.routing.key
+  delay-exchange-name: prod-delay-queue
+  delay-queue-name: prod-delay-exchange
+  delay-routing-key: prod.delay.routing.key
+  dead-letter-exchange: prod-dlx-exchange
+  dead-letter-queue: prod-dlx-queue
+  dead-letter-routing-key: prod.dlx.routing.key

xinnengyuan/ruoyi-admin/src/main/resources/application.yml

@@ -22,7 +22,7 @@ captcha:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8899
+  #  port: 8899
   servlet:
     # 应用的访问路径
     context-path: /
@@ -76,9 +76,9 @@ spring:
   servlet:
     multipart:
       # 单个文件大小
-      max-file-size: 200MB
+      max-file-size: 1024MB
       # 设置总上传的文件大小
-      max-request-size: 200MB
+      max-request-size: 1024MB
   mvc:
     # 设置静态资源路径 防止所有请求都去查静态资源
     static-path-pattern: /static/**
@@ -95,7 +95,13 @@ spring:
     deserialization:
       # 允许对象忽略json中不存在的属性
       fail_on_unknown_properties: false
-
+  rabbitmq:
+    host: 192.168.110.2
+    port: 5672
+    username: admin
+    password: yuanjiexny
+    publisher-returns: true
+    publisher-confirm-type: correlated
 # Sa-Token配置
 sa-token:
   # token名称 (同时也是cookie名称)
@@ -106,6 +112,12 @@ sa-token:
   is-share: false
   # jwt秘钥
   jwt-secret-key: abcdefghijklmnopqrstuvwxyz
+  # token有效期，单位s 默认30天, -1代表永不过期
+  timeout: 2592000
+  # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
+  active-timeout: 2592000
+  # 同一账号最大登录数量，-1代表不限
+  max-login-count: -1
 
 # security配置
 security:
@@ -130,6 +142,8 @@ security:
     # todo 仅测试
     - /facility/matrix/**
     - /hat/device/data
+    - /websocket/ue
+    - /websocket/vehicle
 
 # 多租户配置
 tenant:
@@ -168,7 +182,7 @@ mybatis-plus:
 # 数据加密
 mybatis-encryptor:
   # 是否开启加密
-  enable: false
+  enable: true
   # 默认加密算法
   algorithm: BASE64
   # 编码方式 BASE64/HEX。默认BASE64
@@ -202,6 +216,10 @@ api-decrypt:
     - /gps/equipment/dataAcceptance  # GPS数据接收接口
 
 springdoc:
+  default-flat-param-object: true
+  swagger-ui:
+    path: /swagger-ui.html
+    tags-sorter: alpha
   api-docs:
     # 是否开启接口文档
     enabled: true
@@ -221,10 +239,14 @@ springdoc:
   components:
     # 鉴权方式配置
     security-schemes:
-      apiKey:
-        type: APIKEY
+      Authorization:
+        type: HTTP
         in: HEADER
         name: ${sa-token.token-name}
+      Clientid:
+        type: HTTP
+        in: HEADER
+        name: Clientid
   #这里定义了两个分组，可定义多个，也可以不定义
   group-configs:
     - group: 1.通用模块
@@ -253,10 +275,10 @@ springdoc:
       packages-to-scan: org.dromara.design
     - group: 13.工作流模块
       packages-to-scan: org.dromara.workflow
+    - group: 14.合同模块
+      packages-to-scan: org.dromara.ctr
     - group: 15.无人机模块
       packages-to-scan: org.dromara.drone
-    - group: 20.代码生成模块
-      packages-to-scan: org.dromara.generator
     - group: 16.app模块
       packages-to-scan: org.dromara.app
     - group: 17.材料设备模块
@@ -265,22 +287,36 @@ springdoc:
       packages-to-scan: org.dromara.out
     - group: 19.消息模块
       packages-to-scan: org.dromara.message
+    - group: 20.代码生成模块
+      packages-to-scan: org.dromara.generator
     - group: 21.分标策划模块
       packages-to-scan: org.dromara.tender
     - group: 22.大屏模块
       packages-to-scan: org.dromara.bigscreen
-    - group: 22.投标管理模块
-      packages-to-scan: org.dromara.bidding
     - group: 23.GPS定位模块
       packages-to-scan: org.dromara.gps
     - group: 24.招标模块
       packages-to-scan: org.dromara.tender
-    - group: 25.app版本模块
-      packages-to-scan: org.dromara.app
+    - group: 25.数据迁移模块
+      packages-to-scan: org.dromara.transferData
     - group: 26.netty消息模块
       packages-to-scan: org.dromara.websocket
     - group: 27.新中大模块
       packages-to-scan: org.dromara.xzd
+    - group: 28.车辆模块
+      packages-to-scan: org.dromara.vehicle
+    - group: 29.app版本模块
+      packages-to-scan: org.dromara.app
+    - group: 30.AI 模块
+      packages-to-scan: org.dromara.ai
+    - group: 31.投标管理模块
+      packages-to-scan: org.dromara.bidding
+    - group: 32.设备模块
+      packages-to-scan: org.dromara.device
+    - group: 33.摄像头模块
+      packages-to-scan: org.dromara.other
+    - group: 34.机械模块
+      packages-to-scan: org.dromara.mechanical
 # knife4j的增强配置，不需要增强可以不配
 knife4j:
   enable: true
@@ -296,6 +332,17 @@ xss:
     - /system/notice
     - /warm-flow/save-xml
     - /project/project
+    - /xzd/contractDetails/**
+    - /xzd/contractChange/**
+    - /xzd/comprehensive/csContractChange/**
+    - /xzd/comprehensive/csContractInformation/**
+    - /xzd/hetongbiangeng/**
+    - /xzd/fenbaohetongjungong/**
+    - /xzd/fenbaohetongbiangg/**
+    - /xzd/fenbaohetongxinxi/**
+    - /xzd/contractManagement/**
+    - /xzd/jixiehetongxinxi/contractMachinery/**
+    - /xzd/jixiehetongbiang/machineryContractAlteration/**
 
 # 全局线程池相关配置
 # 如使用JDK21请直接使用虚拟线程 不要开启此配置

xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/DemoTest.java

@@ -3,6 +3,9 @@ package org.dromara.test;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.IdcardUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -21,7 +24,15 @@ import org.dromara.facility.domain.FacMatrix;
 import org.dromara.facility.service.IFacMatrixService;
 import org.dromara.facility.service.IFacPhotovoltaicPanelPartsService;
 import org.dromara.facility.service.IFacPhotovoltaicPanelService;
+import org.dromara.manager.recognizermanager.enums.RecognizerTypeEnum;
 import org.dromara.manager.recognizermanager.vo.RecognizeConvertCoordinateResult;
+import org.dromara.manager.ys7manager.Ys7Constant;
+import org.dromara.manager.ys7manager.Ys7Manager;
+import org.dromara.manager.ys7manager.vo.Ys7ResponseVo;
+import org.dromara.other.domain.OthYs7Device;
+import org.dromara.other.domain.dto.ys7deviceimg.OthYs7DeviceImgCreateByCapture;
+import org.dromara.other.service.IOthYs7DeviceImgService;
+import org.dromara.other.service.IOthYs7DeviceService;
 import org.dromara.out.domain.OutConstructionValue;
 import org.dromara.out.domain.OutConstructionValueRange;
 import org.dromara.out.service.IOutConstructionValueRangeService;
@@ -47,6 +58,8 @@ import java.time.LocalDate;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -101,6 +114,15 @@ public class DemoTest {
     @Resource
     private IOutConstructionValueService constructionValueService;
 
+    @Resource
+    private IOthYs7DeviceService ys7DeviceService;
+
+    @Resource
+    private IOthYs7DeviceImgService ys7DeviceImgService;
+
+    @Resource
+    private Ys7Manager ys7Manager;
+
 
     @Test
     void testConstructionValue() {
@@ -114,7 +136,7 @@ public class DemoTest {
         log.info("执行定时任务：同步 {}至{} 计划详情到施工产值", lastMonday, lastSunday);
         Boolean synced = progressPlanDetailService.syncPlanDetail2ConstructionValue(lastMonday, lastSunday, null);*/
         LocalDate start = LocalDate.of(2024, 1, 1); // 起始时间（2024-01-01）
-        LocalDate end = LocalDate.of(2025, 9, 15); // 截止时间（2025-09-15）
+        LocalDate end = LocalDate.of(2025, 10, 27); // 截止时间（2025-09-15）
 
         // 如果起始不是周一，调整到当周的周一
         if (start.getDayOfWeek() != DayOfWeek.MONDAY) {
@@ -129,8 +151,14 @@ public class DemoTest {
             System.out.println(monday + " ~ " + sunday);
             log.info("执行定时任务：同步 {}至{} 计划详情到施工产值", monday, sunday);
 //        Boolean synced = progressPlanDetailService.syncPlanDetail2ConstructionValue(start, now, null);
+            List<BusProject> list = projectService.lambdaQuery()
+                .eq(BusProject::getPId, 1968506669544656898L)
+                .list();
+            List<Long> list1 = new ArrayList<>(list.stream().map(BusProject::getId).toList());
+            list1.add(1968506669544656898L);
             // 获取范围时间内的计划详情
             List<PgsProgressPlanDetail> planDetailList = progressPlanDetailService.lambdaQuery()
+                .in(PgsProgressPlanDetail::getProjectId, list1)
                 .ge(PgsProgressPlanDetail::getDate, monday)
                 .le(PgsProgressPlanDetail::getDate, sunday)
                 .ne(PgsProgressPlanDetail::getFinishedNumber, BigDecimal.ZERO)
@@ -229,8 +257,8 @@ public class DemoTest {
                     value.setOutValue(constructionValue);
                     value.setOwnerValue(ownerValue);
                     // 统计总产值
-                    allConstructionValue = allConstructionValue.add(constructionValue).setScale(4, RoundingMode.HALF_UP);
-                    allOwnerValue = allOwnerValue.add(ownerValue).setScale(4, RoundingMode.HALF_UP);
+                    allConstructionValue = allConstructionValue.add(constructionValue);
+                    allOwnerValue = allOwnerValue.add(ownerValue);
                     // 添加需要修改状态的计划详情
                     PgsProgressPlanDetail update = new PgsProgressPlanDetail();
                     update.setId(planDetail.getId());
@@ -238,8 +266,8 @@ public class DemoTest {
                     updateList.add(update);
                     saveList.add(value);
                 }
-                range.setOutValue(allConstructionValue);
-                range.setOwnerValue(allOwnerValue);
+                range.setOutValue(allConstructionValue.setScale(4, RoundingMode.HALF_UP));
+                range.setOwnerValue(allOwnerValue.setScale(4, RoundingMode.HALF_UP));
                 // 如果产值都为0，则不保存
                 if (allConstructionValue.compareTo(BigDecimal.ZERO) == 0 && allOwnerValue.compareTo(BigDecimal.ZERO) == 0) {
                     return null;
@@ -376,7 +404,8 @@ public class DemoTest {
     @Test
     void testImport() {
         photovoltaicPanelService.updateFinishNumberByCoordinate(List.of(1968510961294921730L),
-            List.of(new RecognizeConvertCoordinateResult("107.124334530", "23.830557974")));
+            List.of(new RecognizeConvertCoordinateResult("107.124334530", "23.830557974")),
+            RecognizerTypeEnum.BRACKET.getValue());
     }
 
     @Test
@@ -505,4 +534,66 @@ public class DemoTest {
         }
     }
 
+    @Test
+    void openSxtLx() {
+        String token = ys7Manager.getToken();
+        List<OthYs7Device> list = ys7DeviceService.list();
+        for (OthYs7Device othYs7Device : list) {
+            HashMap<String, Object> paramMap = new HashMap<>();
+            paramMap.put("accessToken", token);
+            paramMap.put("deviceSerial", othYs7Device.getDeviceSerial());
+            paramMap.put("enable", 1);
+            String errorMsg = "Ys7 Token 请求失败";
+            try (HttpResponse response = HttpRequest.post(Ys7Constant.setDeviceVideoUrlByPost)
+                .form(paramMap)
+                .execute()) {
+                if (!response.isOk()) {
+                    log.error("{}：{}", errorMsg, response.getStatus());
+//                    throw new ServiceException(errorMsg + response.getStatus());
+                }
+                String body = response.body();
+                Ys7ResponseVo responseVo = JSONUtil.toBean(body, Ys7ResponseVo.class);
+                if (!responseVo.getCode().equals("200")) {
+                    log.error("{}，状态码：{}，{}", errorMsg, responseVo.getCode(), responseVo.getMsg());
+//                    throw new ServiceException(errorMsg + responseVo.getMsg());
+                }
+                log.info("Ys7 Token 请求成功：{}", body);
+            }
+        }
+    }
+
+
+    @Test
+    void capturePic() {
+        List<String> urlList = List.of(
+            "http://xny.yj-3d.com:9000/xinnengyuan-dev/2025/10/23/db8a379b456142459852b654f20d5f97.png",
+            "http://xny.yj-3d.com:9000/xinnengyuan-dev/2025/10/23/913dbcf0f7244c8b878e84b5525bec4b.png",
+            "http://xny.yj-3d.com:9000/xinnengyuan-dev/2025/10/23/2b904765f03f40b2ad0ddbf6ddeadb45.png"
+        );
+        for (String url : urlList) {
+            Pattern pattern = Pattern.compile(".*/device/img/([^/]+)/.*");
+            Matcher matcher = pattern.matcher(url);
+            OthYs7Device ys7Device = ys7DeviceService.lambdaQuery()
+                .eq(OthYs7Device::getDeviceSerial, "GA1730672")
+                .last("limit 1")
+                .one();
+            if (ys7Device == null) {
+                throw new ServiceException("设备不存在", HttpStatus.ERROR);
+            }
+            String deviceSerial = ys7Device.getDeviceSerial();
+            // 如果没有预置位，则直接对默认通道抓图
+            OthYs7DeviceImgCreateByCapture img = new OthYs7DeviceImgCreateByCapture();
+            img.setProjectId(ys7Device.getProjectId());
+            img.setDeviceSerial(deviceSerial);
+            img.setDeviceName(ys7Device.getDeviceName());
+//        String url = "http://xny.yj-3d.com:9000/xinnengyuan/ys7/device/img/GA1044315/2025-10-13_859fdfb7dde540608356f29cb9e3d63e.jpg";
+//            String url = "http://xny.yj-3d.com:9000/xinnengyuan/ys7/device/img/GA1044315/2025-10-12_2801707255b84004acb5fee2a75299b2.jpg";
+            img.setCreateTime(new Date());
+            img.setUrl(url);
+            log.info("图片：{}，识别中", url);
+            ys7DeviceImgService.saveCapturePic(List.of(img));
+
+        }
+    }
+
 }

xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/MaterialsTest.java

@@ -0,0 +1,132 @@
+package org.dromara.test;
+
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.materials.domain.MatMaterialIssue;
+import org.dromara.materials.domain.MatMaterialReceive;
+import org.dromara.materials.domain.MatMaterials;
+import org.dromara.materials.domain.MatMaterialsInventory;
+import org.dromara.materials.domain.enums.MatMaterialsInventoryOutPutEnum;
+import org.dromara.materials.service.IMatMaterialIssueService;
+import org.dromara.materials.service.IMatMaterialReceiveService;
+import org.dromara.materials.service.IMatMaterialsInventoryService;
+import org.dromara.materials.service.IMatMaterialsService;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * @author lilemy
+ * @date 2025-10-30 15:58
+ */
+@Slf4j
+@SpringBootTest
+public class MaterialsTest {
+
+    /**
+     * 长顺项目id
+     */
+    private static final Long PROJECT_ID = 1897161054676336641L;
+
+    @Resource
+    private IMatMaterialsService materialsService;
+
+    @Resource
+    private IMatMaterialsInventoryService materialsInventoryService;
+
+    @Resource
+    private IMatMaterialReceiveService materialReceiveService;
+
+    @Resource
+    private IMatMaterialIssueService materialIssueService;
+
+    @Test
+    void test() {
+        // 获取所有材料
+        List<MatMaterials> materials = materialsService.lambdaQuery()
+            .eq(MatMaterials::getProjectId, PROJECT_ID)
+            .list();
+        Set<Long> materialIds = materials.stream().map(MatMaterials::getId).collect(Collectors.toSet());
+        // 获取所有材料的出库数据
+        List<MatMaterialsInventory> inventoryList = materialsInventoryService.lambdaQuery()
+            .in(MatMaterialsInventory::getMaterialsId, materialIds)
+            .eq(MatMaterialsInventory::getOutPut, MatMaterialsInventoryOutPutEnum.OUT.getValue())
+            .list();
+        // 按表单编号分组
+        Map<String, List<MatMaterials>> map = materials.stream()
+            .collect(Collectors.groupingBy(MatMaterials::getFormCode));
+        for (Map.Entry<String, List<MatMaterials>> entry : map.entrySet()) {
+            String formCode = entry.getKey();
+            List<MatMaterials> materialsList = entry.getValue();
+            // 获取入库数据
+            MatMaterialReceive receive = materialReceiveService.lambdaQuery()
+                .eq(MatMaterialReceive::getFormCode, formCode)
+                .one();
+            // 创建领料出库数据
+            MatMaterialIssue issue = new MatMaterialIssue();
+            issue.setProjectId(PROJECT_ID);
+            issue.setMaterialSource("2");
+            issue.setFormCode(formCode);
+            issue.setProjectName(receive.getProjectName());
+            issue.setMaterialName(receive.getMaterialName());
+            issue.setOrderingUnit(receive.getOrderingUnit());
+            issue.setSupplierUnit(receive.getSupplierUnit());
+//            issue.setIssueUnit(inventory.getRecipient());
+//            issue.setIssueUnitId(inventory.getRecipientId());
+//            issue.setShipper(inventory.getShipper());
+
+
+
+
+//                issue.setStorageUnit();
+            issue.setCertCount(0);
+            issue.setReportCount(0);
+            issue.setTechDocCount(0);
+            issue.setLicenseCount(0);
+            log.info("领料出库数据：{}", issue);
+            log.info("=============================");
+        }
+
+        for (MatMaterials material : materials) {
+            String formCode = material.getFormCode();
+            // 查看入库数据
+            MatMaterialReceive receive = materialReceiveService.lambdaQuery()
+                .eq(MatMaterialReceive::getFormCode, formCode)
+                .one();
+            // 查看出库数据
+/*            List<MatMaterialsInventory> inventoryList = materialsInventoryService.lambdaQuery()
+                .eq(MatMaterialsInventory::getMaterialsId, material.getId())
+                .eq(MatMaterialsInventory::getOutPut, MatMaterialsInventoryOutPutEnum.OUT.getValue())
+                .list();
+            if (CollUtil.isEmpty(inventoryList)) {
+                continue;
+            }*/
+            // 创建领料出库数据
+            List<MatMaterialIssue> issueList = inventoryList.stream().map(inventory -> {
+                MatMaterialIssue issue = new MatMaterialIssue();
+                issue.setProjectId(PROJECT_ID);
+                issue.setMaterialSource("2");
+                issue.setFormCode(receive.getFormCode());
+                issue.setProjectName(receive.getProjectName());
+                issue.setMaterialName(receive.getMaterialName());
+                issue.setOrderingUnit(receive.getOrderingUnit());
+                issue.setSupplierUnit(receive.getSupplierUnit());
+                issue.setIssueUnit(inventory.getRecipient());
+                issue.setIssueUnitId(inventory.getRecipientId());
+                issue.setShipper(inventory.getShipper());
+//                issue.setStorageUnit();
+                issue.setCertCount(0);
+                issue.setReportCount(0);
+                issue.setTechDocCount(0);
+                issue.setLicenseCount(0);
+                log.info("领料出库数据：{}", issue);
+                log.info("=============================");
+                return issue;
+            }).toList();
+        }
+    }
+}

xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/RecognizerTest.java

@@ -1,14 +1,23 @@
 package org.dromara.test;
 
+import cn.hutool.json.JSONUtil;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.StringUtils;
 import org.dromara.manager.recognizermanager.RecognizerManager;
 import org.dromara.manager.recognizermanager.enums.RecognizerTypeEnum;
 import org.dromara.manager.recognizermanager.vo.RecognizeVo;
+import org.dromara.progress.domain.PgsProgressPlanDetail;
+import org.dromara.progress.domain.vo.progressplandetail.PgsProgressPlanDetailFinishedVo;
+import org.dromara.progress.service.IPgsProgressPlanDetailService;
+import org.dromara.progress.service.IPgsProgressPlanService;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author lilemy
@@ -21,9 +30,55 @@ public class RecognizerTest {
     @Resource
     private RecognizerManager recognizerManager;
 
+    @Resource
+    private IPgsProgressPlanDetailService progressPlanDetailService;
+
+    @Resource
+    private IPgsProgressPlanService progressPlanService;
+
     @Test
     void test() {
-        RecognizeVo recognize = recognizerManager.recognize("http://xny.yj-3d.com:7363/file/tif/20250625160218orthophoto.png", List.of(RecognizerTypeEnum.SOLAR));
+        RecognizeVo recognize = recognizerManager.recognize("http://xny.yj-3d.com:7363/file/tif/20250625160218orthophoto.png", List.of(RecognizerTypeEnum.PANEL));
         log.info("recognize: {}", recognize);
     }
+
+    @Test
+    void testChange() {
+        recognizerManager.convertCoordinate("http://xny.yj-3d.com:9000/xinnengyuan-dev/2025/11/11/d48767a62bc04867a552e06ba6712004.tif", List.of());
+    }
+
+    @Test
+    void checkNumber() {
+        List<PgsProgressPlanDetail> detailList = progressPlanDetailService.list();
+        List<PgsProgressPlanDetail> planDetailList = detailList.stream()
+            .filter(detail -> StringUtils.isNotBlank(detail.getFinishedDetail()))
+            .toList();
+        Map<String, List<PgsProgressPlanDetail>> collect = planDetailList.stream()
+            .collect(Collectors.groupingBy(PgsProgressPlanDetail::getFinishedDetail));
+        // 遍历分组结果，输出重复项
+        for (Map.Entry<String, List<PgsProgressPlanDetail>> entry : collect.entrySet()) {
+            String fieldValue = entry.getKey();
+            List<PgsProgressPlanDetail> duplicates = entry.getValue();
+            if (duplicates.size() > 1) { // 筛选出有重复的字段值
+                PgsProgressPlanDetail first = duplicates.getFirst();
+                Long id = first.getId();
+                Long planId = first.getProgressPlanId();
+                progressPlanService.removeById(planId);
+                progressPlanDetailService.removeById(id);
+                System.out.println("重复对象的对象：" + duplicates.stream().map(PgsProgressPlanDetail::getId).toList());
+            }
+        }
+        for (PgsProgressPlanDetail detail : detailList) {
+            BigDecimal aiFill = detail.getFinishedNumber();
+            String finishedDetail = detail.getFinishedDetail();
+            if (StringUtils.isBlank(finishedDetail)) {
+                continue;
+            }
+//            log.info("id: {}, finishedDetail: {}", detail.getId(), finishedDetail);
+            List<PgsProgressPlanDetailFinishedVo> finishedVos = JSONUtil.toList(finishedDetail, PgsProgressPlanDetailFinishedVo.class);
+            if (aiFill.compareTo(BigDecimal.valueOf(finishedVos.size())) != 0) {
+                log.info("数量异常：{}：{}", detail.getId(), detail.getProgressCategoryId());
+            }
+        }
+    }
 }

xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/ViolationRecordTest.java

@@ -1,9 +1,17 @@
 package org.dromara.test;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import jakarta.annotation.Resource;
+import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.safety.domain.dto.violationrecord.HseViolationRecordCreateDto;
 import org.dromara.safety.service.IHseViolationRecordService;
+import org.dromara.system.domain.SysMenu;
+import org.dromara.system.domain.vo.SysMenuVo;
+import org.dromara.system.mapper.SysMenuMapper;
+import org.dromara.system.service.ISysMenuService;
+import org.hamcrest.core.Is;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import java.util.ArrayList;
@@ -20,6 +28,9 @@ public class ViolationRecordTest {
     @Resource
     private IHseViolationRecordService violationRecordService;
 
+    @Autowired
+    private SysMenuMapper sysMenuMapper;
+
     @Test
     void test() {
         List<HseViolationRecordCreateDto> list = new ArrayList<>();
@@ -55,4 +66,26 @@ public class ViolationRecordTest {
         list.add(dto5);
         violationRecordService.insertByMonitor(list);
     }
+
+    @Test
+    void contextLoads() {
+        SysMenuVo sysMenuVo = sysMenusByList(1972500768346673154L);
+        System.out.println(sysMenuVo.toString());
+
+    }
+
+    SysMenuVo sysMenusByList(Long id) {
+        SysMenuVo sysMenus = new SysMenuVo();
+        List<SysMenu> res = sysMenuMapper.selectList(new LambdaQueryWrapper<SysMenu>().eq(SysMenu::getParentId, id));
+        if (res != null && res.size() > 0 ) {
+            sysMenus.setChildren(MapstructUtils.convert(res, SysMenuVo.class));
+            res.forEach(sysMenu -> {
+                sysMenusByList(sysMenu.getMenuId());
+            });
+        }
+        return sysMenus;
+
+    }
+
+
 }

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java

@@ -5,11 +5,14 @@ import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.SpringUtils;
 import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.context.annotation.Bean;
 import org.springframework.core.task.VirtualThreadTaskExecutor;
 import org.springframework.scheduling.annotation.AsyncConfigurer;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 import java.util.Arrays;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
 
 /**
  * 异步配置
@@ -26,12 +29,48 @@ public class AsyncConfig implements AsyncConfigurer {
      */
     @Override
     public Executor getAsyncExecutor() {
-        if(SpringUtils.isVirtual()) {
+        if (SpringUtils.isVirtual()) {
             return new VirtualThreadTaskExecutor("async-");
         }
         return SpringUtils.getBean("scheduledExecutorService");
     }
 
+    /**
+     * 新增：自定义线程池（可以在 @Async("capturePicExecutor") 使用）
+     */
+    @Bean("capturePicExecutor")
+    public Executor customExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        // 核心线程数
+        executor.setCorePoolSize(5);
+        // 最大线程数
+        executor.setMaxPoolSize(10);
+        // 队列容量（超过核心线程数时，任务进入队列）
+        executor.setQueueCapacity(50);
+        // 空闲线程最大存活时间（秒）
+        executor.setKeepAliveSeconds(60);
+        // 线程名前缀，方便定位日志
+        executor.setThreadNamePrefix("capturePic-async-");
+        // 拒绝策略：当线程池满时
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        // CallerRunsPolicy：由调用线程执行任务（相对安全）
+        // 初始化
+        executor.initialize();
+        return executor;
+    }
+
+    // 解压线程池（大文件操作，不需要太多线程）
+    @Bean("unzipExecutor")
+    public Executor unzipExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(2);
+        executor.setMaxPoolSize(4);
+        executor.setQueueCapacity(10);
+        executor.setThreadNamePrefix("unzip-");
+        executor.initialize();
+        return executor;
+    }
+
     /**
      * 异步执行异常处理
      */

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/vo/XzdCustomerSupplierVos.java

@@ -0,0 +1,32 @@
+package org.dromara.common.core.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+@Data
+public class XzdCustomerSupplierVos  implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+
+    private Long id;
+
+    /**
+     * 类型（1、供应商，2、客户）
+     */
+    private String type;
+
+    /**
+     * 供应商-客户id
+     */
+    private Long cSId;
+
+
+}

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/XzdCbysZjhcbService.java

@@ -0,0 +1,5 @@
+package org.dromara.common.core.service;
+
+public interface XzdCbysZjhcbService {
+    String selectNmaeByIds(String ids);
+}

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/XzdContractMachineryService.java

@@ -0,0 +1,14 @@
+package org.dromara.common.core.service;
+
+/**
+ * 机械合同信息Service接口
+ *
+ * @author Lion Li
+ * @date 2025-11-12
+ */
+public interface XzdContractMachineryService {
+
+    String selectNmaeByIds(String ids);
+
+
+}

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/XzdCsContractInformationService.java

@@ -0,0 +1,6 @@
+package org.dromara.common.core.service;
+
+public interface XzdCsContractInformationService {
+
+    String selectNameByIds(String ids);
+}

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/XzdCustomerSupplierService.java

@@ -0,0 +1,14 @@
+package org.dromara.common.core.service;
+
+import org.dromara.common.core.domain.vo.XzdCustomerSupplierVos;
+
+public interface XzdCustomerSupplierService {
+
+    /**
+     * 查询供应商-客户中间
+     *
+     * @param id 主键
+     * @return 供应商-客户中间
+     */
+    XzdCustomerSupplierVos queryByIdone(Long id);
+}

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/XzdCustomerinformationService.java

@@ -0,0 +1,8 @@
+package org.dromara.common.core.service;
+
+public interface XzdCustomerinformationService {
+
+    String selectNmaeByIds(String id);
+
+    String selectNmaeById(Long id);
+}

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/XzdJsCgJungonService.java

@@ -0,0 +1,6 @@
+package org.dromara.common.core.service;
+
+public interface XzdJsCgJungonService {
+
+    String selectNameByIds(String ids);
+}

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/XzdProjectManagerApprovalService.java

@@ -0,0 +1,6 @@
+package org.dromara.common.core.service;
+
+public interface XzdProjectManagerApprovalService {
+
+    String selectNmaeByIds(String ids);
+}

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/XzdProjectService.java

@@ -0,0 +1,6 @@
+package org.dromara.common.core.service;
+
+public interface XzdProjectService {
+
+    String selectNmaeByIds(String ids);
+}

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/XzdPurchaseContractInformationService.java

@@ -0,0 +1,5 @@
+package org.dromara.common.core.service;
+
+public interface XzdPurchaseContractInformationService {
+    String selectNameByIds(String ids);
+}

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/XzdSjContractInfoService.java

@@ -0,0 +1,6 @@
+package org.dromara.common.core.service;
+
+public interface XzdSjContractInfoService {
+
+    String selectNameByIds(String ids);
+}

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/XzdSupplierInfoService.java

@@ -0,0 +1,9 @@
+package org.dromara.common.core.service;
+
+public interface XzdSupplierInfoService {
+
+    String selectNmaeByIds(String ids);
+
+    String selectNmaeById(Long id);
+
+}

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/XzdSupplierOpenBankService.java

@@ -0,0 +1,6 @@
+package org.dromara.common.core.service;
+
+public interface XzdSupplierOpenBankService {
+
+    String selectNameByIds(String ids);
+}

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

@@ -0,0 +1,146 @@
+package org.dromara.common.core.utils;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+
+/**
+ * 时间戳转换工具类（包含时分秒提取）
+ */
+public class TimestampUtils {
+
+    // 默认时区（东八区）
+    private static final TimeZone DEFAULT_TIME_ZONE = TimeZone.getTimeZone("GMT+8");
+
+    // 完整日期格式
+    private static final String FULL_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+    // 时分秒格式
+    private static final String TIME_FORMAT = "HH:mm:ss";
+
+    // 日期格式
+    private static final String DATE_FORMAT = "yyyy-MM-dd";
+
+    /**
+     * 将日期字符串转为秒级时间戳（优化版）
+     * 支持格式："2025-12-03 23:59:59"、"2025-12-03"等
+     * @param dateStr 日期字符串
+     * @return 秒级时间戳
+     */
+    public static Long parseDateToTimestamp(String dateStr) {
+        if (StrUtil.isBlank(dateStr)) {
+            return null;
+        }
+
+        // 使用Hutool的DateUtil进行智能解析（推荐）
+        try {
+            Date date = DateUtil.parse(dateStr);
+            return date.getTime() / 1000L; // 转为秒级时间戳
+        } catch (Exception e) {
+            throw new IllegalArgumentException(
+                String.format("日期格式错误：%s，支持格式：yyyy-MM-dd HH:mm:ss、yyyy-MM-dd等", dateStr)
+            );
+        }
+    }
+
+    /**
+     * 将时间戳转换为完整日期格式（yyyy-MM-dd HH:mm:ss）
+     */
+    public static String formatTimestamp(Object timestamp) {
+        if (timestamp == null) {
+            return null;
+        }
+
+        String timestampStr = timestamp.toString().trim();
+        if (StrUtil.isBlank(timestampStr)) {
+            return null;
+        }
+
+        Long time = parseToMilliseconds(timestampStr);
+        SimpleDateFormat sdf = new SimpleDateFormat(FULL_DATE_FORMAT);
+        sdf.setTimeZone(DEFAULT_TIME_ZONE);
+        return sdf.format(new Date(time));
+    }
+
+    /**
+     * 提取时间戳中的时分秒部分（HH:mm:ss）
+     */
+    public static String extractTime(Object timestamp) {
+        if (timestamp == null) {
+            return null;
+        }
+
+        String timestampStr = timestamp.toString().trim();
+        if (StrUtil.isBlank(timestampStr)) {
+            return null;
+        }
+
+        Long time = parseToMilliseconds(timestampStr);
+        SimpleDateFormat sdf = new SimpleDateFormat(TIME_FORMAT);
+        sdf.setTimeZone(DEFAULT_TIME_ZONE);
+        return sdf.format(new Date(time));
+    }
+
+    /**
+     * 提取时间戳中的日期部分（yyyy-MM-dd）
+     */
+    public static String extractDate(Object timestamp) {
+        if (timestamp == null) {
+            return null;
+        }
+
+        String timestampStr = timestamp.toString().trim();
+        if (StrUtil.isBlank(timestampStr)) {
+            return null;
+        }
+
+        Long time = parseToMilliseconds(timestampStr);
+        SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT);
+        sdf.setTimeZone(DEFAULT_TIME_ZONE);
+        return sdf.format(new Date(time));
+    }
+
+    /**
+     * 解析时间戳字符串为毫秒级时间戳
+     */
+    private static Long parseToMilliseconds(String timestampStr) {
+        try {
+            Long time = Long.parseLong(timestampStr);
+            // 10位秒级时间戳转为13位毫秒级
+            if (timestampStr.length() == 10) {
+                time = time * 1000;
+            }
+            return time;
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException("时间戳格式错误：" + timestampStr);
+        }
+    }
+
+    /**
+     * 获取时间戳对应的小时
+     */
+    public static int getHour(Object timestamp) {
+        String timeStr = extractTime(timestamp);
+        return Integer.parseInt(timeStr.split(":")[0]);
+    }
+
+    /**
+     * 获取时间戳对应的分钟
+     */
+    public static int getMinute(Object timestamp) {
+        String timeStr = extractTime(timestamp);
+        return Integer.parseInt(timeStr.split(":")[1]);
+    }
+
+    /**
+     * 获取时间戳对应的秒
+     */
+    public static int getSecond(Object timestamp) {
+        String timeStr = extractTime(timestamp);
+        return Integer.parseInt(timeStr.split(":")[2]);
+    }
+}

xinnengyuan/ruoyi-common/ruoyi-common-doc/pom.xml

@@ -44,7 +44,17 @@
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
-            <version>4.4.0</version>
+            <version>4.5.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springdoc</groupId>
+                    <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springdoc</groupId>
+                    <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
     </dependencies>

xinnengyuan/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java

@@ -1,6 +1,8 @@
 package org.dromara.common.doc.config;
 
+import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.Paths;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
@@ -9,6 +11,7 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.doc.config.properties.SpringDocProperties;
 import org.dromara.common.doc.handler.OpenApiHandler;
 import org.springdoc.core.configuration.SpringDocConfiguration;
+import org.springdoc.core.customizers.GlobalOpenApiCustomizer;
 import org.springdoc.core.customizers.OpenApiBuilderCustomizer;
 import org.springdoc.core.customizers.OpenApiCustomizer;
 import org.springdoc.core.customizers.ServerBaseUrlCustomizer;
@@ -23,6 +26,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
+import org.springframework.http.HttpHeaders;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -61,7 +65,6 @@ public class SpringDocConfig {
         keySet.forEach(securityRequirement::addList);
         list.add(securityRequirement);
         openApi.security(list);
-
         return openApi;
     }
 
@@ -123,4 +126,26 @@ public class SpringDocConfig {
         }
     }
 
+
+    @Bean
+    public GlobalOpenApiCustomizer orderGlobalOpenApiCustomizer() {
+        return openApi -> {
+            // 全局添加鉴权参数
+            if(openApi.getPaths()!=null){
+                openApi.getPaths().forEach((s, pathItem) -> {
+                    // 为所有接口添加鉴权
+                    List<Operation> operations = pathItem.readOperations();
+                    operations.forEach(operation -> {
+                        operation.addSecurityItem(new SecurityRequirement()
+                            .addList(HttpHeaders.AUTHORIZATION)
+                            .addList("Clientid")
+                        );
+                    });
+                });
+            }
+
+        };
+
+    }
+
 }

xinnengyuan/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/coryUtils/ExcelReader.java

@@ -73,8 +73,7 @@ public class ExcelReader {
 
         // 从MultipartFile获取输入流
         try (InputStream stream = file.getInputStream();
-             org.apache.poi.ss.usermodel.Workbook workbook = isXlsx ?
-                 new XSSFWorkbook(stream) : new HSSFWorkbook(stream)) {
+             Workbook workbook = WorkbookFactory.create(stream)) {
 
             for (int sheetIndex = 0; sheetIndex < workbook.getNumberOfSheets(); sheetIndex++) {
                 org.apache.poi.ss.usermodel.Sheet sheet = workbook.getSheetAt(sheetIndex);

xinnengyuan/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/handler/LockColumnHandler.java

@@ -0,0 +1,40 @@
+package org.dromara.common.excel.handler;
+
+import com.alibaba.excel.write.handler.CellWriteHandler;
+import com.alibaba.excel.write.handler.context.CellWriteHandlerContext;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Workbook;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+public class LockColumnHandler implements CellWriteHandler {
+
+    private final Set<Integer> lockColumns;
+
+    public LockColumnHandler(Collection<Integer> lockColumns) {
+        this.lockColumns = new HashSet<>(lockColumns);
+    }
+
+    @Override
+    public void afterCellDispose(CellWriteHandlerContext context) {
+        Cell cell = context.getCell();
+        if (cell == null) return;
+
+        Workbook workbook = cell.getSheet().getWorkbook();
+
+        // 必须为所有单元格创建一个新的 CellStyle
+        CellStyle style = workbook.createCellStyle();
+
+        // 锁定指定列
+        if (lockColumns.contains(cell.getColumnIndex())) {
+            style.setLocked(true);
+        } else {
+            style.setLocked(false);  // 非锁定列必须明确设置为 false！
+        }
+
+        cell.setCellStyle(style);
+    }
+}

xinnengyuan/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/handler/SheetProtectHandler.java

@@ -0,0 +1,26 @@
+package org.dromara.common.excel.handler;
+
+import com.alibaba.excel.write.handler.SheetWriteHandler;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder;
+import org.apache.poi.ss.usermodel.Sheet;
+
+/**
+ * @author lilemy
+ * @date 2025-11-14 15:05
+ */
+public class SheetProtectHandler implements SheetWriteHandler {
+
+    private final String password;
+
+    public SheetProtectHandler(String password) {
+        this.password = password;
+    }
+
+    @Override
+    public void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder,
+                                 WriteSheetHolder writeSheetHolder) {
+        Sheet sheet = writeSheetHolder.getSheet();
+        sheet.protectSheet(password);  // 可为空字符串
+    }
+}

xinnengyuan/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java

@@ -4,7 +4,10 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.resource.ClassPathResource;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelReader;
 import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.read.builder.ExcelReaderBuilder;
+import com.alibaba.excel.read.metadata.ReadSheet;
 import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillConfig;
@@ -14,27 +17,27 @@ import jakarta.servlet.ServletOutputStream;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.file.FileUtils;
 import org.dromara.common.excel.convert.ExcelBigNumberConvert;
 import org.dromara.common.excel.core.*;
 import org.dromara.common.excel.handler.DataWriteHandler;
-import org.springframework.http.HttpHeaders;
+import org.dromara.common.excel.handler.LockColumnHandler;
+import org.dromara.common.excel.handler.SheetProtectHandler;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Excel相关处理
  *
  * @author Lion Li
  */
+@Slf4j
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class ExcelUtil {
 
@@ -48,6 +51,41 @@ public class ExcelUtil {
         return EasyExcel.read(is).head(clazz).autoCloseStream(false).sheet().doReadSync();
     }
 
+    /**
+     * 同步读取 Excel（支持读取多个 Sheet）
+     *
+     * @param is    输入流（一次性读取）
+     * @param clazz Excel 映射实体类
+     * @return 所有 Sheet 的数据汇总
+     */
+    public static <T> List<T> importExcelAllSheet(InputStream is, Class<T> clazz) {
+        // 用于存放所有 sheet 的数据
+        List<T> allData = new ArrayList<>();
+        // 1. 构建 ExcelReader
+        ExcelReaderBuilder readerBuilder = EasyExcel.read(is);
+        ExcelReader reader = readerBuilder.build();
+        // 2. 获取 Excel 中全部 Sheet 信息（包含 SheetNo、页名等）
+        List<ReadSheet> readSheets = reader.excelExecutor().sheetList();
+        // 3. 遍历每一个 Sheet
+        for (ReadSheet sheet : readSheets) {
+            // 为每个 Sheet 创建独立监听器，用于接收读取结果
+            DefaultExcelListener<T> listener = new DefaultExcelListener<>(false);
+            // 4. 构建当前 Sheet 的读取器 使用 sheet.getSheetNo() 指定当前 sheet
+            ReadSheet readSheet = EasyExcel.readSheet(sheet.getSheetNo())
+                // 设置头映射实体类
+                .head(clazz)
+                // 注册读取监听器
+                .registerReadListener(listener)
+                .build();
+            // 5. 开始读取当前 Sheet
+            reader.read(readSheet);
+            // 6. 收集当前 Sheet 读取的数据
+            allData.addAll(listener.getExcelResult().getList());
+        }
+        // 7. 关闭读取器，释放资源
+        reader.finish();
+        return allData;
+    }
 
     /**
      * 使用校验监听器 异步导入 同步返回
@@ -205,15 +243,48 @@ public class ExcelUtil {
         builder.doWrite(list);
     }
 
+    /**
+     * 导出excel
+     *
+     * @param list        导出数据集合
+     * @param sheetName   工作表的名称
+     * @param clazz       实体类
+     * @param lockColumns 锁定列
+     * @param merge       是否合并单元格
+     * @param os          输出流
+     */
+    public static <T> void exportExcel(List<T> list, String sheetName, Class<T> clazz, List<Integer> lockColumns,
+                                       boolean merge, OutputStream os, List<DropDownOptions> options) {
+        ExcelWriterSheetBuilder builder = EasyExcel.write(os, clazz)
+            .registerWriteHandler(new LockColumnHandler(lockColumns))  // 锁定第3列
+            .registerWriteHandler(new SheetProtectHandler("dawdawdwad")) // 保护整张 sheet
+            .autoCloseStream(false)
+            // 自动适配
+            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+            // 大数值自动转换 防止失真
+            .registerConverter(new ExcelBigNumberConvert())
+            .registerWriteHandler(new DataWriteHandler(clazz))
+            .sheet(sheetName);
+        if (merge) {
+            // 合并处理器
+            builder.registerWriteHandler(new CellMergeStrategy(list, true));
+        }
+        // 添加下拉框操作
+        builder.registerWriteHandler(new ExcelDownHandler(options));
+        builder.doWrite(list);
+    }
+
     /**
      * 导出多sheet excel（增强版，解决XML安全问题）
      *
-     * @param sheetData    多个sheet的数据
-     * @param sheetNames   多个sheet的名称
-     * @param clazz        实体类
-     * @param optionsList  级联下拉选内容列表
+     * @param sheetData   多个sheet的数据
+     * @param sheetNames  多个sheet的名称
+     * @param clazz       实体类
+     * @param optionsList 级联下拉选内容列表
      */
-    public static <T> void exportMultiSheetExcelEnhanced(List<List<T>> sheetData, List<String> sheetNames, Class<T> clazz, List<List<DropDownOptions>> optionsList,HttpServletResponse response) throws IOException {
+    public static <T> void exportMultiSheetExcelEnhanced(List<List<T>> sheetData, List<String> sheetNames,
+                                                         Class<T> clazz, List<List<DropDownOptions>> optionsList,
+                                                         HttpServletResponse response) throws IOException {
         resetResponse("file", response);
         ExcelWriter excelWriter = null;
         ServletOutputStream os = response.getOutputStream();
@@ -224,6 +295,9 @@ public class ExcelUtil {
                 .head(clazz)
                 .autoCloseStream(false)
                 .registerConverter(new ExcelBigNumberConvert())
+                // 自动适配
+                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+                .registerWriteHandler(new DataWriteHandler(clazz))
                 .build();
 
 
@@ -252,12 +326,71 @@ public class ExcelUtil {
                     excelWriter.finish();
                 } catch (Exception e) {
                     // 记录日志但不中断主流程
-                    e.printStackTrace();
+                    log.error("Excel 导出错误", e);
                 }
             }
         }
     }
 
+    /**
+     * 导出多sheet excel（增强版，解决XML安全问题）
+     *
+     * @param sheetData   多个sheet的数据
+     * @param sheetNames  多个sheet的名称
+     * @param clazz       实体类
+     * @param optionsList 级联下拉选内容列表
+     */
+    public static <T> void exportExcel(List<List<T>> sheetData, List<String> sheetNames, List<Integer> lockColumns,
+                                       Class<T> clazz, List<List<DropDownOptions>> optionsList,
+                                       HttpServletResponse response) throws IOException {
+        resetResponse("file", response);
+        ExcelWriter excelWriter = null;
+        ServletOutputStream os = response.getOutputStream();
+
+        try {
+            // 使用SXSSFWorkbook避免内存问题，并减少XML处理复杂度
+            excelWriter = EasyExcel.write(os)
+                .head(clazz)
+                .registerWriteHandler(new LockColumnHandler(lockColumns))  // 锁定第3列
+//                .registerWriteHandler(new SheetProtectHandler("dawdawdwad")) // 保护整张 sheet
+                .autoCloseStream(false)
+                .registerConverter(new ExcelBigNumberConvert())
+                // 自动适配
+                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+                .registerWriteHandler(new DataWriteHandler(clazz))
+                .build();
+
+
+            // 为每个sheet写入数据
+            for (int i = 0; i < sheetData.size(); i++) {
+                // 创建基本sheet配置
+                WriteSheet writeSheet = EasyExcel.writerSheet(i, sheetNames.get(i))
+                    .head(clazz)
+                    .build();
+
+                // 添加下拉选项（如果存在）
+                if (optionsList != null && optionsList.size() > i && optionsList.get(i) != null) {
+                    ExcelDownHandler handler = new ExcelDownHandler(optionsList.get(i));
+                    writeSheet.setCustomWriteHandlerList(
+                        Collections.singletonList(handler));
+                }
+
+                // 写入数据
+                excelWriter.write(sheetData.get(i), writeSheet);
+            }
+
+        } finally {
+            // 确保资源正确释放
+            if (excelWriter != null) {
+                try {
+                    excelWriter.finish();
+                } catch (Exception e) {
+                    // 记录日志但不中断主流程
+                    log.error("Excel 导出错误", e);
+                }
+            }
+        }
+    }
 
     /**
      * 单表多数据模板导出 模板格式为 {.属性}
@@ -493,6 +626,4 @@ public class ExcelUtil {
     }
 
 
-
-
 }

xinnengyuan/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java

@@ -91,7 +91,7 @@ public class PlusDataPermissionHandler {
                 DataPermissionHelper.setVariable("user", currentUser);
             }
             // 如果是超级管理员或租户管理员，则不过滤数据
-            if (LoginHelper.isSuperAdmin() || LoginHelper.isTenantAdmin()) {
+            if (LoginHelper.isSuperAdmin()) {
                 return where;
             }
             // 构造数据过滤条件的 SQL 片段

xinnengyuan/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java

@@ -77,7 +77,7 @@ public class RedisUtils {
     public static <T> void publish(String channelKey, T msg, Consumer<T> consumer) {
         RTopic topic = CLIENT.getTopic(channelKey);
         topic.publish(msg);
-        System.out.println("发布通道消息---------"+msg.toString());
+//        System.out.println("发布通道消息---------"+msg.toString());
         consumer.accept(msg);
     }
 

xinnengyuan/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java

@@ -4,6 +4,7 @@ import cn.hutool.core.map.MapUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.sse.dto.SseMessageDto;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
 import java.io.IOException;
@@ -22,7 +23,14 @@ public class SseEmitterManager {
     /**
      * 订阅的频道
      */
-    private final static String SSE_TOPIC = "global:sse";
+//    private final static String SSE_TOPIC = "global:sse";
+
+    private static String SSE_TOPIC;
+
+    @Value("${spring.data.redis.database:0}")
+    public void setDatabase(int database) {
+        SSE_TOPIC = "global:sse:db" + database;
+    }
 
     private final static Map<Long, Map<String, SseEmitter>> USER_TOKEN_EMITTERS = new ConcurrentHashMap<>();
 

xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java

@@ -37,4 +37,55 @@ public interface TransConstant {
      */
     String PROJECT_ID_TO_NAME = "project_id_to_name";
 
+
+    /**
+     * 客户id转名称
+     */
+    String XZD_KHXX_ID_TO_NAME = "khxx_id_to_name";
+
+
+
+    /**
+     * 新中大项目id转名称
+     */
+    String XZD_PROJECT_ID_TO_NAME = "xzd_project_id_to_name";
+    /**
+     * 采购合同id转名称
+     */
+    String XZD_PURCHASE_CONTRACT_ID_TO_NAME = "xzd_purchase_contract_id_to_name";
+
+    /**
+     * 机械合同id转名称
+     */
+    String XZD_PURCHASE_JXXIE_ID_TO_NAME = "xzd_purchase_contract_jixie_id_to_name";
+
+    /**
+     * 综合服务合同id转名称
+     */
+    String XZD_CS_CONTRACT_INFORMATION_ID_TO_NAME = "xzd_cs_contract_information_id_to_name";
+    /**
+     * 结算-采购合同竣工结算id转名称
+     */
+    String XZD_JS_CG_JUNGON_ID_TO_NAME = "xzd_js_cg_jungon_id_to_name";
+    /**
+     * 新中大供应商信息-开户银行id转银行名称
+     */
+    String XZD_SUPPLIER_OPEN_BANK_ID_TO_NAME = "xzd_supplier_open_bank_id_to_name";
+
+
+    /**
+     * 新中大-项目经理推荐及审批id转名称
+     */
+    String XZD_PROJECT_MANAGER_APPROVAL_ID_TO_NAME = "xzd_project_manager_approval_id_to_name";
+    /**
+     * 新中大-立项及成本-成本预算-总体计划成本id转名称
+     */
+    String XZD_CBYS_ZJHCB_ID_TO_NAME = "xzd_cbys_zjhcb_id_to_name";
+
+    /**
+     * 新中大-设计合同信息id转name
+     */
+    String XZD_SJ_CONTRACT_INFO_ID_TO_NAME = "xzd_sj_contract_info_id_to_name";
+
+
 }

xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/XzdCbysZjhcbImpl.java

@@ -0,0 +1,24 @@
+package org.dromara.common.translation.core.impl;
+
+import lombok.AllArgsConstructor;
+import org.dromara.common.core.service.XzdCbysZjhcbService;
+import org.dromara.common.core.service.XzdProjectManagerApprovalService;
+import org.dromara.common.translation.annotation.TranslationType;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.common.translation.core.TranslationInterface;
+
+@AllArgsConstructor
+@TranslationType(type = TransConstant.XZD_CBYS_ZJHCB_ID_TO_NAME)
+public class XzdCbysZjhcbImpl implements TranslationInterface<String> {
+    private final XzdCbysZjhcbService xzdCbysZjhcbService;
+
+    @Override
+    public String translation(Object key, String other) {
+        if (key instanceof String ids) {
+            return xzdCbysZjhcbService.selectNmaeByIds(ids);
+        } else if (key instanceof Long id) {
+            return xzdCbysZjhcbService.selectNmaeByIds(id.toString());
+        }
+        return null;
+    }
+}

xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/XzdCsContractInformationImpl.java

@@ -0,0 +1,26 @@
+package org.dromara.common.translation.core.impl;
+
+import lombok.AllArgsConstructor;
+import org.dromara.common.core.service.XzdCsContractInformationService;
+import org.dromara.common.core.service.XzdPurchaseContractInformationService;
+import org.dromara.common.translation.annotation.TranslationType;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.common.translation.core.TranslationInterface;
+
+@AllArgsConstructor
+@TranslationType(type = TransConstant.XZD_CS_CONTRACT_INFORMATION_ID_TO_NAME)
+public class XzdCsContractInformationImpl implements TranslationInterface<String> {
+
+    private final XzdCsContractInformationService xzdCsContractInformationService;
+
+
+    @Override
+    public String translation(Object key, String other) {
+        if (key instanceof String ids) {
+            return xzdCsContractInformationService.selectNameByIds(ids);
+        } else if (key instanceof Long id) {
+            return xzdCsContractInformationService.selectNameByIds(id.toString());
+        }
+        return null;
+    }
+}

xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/XzdCustomerinformationImpl.java

@@ -0,0 +1,24 @@
+package org.dromara.common.translation.core.impl;
+
+import lombok.AllArgsConstructor;
+import org.dromara.common.core.service.XzdCustomerinformationService;
+import org.dromara.common.translation.annotation.TranslationType;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.common.translation.core.TranslationInterface;
+
+@AllArgsConstructor
+@TranslationType(type = TransConstant.XZD_KHXX_ID_TO_NAME)
+public class XzdCustomerinformationImpl implements TranslationInterface<String> {
+
+    private final XzdCustomerinformationService xzdCustomerinformationService;
+
+    @Override
+    public String translation(Object key, String other) {
+        if (key instanceof String ids) {
+            return xzdCustomerinformationService.selectNmaeByIds(ids);
+        } else if (key instanceof Long id) {
+            return xzdCustomerinformationService.selectNmaeByIds(id.toString());
+        }
+        return null;
+    }
+}

xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/XzdJXHTTranslation.java

@@ -0,0 +1,27 @@
+package org.dromara.common.translation.core.impl;
+
+
+import lombok.AllArgsConstructor;
+import org.dromara.common.core.service.XzdContractMachineryService;
+import org.dromara.common.core.service.XzdJsCgJungonService;
+import org.dromara.common.translation.annotation.TranslationType;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.common.translation.core.TranslationInterface;
+
+@AllArgsConstructor
+@TranslationType(type = TransConstant.XZD_PURCHASE_JXXIE_ID_TO_NAME)
+public class XzdJXHTTranslation implements TranslationInterface<String> {
+
+    private final XzdContractMachineryService xzdContractMachineryService;
+
+    @Override
+    public String translation(Object key, String other) {
+        if (key instanceof String ids) {
+            return xzdContractMachineryService.selectNmaeByIds(ids);
+        } else if (key instanceof Long id) {
+            return xzdContractMachineryService.selectNmaeByIds(id.toString());
+        }
+        return null;
+    }
+
+}

xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/XzdJsCgJungonImpl.java

@@ -0,0 +1,23 @@
+package org.dromara.common.translation.core.impl;
+
+import lombok.AllArgsConstructor;
+import org.dromara.common.core.service.XzdJsCgJungonService;
+import org.dromara.common.translation.annotation.TranslationType;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.common.translation.core.TranslationInterface;
+
+@AllArgsConstructor
+@TranslationType(type = TransConstant.XZD_JS_CG_JUNGON_ID_TO_NAME)
+public class XzdJsCgJungonImpl implements TranslationInterface<String> {
+
+    private final XzdJsCgJungonService xzdJsCgJungonService;
+    @Override
+    public String translation(Object key, String other) {
+        if (key instanceof String ids) {
+            return xzdJsCgJungonService.selectNameByIds(ids);
+        } else if (key instanceof Long id) {
+            return xzdJsCgJungonService.selectNameByIds(id.toString());
+        }
+        return null;
+    }
+}

xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/XzdProjectImpl.java

@@ -0,0 +1,23 @@
+package org.dromara.common.translation.core.impl;
+
+import lombok.AllArgsConstructor;
+import org.dromara.common.core.service.XzdProjectService;
+import org.dromara.common.translation.annotation.TranslationType;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.common.translation.core.TranslationInterface;
+
+@AllArgsConstructor
+@TranslationType(type = TransConstant.XZD_PROJECT_ID_TO_NAME)
+public class XzdProjectImpl implements TranslationInterface<String> {
+    private final XzdProjectService xzdProjectService;
+
+    @Override
+    public String translation(Object key, String other) {
+        if (key instanceof String ids) {
+            return xzdProjectService.selectNmaeByIds(ids);
+        } else if (key instanceof Long id) {
+            return xzdProjectService.selectNmaeByIds(id.toString());
+        }
+        return null;
+    }
+}

xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/XzdProjectManagerApprovalImpl.java

@@ -0,0 +1,23 @@
+package org.dromara.common.translation.core.impl;
+
+import lombok.AllArgsConstructor;
+import org.dromara.common.core.service.XzdProjectManagerApprovalService;
+import org.dromara.common.translation.annotation.TranslationType;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.common.translation.core.TranslationInterface;
+
+@AllArgsConstructor
+@TranslationType(type = TransConstant.XZD_PROJECT_MANAGER_APPROVAL_ID_TO_NAME)
+public class XzdProjectManagerApprovalImpl implements TranslationInterface<String> {
+    private final XzdProjectManagerApprovalService xzdProjectManagerApprovalService;
+
+    @Override
+    public String translation(Object key, String other) {
+        if (key instanceof String ids) {
+            return xzdProjectManagerApprovalService.selectNmaeByIds(ids);
+        } else if (key instanceof Long id) {
+            return xzdProjectManagerApprovalService.selectNmaeByIds(id.toString());
+        }
+        return null;
+    }
+}

xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/XzdPurchaseContractInformationImpl.java

@@ -0,0 +1,26 @@
+package org.dromara.common.translation.core.impl;
+
+import lombok.AllArgsConstructor;
+
+import org.dromara.common.core.service.XzdPurchaseContractInformationService;
+import org.dromara.common.translation.annotation.TranslationType;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.common.translation.core.TranslationInterface;
+
+@AllArgsConstructor
+@TranslationType(type = TransConstant.XZD_PURCHASE_CONTRACT_ID_TO_NAME)
+public class XzdPurchaseContractInformationImpl implements TranslationInterface<String> {
+
+    private final XzdPurchaseContractInformationService xzdCustomerinformationService;
+
+
+    @Override
+    public String translation(Object key, String other) {
+        if (key instanceof String ids) {
+            return xzdCustomerinformationService.selectNameByIds(ids);
+        } else if (key instanceof Long id) {
+            return xzdCustomerinformationService.selectNameByIds(id.toString());
+        }
+        return null;
+    }
+}

xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/XzdSjContractInfoImpl.java

@@ -0,0 +1,24 @@
+package org.dromara.common.translation.core.impl;
+
+import lombok.AllArgsConstructor;
+import org.dromara.common.core.service.XzdSjContractInfoService;
+import org.dromara.common.core.service.XzdSupplierOpenBankService;
+import org.dromara.common.translation.annotation.TranslationType;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.common.translation.core.TranslationInterface;
+
+@AllArgsConstructor
+@TranslationType(type = TransConstant.XZD_SJ_CONTRACT_INFO_ID_TO_NAME)
+public class XzdSjContractInfoImpl implements TranslationInterface<String> {
+
+    private final XzdSjContractInfoService xzdSjContractInfoService;
+    @Override
+    public String translation(Object key, String other) {
+        if (key instanceof String ids) {
+            return xzdSjContractInfoService.selectNameByIds(ids);
+        } else if (key instanceof Long id) {
+            return xzdSjContractInfoService.selectNameByIds(id.toString());
+        }
+        return null;
+    }
+}

xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/XzdSupplierOpenBankImpl.java

@@ -0,0 +1,23 @@
+package org.dromara.common.translation.core.impl;
+
+import lombok.AllArgsConstructor;
+import org.dromara.common.core.service.XzdSupplierOpenBankService;
+import org.dromara.common.translation.annotation.TranslationType;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.common.translation.core.TranslationInterface;
+
+@AllArgsConstructor
+@TranslationType(type = TransConstant.XZD_SUPPLIER_OPEN_BANK_ID_TO_NAME)
+public class XzdSupplierOpenBankImpl implements TranslationInterface<String> {
+
+    private final XzdSupplierOpenBankService xzdSupplierOpenBankService;
+    @Override
+    public String translation(Object key, String other) {
+        if (key instanceof String ids) {
+            return xzdSupplierOpenBankService.selectNameByIds(ids);
+        } else if (key instanceof Long id) {
+            return xzdSupplierOpenBankService.selectNameByIds(id.toString());
+        }
+        return null;
+    }
+}

xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -5,3 +5,13 @@ org.dromara.common.translation.core.impl.OssUrlTranslationImpl
 org.dromara.common.translation.core.impl.UserNameTranslationImpl
 org.dromara.common.translation.core.impl.NicknameTranslationImpl
 org.dromara.common.translation.core.impl.ProjectNameTranslationImpl
+org.dromara.common.translation.core.impl.XzdCustomerinformationImpl
+org.dromara.common.translation.core.impl.XzdProjectImpl
+org.dromara.common.translation.core.impl.XzdPurchaseContractInformationImpl
+org.dromara.common.translation.core.impl.XzdJsCgJungonImpl
+org.dromara.common.translation.core.impl.XzdCsContractInformationImpl
+org.dromara.common.translation.core.impl.XzdSupplierOpenBankImpl
+org.dromara.common.translation.core.impl.XzdProjectManagerApprovalImpl
+org.dromara.common.translation.core.impl.XzdCbysZjhcbImpl
+org.dromara.common.translation.core.impl.XzdJXHTTranslation
+org.dromara.common.translation.core.impl.XzdSjContractInfoImpl

xinnengyuan/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java

@@ -13,6 +13,7 @@ import org.springframework.web.socket.WebSocketHandler;
 import org.springframework.web.socket.config.annotation.EnableWebSocket;
 import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
 import org.springframework.web.socket.server.HandshakeInterceptor;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 /**
  * WebSocket 配置

xinnengyuan/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java

@@ -45,8 +45,7 @@ public class PlusWebSocketInterceptor implements HandshakeInterceptor {
             String headerCid = ServletUtils.getRequest().getHeader(LoginHelper.CLIENT_KEY);
             String paramCid = ServletUtils.getParameter(LoginHelper.CLIENT_KEY);
             String clientId = StpUtil.getExtra(LoginHelper.CLIENT_KEY).toString();
-            String projectIdStr = ServletUtils.getRequest().getParameter("projectId");
-            Long projectId = Long.parseLong(projectIdStr);
+            String projectIdStr = ServletUtils.getRequest().getParameter(LoginHelper.PROJECT_KEY);
             if (!StringUtils.equalsAny(clientId, headerCid, paramCid)) {
                 // token 无效
                 throw NotLoginException.newInstance(StpUtil.getLoginType(),
@@ -55,7 +54,10 @@ public class PlusWebSocketInterceptor implements HandshakeInterceptor {
             }
 
             attributes.put(LOGIN_USER_KEY, loginUser);
-            attributes.put(PROJECT_ID,projectId);
+            if (projectIdStr != null && !projectIdStr.isEmpty()) {
+                Long projectId = Long.parseLong(projectIdStr);
+                attributes.put(PROJECT_ID,projectId);
+            }
             return true;
         } catch (NotLoginException e) {
             log.error("WebSocket 认证失败'{}',无法访问系统资源", e.getMessage());

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

@@ -69,8 +69,8 @@ public class WebSocketUtils {
             broadcastMessage.setMessage(webSocketMessage.getMessage());
             broadcastMessage.setSessionKeys(unsentSessionKeys);
             RedisUtils.publish(WEB_SOCKET_TOPIC, broadcastMessage, consumer -> {
-                log.info(" WebSocket发送主题订阅消息topic:{} session keys:{} message:{}",
-                    WEB_SOCKET_TOPIC, unsentSessionKeys, webSocketMessage.getMessage());
+//                log.info(" WebSocket发送主题订阅消息topic:{} session keys:{} message:{}",
+//                    WEB_SOCKET_TOPIC, unsentSessionKeys, webSocketMessage.getMessage());
             });
         }
     }
@@ -84,7 +84,7 @@ public class WebSocketUtils {
         WebSocketMessageDto broadcastMessage = new WebSocketMessageDto();
         broadcastMessage.setMessage(message);
         RedisUtils.publish(WEB_SOCKET_TOPIC, broadcastMessage, consumer -> {
-            log.info("WebSocket发送主题订阅消息topic:{} message:{}", WEB_SOCKET_TOPIC, message);
+//            log.info("WebSocket发送主题订阅消息topic:{} message:{}", WEB_SOCKET_TOPIC, message);
         });
     }
 

xinnengyuan/ruoyi-modules/ruoyi-system/pom.xml

@@ -15,21 +15,80 @@
         system系统模块
     </description>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.alibaba.cloud.ai</groupId>
+                <artifactId>spring-ai-alibaba-bom</artifactId>
+                <version>1.0.0.2</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
+        <!-- TwelveMonkeys ImageIO 扩展 -->
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-core</artifactId>
+            <version>3.12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-webp</artifactId>
+            <version>3.12.0</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.sejda.imageio/webp-imageio -->
+        <dependency>
+            <groupId>org.sejda.imageio</groupId>
+            <artifactId>webp-imageio</artifactId>
+            <version>0.1.6</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud.ai</groupId>
+            <artifactId>spring-ai-alibaba-starter-dashscope</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.esotericsoftware</groupId>
+            <artifactId>kryo</artifactId>
+            <version>5.6.2</version>
+        </dependency>
+        <!-- Java WebSocket 标准API -->
+        <!--        <dependency>-->
+        <!--            <groupId>javax.websocket</groupId>-->
+        <!--            <artifactId>javax.websocket-api</artifactId>-->
+        <!--            <version>1.1</version>-->
+        <!--            <scope>provided</scope>-->
+        <!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>com.drewnoakes</groupId>-->
-<!--            <artifactId>metadata-extractor</artifactId>-->
-<!--            <version>2.18.0</version>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>com.drewnoakes</groupId>-->
+        <!--            <artifactId>metadata-extractor</artifactId>-->
+        <!--            <version>2.18.0</version>-->
+        <!--        </dependency>-->
 
 
-<!--        <dependency>-->
-<!--            <groupId>technology.tabula</groupId>-->
-<!--            <artifactId>tabula</artifactId>-->
-<!--            <version>1.0.4</version>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>technology.tabula</groupId>-->
+        <!--            <artifactId>tabula</artifactId>-->
+        <!--            <version>1.0.4</version>-->
+        <!--        </dependency>-->
 
 
         <!-- JSON解析（FastJSON） -->
@@ -101,19 +160,18 @@
         </dependency>
 
 
-
         <!--  支持中文字体  -->
-<!--        <dependency>-->
-<!--            <groupId>com.itextpdf</groupId>-->
-<!--            <artifactId>itext-asian</artifactId>-->
-<!--            <version>5.2.0</version>-->
-<!--        </dependency>-->
-<!--        &lt;!&ndash;  iText  &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.itextpdf</groupId>-->
-<!--            <artifactId>itextpdf</artifactId>-->
-<!--            <version>5.5.13.3</version>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>com.itextpdf</groupId>-->
+        <!--            <artifactId>itext-asian</artifactId>-->
+        <!--            <version>5.2.0</version>-->
+        <!--        </dependency>-->
+        <!--        &lt;!&ndash;  iText  &ndash;&gt;-->
+        <!--        <dependency>-->
+        <!--            <groupId>com.itextpdf</groupId>-->
+        <!--            <artifactId>itextpdf</artifactId>-->
+        <!--            <version>5.5.13.3</version>-->
+        <!--        </dependency>-->
         <!--  ZXing  -->
         <dependency>
             <groupId>com.google.zxing</groupId>
@@ -262,6 +320,13 @@
             <artifactId>netty-all</artifactId>
         </dependency>
 
+
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.15</version> <!-- 最新版本可自行调整 -->
+        </dependency>
+
     </dependencies>
 
 </project>

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/advisor/CustomLoggerAdvisor.java

@@ -0,0 +1,61 @@
+package org.dromara.ai.advisor;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.ai.chat.client.ChatClientMessageAggregator;
+import org.springframework.ai.chat.client.ChatClientRequest;
+import org.springframework.ai.chat.client.ChatClientResponse;
+import org.springframework.ai.chat.client.advisor.api.CallAdvisor;
+import org.springframework.ai.chat.client.advisor.api.CallAdvisorChain;
+import org.springframework.ai.chat.client.advisor.api.StreamAdvisor;
+import org.springframework.ai.chat.client.advisor.api.StreamAdvisorChain;
+import reactor.core.publisher.Flux;
+
+/**
+ * 自定义日志拦截器
+ *
+ * @author lilemy
+ * @date 2025-11-04 10:15
+ */
+@Slf4j
+public class CustomLoggerAdvisor implements CallAdvisor, StreamAdvisor {
+
+    private void before(ChatClientRequest request) {
+        log.info("AI 请求参数：{}", request.prompt());
+    }
+
+    private void observeAfter(ChatClientResponse response) {
+        if (response.chatResponse() != null) {
+            log.info("AI 响应结果：{}", response.chatResponse().getResult().getOutput().getText());
+        }
+    }
+
+    @Override
+    public ChatClientResponse adviseCall(ChatClientRequest chatClientRequest, CallAdvisorChain callAdvisorChain) {
+        before(chatClientRequest);
+        ChatClientResponse chatClientResponse = callAdvisorChain.nextCall(chatClientRequest);
+        observeAfter(chatClientResponse);
+        return chatClientResponse;
+    }
+
+    @Override
+    public Flux<ChatClientResponse> adviseStream(ChatClientRequest chatClientRequest, StreamAdvisorChain streamAdvisorChain) {
+        before(chatClientRequest);
+        Flux<ChatClientResponse> chatClientResponseFlux = streamAdvisorChain.nextStream(chatClientRequest);
+        return (new ChatClientMessageAggregator()).aggregateChatClientResponse(chatClientResponseFlux, this::observeAfter);
+    }
+
+    /**
+     * Return the name of the advisor.
+     *
+     * @return the advisor name.
+     */
+    @Override
+    public String getName() {
+        return this.getClass().getSimpleName();
+    }
+
+    @Override
+    public int getOrder() {
+        return 0;
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/chat/DashScopeChat.java

@@ -0,0 +1,116 @@
+package org.dromara.ai.chat;
+
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.advisor.CustomLoggerAdvisor;
+import org.dromara.ai.chatmemory.FileBasedChatMemory;
+import org.dromara.ai.domain.AIChatMemory;
+import org.dromara.ai.service.IAIChatMemoryService;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.springframework.ai.chat.client.ChatClient;
+import org.springframework.ai.chat.client.advisor.MessageChatMemoryAdvisor;
+import org.springframework.ai.chat.memory.ChatMemory;
+import org.springframework.ai.chat.model.ChatModel;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * @author lilemy
+ * @date 2025-11-04 09:34
+ */
+@Slf4j
+@Component
+public class DashScopeChat {
+
+    @Resource
+    private DashScopeSimpleChat dashScopeSimpleChat;
+
+    @Resource
+    private IAIChatMemoryService chatMemoryService;
+
+    private final ChatClient chatClient;
+
+    private static final String DEFAULT_PROMPT =
+        "你是一名智能助手，代号为“煤球”。回答时不要提及自身身份或角色设定，除非用户主动询问；请直接提供清晰、准确、专业的回答。";
+
+    private static final String DEFAULT_FILE_DIR = System.getProperty("user.dir") + "/chat-memory";
+
+    public DashScopeChat(ChatModel dashScopeChatModel) {
+        // 初始化基于文件的对话记忆
+        ChatMemory chatMemory = new FileBasedChatMemory(DEFAULT_FILE_DIR);
+        chatClient = ChatClient.builder(dashScopeChatModel)
+            .defaultSystem(DEFAULT_PROMPT)
+            .defaultAdvisors(
+                MessageChatMemoryAdvisor.builder(chatMemory).build(),
+                // 自定义日志输出
+                new CustomLoggerAdvisor()
+            ).build();
+    }
+
+    /**
+     * AI 对话，流式输出
+     *
+     * @param message 用户输入
+     * @param chatId  会话id
+     * @return 流式输出结果
+     */
+    public Flux<String> doChatStream(String message, String chatId, Boolean isFirst) {
+        Long userId = LoginHelper.getUserId();
+        return chatClient
+            .prompt()
+            .user(message)
+            .advisors(spec -> spec.param(ChatMemory.CONVERSATION_ID, chatId))
+            .stream()
+            .content()// 收集所有 token，生成完整回复
+            .collectList()
+            .flatMapMany(tokens -> {
+                String aiResponse = String.join("", tokens);
+                // 异步生成标题
+                generateChatTitleAsync(chatId, message, aiResponse, userId);
+                // 返回完整的流结果
+                return Flux.fromIterable(tokens);
+            });
+    }
+
+    /**
+     * 异步生成标题
+     *
+     * @param chatId      会话id
+     * @param userMessage 用户输入
+     * @param aiResponse  AI回复
+     * @param userId      用户id
+     */
+    private void generateChatTitleAsync(String chatId, String userMessage, String aiResponse, Long userId) {
+        CompletableFuture.runAsync(() -> {
+            try {
+                // 先判断一下当前聊天是否存在
+                Long count = chatMemoryService.lambdaQuery()
+                    .eq(AIChatMemory::getUserId, userId)
+                    .eq(AIChatMemory::getFileName, chatId)
+                    .count();
+                if (count > 0) {
+                    return;
+                }
+                // 构建生成标题的提示词
+                String prompt = String.format("""
+                    请以陈述句的形式总结下面这段用户与AI的对话生成一个简短的标题（不超过10个字）：
+                    用户：%s
+                    AI：%s
+                    """, userMessage, aiResponse);
+                String title = dashScopeSimpleChat.doChat(prompt);
+                log.info("用户：{} 生成标题成功：{} -> {}", userId, chatId, title);
+                // 保存对话数据
+                AIChatMemory memory = new AIChatMemory();
+                memory.setUserId(userId);
+                memory.setFileName(chatId);
+                memory.setFirstQuestion(title);
+                chatMemoryService.save(memory);
+            } catch (Exception e) {
+                log.error("生成标题失败", e);
+            }
+        });
+    }
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/chat/DashScopeSimpleChat.java

@@ -0,0 +1,36 @@
+package org.dromara.ai.chat;
+
+import com.alibaba.cloud.ai.dashscope.chat.DashScopeChatOptions;
+import org.springframework.ai.chat.client.ChatClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author lilemy
+ * @date 2025-11-04 15:26
+ */
+@Component
+public class DashScopeSimpleChat {
+
+    private final ChatClient dashScopeChatClient;
+
+    public DashScopeSimpleChat(ChatClient.Builder chatClientBuilder) {
+        this.dashScopeChatClient = chatClientBuilder
+            // 设置 ChatClient 中 ChatModel 的 Options 参数
+            .defaultOptions(
+                DashScopeChatOptions.builder()
+                    .withTopP(0.7)
+                    .build()
+            )
+            .build();
+    }
+
+    /**
+     * AI 对话
+     *
+     * @param message 用户输入
+     * @return 响应结果
+     */
+    public String doChat(String message) {
+        return dashScopeChatClient.prompt(message).call().content();
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/chatmemory/FileBasedChatMemory.java

@@ -0,0 +1,89 @@
+package org.dromara.ai.chatmemory;
+
+import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.io.Input;
+import com.esotericsoftware.kryo.io.Output;
+import lombok.extern.slf4j.Slf4j;
+import org.objenesis.strategy.StdInstantiatorStrategy;
+import org.springframework.ai.chat.memory.ChatMemory;
+import org.springframework.ai.chat.messages.Message;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 基于文件持久化的对话记忆
+ */
+@Slf4j
+public class FileBasedChatMemory implements ChatMemory {
+
+    private final String BASE_DIR;
+    private static final Kryo kryo = new Kryo();
+
+    static {
+        kryo.setRegistrationRequired(false);
+        // 设置实例化策略
+        kryo.setInstantiatorStrategy(new StdInstantiatorStrategy());
+    }
+
+    // 构造对象时，指定文件保存目录
+    public FileBasedChatMemory(String dir) {
+        this.BASE_DIR = dir;
+        File baseDir = new File(dir);
+        if (!baseDir.exists()) {
+            baseDir.mkdirs();
+        }
+    }
+
+    @Override
+    public void add(String conversationId, List<Message> messages) {
+        List<Message> conversationMessages = getOrCreateConversation(conversationId);
+        conversationMessages.addAll(messages);
+        saveConversation(conversationId, conversationMessages);
+    }
+
+    @Override
+    public List<Message> get(String conversationId) {
+        List<Message> messages = getOrCreateConversation(conversationId);
+        log.info("获取对话：{}", messages);
+        return messages;
+    }
+
+    @Override
+    public void clear(String conversationId) {
+        File file = getConversationFile(conversationId);
+        if (file.exists()) {
+            file.delete();
+        }
+    }
+
+    private List<Message> getOrCreateConversation(String conversationId) {
+        File file = getConversationFile(conversationId);
+        List<Message> messages = new ArrayList<>();
+        if (file.exists()) {
+            try (Input input = new Input(new FileInputStream(file))) {
+                messages = kryo.readObject(input, ArrayList.class);
+            } catch (IOException e) {
+                log.error("读取对话失败", e);
+            }
+        }
+        return messages;
+    }
+
+    private void saveConversation(String conversationId, List<Message> messages) {
+        File file = getConversationFile(conversationId);
+        try (Output output = new Output(new FileOutputStream(file))) {
+            kryo.writeObject(output, messages);
+        } catch (IOException e) {
+            log.error("保存对话失败", e);
+        }
+    }
+
+    private File getConversationFile(String conversationId) {
+        return new File(BASE_DIR, conversationId + ".kryo");
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/controller/AIChatController.java

@@ -0,0 +1,49 @@
+package org.dromara.ai.controller;
+
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.chat.DashScopeChat;
+import org.dromara.ai.chatmemory.FileBasedChatMemory;
+import org.dromara.ai.domain.dto.AIChatReq;
+import org.dromara.common.core.domain.R;
+import org.springframework.ai.chat.messages.Message;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Flux;
+
+import java.util.List;
+
+/**
+ * @author lilemy
+ * @date 2025-10-23 11:32
+ */
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/ai/chat")
+public class AIChatController {
+
+    @Resource
+    private DashScopeChat dashScopeChat;
+
+    /**
+     * ChatClient 流式调用
+     */
+    @GetMapping("/stream")
+    public Flux<String> streamChat(@Validated AIChatReq req, HttpServletResponse response) {
+        response.setCharacterEncoding("UTF-8");
+        return dashScopeChat.doChatStream(req.getQuery(), req.getChatId(), req.getIsFirst());
+    }
+
+    /**
+     * 对话记录
+     */
+    @GetMapping("/history")
+    public R<List<Message>> getChatHistory(String chatId) {
+        FileBasedChatMemory memory = new FileBasedChatMemory(System.getProperty("user.dir") + "/chat-memory");
+        return R.ok(memory.get(chatId));
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/controller/AIChatMemoryController.java

@@ -0,0 +1,94 @@
+package org.dromara.ai.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.ai.domain.dto.AIChatMemoryQueryReq;
+import org.dromara.ai.domain.dto.AIChatMemoryUpdateReq;
+import org.dromara.ai.domain.vo.AIChatMemoryVo;
+import org.dromara.ai.service.IAIChatMemoryService;
+import org.dromara.common.core.domain.R;
+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.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * AI 对话记录信息
+ *
+ * @author lilemy
+ * @date 2025-11-04
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/ai/chatMemory")
+public class AIChatMemoryController extends BaseController {
+
+    private final IAIChatMemoryService aiChatMemoryService;
+
+    /**
+     * 查询AI 对话记录信息列表
+     */
+    @SaCheckPermission("ai:chatMemory:list")
+    @GetMapping("/list")
+    public TableDataInfo<AIChatMemoryVo> list(AIChatMemoryQueryReq req, PageQuery pageQuery) {
+        return aiChatMemoryService.queryPageList(req, pageQuery);
+    }
+
+    /**
+     * 导出AI 对话记录信息列表
+     */
+    @SaCheckPermission("ai:chatMemory:export")
+    @Log(title = "AI 对话记录信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(AIChatMemoryQueryReq req, HttpServletResponse response) {
+        List<AIChatMemoryVo> list = aiChatMemoryService.queryList(req);
+        ExcelUtil.exportExcel(list, "AI 对话记录信息", AIChatMemoryVo.class, response);
+    }
+
+    /**
+     * 获取AI 对话记录信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("ai:chatMemory:query")
+    @GetMapping("/{id}")
+    public R<AIChatMemoryVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(aiChatMemoryService.queryById(id));
+    }
+
+    /**
+     * 修改 AI 对话记录信息
+     */
+    @SaCheckPermission("ai:chatMemory:edit")
+    @Log(title = "AI 对话记录信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> updateAIChatMemory(@Validated AIChatMemoryUpdateReq req) {
+        return toAjax(aiChatMemoryService.updateByReq(req));
+    }
+
+    /**
+     * 删除AI 对话记录信息
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("ai:chatMemory:remove")
+    @Log(title = "AI 对话记录信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(aiChatMemoryService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/domain/AIChatMemory.java

@@ -0,0 +1,52 @@
+package org.dromara.ai.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * AI 对话记录信息对象 ai_chat_memory
+ *
+ * @author lilemy
+ * @date 2025-11-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("ai_chat_memory")
+public class AIChatMemory extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 文件名
+     */
+    private String fileName;
+
+    /**
+     * 第一条问题
+     */
+    private String firstQuestion;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/domain/dto/AIChatMemoryQueryReq.java

@@ -0,0 +1,32 @@
+package org.dromara.ai.domain.dto;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author lilemy
+ * @date 2025-11-04 15:19
+ */
+@Data
+public class AIChatMemoryQueryReq implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -4090176451164739134L;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 文件名
+     */
+    private String fileName;
+
+    /**
+     * 第一条问题
+     */
+    private String firstQuestion;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/domain/dto/AIChatMemoryUpdateReq.java

@@ -0,0 +1,34 @@
+package org.dromara.ai.domain.dto;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author lilemy
+ * @date 2025-11-05 11:28
+ */
+@Data
+public class AIChatMemoryUpdateReq implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 6541297164616819137L;
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空")
+    private Long id;
+
+    /**
+     * 第一条问题
+     */
+    private String firstQuestion;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/domain/dto/AIChatReq.java

@@ -0,0 +1,37 @@
+package org.dromara.ai.domain.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author lilemy
+ * @date 2025-11-05 09:31
+ */
+@Data
+public class AIChatReq implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -4669223630531267889L;
+
+    /**
+     * 聊天内容
+     */
+    @NotBlank(message = "请输入内容")
+    private String query;
+
+    /**
+     * 会话id
+     */
+    @NotBlank(message = "请输入会话id")
+    private String chatId;
+
+    /**
+     * 是否首次对话
+     */
+    @NotNull(message = "请选择是否首次对话")
+    private Boolean isFirst;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/domain/vo/AIChatMemoryVo.java

@@ -0,0 +1,58 @@
+package org.dromara.ai.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.ai.domain.AIChatMemory;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+/**
+ * AI 对话记录信息视图对象 ai_chat_memory
+ *
+ * @author lilemy
+ * @date 2025-11-04
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = AIChatMemory.class)
+public class AIChatMemoryVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    @ExcelProperty(value = "用户id")
+    private Long userId;
+
+    /**
+     * 文件名
+     */
+    @ExcelProperty(value = "文件名")
+    private String fileName;
+
+    /**
+     * 第一条问题
+     */
+    @ExcelProperty(value = "第一条问题")
+    private String firstQuestion;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/mapper/AIChatMemoryMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.ai.mapper;
+
+import org.dromara.ai.domain.AIChatMemory;
+import org.dromara.ai.domain.vo.AIChatMemoryVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * AI 对话记录信息Mapper接口
+ *
+ * @author lilemy
+ * @date 2025-11-04
+ */
+public interface AIChatMemoryMapper extends BaseMapperPlus<AIChatMemory, AIChatMemoryVo> {
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/service/IAIChatMemoryService.java

@@ -0,0 +1,63 @@
+package org.dromara.ai.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.ai.domain.AIChatMemory;
+import org.dromara.ai.domain.dto.AIChatMemoryQueryReq;
+import org.dromara.ai.domain.dto.AIChatMemoryUpdateReq;
+import org.dromara.ai.domain.vo.AIChatMemoryVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * AI 对话记录信息Service接口
+ *
+ * @author lilemy
+ * @date 2025-11-04
+ */
+public interface IAIChatMemoryService extends IService<AIChatMemory> {
+
+    /**
+     * 查询AI 对话记录信息
+     *
+     * @param id 主键
+     * @return AI 对话记录信息
+     */
+    AIChatMemoryVo queryById(Long id);
+
+    /**
+     * 分页查询AI 对话记录信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return AI 对话记录信息分页列表
+     */
+    TableDataInfo<AIChatMemoryVo> queryPageList(AIChatMemoryQueryReq bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的AI 对话记录信息列表
+     *
+     * @param bo 查询条件
+     * @return AI 对话记录信息列表
+     */
+    List<AIChatMemoryVo> queryList(AIChatMemoryQueryReq bo);
+
+    /**
+     * 修改 AI 对话记录信息
+     *
+     * @param req 修改参数
+     * @return 是否修改成功
+     */
+    Boolean updateByReq(AIChatMemoryUpdateReq req);
+
+    /**
+     * 校验并批量删除AI 对话记录信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/service/impl/AIChatMemoryServiceImpl.java

@@ -0,0 +1,150 @@
+package org.dromara.ai.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.domain.AIChatMemory;
+import org.dromara.ai.domain.dto.AIChatMemoryQueryReq;
+import org.dromara.ai.domain.dto.AIChatMemoryUpdateReq;
+import org.dromara.ai.domain.vo.AIChatMemoryVo;
+import org.dromara.ai.mapper.AIChatMemoryMapper;
+import org.dromara.ai.service.IAIChatMemoryService;
+import org.dromara.common.core.constant.HttpStatus;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.file.FileUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * AI 对话记录信息Service业务层处理
+ *
+ * @author lilemy
+ * @date 2025-11-04
+ */
+@Slf4j
+@Service
+public class AIChatMemoryServiceImpl extends ServiceImpl<AIChatMemoryMapper, AIChatMemory>
+    implements IAIChatMemoryService {
+
+    /**
+     * 查询AI 对话记录信息
+     *
+     * @param id 主键
+     * @return AI 对话记录信息
+     */
+    @Override
+    public AIChatMemoryVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询AI 对话记录信息列表
+     *
+     * @param req       查询条件
+     * @param pageQuery 分页参数
+     * @return AI 对话记录信息分页列表
+     */
+    @Override
+    public TableDataInfo<AIChatMemoryVo> queryPageList(AIChatMemoryQueryReq req, PageQuery pageQuery) {
+        LambdaQueryWrapper<AIChatMemory> lqw = buildQueryWrapper(req);
+        Page<AIChatMemoryVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的AI 对话记录信息列表
+     *
+     * @param req 查询条件
+     * @return AI 对话记录信息列表
+     */
+    @Override
+    public List<AIChatMemoryVo> queryList(AIChatMemoryQueryReq req) {
+        LambdaQueryWrapper<AIChatMemory> lqw = buildQueryWrapper(req);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 修改 AI 对话记录信息
+     *
+     * @param req 修改参数
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByReq(AIChatMemoryUpdateReq req) {
+        AIChatMemory oldChatMemory = this.getById(req.getId());
+        if (oldChatMemory == null) {
+            throw new ServiceException("数据不存在", HttpStatus.NOT_FOUND);
+        }
+        AIChatMemory update = new AIChatMemory();
+        BeanUtils.copyProperties(req, update);
+        return this.updateById(update);
+    }
+
+    private LambdaQueryWrapper<AIChatMemory> buildQueryWrapper(AIChatMemoryQueryReq req) {
+        LambdaQueryWrapper<AIChatMemory> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(AIChatMemory::getId);
+        lqw.eq(req.getUserId() != null, AIChatMemory::getUserId, req.getUserId());
+        lqw.like(StringUtils.isNotBlank(req.getFileName()), AIChatMemory::getFileName, req.getFileName());
+        lqw.eq(StringUtils.isNotBlank(req.getFirstQuestion()), AIChatMemory::getFirstQuestion, req.getFirstQuestion());
+        return lqw;
+    }
+
+    /**
+     * 校验并批量删除AI 对话记录信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        List<AIChatMemory> aiChatMemories = this.listByIds(ids);
+        if (aiChatMemories.size() != ids.size()) {
+            throw new ServiceException("数据不存在");
+        }
+        // 暂存文件路径
+        List<File> filesToDelete = new ArrayList<>();
+        for (AIChatMemory mem : aiChatMemories) {
+            if (StringUtils.isNotBlank(mem.getFileName())) {
+                File file = new File(System.getProperty("user.dir")
+                    + "/chat-memory/", mem.getFileName());
+
+                try {
+                    // 防止目录穿越
+                    if (file.getCanonicalPath().startsWith(
+                        new File(System.getProperty("user.dir") + "/chat-memory").getCanonicalPath())) {
+                        filesToDelete.add(file);
+                    } else {
+                        log.warn("危险的 filename 路径被拒绝删除: {}", mem.getFileName());
+                    }
+                } catch (IOException e) {
+                    log.warn("filename 获取失败: {}", mem.getFileName());
+                    throw new ServiceException("文件获取失败: " + mem.getFileName());
+                }
+            }
+        }
+        // 删除数据库
+        boolean b = baseMapper.deleteByIds(ids) > 0;
+        if (!b) {
+            throw new ServiceException("数据库删除失败");
+        }
+        // 删除文件（非事务，不影响数据库逻辑）
+        for (File f : filesToDelete) {
+            if (f.exists() && !FileUtils.del(f)) {
+                log.warn("文件删除失败: {}", f.getAbsolutePath());
+            }
+        }
+        return true;
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/controller/SysPackageController.java

@@ -3,8 +3,12 @@ package org.dromara.app.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.app.domain.SysPackage;
+import org.dromara.app.domain.bo.SysPackageBo;
+import org.dromara.app.domain.vo.SysPackageVo;
 import org.dromara.app.service.SysPackageServiceImpl;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.system.domain.vo.SysOssVo;
 import org.dromara.system.service.impl.SysOssServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +30,14 @@ public class SysPackageController {
     @Autowired
     private SysPackageServiceImpl sysPackageService;
 
+    /**
+     * 获取列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<SysPackageVo> list(SysPackageBo bo, PageQuery pageQuery) {
+        return sysPackageService.queryPageList(bo, pageQuery);
+    }
+
     /**
      * 获取最新版本
      */
@@ -42,7 +54,7 @@ public class SysPackageController {
      * 上传最新安装包及版本
      */
     @GetMapping("/uploadNewVersion")
-    public R<SysPackage> uploadNewVersion(String version, String type, MultipartFile file) {
+    public R<SysPackage> uploadNewVersion(String version, String type, MultipartFile file, String context) {
         String originalFileName = "apk/package/app-release.apk";
 
         // 先查询最新记录
@@ -57,11 +69,11 @@ public class SysPackageController {
         }
 
         // 分离事务：再处理数据库操作
-        return handleDatabaseOperations(version, type, upload, list);
+        return handleDatabaseOperations(version, type, upload, list, context);
     }
 
     @Transactional
-    public R<SysPackage> handleDatabaseOperations(String version, String type, SysOssVo upload, List<SysPackage> existingPackages) {
+    public R<SysPackage> handleDatabaseOperations(String version, String type, SysOssVo upload, List<SysPackage> existingPackages, String context) {
         try {
             // 先删除旧文件记录
             if (existingPackages != null && !existingPackages.isEmpty()) {
@@ -78,6 +90,7 @@ public class SysPackageController {
             sysPackage.setFileId(upload.getOssId());
             sysPackage.setFileUrl(upload.getUrl());
             sysPackage.setType(type);
+            sysPackage.setContext(context);
 
             boolean save = sysPackageService.save(sysPackage);
             if (!save) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/domain/SysPackage.java

@@ -30,4 +30,9 @@ public class SysPackage extends BaseEntity {
 
     private String fileUrl;
 
+    /**
+     * 更新内容
+     */
+    private String context;
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/domain/bo/SysPackageBo.java

@@ -0,0 +1,32 @@
+package org.dromara.app.domain.bo;
+
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.xzd.domain.XzdContractDetails;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = XzdContractDetails.class, reverseConvertGenerate = false)
+public class SysPackageBo extends BaseEntity {
+
+    private Long id;
+
+    /**
+     * 0安卓1苹果2鸿蒙
+     */
+    private String type;
+
+    private String version;
+
+    private Long fileId;
+
+    private String fileUrl;
+
+    /**
+     * 更新内容
+     */
+    private String context;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/domain/vo/SysPackageVo.java

@@ -27,4 +27,9 @@ public class SysPackageVo {
 
     @ExcelProperty("安装包地址")
     private String fileUrl;
+
+    /**
+     * 更新内容
+     */
+    private String context;
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/service/SysPackageServiceImpl.java

@@ -1,10 +1,24 @@
 package org.dromara.app.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.dromara.app.domain.SysPackage;
+import org.dromara.app.domain.bo.SysPackageBo;
+import org.dromara.app.domain.vo.SysPackageVo;
 import org.dromara.app.mapper.SysPackageMapper;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.springframework.stereotype.Service;
 
 @Service
 public class SysPackageServiceImpl extends ServiceImpl<SysPackageMapper, SysPackage> {
+
+    public TableDataInfo<SysPackageVo> queryPageList(SysPackageBo bo, PageQuery pageQuery) {
+//        LambdaQueryWrapper<SysPackage> lqw = buildQueryWrapper(bo);
+        Page<SysPackageVo> result = baseMapper.selectVoPage(pageQuery.build(), new LambdaQueryWrapper<>());
+//        setValue(result.getRecords());
+        return TableDataInfo.build(result);
+    }
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/controller/BusBiddingUserController.java

@@ -2,6 +2,7 @@ package org.dromara.bidding.controller;
 
 import java.util.List;
 
+import cn.dev33.satoken.annotation.SaMode;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
@@ -50,7 +51,7 @@ public class BusBiddingUserController extends BaseController {
     /**
      * 查询招投标人员列表
      */
-    @SaCheckPermission("bidding:biddingUser:getUser")
+    @SaCheckPermission(value = {"bidding:biddingUser:list","bidding:biddingUser:query","bidding:biddingUser:add"},mode = SaMode.OR)
     @GetMapping("/getUser")
     public R<List<SysUser>> getUser() {
         return R.ok(busBiddingUserService.getUser());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/config/AsyncConfig.java

@@ -0,0 +1,43 @@
+package org.dromara.bigscreen.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
+
+/**
+ * 无人机消息redis订阅专用线程池
+ */
+@Configuration // 标记为配置类，让Spring扫描加载
+@EnableAsync // 启用Spring异步功能（若项目已在启动类加过，此处可省略，但加上更稳妥）
+public class AsyncConfig {
+
+    /**
+     * 定义名为 "messageAsyncExecutor" 的线程池 Bean（与 @Async("messageAsyncExecutor") 对应）
+     */
+    @Bean(name = "messageAsyncExecutor") // Bean名称必须是 "messageAsyncExecutor"，大小写敏感
+    public Executor messageAsyncExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+
+        // 1. 核心线程数：根据CPU核心数或业务量调整（示例：5个）
+        executor.setCorePoolSize(5);
+        // 2. 最大线程数：避免线程过多导致资源耗尽（示例：10个）
+        executor.setMaxPoolSize(10);
+        // 3. 任务队列容量：缓冲待处理的异步任务（示例：50个）
+        executor.setQueueCapacity(50);
+        // 4. 线程名前缀：便于日志排查（格式：message-async-1, message-async-2...）
+        executor.setThreadNamePrefix("message-async-");
+        // 5. 线程空闲时间：超过60秒空闲则销毁（释放资源）
+        executor.setKeepAliveSeconds(60);
+        // 6. 任务拒绝策略：队列满时，由提交任务的线程临时执行（避免消息丢失）
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+
+        // 7. 初始化线程池（必须调用，否则线程池不会生效）
+        executor.initialize();
+
+        return executor;
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/config/RedisConfig.java

@@ -12,8 +12,6 @@ import org.springframework.data.redis.listener.PatternTopic;
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.springframework.data.redis.listener.adapter.MessageListenerAdapter;
 
-import java.util.List;
-
 @Configuration
 public class RedisConfig {
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/BusBwlController.java

@@ -0,0 +1,106 @@
+package org.dromara.bigscreen.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.bigscreen.domain.dto.BusBwlBo;
+import org.dromara.bigscreen.domain.vo.BusBwlVo;
+import org.dromara.bigscreen.service.IBusBwlService;
+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.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 备忘录
+ *
+ * @author Lion Li
+ * @date 2025-11-04
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/bwl/bwl")
+public class BusBwlController extends BaseController {
+
+    private final IBusBwlService busBwlService;
+
+    /**
+     * 查询备忘录列表
+     */
+//    @SaCheckPermission("bwl:bwl:list")
+    @GetMapping("/list")
+    public TableDataInfo<BusBwlVo> list(BusBwlBo bo, PageQuery pageQuery) {
+        return busBwlService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出备忘录列表
+     */
+    @SaCheckPermission("bwl:bwl:export")
+    @Log(title = "备忘录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(BusBwlBo bo, HttpServletResponse response) {
+        List<BusBwlVo> list = busBwlService.queryList(bo);
+        ExcelUtil.exportExcel(list, "备忘录", BusBwlVo.class, response);
+    }
+
+    /**
+     * 获取备忘录详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("bwl:bwl:query")
+    @GetMapping("/{id}")
+    public R<BusBwlVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(busBwlService.queryById(id));
+    }
+
+    /**
+     * 新增备忘录
+     */
+    @SaCheckPermission("bwl:bwl:add")
+    @Log(title = "备忘录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody BusBwlBo bo) {
+        return toAjax(busBwlService.insertByBo(bo));
+    }
+
+    /**
+     * 修改备忘录
+     */
+    @SaCheckPermission("bwl:bwl:edit")
+    @Log(title = "备忘录", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody BusBwlBo bo) {
+        return toAjax(busBwlService.updateByBo(bo));
+    }
+
+    /**
+     * 删除备忘录
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("bwl:bwl:remove")
+    @Log(title = "备忘录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(busBwlService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/BusSygjController.java

@@ -0,0 +1,106 @@
+package org.dromara.bigscreen.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.bigscreen.domain.dto.BusSygjBo;
+import org.dromara.bigscreen.domain.vo.BusSygjVo;
+import org.dromara.bigscreen.service.IBusSygjService;
+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.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 实用工具
+ *
+ * @author Lion Li
+ * @date 2025-11-05
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/bigscreen/sygj")
+public class BusSygjController extends BaseController {
+
+    private final IBusSygjService busSygjService;
+
+    /**
+     * 查询实用工具列表
+     */
+//    @SaCheckPermission("bigscreen:sygj:list")
+    @GetMapping("/list")
+    public TableDataInfo<BusSygjVo> list(BusSygjBo bo, PageQuery pageQuery) {
+        return busSygjService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出实用工具列表
+     */
+    @SaCheckPermission("bigscreen:sygj:export")
+    @Log(title = "实用工具", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(BusSygjBo bo, HttpServletResponse response) {
+        List<BusSygjVo> list = busSygjService.queryList(bo);
+        ExcelUtil.exportExcel(list, "实用工具", BusSygjVo.class, response);
+    }
+
+    /**
+     * 获取实用工具详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("bigscreen:sygj:query")
+    @GetMapping("/{id}")
+    public R<BusSygjVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(busSygjService.queryById(id));
+    }
+
+    /**
+     * 新增实用工具
+     */
+    @SaCheckPermission("bigscreen:sygj:add")
+    @Log(title = "实用工具", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody BusSygjBo bo) {
+        return toAjax(busSygjService.insertByBo(bo));
+    }
+
+    /**
+     * 修改实用工具
+     */
+    @SaCheckPermission("bigscreen:sygj:edit")
+    @Log(title = "实用工具", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody BusSygjBo bo) {
+        return toAjax(busSygjService.updateByBo(bo));
+    }
+
+    /**
+     * 删除实用工具
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("bigscreen:sygj:remove")
+    @Log(title = "实用工具", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(busSygjService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/BusWjzxController.java

@@ -0,0 +1,106 @@
+package org.dromara.bigscreen.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.bigscreen.domain.dto.BusWjzxBo;
+import org.dromara.bigscreen.domain.vo.BusWjzxVo;
+import org.dromara.bigscreen.service.IBusWjzxService;
+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.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 文件中心
+ *
+ * @author Lion Li
+ * @date 2025-11-05
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/bigscreen/wjzx")
+public class BusWjzxController extends BaseController {
+
+    private final IBusWjzxService busWjzxService;
+
+    /**
+     * 查询文件中心列表
+     */
+//    @SaCheckPermission("bigscreen:wjzx:list")
+    @GetMapping("/list")
+    public TableDataInfo<BusWjzxVo> list(BusWjzxBo bo, PageQuery pageQuery) {
+        return busWjzxService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出文件中心列表
+     */
+    @SaCheckPermission("bigscreen:wjzx:export")
+    @Log(title = "文件中心", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(BusWjzxBo bo, HttpServletResponse response) {
+        List<BusWjzxVo> list = busWjzxService.queryList(bo);
+        ExcelUtil.exportExcel(list, "文件中心", BusWjzxVo.class, response);
+    }
+
+    /**
+     * 获取文件中心详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("bigscreen:wjzx:query")
+    @GetMapping("/{id}")
+    public R<BusWjzxVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(busWjzxService.queryById(id));
+    }
+
+    /**
+     * 新增文件中心
+     */
+    @SaCheckPermission("bigscreen:wjzx:add")
+    @Log(title = "文件中心", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody BusWjzxBo bo) {
+        return toAjax(busWjzxService.insertByBo(bo));
+    }
+
+    /**
+     * 修改文件中心
+     */
+    @SaCheckPermission("bigscreen:wjzx:edit")
+    @Log(title = "文件中心", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody BusWjzxBo bo) {
+        return toAjax(busWjzxService.updateByBo(bo));
+    }
+
+    /**
+     * 删除文件中心
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("bigscreen:wjzx:remove")
+    @Log(title = "文件中心", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(busWjzxService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/EnterpriseBigScreenController.java

@@ -1,10 +1,8 @@
 package org.dromara.bigscreen.controller;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletRequest;
 import org.dromara.bigscreen.domain.dto.WeatherQueryReq;
 import org.dromara.bigscreen.domain.vo.*;
 import org.dromara.bigscreen.mapper.ProjectBigScreenMapper;
@@ -52,14 +50,10 @@ public class EnterpriseBigScreenController {
     @Resource
     private IBusProjectService projectService;
 
-    @Resource
-    private ProjectBigScreenMapper projectBigScreenMapper;
-
-
     /**
      * 获取关键指标
      */
-    @SaCheckPermission("enterprise:bigScreen:keyIndex")
+//    @SaCheckPermission("enterprise:bigScreen:keyIndex")
     @GetMapping("/keyIndex")
     public R<EnterpriseKeyIndexVo> getEnterpriseKeyIndex() {
         return R.ok(enterpriseBigScreenService.getEnterpriseKeyIndex());
@@ -68,7 +62,7 @@ public class EnterpriseBigScreenController {
     /**
      * 项目进度分析
      */
-    @SaCheckPermission("enterprise:bigScreen:projectProgress")
+//    @SaCheckPermission("enterprise:bigScreen:projectProgress")
     @GetMapping("/projectProgress")
     public R<ProjectProgressAnalysisVo> getProjectProgress() {
         return R.ok(enterpriseBigScreenService.getProjectProgressAnalysis());
@@ -77,7 +71,7 @@ public class EnterpriseBigScreenController {
     /**
      * 项目产值对比
      */
-    @SaCheckPermission("enterprise:bigScreen:projectOutputValueComparison")
+//    @SaCheckPermission("enterprise:bigScreen:projectOutputValueComparison")
     @GetMapping("/projectOutputValueComparison")
     public R<List<OutputValueComparisonVo>> getProjectOutputValueComparison() {
         return R.ok(enterpriseBigScreenService.getProjectOutputValueComparison());
@@ -86,7 +80,7 @@ public class EnterpriseBigScreenController {
     /**
      * 项目进度完成度和计划容量
      */
-    @SaCheckPermission("enterprise:bigScreen:projectProgressCapacity")
+//    @SaCheckPermission("enterprise:bigScreen:projectProgressCapacity")
     @GetMapping("/projectProgressCapacity")
     public R<List<ProjectProgressCapacityVo>> getProjectProgressCapacity() {
         return R.ok(enterpriseBigScreenService.getProjectProgressCapacity());
@@ -95,7 +89,7 @@ public class EnterpriseBigScreenController {
     /**
      * 风险预警
      */
-    @SaCheckPermission("enterprise:bigScreen:riskEarlyWarning")
+//    @SaCheckPermission("enterprise:bigScreen:riskEarlyWarning")
     @GetMapping("/riskEarlyWarning")
     public R<List<RiskEarlyWarningVo>> getRiskEarlyWarning() {
         return R.ok(enterpriseBigScreenService.getRiskEarlyWarning());
@@ -104,7 +98,7 @@ public class EnterpriseBigScreenController {
     /**
      * 查询天气
      */
-    @SaCheckPermission("enterprise:bigScreen:weather")
+//    @SaCheckPermission("enterprise:bigScreen:weather")
     @GetMapping("/weather")
     public R<List<WeatherVo>> getProjectWeather(WeatherQueryReq req) {
         return R.ok(enterpriseBigScreenService.getWeather3DaysList(req));
@@ -113,7 +107,7 @@ public class EnterpriseBigScreenController {
     /**
      * 查询安全天数
      */
-    @SaCheckPermission("enterprise:bigScreen:safetyDay")
+//    @SaCheckPermission("enterprise:bigScreen:safetyDay")
     @GetMapping("/safetyDay")
     public R<Long> getProjectSafetyDay() {
         LocalDate date = LocalDate.of(2023, 1, 1);
@@ -125,7 +119,7 @@ public class EnterpriseBigScreenController {
     /**
      * 人数统计
      */
-    @SaCheckPermission("enterprise:bigScreen:peopleCount")
+//    @SaCheckPermission("enterprise:bigScreen:peopleCount")
     @GetMapping("/peopleCount")
     public R<PeopleCountVo> getProjectPeopleCount() {
         PeopleCountVo peopleCountVo = new PeopleCountVo();
@@ -156,7 +150,7 @@ public class EnterpriseBigScreenController {
     /**
      * 出勤人数统计
      */
-    @SaCheckPermission("enterprise:bigScreen:allAttendanceCount")
+//    @SaCheckPermission("enterprise:bigScreen:allAttendanceCount")
     @GetMapping("/allAttendanceCount")
     public R<TodayAttendanceCountVo> getAllAttendanceCount() {
         TodayAttendanceCountVo todayAttendanceCountVo = new TodayAttendanceCountVo();
@@ -195,7 +189,7 @@ public class EnterpriseBigScreenController {
     /**
      * 每个项目的出勤人数
      */
-    @SaCheckPermission("enterprise:bigScreen:projectAttendanceCount")
+//    @SaCheckPermission("enterprise:bigScreen:projectAttendanceCount")
     @GetMapping("/projectAttendanceCount")
     public R<List<ProjectAttendanceCountVo>> getProjectAttendanceCount() {
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/MoneyBigScreenController.java

@@ -1,6 +1,5 @@
 package org.dromara.bigscreen.controller;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
@@ -62,7 +61,7 @@ public class MoneyBigScreenController {
     /**
      * 查询项目位置列表
      */
-    @SaCheckPermission("money:bigScreen:projectGis")
+//    @SaCheckPermission("money:bigScreen:projectGis")
     @GetMapping("/project/gis")
     public R<List<BusProjectGisVo>> getProjectGis() {
         return R.ok(moneyBigScreenService.getProjectGis());
@@ -545,7 +544,7 @@ public class MoneyBigScreenController {
     /**
      * 查询项目天气
      */
-    @SaCheckPermission("project:bigScreen:weather")
+//    @SaCheckPermission("project:bigScreen:weather")
     @GetMapping("/weather/{projectId}")
     public R<List<WeatherVo>> getProjectWeather(@NotNull(message = "主键不能为空")
                                                 @PathVariable Long projectId) {
@@ -555,7 +554,7 @@ public class MoneyBigScreenController {
     /**
      * 查询项目安全天数
      */
-    @SaCheckPermission("project:bigScreen:safetyDay")
+//    @SaCheckPermission("project:bigScreen:safetyDay")
     @GetMapping("/safetyDay/{projectId}")
     public R<BusProjectSafetyDayVo> getProjectSafetyDay(@NotNull(message = "主键不能为空")
                                                         @PathVariable Long projectId) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/PersonalHomeController.java

@@ -0,0 +1,324 @@
+package org.dromara.bigscreen.controller;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.ai.chat.DashScopeChat;
+import org.dromara.ai.chatmemory.FileBasedChatMemory;
+import org.dromara.ai.domain.dto.AIChatMemoryQueryReq;
+import org.dromara.ai.domain.dto.AIChatMemoryUpdateReq;
+import org.dromara.ai.domain.dto.AIChatReq;
+import org.dromara.ai.domain.vo.AIChatMemoryVo;
+import org.dromara.ai.service.IAIChatMemoryService;
+import org.dromara.bigscreen.domain.dto.BusBwlBo;
+import org.dromara.bigscreen.domain.dto.BusSygjBo;
+import org.dromara.bigscreen.domain.dto.BusWjzxBo;
+import org.dromara.bigscreen.domain.dto.TaskInfoDto;
+import org.dromara.bigscreen.domain.vo.*;
+import org.dromara.bigscreen.service.IBusBwlService;
+import org.dromara.bigscreen.service.IBusSygjService;
+import org.dromara.bigscreen.service.IBusWjzxService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.dto.UserDTO;
+import org.dromara.common.core.enums.BusinessStatusEnum;
+import org.dromara.common.core.utils.StreamUtils;
+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.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.patch.domain.bo.PdMasterBo;
+import org.dromara.patch.domain.vo.PdMasterBymiAndQt;
+import org.dromara.patch.service.IPdMasterService;
+import org.dromara.project.service.IBusProjectService;
+import org.dromara.system.domain.SysMenu;
+import org.dromara.system.domain.vo.RouterVo;
+import org.dromara.system.service.impl.SysMenuServiceImpl;
+import org.dromara.system.service.impl.SysUserServiceImpl;
+import org.dromara.warm.flow.core.FlowEngine;
+import org.dromara.warm.flow.core.entity.User;
+import org.dromara.warm.flow.core.enums.NodeType;
+import org.dromara.warm.flow.orm.entity.FlowDefinition;
+import org.dromara.warm.flow.orm.mapper.FlowDefinitionMapper;
+import org.dromara.workflow.domain.bo.FlowTaskBo;
+import org.dromara.workflow.domain.vo.FlowTaskVo;
+import org.dromara.workflow.mapper.FlwTaskMapper;
+import org.springframework.ai.chat.messages.Message;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import reactor.core.publisher.Flux;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 个人首页接口
+ */
+@Validated
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/personalHome")
+public class PersonalHomeController extends BaseController {
+
+    @Autowired
+    private FlwTaskMapper flwTaskMapper;
+    @Autowired
+    private FlowDefinitionMapper flowDefinitionMapper;
+    @Autowired
+    private SysUserServiceImpl userService;
+
+    private final IBusWjzxService busWjzxService;
+
+    private final IBusSygjService busSygjService;
+    @Autowired
+    private IPdMasterService pdMasterService;
+
+    private final IBusBwlService busBwlService;
+
+    @Resource
+    private DashScopeChat dashScopeChat;
+
+    @Resource
+    private IAIChatMemoryService aiChatMemoryService;
+
+    @Resource
+    private IBusProjectService projectService;
+
+    private final SysMenuServiceImpl sysMenuService;
+
+    // region AI 模块
+
+    /**
+     * 获取新 AI 对话聊天id
+     */
+    @GetMapping("/ai/chat/new")
+    public R<String> getNewAIChat() {
+        return R.ok(UUID.randomUUID().toString());
+    }
+
+    /**
+     * AI 对话流式调用
+     */
+    @GetMapping("/ai/chat/stream")
+    public Flux<String> streamChat(@Validated AIChatReq req, HttpServletResponse response) {
+        response.setCharacterEncoding("UTF-8");
+        return dashScopeChat.doChatStream(req.getQuery(), req.getChatId(), req.getIsFirst());
+    }
+
+    /**
+     * 获取 AI 对话记录
+     */
+    @GetMapping("/ai/chat/history")
+    public R<List<Message>> getChatHistory(String chatId) {
+        FileBasedChatMemory memory = new FileBasedChatMemory(System.getProperty("user.dir") + "/chat-memory");
+        return R.ok(memory.get(chatId));
+    }
+
+    /**
+     * 查询 AI 对话记录信息列表
+     */
+    @GetMapping("/ai/chatMemory/list")
+    public TableDataInfo<AIChatMemoryVo> listAIChatMemory(AIChatMemoryQueryReq req, PageQuery pageQuery) {
+        return aiChatMemoryService.queryPageList(req, pageQuery);
+    }
+
+    /**
+     * 获取 AI 对话记录信息详细信息
+     *
+     * @param id 主键
+     */
+    @GetMapping("/ai/chatMemory/{id}")
+    public R<AIChatMemoryVo> getAIChatMemoryInfo(@NotNull(message = "主键不能为空")
+                                                 @PathVariable Long id) {
+        return R.ok(aiChatMemoryService.queryById(id));
+    }
+
+    /**
+     * 修改 AI 对话记录信息
+     */
+    @Log(title = "AI 对话记录信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/ai/chatMemory")
+    public R<Void> updateAIChatMemory(@Validated AIChatMemoryUpdateReq req) {
+        return toAjax(aiChatMemoryService.updateByReq(req));
+    }
+
+    /**
+     * 删除 AI 对话记录信息
+     *
+     * @param ids 主键串
+     */
+    @Log(title = "AI 对话记录信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/ai/chatMemory/{ids}")
+    public R<Void> removeAIChatMemory(@NotEmpty(message = "主键不能为空")
+                                      @PathVariable Long[] ids) {
+        return toAjax(aiChatMemoryService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    // endregion
+
+    /**
+     * 获取我的项目信息
+     */
+    @GetMapping("/getMyProjectInfo")
+    public R<List<MyProjectInfoVo>> getMyProjectInfoList() {
+        return R.ok(projectService.getMyProjectInfo());
+    }
+
+    /**
+     * 首页待办事项
+     *
+     * @param projectId
+     * @return
+     */
+    @GetMapping("/getTaskList")
+    public R<TaskInfoDto> getTaskList(String projectId) {
+        TaskInfoDto taskInfoDto = new TaskInfoDto();
+
+        QueryWrapper<FlowTaskBo> queryWrapper = new QueryWrapper<>();
+        List<Long> definitionIds = new ArrayList<>();
+        if (!"0".equals(projectId)) {
+            List<FlowDefinition> flowDefinitions = flowDefinitionMapper.selectList(new LambdaQueryWrapper<FlowDefinition>()
+                .select(FlowDefinition::getId)
+                .like(FlowDefinition::getFlowCode, projectId));
+            if (flowDefinitions != null && !flowDefinitions.isEmpty()) {
+                flowDefinitions.forEach(flowDefinition -> {
+                    definitionIds.add(flowDefinition.getId());
+                });
+            }
+            if (definitionIds.isEmpty()) {
+                return null;
+            }
+        }
+        queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey());
+        queryWrapper.in("t.processed_by", LoginHelper.getUserIdStr());
+        queryWrapper.in("t.flow_status", BusinessStatusEnum.WAITING.getStatus());
+        List<FlowTaskVo> page = this.getFlowTaskDefinitionIdsVoPage(definitionIds, queryWrapper);
+
+        //根据createTime过滤出本周数据
+        // 获取本周一和本周日
+        LocalDate today = LocalDate.now();
+        LocalDate monday = today.with(DayOfWeek.MONDAY);
+        LocalDate sunday = today.with(DayOfWeek.SUNDAY);
+
+        // 筛选本周数据
+        List<FlowTaskVo> weeklyTasks = page.stream()
+            .filter(task -> {
+                Date createTime = task.getCreateTime(); // 假设字段名为createTime
+                if (createTime != null) {
+                    LocalDate createLocalDate = createTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+                    return !createLocalDate.isBefore(monday) && !createLocalDate.isAfter(sunday);
+                }
+                return false;
+            })
+            .toList();
+
+        taskInfoDto.setList(page);
+        taskInfoDto.setTotal((long) page.size());
+        taskInfoDto.setWeekCount((long) weeklyTasks.size());
+
+        BusPdSjVo busPdSjVo = pdMasterService.queryPageListByDate();
+        BusWjzxSjDateVo busWjzxSjDateVo = busWjzxService.queryWjzx();
+
+        taskInfoDto.setBusWjzxSjDateVo(busWjzxSjDateVo);
+        taskInfoDto.setBusPdSjVo(busPdSjVo);
+
+        return R.ok(taskInfoDto);
+    }
+
+    private List<FlowTaskVo> getFlowTaskDefinitionIdsVoPage(List<Long> definitionIds, QueryWrapper<FlowTaskBo> queryWrapper) {
+        List<FlowTaskVo> records = flwTaskMapper.getListRunTaskDefinitionInfo(definitionIds, queryWrapper);
+        if (CollUtil.isNotEmpty(records)) {
+            List<Long> taskIds = StreamUtils.toList(records, FlowTaskVo::getId);
+            Map<Long, List<UserDTO>> listMap = currentTaskAllUser(taskIds);
+            records.forEach(t -> {
+                List<UserDTO> userList = listMap.getOrDefault(t.getId(), Collections.emptyList());
+                if (CollUtil.isNotEmpty(userList)) {
+                    t.setAssigneeIds(StreamUtils.join(userList, e -> String.valueOf(e.getUserId())));
+                    t.setAssigneeNames(StreamUtils.join(userList, UserDTO::getNickName));
+                }
+            });
+        }
+        return records;
+    }
+
+    public Map<Long, List<UserDTO>> currentTaskAllUser(List<Long> taskIdList) {
+        Map<Long, List<UserDTO>> map = new HashMap<>();
+        // 获取与当前任务关联的用户列表
+        List<User> associatedUsers = FlowEngine.userService().getByAssociateds(taskIdList);
+        Map<Long, List<User>> listMap = StreamUtils.groupByKey(associatedUsers, User::getAssociated);
+        for (Map.Entry<Long, List<User>> entry : listMap.entrySet()) {
+            List<User> value = entry.getValue();
+            if (CollUtil.isNotEmpty(value)) {
+                List<UserDTO> userDtoList = userService.selectListByIds(StreamUtils.toList(value, e -> Convert.toLong(e.getProcessedBy())));
+                map.put(entry.getKey(), userDtoList);
+            }
+        }
+        return map;
+    }
+
+
+    /**
+     * 查询实用工具列表
+     */
+//    @SaCheckPermission("bigscreen:sygj:list")
+    @GetMapping("/listsygj")
+    public TableDataInfo<BusSygjVo> listsygj(BusSygjBo bo, PageQuery pageQuery) {
+        return busSygjService.queryPageList(bo, pageQuery);
+    }
+
+
+    /**
+     * 查询文件中心列表
+     */
+//    @SaCheckPermission("bigscreen:wjzx:list")
+    @GetMapping("/listBywjzx")
+    public TableDataInfo<BusWjzxVo> listBywjzx(BusWjzxBo bo, PageQuery pageQuery) {
+        return busWjzxService.queryPageList(bo, pageQuery);
+    }
+
+
+    /**
+     * 查询派单列表
+     */
+//    @SaCheckPermission("patch:master:list")
+    @GetMapping("/listPd")
+    public PdMasterBymiAndQt listPd(PdMasterBo bo, PageQuery pageQuery) {
+        return pdMasterService.queryPageListBy(bo, pageQuery);
+    }
+
+
+    /**
+     * 查询备忘录列表
+     */
+//    @SaCheckPermission("bwl:bwl:list")
+    @GetMapping("/listbwl")
+    public TableDataInfo<BusBwlVo> listbwl(BusBwlBo bo, PageQuery pageQuery) {
+        return busBwlService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取部门树
+     */
+    @GetMapping("/deptTree")
+    public R<List<RouterVo>> deptTree() {
+//        SysRole role = roleMapper.selectById(1);
+        List<SysMenu> menus = sysMenuService.selectMenuTreeByUserId(LoginHelper.getUserId(), null);
+//        menus = menus.stream().filter(menu -> "2".equals(menu.getMenuSource())).collect(Collectors.toList());
+        menus = menus.stream().filter(menu -> "1".equals(menu.getMenuSource())).collect(Collectors.toList());
+        return R.ok(sysMenuService.buildMenus(menus));
+    }
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProjectBigScreenController.java

@@ -1,18 +1,16 @@
 package org.dromara.bigscreen.controller;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import jakarta.annotation.Resource;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
+import org.dromara.bigscreen.domain.dto.ProjectImageProgressDetailReq;
+import org.dromara.bigscreen.domain.dto.ProjectUpdateDto;
 import org.dromara.bigscreen.domain.dto.TanchuangInfoReq;
 import org.dromara.bigscreen.domain.dto.Ys7DeviceUpdateReq;
-import org.dromara.bigscreen.domain.vo.ProjectImageProgressVo;
-import org.dromara.bigscreen.domain.vo.ProjectLandVo;
-import org.dromara.bigscreen.domain.vo.ProjectPeopleVo;
-import org.dromara.bigscreen.domain.vo.ProjectSafetyInspectionVo;
+import org.dromara.bigscreen.domain.vo.*;
 import org.dromara.bigscreen.service.ProjectBigScreenService;
 import org.dromara.common.core.constant.HttpStatus;
 import org.dromara.common.core.domain.R;
@@ -20,7 +18,12 @@ import org.dromara.common.core.exception.ServiceException;
 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.facility.domain.bo.FacRedLineBo;
+import org.dromara.facility.domain.vo.redline.FacRedLineVo;
+import org.dromara.facility.service.IFacRedLineService;
 import org.dromara.gps.domain.bo.GpsEquipmentBo;
 import org.dromara.land.domain.BusLandBlock;
 import org.dromara.land.domain.BusLandTransferLedger;
@@ -33,8 +36,8 @@ import org.dromara.manager.ys7manager.Ys7Manager;
 import org.dromara.other.domain.OthYs7Device;
 import org.dromara.other.service.IOthYs7DeviceService;
 import org.dromara.project.domain.vo.project.BusProjectSafetyDayVo;
+import org.dromara.project.domain.vo.project.BusProjectVo;
 import org.dromara.project.domain.vo.projectnews.BusProjectNewsVo;
-import org.dromara.project.service.IBusProjectNewsService;
 import org.dromara.project.service.IBusProjectService;
 import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionGisReq;
 import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionListGisVo;
@@ -50,6 +53,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -76,8 +80,6 @@ public class ProjectBigScreenController extends BaseController {
 
     private final IBusProjectService projectService;
 
-    private final IBusProjectNewsService projectNewsService;
-
     private final IQltQualityInspectionService qualityInspectionService;
 
     private final IHseSafetyInspectionService safetyInspectionService;
@@ -86,9 +88,12 @@ public class ProjectBigScreenController extends BaseController {
 
     private final BusLandTransferLedgerSonServiceImpl busLandTransferLedgerSonService;
 
+    private final IFacRedLineService facRedLineService;
+
     /**
      * 查询项目土地统计
      */
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/{projectId}")
     public R<List<ProjectLandVo>> landCount(@NotNull(message = "主键不能为空")
                                             @PathVariable Long projectId) {
@@ -100,9 +105,16 @@ public class ProjectBigScreenController extends BaseController {
             LambdaQueryWrapper<BusLandTransferLedgerSon> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.in(BusLandTransferLedgerSon::getParentId, list1);
             List<BusLandTransferLedgerSon> sonList = busLandTransferLedgerSonService.list(lambdaQueryWrapper);
-            Map<Long, BigDecimal> collect = sonList.stream().filter(vo -> "1".equals(vo.getTransferStatus()))
-                .collect(Collectors.toMap(BusLandTransferLedgerSon::getParentId, BusLandTransferLedgerSon::getAreaValue));
-
+            Map<Long, BigDecimal> collect = sonList.stream()
+                .filter(vo -> "1".equals(vo.getTransferStatus()))
+                .collect(Collectors.groupingBy(
+                    BusLandTransferLedgerSon::getParentId,
+                    Collectors.reducing(
+                        BigDecimal.ZERO,
+                        BusLandTransferLedgerSon::getAreaValue,
+                        BigDecimal::add
+                    )
+                ));
             for (BusLandTransferLedger busLandTransferLedger : levelList) {
                 BigDecimal areaValue = collect.get(busLandTransferLedger.getId());
                 if (areaValue != null) {
@@ -153,7 +165,7 @@ public class ProjectBigScreenController extends BaseController {
     /**
      * 查询项目天气
      */
-    @SaCheckPermission("project:bigScreen:weather")
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/weather/{projectId}")
     public R<List<WeatherVo>> getProjectWeather(@NotNull(message = "主键不能为空")
                                                 @PathVariable Long projectId) {
@@ -163,7 +175,7 @@ public class ProjectBigScreenController extends BaseController {
     /**
      * 查询项目安全天数
      */
-    @SaCheckPermission("project:bigScreen:safetyDay")
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/safetyDay/{projectId}")
     public R<BusProjectSafetyDayVo> getProjectSafetyDay(@NotNull(message = "主键不能为空")
                                                         @PathVariable Long projectId) {
@@ -173,138 +185,82 @@ public class ProjectBigScreenController extends BaseController {
     /**
      * 查询项目公告
      */
-    @SaCheckPermission("project:bigScreen:news")
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/news/{projectId}")
     public R<List<BusProjectNewsVo>> getProjectNews(@NotNull(message = "主键不能为空")
                                                     @PathVariable Long projectId) {
-//        List<BusCorporateEvents> busCorporateEvents = projectBigScreenMapper.getBusCorporateEvents();
-//        return R.ok(busCorporateEvents.stream().map(event -> {
-//            BusProjectNewsVo vo = new BusProjectNewsVo();
-//            vo.setId(event.getId());
-//            vo.setTitle(event.getHeadline());
-//            vo.setContent(event.getContent());
-//            return vo;
-//        }).toList());
         return R.ok(projectBigScreenService.getProjectNews(projectId));
     }
 
     /**
      * 查询项目AI安全巡检
      */
-    @SaCheckPermission("project:bigScreen:safetyInspection")
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/safetyInspection/{projectId}")
     public R<List<ProjectSafetyInspectionVo>> getProjectSafetyInspection(@NotNull(message = "主键不能为空")
                                                                          @PathVariable Long projectId) {
-/*        BusProject project = projectService.getById(projectId);
-        projectId = project.getGoId();
-        String pic;
-        if (projectId == 60) {
-            pic = "http://xny.yj-3d.com:7464";
-        } else {
-            pic = "http://xny.yj-3d.com:7363";
-        }
-        List<BusTour> busTours = projectBigScreenMapper.selectTourByProjectId(projectId);
-        return R.ok(busTours.stream().map(tour -> {
-            ProjectSafetyInspectionVo vo = new ProjectSafetyInspectionVo();
-            vo.setId(tour.getId());
-            vo.setViolationType(tour.getTourType());
-            vo.setPicture(pic + tour.getPicture());
-            vo.setCreateTime(tour.getCreatedAt());
-            return vo;
-        }).toList());*/
         return R.ok(projectBigScreenService.getProjectSafetyInspection(projectId));
     }
 
     /**
      * 查询项目人员情况
      */
-    @SaCheckPermission("project:bigScreen:people")
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/people/{projectId}")
     public R<ProjectPeopleVo> getProjectPeople(@NotNull(message = "主键不能为空")
                                                @PathVariable Long projectId) {
-//        BusProject project = projectService.getById(projectId);
-//        projectId = project.getGoId();
-//        Integer projectUserCount = projectBigScreenMapper.getProjectUserCount(projectId);
-//        ProjectPeopleVo vo = new ProjectPeopleVo();
-//        vo.setPeopleCount(BigDecimal.valueOf(projectUserCount));
-//        Integer attendanceCount = projectBigScreenMapper.getAttendanceCount(projectId, DateUtils.getDate());
-//        vo.setAttendanceCount(BigDecimal.valueOf(attendanceCount));
-//        vo.setAttendanceRate(BigDecimalUtil.toPercentage(BigDecimal.valueOf(attendanceCount), BigDecimal.valueOf(projectUserCount)));
-//        List<BusConstructionUser> projectUserList = projectBigScreenMapper.getProjectUserList(projectId);
-//        List<BusProjectTeamByGo> teamList = projectBigScreenMapper.getTeamList(projectId);
-//
-//        List<ProjectTeamAttendanceVo> teamAttendanceList = new ArrayList<>();
-//        String punchRange = project.getPunchRange();
-//        String punchTime = "";
-//        if (punchRange != null) {
-//            String start = punchRange.split(",")[0];
-//            punchTime = LocalDate.now() + " " + start;
-//        }
-//        if (projectUserList != null && teamList != null) {
-//            projectUserList = projectUserList.stream().filter(user -> user.getTeamId() != null).toList();
-//            Map<Long, List<BusConstructionUser>> userMap = projectUserList.stream()
-//                .collect(Collectors.groupingBy(BusConstructionUser::getTeamId));
-//            for (BusProjectTeamByGo team : teamList) {
-//                ProjectTeamAttendanceVo vo1 = new ProjectTeamAttendanceVo();
-//                vo1.setId(team.getId());
-//                vo1.setTeamName(team.getName());
-//                vo1.setAttendanceTime(punchTime);
-//                vo1.setAttendanceNumber(BigDecimal.ZERO);
-//                List<BusConstructionUser> userList = userMap.get(team.getId());
-//                if (CollUtil.isNotEmpty(userList)) {
-//                    List<String> list = userList.stream().map(BusConstructionUser::getOpenid).distinct().toList();
-//                    Integer aCount = projectBigScreenMapper.getAttendanceCountByOpenIds(list, LocalDate.now());
-//                    vo1.setAttendanceNumber(BigDecimal.valueOf(aCount));
-//                }
-//                vo1.setAllNumber(BigDecimal.valueOf(userMap.getOrDefault(team.getId(), List.of()).size()));
-//                if (vo1.getAttendanceNumber() != null && vo1.getAllNumber() != null && vo1.getAllNumber().compareTo(BigDecimal.ZERO) != 0) {
-//                    vo1.setAttendanceRate(BigDecimalUtil.toPercentage(vo1.getAttendanceNumber(), vo1.getAllNumber()));
-//                } else {
-//                    vo1.setAttendanceRate(BigDecimal.ZERO);
-//                }
-//                teamAttendanceList.add(vo1);
-//            }
-//        }
-//        vo.setTeamAttendanceList(teamAttendanceList);
-//        return R.ok(vo);
         return R.ok(projectBigScreenService.getProjectPeople(projectId));
     }
 
+    /**
+     * 查询项目人员情况
+     */
+//    @SaCheckPermission("project:big:screen")
+    @GetMapping("/ue/people/{projectId}")
+    public R<ProjectPeopleVo> getProjectPeopleUe(@NotNull(message = "主键不能为空")
+                                                 @PathVariable Long projectId) {
+        final Long tdyq = 1897160897167638529L;
+        final Long tdeq = 1968506669544656898L;
+        if (Objects.equals(projectId, tdeq) || Objects.equals(projectId, tdyq)) {
+            return R.ok(projectBigScreenService.getProjectPeopleTianDong());
+        } else {
+            return R.ok(projectBigScreenService.getProjectPeople(projectId));
+        }
+    }
+
     /**
      * 查询项目形象进度
      */
-    @SaCheckPermission("project:bigScreen:imageProgress")
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/imageProgress/{projectId}")
     public R<List<ProjectImageProgressVo>> getProjectImageProgress(@NotNull(message = "主键不能为空")
                                                                    @PathVariable Long projectId) {
         return R.ok(projectBigScreenService.getProjectImageProgress(projectId));
     }
 
+    /**
+     * 获取项目形象进度详情
+     */
+    @GetMapping("/imageProgress/detail")
+    public R<List<ProjectImageProgressDetailVo>> getProjectImageProgressDetail(@Validated ProjectImageProgressDetailReq req) {
+        List<ProjectImageProgressDetailVo> list = projectBigScreenService.getProjectImageProgressDetail(req);
+        return R.ok(list);
+    }
+
     /**
      * 查询项目概括
      */
-    @SaCheckPermission("project:bigScreen:generalize")
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/generalize/{projectId}")
     public R<String> getProjectGeneralize(@NotNull(message = "主键不能为空")
                                           @PathVariable Long projectId) {
-//        BusProject project = projectService.getById(projectId);
-//        if (project != null) {
-//            Long goId = project.getGoId();
-//            if (goId != null) {
-//                List<SysProjectIntroduce> sysProjectIntroduces = projectBigScreenMapper.selectByProjectId(goId);
-//                if (CollUtil.isNotEmpty(sysProjectIntroduces)) {
-//                    return R.ok(sysProjectIntroduces.getFirst().getRichText());
-//                }
-//            }
-//        }
         return R.ok(projectBigScreenService.getProjectGeneralize(projectId));
-//        return R.ok();
     }
 
     /**
      * 查询设备列表
      */
-    @SaCheckPermission("project:bigScreen:getClientList")
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/getClientList/{projectId}")
     public R<List<Map<String, Object>>> getClientList(@NotNull(message = "主键不能为空")
                                                       @PathVariable Long projectId) {
@@ -314,6 +270,7 @@ public class ProjectBigScreenController extends BaseController {
     /**
      * 修改萤石摄像头
      */
+//    @SaCheckPermission("project:big:screen")
     @RepeatSubmit()
     @PutMapping("/device")
     public R<Void> edit(@Validated @RequestBody Ys7DeviceUpdateReq req) {
@@ -337,11 +294,15 @@ public class ProjectBigScreenController extends BaseController {
             if (count > 0) {
                 throw new ServiceException("已存在同名萤石摄像头", HttpStatus.CONFLICT);
             }
-            // todo 更新云端名称
-/*            Boolean result = ys7Manager.updateDeviceName(one.getDeviceSerial(), deviceName);
+            // 更新云端名称
+            Boolean result = ys7Manager.updateDeviceName(one.getDeviceSerial(), deviceName);
             if (!result) {
                 throw new ServiceException("更新云端萤石摄像头名称异常", HttpStatus.ERROR);
-            }*/
+            }
+        }
+        if (req.getLatitude() != null && req.getLongitude() != null) {
+            ys7Device.setLatitude(req.getLatitude());
+            ys7Device.setLongitude(req.getLongitude());
         }
         return toAjax(othYs7DeviceService.updateById(ys7Device));
     }
@@ -349,6 +310,7 @@ public class ProjectBigScreenController extends BaseController {
     /**
      * 查询质量信息
      */
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/getQualityList/gis")
     public R<QltQualityInspectionListGisVo> queryGisList(QltQualityInspectionGisReq req) {
         return R.ok(qualityInspectionService.queryGisList(req));
@@ -357,6 +319,7 @@ public class ProjectBigScreenController extends BaseController {
     /**
      * 查询大屏安全信息
      */
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/getSafetyList/gis")
     public R<HseSafetyInspectionListGisVo> queryGisList(HseSafetyInspectionGisReq req) {
         return R.ok(safetyInspectionService.queryGisList(req));
@@ -365,7 +328,7 @@ public class ProjectBigScreenController extends BaseController {
     /**
      * 查询GPS设备用户列表
      */
-    @SaCheckPermission("project:bigScreen:getList")
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/getList")
     public R<List<String>> getList(Long projectId) {
         return R.ok(projectBigScreenService.getList(projectId));
@@ -374,7 +337,7 @@ public class ProjectBigScreenController extends BaseController {
     /**
      * 新增GPS设备详细
      */
-    @SaCheckPermission("project:bigScreen:setList")
+//    @SaCheckPermission("project:big:screen")
     @Log(title = "GPS设备详细", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/setList")
@@ -385,17 +348,42 @@ public class ProjectBigScreenController extends BaseController {
     /**
      * 查询地图项目分类
      */
-//    @SaCheckPermission("project:bigScreen:getProjectMapList")
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/getProjectMapList")
     public R<Map<String, Map<String, Map<String, String>>>> getProjectMapList() {
         return R.ok(projectService.getProjectMapList());
     }
 
+    /**
+     * 查询地图项目分类
+     */
+//    @SaCheckPermission("project:big:screen")
+    @PostMapping("/updatePosition")
+    public R<Void> updatePosition(@RequestBody ProjectUpdateDto dto) {
+        return toAjax(projectService.updatePosition(dto));
+    }
+
+    /**
+     * 获取项目信息
+     */
+    @GetMapping("/getProjectInfo/{projectId}")
+    public R<ProjectInfo> getProjectInfo(@NotNull(message = "主键不能为空")
+                                         @PathVariable Long projectId) {
+        BusProjectVo projectVo = projectService.queryById(projectId);
+        ProjectInfo info = new ProjectInfo();
+        info.setLat(projectVo.getLat());
+        info.setLng(projectVo.getLng());
+        info.setPlan(projectVo.getPlan());
+        info.setPosition(projectVo.getPosition());
+        info.setProjectId(projectVo.getId().toString());
+        return R.ok(info);
+    }
+
 
     /**
      * 查询项目地域分散图
      */
-//    @SaCheckPermission("project:bigScreen:getProjectMapList")
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/getProjectDiYv")
     public R<Map<String, Long>> getProjectDiYv() {
         return R.ok(projectService.getProjectDiYv());
@@ -404,7 +392,7 @@ public class ProjectBigScreenController extends BaseController {
     /**
      * 计划和实际容量对比
      */
-//    @SaCheckPermission("project:bigScreen:getProjectMapList")
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/getProjectCapacity")
     public R<Map<String, Map<String, String>>> getProjectCapacity() {
         return R.ok(projectService.getProjectCapacity());
@@ -414,17 +402,27 @@ public class ProjectBigScreenController extends BaseController {
     /**
      * 更新无人机缓存
      */
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/setWrjHc")
-    public void setWrjHc(){
+    public void setWrjHc() {
         projectBigScreenService.setWrjHc();
     }
 
     /**
      * 更新无人机缓存
      */
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/getInfoData")
-    public R<Map<String, Map<String, Object>>> getInfoData(TanchuangInfoReq req){
+    public R<Map<String, Map<String, Object>>> getInfoData(TanchuangInfoReq req) {
         return R.ok(projectBigScreenService.getInfoData(req));
     }
 
+    /**
+     * 查询设施-红线列表
+     */
+    @GetMapping("/redLine/list")
+    public TableDataInfo<FacRedLineVo> list(FacRedLineBo bo, PageQuery pageQuery) {
+        return facRedLineService.queryPageList(bo, pageQuery);
+    }
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/SysRoleWorkController.java

@@ -0,0 +1,150 @@
+package org.dromara.bigscreen.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.bigscreen.domain.SysRoleWork;
+import org.dromara.bigscreen.domain.bo.SysRoleWorkBo;
+import org.dromara.bigscreen.domain.vo.SysRoleWorkVo;
+import org.dromara.bigscreen.service.impl.SysRoleWorkServiceImpl;
+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.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.project.domain.vo.project.BusProjectVo;
+import org.dromara.system.domain.vo.SysRoleVo;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 角色流程对应
+ *
+ * @author Lion Li
+ * @date 2025-11-06
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/bigscreen/roleWork")
+public class SysRoleWorkController extends BaseController {
+
+    private final SysRoleWorkServiceImpl sysRoleWorkService;
+
+    /**
+     * 查询角色流程对应列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<SysRoleWorkVo> list(SysRoleWorkBo bo, PageQuery pageQuery) {
+        return sysRoleWorkService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出角色流程对应列表
+     */
+    @SaCheckPermission("bigscreen:roleWork:export")
+    @Log(title = "角色流程对应", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SysRoleWorkBo bo, HttpServletResponse response) {
+        List<SysRoleWorkVo> list = sysRoleWorkService.queryList(bo);
+        ExcelUtil.exportExcel(list, "角色流程对应", SysRoleWorkVo.class, response);
+    }
+
+    /**
+     * 获取角色流程对应详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("bigscreen:roleWork:query")
+    @GetMapping("/{id}")
+    public R<SysRoleWorkVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(sysRoleWorkService.queryById(id));
+    }
+
+    /**
+     * 新增角色流程对应
+     */
+    @SaCheckPermission("bigscreen:roleWork:add")
+    @Log(title = "角色流程对应", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysRoleWorkBo bo) {
+        return toAjax(sysRoleWorkService.insertByBo(bo));
+    }
+
+    /**
+     * 修改角色流程对应
+     */
+    @SaCheckPermission("bigscreen:roleWork:edit")
+    @Log(title = "角色流程对应", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysRoleWorkBo bo) {
+        return toAjax(sysRoleWorkService.updateByBo(bo));
+    }
+
+    /**
+     * 删除角色流程对应
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("bigscreen:roleWork:remove")
+    @Log(title = "角色流程对应", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(sysRoleWorkService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 获取当前用户在制定项目下有流程的角色列表
+     */
+    @GetMapping("/getRoleList/{projectId}")
+    public R<List<SysRoleVo>> getRoleList(@PathVariable("projectId") Long projectId) {
+        return R.ok(sysRoleWorkService.getRoleList(projectId));
+    }
+
+    /**
+     * 判断当前用户在所有项目下所有角色是否有角色流程
+     */
+    @GetMapping("/isHaveValue")
+    public R<Boolean> isHaveValue() {
+        return R.ok(sysRoleWorkService.isHaveValue(LoginHelper.getUserId()));
+    }
+
+    /**
+     * 根据用户和项目判断是否有角色流程
+     */
+    @GetMapping("/getRoleWork/{projectId}")
+    public R<Boolean> getRoleWorkByProject(@PathVariable("projectId") Long projectId) {
+        return R.ok(sysRoleWorkService.isHaveValueByProject(projectId));
+    }
+
+    /**
+     * 获取角色对应流程     弃用
+     */
+    @GetMapping("/getRoleToWork/{projectId}")
+    public R<SysRoleWork> getRoleWork(@PathVariable("projectId") Long projectId) {
+        return R.ok(sysRoleWorkService.getRoleWork(projectId));
+    }
+
+    /**
+     * 获取有对应流程并且包含角色列表的项目列表
+     */
+    @GetMapping("/getProjectRoles")
+    public R<List<BusProjectVo>> getProjectRoles() {
+        return R.ok(sysRoleWorkService.getProjectRoles());
+    }
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/UEController.java

@@ -0,0 +1,39 @@
+package org.dromara.bigscreen.controller;
+
+import jakarta.annotation.Resource;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.bigscreen.domain.vo.ProjectPeopleVo;
+import org.dromara.bigscreen.service.ProjectBigScreenService;
+import org.dromara.common.core.domain.R;
+import org.dromara.project.domain.vo.project.BusProjectVo;
+import org.dromara.project.service.IBusProjectService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * UE大屏
+ *
+ * @author Lion Li
+ * @date 2025-11-04
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/UE/screen")
+public class UEController {
+
+    @Resource
+    private IBusProjectService projectService;
+
+
+    @GetMapping("/projectInfo/{projectId}")
+    public R<BusProjectVo> getProjectPeople(@NotNull(message = "主键不能为空")
+                                               @PathVariable Long projectId) {
+        return R.ok(projectService.selectById(projectId));
+    }
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusAttendanceByGo.java

@@ -1,58 +0,0 @@
-package org.dromara.bigscreen.domain;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-public class BusAttendanceByGo {
-
-    private Long id;                 // 主键ID
-
-    private String userName;         // 人员姓名
-
-    private String pacePhoto;        // 人脸照
-
-    private Long projectId;          // 项目id
-
-    private String createBy;         // 创建者
-
-    private String updateBy;         // 更新者
-
-    private LocalDateTime createdAt; // 创建时间
-
-    private LocalDateTime updatedAt; // 更新时间
-
-    private LocalDateTime deletedAt; // 删除时间
-
-    private String clockOn;          // 上午打卡
-
-    private String clockOff;         // 下午打卡
-
-    private String printingDate;     // 年月日打卡时间
-
-    private String isPinch;          // 1正常,2迟到,3早退,4缺勤,5补卡
-
-    private String openid;           // 微信id
-
-    private String pinchOpenId;      // 代打id
-
-    private String clockRecord;      // 多次打卡时间记录
-
-    private String pinchUserName;    // 代打人姓名
-
-    private String commuter;         // 上下班（1上班 2下班）
-
-    private String punchRange;       // 打卡范围
-
-    private BigDecimal dailyWage;    // 日薪
-
-    private String lng;              // 经度
-
-    private String lat;              // 纬度
-
-    private String location;         // 逆编码地址信息
-
-    private LocalDateTime missing;   // 缺卡统一处理时间
-}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusBwl.java

@@ -0,0 +1,58 @@
+package org.dromara.bigscreen.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 备忘录对象 bus_bwl
+ *
+ * @author Lion Li
+ * @date 2025-11-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("bus_bwl")
+public class BusBwl extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 备忘录ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 状态（0:未完成 1：已完成）
+     */
+    private Long status;
+
+    /**
+     * 计划开始时间
+     */
+    private Date jhkssj;
+
+    /**
+     * 计划结束时间
+     */
+    private Date jhjssj;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusConstructionUser.java

@@ -1,91 +0,0 @@
-package org.dromara.bigscreen.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-@TableName("bus_construction_user")
-public class BusConstructionUser {
-
-    @TableId(type = IdType.AUTO)
-    private Long id;                  // 主键ID
-
-    private String openid;            // 微信id
-
-    private String nickName;          // 微信名称
-
-    private Long teamId;              // 班组id
-
-    private String headIcon;          // 登陆照片
-
-    private String pacePhoto;         // 人脸照
-
-    private String userName;          // 人员姓名
-
-    private Long projectId;           // 项目id
-
-    private String status;            // 状态（0在职 1离职）-字典position_status
-
-    private String isPinch;           // 是否代打
-
-    private String ifManagement;      // 是否班组管理
-
-    private String createBy;          // 创建者
-
-    private String updateBy;          // 更新者
-
-    private LocalDateTime createdAt;  // 创建时间
-
-    private LocalDateTime updatedAt;  // 更新时间
-
-    private LocalDateTime deletedAt;  // 删除时间
-
-    private String phone;             // 电话
-
-    private String sex;               // 1:男,2女,3保密
-
-    private String sfzNation;         // 身份证民族
-
-    private String sfzNumber;         // 身份证号码
-
-    private String sfzStart;          // 身份证有效开始期
-
-    private String sfzEnd;            // 身份证有效结束期
-
-    private String sfzSite;           // 身份证地址
-
-    private String sfzBirth;          // 身份证出生日期
-
-    private String nativePlace;       // 籍贯
-
-    private String yhkNumber;         // 银行卡号
-
-    private String yhkOpeningBank;    // 开户行
-
-    private String yhkCardholder;     // 持卡人
-
-    private String typeOfWork;        // 工种（字典）
-
-    private String clock;             // 打卡(1启用打卡 2禁止打卡)
-
-    private Long labourserviceId;     // 劳务公司id
-
-    private String entryDate;         // 入场时间
-
-    private String leaveDate;         // 离场时间
-
-    private BigDecimal salary;        // 薪水（为0表示无效）
-
-    private String projectRecord;     // 是否开启项目备案（1开启 2不开启）
-
-    private String wxOrPc;            // 哪添加的（1表示pc 2表示小程序）
-
-    private String subscription;      // 消息订阅状态（1订阅 2无订阅）
-
-    private String devNum;            // 安全帽设备标识
-}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusCorporateEvents.java

@@ -1,52 +0,0 @@
-package org.dromara.bigscreen.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * 企业大事记
- */
-@Data
-@TableName("bus_corporate_events")
-public class BusCorporateEvents {
-
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 标题
-     */
-    private String headline;
-
-    /**
-     * 内容
-     */
-    private String content;
-
-    /**
-     * 创建人
-     */
-    private Long createdBy;
-
-    /**
-     * 更新人
-     */
-    private Long updatedBy;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdAt;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updatedAt;
-
-    /**
-     * 删除时间（软删除标记）
-     */
-    private LocalDateTime deletedAt;
-}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusProjectTeamByGo.java

@@ -1,31 +0,0 @@
-package org.dromara.bigscreen.domain;
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class BusProjectTeamByGo {
-
-    private Long id;              // 主键id
-
-    private Long projectId;       // 项目id
-
-    private String name;      // 班组名称
-
-    private String isClockIn;     // 范围内打卡（0范围内打卡 1任何地点打卡）
-
-    private String punchRange;    // 打卡范围(id串)
-
-    private String remark;        // 备注
-
-    private String createBy;      // 创建者
-
-    private String updateBy;      // 更新者
-
-    private Long createDept;      // 创建部门
-
-    private LocalDateTime createTime; // 创建时间
-
-    private LocalDateTime updateTime; // 更新时间
-}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusProjectTeamMemberByGo.java

@@ -1,25 +0,0 @@
-package org.dromara.bigscreen.domain;
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class BusProjectTeamMemberByGo {
-
-    private Long id;              // 主键id
-
-    private Long teamId;          // 班组id
-
-    private Long projectId;       // 项目id
-
-    private Long memberId;        // 施工人员id
-
-    private String postId;        // 岗位（0普通员工，1组长）
-
-    private String remark;        // 备注
-
-    private LocalDateTime createTime; // 创建时间
-
-    private LocalDateTime updateTime; // 更新时间
-}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusSygj.java

@@ -0,0 +1,67 @@
+package org.dromara.bigscreen.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 实用工具对象 bus_sygj
+ *
+ * @author Lion Li
+ * @date 2025-11-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("bus_sygj")
+public class BusSygj extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 工具名
+     */
+    private String gjm;
+
+    /**
+     * 工具路径
+     */
+    private String gjUrl;
+
+
+    /**
+     * 图片id
+     *
+     * */
+   private Long  imgId;
+    /**
+     * 图片路径
+     * */
+   private String  imgUrl;
+
+    /**
+     * 审核标志
+     */
+    private String auditStatus;
+
+    /**
+     * 工具类型 1内部 ，2外部
+     */
+    private String type;
+
+    /**
+     * 功能描述
+     */
+    private String gnms;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusTour.java

@@ -1,35 +0,0 @@
-package org.dromara.bigscreen.domain;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class BusTour {
-
-    private Long id;                  // 主键ID
-
-    private Long projectId;           // 项目id
-
-    private String tourCategory;      // 类别字典（如：无人机识别、监控拍摄）
-
-    private String tourType;          // 类型字典（如：安全帽、安全带）
-
-    private String picture;           // 图片路径
-
-    private Integer num;              // 违规数量
-
-    private String describe;          // 故障描述
-
-    private Date createdAt;  // 创建时间
-
-    private Date updatedAt;  // 更新时间
-
-    private Date deletedAt;  // 删除时间
-
-    private String tableName;         // 表名
-
-    private Long tableId;             // 表id
-
-    private String sxtName;           // 摄像头名称
-}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusWjzx.java

@@ -0,0 +1,57 @@
+package org.dromara.bigscreen.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 文件中心对象 bus_wjzx
+ *
+ * @author Lion Li
+ * @date 2025-11-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("bus_wjzx")
+public class BusWjzx extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 文件名
+     */
+    private String wjm;
+
+    /**
+     * 文件上传路径
+     */
+    private String wjId;
+
+
+
+    /**
+     * 文件类型
+     */
+    private String wjlx;
+    /**
+     * 文件描述
+     */
+    private String gnms;
+
+    /**
+     * 审核标志
+     */
+    private String auditStatus;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/SysProjectIntroduce.java

@@ -1,34 +0,0 @@
-package org.dromara.bigscreen.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("sys_project_introduce")
-public class SysProjectIntroduce {
-
-    @TableId(type = IdType.AUTO)
-    private Long id;              // 主键id
-
-    private Long projectId;       // 项目id
-
-    private String headline;      // 标题
-
-    private String richText;      // 富文本
-
-    private String createdBy;     // 创建人
-
-    private String updatedBy;     // 更新人
-
-    private LocalDateTime createdAt; // 创建时间
-
-    private LocalDateTime updatedAt; // 更新时间
-
-    private LocalDateTime deletedAt; // 删除时间
-
-    private String files;         // 附件
-}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/SysRoleWork.java

@@ -0,0 +1,57 @@
+package org.dromara.bigscreen.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * 角色流程对应对象 sys_role_work
+ *
+ * @author Lion Li
+ * @date 2025-11-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_role_work")
+public class SysRoleWork extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 绑定角色ID
+     */
+    private Long roleId;
+
+    /**
+     * 绑定项目id
+     */
+    private Long projectId;
+
+    /**
+     * 流程名称
+     */
+    private String lcmc;
+
+    /**
+     * 流程描述
+     */
+    private String lcms;
+
+    /**
+     * 流程详情
+     */
+    private String lcxq;
+
+
+}