|
|
b463e97d28
|
配置文件mqtt端口修改
|
2025-09-16 17:35:29 +08:00 |
|
|
|
e1b147b6be
|
Merge branch 'dyf-device' into 6170
|
2025-09-16 17:05:19 +08:00 |
|
|
|
23b48cfb06
|
设备告警
|
2025-09-16 17:04:45 +08:00 |
|
|
|
4106260e5f
|
在线状态修改优化4
|
2025-09-15 17:49:28 +08:00 |
|
|
|
07449e4a1e
|
查询围栏进出记录列表
|
2025-09-15 16:49:38 +08:00 |
|
|
|
b278a3087e
|
报警事项
|
2025-09-15 14:59:08 +08:00 |
|
|
|
dca5a6c48d
|
在线状态修改优化3
|
2025-09-15 09:43:15 +08:00 |
|
|
|
15b3348989
|
Merge branch 'dyf-device' into 6170
|
2025-09-15 09:41:56 +08:00 |
|
|
|
9fbb0aefcf
|
检查设备位置与围栏的关系
|
2025-09-15 09:41:10 +08:00 |
|
|
|
4004aa1090
|
在线状态修改优化2
|
2025-09-13 16:51:56 +08:00 |
|
|
|
39c8375f08
|
在线状态修改优化
|
2025-09-13 16:46:05 +08:00 |
|
|
|
64c81ac44e
|
在线状态修改2
|
2025-09-13 15:51:34 +08:00 |
|
|
|
41eb3d9a33
|
在线状态修改
|
2025-09-13 15:37:48 +08:00 |
|
|
|
8597dc5a9f
|
导出围栏进出记录列表
|
2025-09-12 14:50:42 +08:00 |
|
|
|
01a1a6e25b
|
查询围栏进出记录
|
2025-09-12 11:48:39 +08:00 |
|
|
|
1722f92328
|
电子围栏-位置检查
|
2025-09-12 09:04:47 +08:00 |
|
|
|
ee8840d657
|
Merge remote-tracking branch 'origin/6170' into 6170
|
2025-09-11 14:43:02 +08:00 |
|
|
|
9b84296419
|
Merge branch 'main' into dyf-device
|
2025-09-11 14:41:41 +08:00 |
|
|
|
d48c7b389e
|
Merge pull request 'jingquan' (#10) from liwenlong/fys-Multi-tenant:jingquan into main
Reviewed-on: #10
|
2025-09-11 14:40:23 +08:00 |
|
|
|
ccdc25595d
|
Merge remote-tracking branch 'origin/6170' into 6170
|
2025-09-11 14:38:06 +08:00 |
|
|
|
f1aad91421
|
修改绑定1
|
2025-09-11 14:37:40 +08:00 |
|
|
|
e2274bdf09
|
feat(web): 新增设备联调中心功能
- 新增设备联调中心相关控制器、服务、DTO和VO
- 实现设备列表查询、文件上传、操作视频添加、设备详情等功能
- 优化设备 logo 上传逻辑，支持批量上传
- 重构部分代码结构，提高可维护性
|
2025-09-11 11:07:58 +08:00 |
|
|
|
8a127b9d2d
|
Merge branch 'dyf-device' into 6170
|
2025-09-11 10:56:29 +08:00 |
|
|
|
b8af6b511c
|
电子围栏
|
2025-09-11 10:54:56 +08:00 |
|
|
|
6bc1d5b20b
|
绑定设备
|
2025-09-10 09:56:39 +08:00 |
|
|
|
228e26df7f
|
merge upstream
|
2025-09-09 17:23:23 +08:00 |
|
|
|
801b0267e6
|
设备分享3
|
2025-09-09 17:01:51 +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 |
|
|
|
1a2f35a092
|
Merge pull request 'jingquan' (#9) from liwenlong/fys-Multi-tenant:jingquan into main
Reviewed-on: #9
|
2025-09-03 15:55:27 +08:00 |
|
|
|
bdbbd5a12f
|
feat(equipment): 添加设备维修图片功能并优化维修记录相关接口- 新增 DeviceRepairImages 相关实体、Mapper 和 XML 文件- 重构 DeviceRepairRecords 相关接口和实现类，支持图片上传
- 新增 RepairImageType 枚举类
- 优化 DeviceRepairRecordsVo，增加图片列表和设备名称字段
|
2025-09-03 15:17:39 +08:00 |
|
