Commit Graph

Select branches

Hide Pull Requests

6170

APP权限登录改造

dyf-device

jingquan

main

prod

#20

#21

#22

Mono Color

• ca11ef0e35 Merge pull request 'feat(equipment): 添加设备图片上传功能' (#22) from liwenlong/fys-Multi-tenant:jingquan into jingquan jingquan dyf-device 6170 dyf 2026-01-12 11:15:56 +08:00
• ef2dc6a6f6 feat(equipment): 添加设备图片上传功能 DragonWenLong 2026-01-12 11:06:44 +08:00
• cde34cab6c Merge branch '6170' into prod prod daiyongfei 2025-12-26 16:22:57 +08:00
• dff37b245a Merge branch 'dyf-device' into 6170 daiyongfei 2025-12-26 16:22:00 +08:00
• d7c4d22de3 该设备类型下已有设备，无法修改设备类型名称!!! daiyongfei 2025-12-26 16:21:33 +08:00
• 6a058318f2 设备记录列表显示问题修改 chenyouting 2025-12-26 15:54:14 +08:00
• f2d74b8f17 Merge branch 'dyf-device' into 6170 daiyongfei 2025-12-22 15:09:39 +08:00
• af42a2199c 根据用户ID查询菜单 daiyongfei 2025-12-22 15:09:07 +08:00
• aaf142ca67 提交 chenyouting 2025-12-19 17:55:48 +08:00
• 7d256df790 Merge branch 'dyf-device' into prod daiyongfei 2025-12-19 16:22:55 +08:00
• c0dfe36b59 cn.idev.excel daiyongfei 2025-12-19 16:21:56 +08:00
• 3d1c2f4e56 Merge branch 'dyf-device' into prod daiyongfei 2025-12-19 14:08:03 +08:00
• c480bda112 围栏进出记录 daiyongfei 2025-12-19 14:06:01 +08:00
• ccadcb8d4e Merge branch '6170' into prod daiyongfei 2025-12-12 14:59:50 +08:00
• 8c636d0484 设备维修记录 daiyongfei 2025-12-12 14:55:03 +08:00
• 0c474ae1f3 维修时间 daiyongfei 2025-12-11 15:24:46 +08:00
• b85664900e 分页查询围栏进出记录列表 daiyongfei 2025-12-10 09:39:00 +08:00
• b8cb663bbf Merge branch 'jingquan' into prod daiyongfei 2025-12-03 16:56:49 +08:00
• 035b24fedd Merge pull request 'feat(equipment): 新增高德轨迹服务相关功能与设备终端管理' (#21) from liwenlong/fys-Multi-tenant:jingquan into jingquan dyf 2025-12-03 16:52:09 +08:00
• e920cfb860 feat(equipment): 新增高德轨迹服务相关功能与设备终端管理 DragonWenLong 2025-12-03 11:39:18 +08:00
• 56e86b070d Merge branch 'dyf-device' into prod daiyongfei 2025-12-01 13:33:59 +08:00
• b33ee00dbd APP文件上传 main daiyongfei 2025-12-01 10:34:41 +08:00
• 0898855108 Merge branch '6170' into prod daiyongfei 2025-11-28 10:18:54 +08:00
• c8f9cc4f31 Merge branch 'dyf-device' into 6170 daiyongfei 2025-11-28 10:17:42 +08:00
• 26d2f05c4e 绑定状态 daiyongfei 2025-11-28 10:13:26 +08:00
• d57d17dc50 登录提示去掉 chenyouting 2025-11-28 09:15:35 +08:00
• 20ddbf6e05 app注销删除相关联数据2 chenyouting 2025-11-27 11:16:07 +08:00
• 92b65ce6df Merge branch 'dyf-device' into prod daiyongfei 2025-11-27 11:01:58 +08:00
• 63a9d2f8f9 导出图片压缩 daiyongfei 2025-11-27 11:00:34 +08:00
• 7753444f25 Merge branch 'dyf-device' into jingquan daiyongfei 2025-11-25 14:52:10 +08:00
• bf182ebc89 强制将HTTP替换为HTTPS daiyongfei 2025-11-25 14:51:10 +08:00
• d5a29feca3 Merge pull request 'jingquan' (#20) from liwenlong/fys-Multi-tenant:jingquan into jingquan dyf 2025-11-25 14:47:00 +08:00
• 0457877c09 merge upstream liwenlong 2025-11-24 08:30:34 +08:00
• 1e9e815314 uploadVideo daiyongfei 2025-11-21 16:24:07 +08:00
• b18ab98feb 导出设备数据 daiyongfei 2025-11-21 13:36:13 +08:00
• 7c6f3be844 merge upstream liwenlong 2025-11-20 16:25:33 +08:00
• aa69b552aa Merge remote-tracking branch 'liwenlong-fys/jingquan' into jingquan DragonWenLong 2025-11-20 16:25:04 +08:00
• 3dd0d4cc90 feat(video): 支持BGR565格式视频处理及MQTT设备确认消息更新 DragonWenLong 2025-11-20 16:24:45 +08:00
• 00a4394b43 新增设备 daiyongfei 2025-11-20 16:15:15 +08:00
• 2376a3b42a 修改设备类型 daiyongfei 2025-11-20 10:11:14 +08:00
• 359cabbd2c feat(video): 支持BGR565格式视频处理- 新增code参数用于指定视频转码格式 - 实现BGR565格式的帧数据转换逻辑 - 添加convertFramesToBGR565和convertToBGR565方法 - 支持将BGR565数据通过FFmpeg生成MP4文件- 更新VideoProcessUtil工具类以支持两种颜色格式 - 在视频处理服务中记录处理日志及hex列表信息 DragonWenLong 2025-11-20 09:06:05 +08:00
• 76c11fff15 Merge remote-tracking branch 'upstream/6170' into 6170 chenyouting 2025-11-19 17:17:40 +08:00
• a0ab5e9fe0 app注销删除相关联数据 chenyouting 2025-11-19 17:17:34 +08:00
• 891ee7c1c9 Merge branch 'dyf-device' into 6170 daiyongfei 2025-11-19 10:56:12 +08:00
• a145c372b8 优化设备导出 daiyongfei 2025-11-19 10:55:44 +08:00
• 3798e52ee0 导入设备数据 daiyongfei 2025-11-18 15:34:46 +08:00
• 6488b8a724 Merge branch 'dyf-device' into 6170 daiyongfei 2025-11-12 11:25:55 +08:00
• 6d58268874 根据新增业务对象插入设备语音 daiyongfei 2025-11-11 15:10:15 +08:00
• 88b54a49f4 Merge branch 'dyf-device' into 6170 daiyongfei 2025-11-11 14:34:19 +08:00
• 56dbfbde71 prod daiyongfei 2025-11-11 14:33:10 +08:00
• dce043f63d Merge branch 'dyf-device' into 6170 daiyongfei 2025-11-11 10:51:57 +08:00
• 77626673e9 设备语音 daiyongfei 2025-11-11 10:51:28 +08:00
• 759c72fc65 Merge branch 'dyf-device' into 6170 daiyongfei 2025-11-10 10:37:43 +08:00
• 1be80be309 灯光模式 5 daiyongfei 2025-11-10 10:37:03 +08:00
• 92df1c8668 Merge branch 'dyf-device' of http://47.107.152.87:3000/dyf/fys-Multi-tenant into dyf-device daiyongfei 2025-11-08 09:48:18 +08:00
• cc2b7664a8 处理MQTT消息 daiyongfei 2025-11-08 09:48:12 +08:00
• 33d6108172 处理MQTT消息 daiyongfei 2025-11-08 09:38:19 +08:00
• 70c416779f Merge branch 'dyf-device' into 6170 daiyongfei 2025-11-07 17:11:45 +08:00
• ee85961eeb Merge branch 'main' into dyf-device daiyongfei 2025-11-07 17:11:21 +08:00
• 004079f7f4 Merge branch 'jingquan' daiyongfei 2025-11-07 17:10:54 +08:00
• 264d0135d9 获取设备分享详细信息 daiyongfei 2025-11-07 17:07:33 +08:00
• 4961ec47f8 Merge pull request 'feat(file): 新增文件哈希去重与文本提取功能- 在多个模块中引入 FileHashUtil 并用于文件上传前的哈希计算' (#19) from liwenlong/fys-Multi-tenant:jingquan into jingquan dyf 2025-11-07 17:06:27 +08:00
• f25afe0e9d feat(file): 新增文件哈希去重与文本提取功能- 在多个模块中引入 FileHashUtil 并用于文件上传前的哈希计算 - 优化文件上传逻辑，实现基于哈希的秒传机制 - 新增音频服务中的文本提取方法，支持 txt 和 docx 格式 - 使用流式解析技术处理大文件内容，避免内存溢出 -为 AppVideoController 添加 /extract 接口用于文本内容提取 - 完善文件哈希工具类，增强线程安全性与异常处理 - 调整 SysOssService 的 updateHash 方法以支持复用逻辑- 统一构建 SysOssVo 实体时的哈希字段设置逻辑 DragonWenLong 2025-11-07 16:59:07 +08:00
• e265dea0ec BJQ6075 设备控制类 daiyongfei 2025-11-07 15:53:13 +08:00
• c7ff118bfe BJQ6075 设备控制类 daiyongfei 2025-11-06 10:39:12 +08:00
• 1dc3386284 6075 mqtt daiyongfei 2025-11-05 17:55:59 +08:00
• c4957aa3aa 音频处理服务 daiyongfei 2025-10-31 08:50:08 +08:00
• f4369f7581 分享设备bug修改 chenyouting 2025-10-30 14:27:01 +08:00
• df28eed305 prod配置文件 chenyouting 2025-10-28 10:51:05 +08:00
• 07e60cf7f0 Merge branch 'dyf-device' into 6170 daiyongfei 2025-10-28 10:33:15 +08:00
• 5d42f8a1e1 Merge branch 'jingquan' into dyf-device daiyongfei 2025-10-28 10:32:31 +08:00
• f2a5e63a41 Merge pull request 'feat(equipment): 添加阿里巴巴TTS语音合成工具类' (#18) from liwenlong/fys-Multi-tenant:jingquan into jingquan dyf 2025-10-28 10:31:37 +08:00
• 467a7befb1 提交2 chenyouting 2025-10-28 10:29:12 +08:00
• 107ddf8851 feat(app): 添加防重复提交注解 DragonWenLong 2025-10-27 09:00:36 +08:00
• a85e74c5e6 在线状态任务3 chenyouting 2025-10-25 08:35:25 +08:00
• 9bbddee1d5 feat(equipment): 添加阿里巴巴TTS语音合成工具类 DragonWenLong 2025-10-24 11:22:35 +08:00
• da0833a400 Merge remote-tracking branch 'origin/6170' into 6170 daiyongfei 2025-10-13 16:15:26 +08:00
• 418fb55bf0 导出电子围栏列表 daiyongfei 2025-10-13 14:25:07 +08:00
• 1d50981a84 在线状态任务2 chenyouting 2025-10-13 14:14:51 +08:00
• 2f80c450c5 最多同时加载5张图片 daiyongfei 2025-10-13 10:48:53 +08:00
• 09cbdf267b 设备绑定提示 chenyouting 2025-10-12 13:37:18 +08:00
• 156fdbb53b 历史轨迹mac地址支持模糊查询 chenyouting 2025-10-11 16:33:57 +08:00
• 3246127893 设备解绑 chenyouting 2025-10-11 16:16:06 +08:00
• dab0440128 绑定bug修复 chenyouting 2025-10-11 16:07:14 +08:00
• 740a638444 Merge pull request 'fix(device):修复SOS报警类型判断逻辑' (#17) from liwenlong/fys-Multi-tenant:jingquan into jingquan dyf 2025-10-11 13:35:08 +08:00
• a3d44a157a fix(device):修复SOS报警类型判断逻辑 DragonWenLong 2025-10-11 13:23:51 +08:00
• cc23f082a6 Merge remote-tracking branch 'upstream/6170' into 6170 chenyouting 2025-10-11 11:06:15 +08:00
• 1bc7dc676e 控制中心查询 chenyouting 2025-10-11 11:06:07 +08:00
• 5cdacad468 获取设备使用频次统计 daiyongfei 2025-10-11 10:32:16 +08:00
• 62af38cbf0 Merge branch 'dyf-device' into 6170 daiyongfei 2025-10-11 09:05:38 +08:00
• 04a21567aa 设备所属分组 daiyongfei 2025-10-11 09:04:48 +08:00
• 5b4fa38dbd 设备告警 chenyouting 2025-10-10 15:46:25 +08:00
• 2c3effa683 历史轨迹1 chenyouting 2025-10-10 09:26:52 +08:00
• 7b8c626cb6 Merge branch 'jingquan' into dyf-device daiyongfei 2025-10-09 14:45:15 +08:00
• 9642908035 Merge pull request 'feat(app): 实现系统版本管理功能-Dto 新增 SystemVersion 数据传输对象- 修改 AppAuthController 的 getAppVersion 接口，从 Redis 获取版本信息' (#16) from liwenlong/fys-Multi-tenant:jingquan into jingquan dyf 2025-10-09 14:44:18 +08:00
• 85b2e2b976 设备告警1 chenyouting 2025-10-09 13:31:37 +08:00
• 88ac0236bd feat(app): 实现系统版本管理功能-Dto 新增 SystemVersion 数据传输对象- 修改 AppAuthController 的 getAppVersion 接口，从 Redis 获取版本信息 - 新增 DeviceXinghanController 的 VersionSettings 接口，用于更新版本信息到 Redis- 引入 FastJSON 和 Redis 工具类支持版本信息的序列化与缓存 - 添加权限注解控制版本更新接口访问 - 定义全局 Redis 键常量用于版本信息存储 DragonWenLong 2025-10-09 11:09:07 +08:00
• 609a3e4058 设备在线状态2 chenyouting 2025-10-09 09:44:48 +08:00
• 68cf78f3f2 设备在线状态5 chenyouting 2025-10-08 17:27:43 +08:00
• c9857a679c 设备在线状态4 chenyouting 2025-10-08 15:08:31 +08:00