|
|
5fb71dd092
|
提交代码5
|
2026-03-02 15:35:19 +08:00 |
|
|
|
1ce87aaec5
|
Merge branch '6170' of http://47.107.152.87:3000/dyf/fys-Multi-tenant into 6170
|
2026-03-02 14:31:46 +08:00 |
|
|
|
4f3e7b0ed0
|
regis
|
2026-03-02 14:31:40 +08:00 |
|
|
|
b75b7ef431
|
提交代码4
|
2026-03-02 13:55:21 +08:00 |
|
|
|
c9cad751f0
|
提交代码3
|
2026-03-02 13:45:30 +08:00 |
|
|
|
34841c8704
|
提交代码2
|
2026-03-02 11:17:46 +08:00 |
|
|
|
20ac6b0baa
|
bug修改4
|
2026-02-27 18:34:21 +08:00 |
|
|
|
4d5292cebc
|
bug修改3
|
2026-02-27 18:31:03 +08:00 |
|
|
|
7a35baa8f0
|
bug修改2
|
2026-02-27 17:42:23 +08:00 |
|
|
|
dbb7076b50
|
Merge remote-tracking branch 'origin/6170' into 6170
|
2026-02-27 15:34:22 +08:00 |
|
|
|
15c85d4c62
|
bug修改
|
2026-02-27 15:34:15 +08:00 |
|
|
|
e036ef05ce
|
Merge branch 'jingquan' into 6170
# Conflicts:
# fys-modules/fys-equipment/src/main/resources/mapper/equipment/AppBusinessFileMapper.xml
|
2026-02-27 15:31:26 +08:00 |
|
|
|
03f453f901
|
Merge pull request 'refactor(equipment): 将业务文件和操作视频功能从app模块迁移到equipment模块' (#25) from liwenlong/fys-Multi-tenant:jingquan into jingquan
Reviewed-on: #25
|
2026-02-27 15:29:26 +08:00 |
|
|
|
e23c5267ee
|
refactor(equipment): 将业务文件和操作视频功能从app模块迁移到equipment模块
- 移动AppBusinessFile相关类到equipment模块
- 移动AppOperationVideo相关类到equipment模块
- 更新所有导入路径以指向新的equipment包结构
- 重构设备创建流程中的文件克隆逻辑
- 添加cloneFiles方法支持从设备类型复制文件和视频到新设备
- 优化DeviceXinghanBizService中的设备验证逻辑
- 更新Mapper XML命名空间和返回类型引用
- 调整设备导入Excel的必填字段验证规则
|
2026-02-27 15:13:53 +08:00 |
|
|
|
552bf0af0a
|
hby100japp功能,语音音量增加2
|
2026-02-07 09:42:16 +08:00 |
|
|
|
efad1f5a4b
|
hby100japp功能,语音音量增加
|
2026-02-06 16:11:38 +08:00 |
|
|
|
f3551be093
|
hby100japp功能3
|
2026-02-06 11:50:38 +08:00 |
|
|
|
855714106e
|
hby100japp功能3
|
2026-02-04 18:40:27 +08:00 |
|
|
|
04cb699081
|
该设备类型下已有设备，无法修改设备类型名称!!!
|
2026-02-04 17:28:08 +08:00 |
|
|
|
0f0dd4c6b1
|
hby100japp功能2
|
2026-02-04 15:49:53 +08:00 |
|
|
|
2db37a75d2
|
hby100japp功能
|
2026-02-04 15:27:43 +08:00 |
|
|
|
696bbb4aa4
|
hby100j功能语音管理
|
2026-02-03 16:29:46 +08:00 |
|
|
|
ee445dc0d2
|
获取音频时长2
|
2026-02-02 16:09:25 +08:00 |
|
|
|
897561ba89
|
获取音频时长
|
2026-02-02 16:08:43 +08:00 |
|
|
|
2e575f78b1
|
语音管理
|
2026-02-02 16:06:11 +08:00 |
|
|
|
6fd7f8ca94
|
配置文件修改
|
2026-01-30 16:54:25 +08:00 |
|
|
|
9936a5ad13
|
新增mac地址
|
2026-01-30 16:53:20 +08:00 |
|
|
|
c267fe0c14
|
配置文件
|
2026-01-30 16:50:01 +08:00 |
|
|
|
e80830e76c
|
Merge remote-tracking branch 'origin/6170' into 6170
|
2026-01-30 16:08:07 +08:00 |
|
|
|
346792d5c1
|
Merge pull request 'feat(device): 新增阿里云语音通知功能并扩展设备查询接口' (#24) from liwenlong/fys-Multi-tenant:jingquan into jingquan
Reviewed-on: #24
|
2026-01-30 16:06:57 +08:00 |
|
|
|
cb87871982
|
feat(device): 新增阿里云语音通知功能并扩展设备查询接口
- 集成阿里云语音服务，实现TTS语音拨号功能
- 添加异步报警拨号机制，支持SOS紧急呼叫
- 新增按设备名称查询设备的接口和SQL
- 扩展设备类型统计和批量查询功能
- 添加租户ID字段支持多租户设备管理
- 配置阿里云语音API依赖和客户端单例模式
|
2026-01-30 16:03:13 +08:00 |
|
|
|
437ab110b7
|
Merge remote-tracking branch 'origin/6170-protocol' into 6170
# Conflicts:
# fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/MqttInboundConfiguration.java
# fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqAlarmRule.java
|
2026-01-30 13:48:33 +08:00 |
|
|
|
b280038502
|
Merge pull request 'fix(controller): 修复新增设备日志注解配置' (#23) from liwenlong/fys-Multi-tenant:jingquan into jingquan
Reviewed-on: #23
|
2026-01-28 16:33:25 +08:00 |
|
|
|
3e119b1dd8
|
feat(device): 添加设备图片字段映射
- 在设备服务实现中添加设备图片字段的赋值逻辑
- 将设备类型中的图片信息同步到设备对象中
|
2026-01-19 16:39:01 +08:00 |
|
|
|
cab0884d7f
|
fix(controller): 修复新增设备日志注解配置
- 将 @Operation 注解替换为 @Log 注解以正确记录操作日志
- 保持新增设备功能的核心逻辑不变
- 确保日志标题正确显示为"新增设备"
|
2026-01-15 17:21:46 +08:00 |
|
|
|
88650c3d9f
|
代码优化
|
2026-01-14 18:36:23 +08:00 |
|
|
|
ca11ef0e35
|
Merge pull request 'feat(equipment): 添加设备图片上传功能' (#22) from liwenlong/fys-Multi-tenant:jingquan into jingquan
Reviewed-on: #22
|
2026-01-12 11:15:56 +08:00 |
|
|
|
ef2dc6a6f6
|
feat(equipment): 添加设备图片上传功能
- 在DeviceType实体类中新增devicePic字段用于存储设备图片
- 修改控制器方法参数从RequestBody改为ModelAttribute以支持文件上传
- 更新DeviceTypeForm表单类添加MultipartFile类型的file字段
- 实现图片上传服务集成OSS存储和文件哈希处理
- 添加HTTP到HTTPS的URL强制转换机制
- 更新数据库操作逻辑以支持图片路径存储
- 在设备创建流程中集成设备类型图片信息传递
|
2026-01-12 11:06:44 +08:00 |
|
|
|
dff37b245a
|
Merge branch 'dyf-device' into 6170
|
2025-12-26 16:22:00 +08:00 |
|
|
|
d7c4d22de3
|
该设备类型下已有设备，无法修改设备类型名称!!!
|
2025-12-26 16:21:33 +08:00 |
|
|
|
6a058318f2
|
设备记录列表显示问题修改
|
2025-12-26 15:54:14 +08:00 |
|
|
|
f2d74b8f17
|
Merge branch 'dyf-device' into 6170
|
2025-12-22 15:09:39 +08:00 |
|
|
|
af42a2199c
|
根据用户ID查询菜单
|
2025-12-22 15:09:07 +08:00 |
|
|
|
aaf142ca67
|
提交
|
2025-12-19 17:55:48 +08:00 |
|
|
|
c0dfe36b59
|
cn.idev.excel
|
2025-12-19 16:21:56 +08:00 |
|
|
|
c480bda112
|
围栏进出记录
|
2025-12-19 14:06:01 +08:00 |
|
|
|
8c636d0484
|
设备维修记录
|
2025-12-12 14:55:03 +08:00 |
|
|
|
0c474ae1f3
|
维修时间
|
2025-12-11 15:24:46 +08:00 |
|
|
|
b85664900e
|
分页查询围栏进出记录列表
|
2025-12-10 09:39:00 +08:00 |
|
|
|
035b24fedd
|
Merge pull request 'feat(equipment): 新增高德轨迹服务相关功能与设备终端管理' (#21) from liwenlong/fys-Multi-tenant:jingquan into jingquan
Reviewed-on: #21
|
2025-12-03 16:52:09 +08:00 |
|
