jingquan #10

Merged
dyf merged 27 commits from liwenlong/fys-Multi-tenant:jingquan into main 2025-09-11 14:40:24 +08:00

27 Commits

Author SHA1 Message Date
e2274bdf09 feat(web): 新增设备联调中心功能
- 新增设备联调中心相关控制器、服务、DTO和VO
- 实现设备列表查询、文件上传、操作视频添加、设备详情等功能
- 优化设备 logo 上传逻辑,支持批量上传
- 重构部分代码结构,提高可维护性
2025-09-11 11:07:58 +08:00
228e26df7f merge upstream 2025-09-09 17:23:23 +08:00
fcbde4322d 今日报警总数 2025-09-09 16:39:43 +08:00
832234269d 获取设备使用数据 2025-09-09 16:06:34 +08:00
7e87971c0b 新增绑定设备 2025-09-09 15:02:46 +08:00
ebd8668178 在线设备 2025-09-09 11:03:38 +08:00
5e3307d2b0 设备分享2 2025-09-09 10:29:51 +08:00
040e44984e Merge branch 'dyf-device' into 6170
# Conflicts:
#	fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceShareController.java
2025-09-09 10:01:26 +08:00
f7a82ef138 设备操作记录 分页 2025-09-09 09:55:58 +08:00
91f787eec7 pageQuery 2025-09-08 17:37:01 +08:00
870f94b2d4 开始时间 2025-09-08 16:12:02 +08:00
395b2957c1 Merge remote-tracking branch 'origin/6170' into 6170 2025-09-06 16:19:35 +08:00
64a4485ced 设备分享 2025-09-06 16:19:12 +08:00
1e4ee840a3 Merge branch 'dyf-device' into 6170 2025-09-06 11:48:00 +08:00
374a03b83d 管理员 2025-09-06 11:46:13 +08:00
b945420446 离线状态变更3 2025-09-05 13:32:32 +08:00
c057af7cd0 离线状态变更2 2025-09-05 11:46:29 +08:00
452c37c4ca 离线状态变更 2025-09-04 18:40:08 +08:00
d5a9a92f9f feat(device): 新增设备控制相关接口
- 人员信息登记- 发送紧急通知
-上传设备 logo 图片
-静电预警档位设置- 照明档位设置- SOS 档位设置- 静止报警状态设置
2025-09-04 11:50:18 +08:00
429c0f1307 Merge branch 'dyf-device' into 6170 2025-09-04 11:29:55 +08:00
ff4db34e2a 型号字典用于APP页面跳转 2025-09-04 11:29:07 +08:00
377579dd14 Merge branch 'dyf-device' into 6170 2025-09-03 15:57:21 +08:00
00e345d5e5 Merge branch 'main' into dyf-device 2025-09-03 15:56:30 +08:00
98cb67b136 修改获取经纬度 2025-09-03 15:11:24 +08:00
d97928b38a 分配客户 接口注释 2025-09-03 09:45:17 +08:00
1d37bfb719 首页数据 2025-09-02 15:08:53 +08:00
98ef841f18 通讯方式 2025-09-02 10:32:17 +08:00