Commit Graph

106 Commits

Author SHA1 Message Date
lxj
a1f4f0a112 修改保洁订单字段问题 2025-06-26 17:33:17 +08:00
a585a1be26 Merge remote-tracking branch 'origin/master'
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m10s
2025-06-26 17:16:00 +08:00
3100f8f54d feat(sis):
- 新增设备管理功能
- 添加设备与门禁的关联关系处理
2025-06-26 17:15:43 +08:00
lxj
d624566f7a 增加单元表 和 房间表 2025-06-26 16:11:24 +08:00
lxj
5a3ed5dd23 处理物业模块报错的问题
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 6m51s
2025-06-26 12:28:46 +08:00
lxj
4ba65e1034 Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 5m31s
2025-06-25 18:24:46 +08:00
lxj
d1de4bf845 添加SisDevicePointServiceImpl 2025-06-25 18:22:08 +08:00
lxj
6b6968994d 删除dimp-wy-web 2025-06-25 18:20:44 +08:00
lxj
6452e85012 删除dimp-wy-web 2025-06-25 18:20:40 +08:00
44f102823c feat(sis): 凭证控制相关功能
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 10m8s
2025-06-25 18:08:08 +08:00
98bfc7835d Merge remote-tracking branch 'origin/master' 2025-06-25 18:06:11 +08:00
lxj
1fbef5386e Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 5m46s
# Conflicts:
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDevicePointVo.java
2025-06-25 18:04:41 +08:00
lxj
3fb9a76876 增加人像库 2025-06-25 18:04:09 +08:00
7903749a8d Merge remote-tracking branch 'origin/master' 2025-06-25 18:04:06 +08:00
ee1896e59b feat(sis): 凭证控制相关功能 2025-06-25 18:03:52 +08:00
759dd5a5af Merge remote-tracking branch 'origin/master'
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 11m20s
2025-06-25 17:51:13 +08:00
0aad306035 1、绿植租赁 2025-06-25 17:50:27 +08:00
dy
8f523d7b16 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-06-25 17:36:36 +08:00
dy
25774259b9 人员组管理实现 2025-06-25 17:36:25 +08:00
dy
2753a01842 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
# Conflicts:
#	ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties
2025-06-25 17:05:04 +08:00
42c615a187 feat(sis): 凭证控制相关功能 2025-06-25 17:04:13 +08:00
dy
f615486c55 区域组管理实现 2025-06-25 17:03:05 +08:00
d5981b0d4a feat(sis): 新增凭证控制相关功能
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m52s
- 新增发行凭证、批量发行凭证、操作凭证、换卡补卡、注销人员凭证等功能
- 实现凭证控制相关的API接口和控制器
2025-06-25 15:41:32 +08:00
bd3ab40be6 E8门禁业务
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m18s
2025-06-25 12:54:08 +08:00
lxj
84efbe0e11 E8门禁业务 2025-06-25 12:47:23 +08:00
lxj
6de67e1956 Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m7s
2025-06-25 12:22:51 +08:00
lxj
71ba316e91 增加门禁设备管理 2025-06-25 12:21:11 +08:00
5603edb1fc Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 9m7s
2025-06-25 11:40:34 +08:00
7e60d2a3cc 资产审批 2025-06-25 11:40:21 +08:00
lxj
d8d01b7d38 修改mapper 包名
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 8m15s
2025-06-25 10:25:15 +08:00
9b4fafeec2 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 8m6s
2025-06-25 09:26:39 +08:00
e5145002a4 asset模块 2025-06-25 09:26:28 +08:00
15683799673
27425e32af 1 增加人像库等操作
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 6m26s
2 修改包名称
2025-06-25 00:40:14 +08:00
15683799673
35cbd74b39 1 增加人像库等操作
2 修改包名称
2025-06-25 00:38:53 +08:00
15683799673
1a51f90731 E8服务合并到安放模块
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 6m49s
2025-06-24 22:06:47 +08:00
15683799673
0b5555ed65 E8服务合并到安放模块 2025-06-24 22:04:26 +08:00
9d4a58e0aa feat(E8Service): 新增门禁设备管理功能
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 6m48s
- 添加门禁设备相关实体类和请求/响应对象
- 实现门禁设备管理的接口和服务类
- 集成E8 API工具类,用于调用第三方接口- 新增查询、分页查询、添加、修改和删除门禁设备的方法
2025-06-24 21:24:25 +08:00
c85ec85b2d feat(E8Service): 新增门禁控制和人员信息管理功能- 添加 AccessControlController、AccessControlService 和 AccessControlServiceImpl 类实现门禁控制功能
- 新增 CustomerService 和 CustomerServiceImpl 类提供人员信息管理服务
- 创建相关请求和响应对象类,如 RemoteOpenDoorReq、AccessRecordFindRes等
- 添加 E8ApiUtil 工具类处理与第三方 API 的交互
- 新增 AreaTypeEnum 枚举类表示区域类型
2025-06-24 21:18:42 +08:00
lxj
d4927d2699 增加宇视AI盒子对接服务
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m18s
iot模块修改为智能安防模块
2025-06-24 21:09:01 +08:00
afbfc9d7fe 保洁订单状态,资产类型 2025-06-24 17:00:39 +08:00
dy
187690125c 会议室和访客管理模块 2025-06-23 10:02:35 +08:00
a55a001b75 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-06-23 09:29:31 +08:00
bfb4a7dfae 新增多个功能模块 2025-06-23 09:29:10 +08:00
71a351c14c feat(iot): 添加 E8门禁设备管理功能
- 新增 E8 门禁设备相关的数据模型和接口
- 实现 E8 门禁设备的添加、查询、修改和删除功能- 在门禁管理服务中集成 E8 门禁设备的添加逻辑
2025-06-20 17:50:04 +08:00
636b8d2f7e feat(iot): 添加 E8门禁设备管理功能
- 新增 E8 门禁设备相关的数据模型和接口
- 实现 E8 门禁设备的添加、查询、修改和删除功能- 在门禁管理服务中集成 E8 门禁设备的添加逻辑
2025-06-20 17:49:01 +08:00
lxj
d6903acf64 增加行政区划树接口 2025-06-19 18:26:41 +08:00
lxj
fabb2d8abc 增加行政区划树接口 2025-06-19 18:19:58 +08:00
17b028c6cd 物业部分代码 2025-06-19 09:49:57 +08:00
9e9047abf0 物业代码定版 2025-06-19 09:47:59 +08:00
15683799673
c514c8ecea 增加水表电表相关 2025-06-18 21:50:37 +08:00
15683799673
891289f682 增加水表电表相关 2025-06-18 21:48:54 +08:00
cb1054c1f8 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-06-18 16:52:34 +08:00
c43170cc87 物业代码 2025-06-18 16:51:52 +08:00
lxj
89ab720fdd 增加设备模块 2025-06-18 14:28:19 +08:00
86b20044c9 物业模块代码生成 2025-06-18 10:48:56 +08:00
71179324c8 init 2025-06-17 17:08:14 +08:00