|
|
7773cae0ea
|
配置文件提交2
|
2025-09-05 10:52:53 +08:00 |
|
|
|
a8c9c631ad
|
Merge remote-tracking branch 'upstream/dyf-device' into main-dyf
|
2025-08-27 09:12:05 +08:00 |
|
|
|
8a7565459b
|
Merge branch '6170' of http://47.107.152.87:3000/dyf/fys-Multi-tenant into 6170
|
2025-08-27 09:09:20 +08:00 |
|
|
|
0bbac2b497
|
设备用户详情
|
2025-08-27 09:08:27 +08:00 |
|
|
|
364574eeae
|
web端控制中心3
|
2025-08-27 08:59:29 +08:00 |
|
|
|
4663a5560f
|
Merge remote-tracking branch 'upstream/dyf-device' into main-dyf
|
2025-08-25 14:32:19 +08:00 |
|
|
|
d962c6ead5
|
查询分享用户数
|
2025-08-25 10:19:57 +08:00 |
|
|
|
7607a0c9c0
|
Merge remote-tracking branch 'origin/6170' into 6170
# Conflicts:
# fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java
|
2025-08-23 16:40:42 +08:00 |
|
|
|
8811c30a97
|
web端控制中心2
|
2025-08-23 16:39:30 +08:00 |
|
|
|
95aa01e1c2
|
feat(device): 新增星汉设备控制功能
- 添加星汉设备控制器 AppDeviceXinghanController- 实现星汉设备业务逻辑 DeviceXinghanBizService
- 增加开机 LOGO 下发规则 XinghanBootLogoRule
- 添加设备发送消息规则 XinghanSendMsgRule
- 更新 MQTT 命令类型常量 XingHanCommandTypeConstants
- 修改设备状态 JSON 结构 MqttXinghanJson
|
2025-08-22 18:09:08 +08:00 |
|
|
|
fd7768acc9
|
Merge remote-tracking branch 'upstream/6170'
|
2025-08-20 16:45:49 +08:00 |
|
|
|
bb11bc4dfa
|
WEB端解绑设备
|
2025-08-20 15:13:43 +08:00 |
|
|
|
75756eb8ab
|
Merge remote-tracking branch 'upstream/6170'
# Conflicts:
# fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtilsTest.java
|
2025-08-19 14:11:02 +08:00 |
|
|
|
9a6bf05c4b
|
根据mac地址查询设备详情
|
2025-08-18 11:04:23 +08:00 |
|
|
|
b51e88052f
|
设备分享3
|
2025-08-16 16:40:58 +08:00 |
|
|
|
6d6db190b9
|
设备分享2
|
2025-08-16 11:30:06 +08:00 |
|
|
|
77542f5e76
|
commit
|
2025-08-15 09:32:54 +08:00 |
|
|
|
c587ef7389
|
解绑优化
|
2025-08-14 18:57:50 +08:00 |
|
|
|
9e24e3daaf
|
添加告警处理逻辑4
|
2025-08-14 17:38:07 +08:00 |
|
|
|
51741adc69
|
添加告警处理逻辑3
|
2025-08-14 16:25:14 +08:00 |
|
|
|
a189d0d0f9
|
添加告警处理逻辑
|
2025-08-14 15:07:58 +08:00 |
|
|
|
a3a1d43dde
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java
# fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppDeviceBindRecord.java
|
2025-08-01 09:06:03 +08:00 |
|
|
|
5f4b12a320
|
设备绑定优化
|
2025-08-01 09:00:32 +08:00 |
|
|
|
7bd652f9b8
|
Merge remote-tracking branch 'upstream/main'
|
2025-07-31 09:23:34 +08:00 |
|
|
|
5a23359112
|
WEB端解绑设备
|
2025-07-31 09:08:17 +08:00 |
|
|
|
ceeda046ea
|
WEB端解绑设备
|
2025-07-30 18:39:12 +08:00 |
|
|
|
f1806fa482
|
app用户登录
|
2025-07-24 14:49:40 +08:00 |
|
|
|
0abc5d48c0
|
Merge remote-tracking branch 'upstream/main'
|
2025-07-23 19:26:12 +08:00 |
|
|
|
f80debbf2b
|
登录问题修复
|
2025-07-23 15:51:25 +08:00 |
|
|
|
6ed1241a6d
|
Merge remote-tracking branch 'upstream/main'
# Conflicts:
# fys-modules/fys-app/src/main/resources/mapper/app/AppBusinessFileMapper.xml
|
2025-07-17 17:03:25 +08:00 |
|
|
|
082f890009
|
登录查询用户新增用户类型查询条件
|
2025-07-14 09:02:13 +08:00 |
|
|
|
800b825892
|
登录查询用户新增用户类型查询条件
|
2025-07-14 08:53:53 +08:00 |
|
|
|
c73a700210
|
app登录配置修改
|
2025-07-11 17:39:53 +08:00 |
|
|
|
3ed2f97752
|
app接口功能实现
|
2025-07-11 16:40:20 +08:00 |
|
|
|
1eb2502a21
|
revert 2815e27240
revert 晶全代码同步，app接口开发
|
2025-07-11 16:20:24 +08:00 |
|
|
|
2815e27240
|
晶全代码同步，app接口开发
|
2025-07-11 16:03:36 +08:00 |
|
|
|
abe9dc2fe8
|
分页查询客户
|
2025-07-03 10:08:09 +08:00 |
|
|
|
5917234ca8
|
新增客户
|
2025-07-02 17:53:53 +08:00 |
|
|
|
f78ba3199c
|
APP登录
|
2025-06-28 16:28:15 +08:00 |
|
|
|
b94549185c
|
fys
|
2025-06-27 10:23:57 +08:00 |
|
