 zhaokai
|
77e65e3af6
|
Merge branch 'dev_visual_page' into dev
|
2026-07-22 17:06:41 +08:00 |
|
zhaokai
|
3a8096859e
|
feat(web): 添加可视化大屏项目进行情况功能
|
2026-07-22 17:00:24 +08:00 |
|
zhaokai
|
ebfcec4419
|
Merge branch 'dev_visual_page' into dev
|
2026-07-22 11:26:03 +08:00 |
|
zhaokai
|
083f580bfd
|
feat(project): 添加可视化大屏部门统计功能并完善项目统计字段
|
2026-07-22 09:35:15 +08:00 |
|
zhaokai
|
c9e2a6667a
|
Merge branch 'dev_visual_page' into dev
|
2026-07-21 14:04:57 +08:00 |
|
zhaokai
|
375997f1df
|
feat(project): 添加可视化大屏重点作业功能
|
2026-07-21 14:04:36 +08:00 |
|
zhaokai
|
36ff847364
|
Merge branch 'dev_visual_page' into dev
# Conflicts:
# web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java
# web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java
# web-app/src/main/java/com/zcloud/key/project/service/project/KeyProjectServiceImpl.java
# web-client/src/main/java/com/zcloud/key/project/api/project/KeyProjectServiceI.java
# web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CameraInfoCO.java
# web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CameraInfoDO.java
# web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectCameraMapper.java
# web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectMapper.java
# web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectCameraRepositoryImpl.java
# web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectRepositoryImpl.java
# web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectCameraRepository.java
# web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectRepository.java
# web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml
# web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml
|
2026-07-21 14:00:05 +08:00 |
|
zhaokai
|
65385ecf18
|
feat(project): 添加可视化大屏重点作业功能
|
2026-07-21 13:54:44 +08:00 |
 lishiwei
|
5f3d891cef
|
feat(): 补充分支合并遗漏代码
|
2026-07-20 09:10:30 +08:00 |
|
zhaokai
|
650c67e97b
|
feat(project): 添加可视化大屏重点作业统计功能
|
2026-07-17 17:31:12 +08:00 |
|
zhaokai
|
8a4f371cf6
|
feat(project): 添加可视化大屏重点作业统计功能
|
2026-07-16 17:31:43 +08:00 |
|
lishiwei
|
e607c022ba
|
feat(): 添加处罚反馈中的被处罚人信息字段
|
2026-07-10 11:15:04 +08:00 |
|
lishiwei
|
fbe0d77f45
|
feat(): 添加安全环保检查和隐患模块申辩功能
|
2026-07-09 09:04:07 +08:00 |
|
lishiwei
|
73da9e4153
|
fix(): 修复隐患查询和关键项目统计相关问题
|
2026-07-02 09:06:35 +08:00 |
|
lishiwei
|
b64c1048a0
|
fix(): 修复关键项目摄像头计数逻辑并添加在线状态字段
|
2026-07-02 08:59:31 +08:00 |
|
lishiwei
|
5ad384e5b1
|
fix(): 修复隐患处罚功能中的重复处罚和数据查询问题
|
2026-06-26 10:10:58 +08:00 |
|
lishiwei
|
5f6f6ed9dc
|
feat(): 隐患处罚消息通知流程
|
2026-06-24 16:42:02 +08:00 |
|
lishiwei
|
8b4024c323
|
feat(): 添加处罚管理、处罚反馈待办数量统计
|
2026-06-23 13:37:15 +08:00 |
|
lishiwei
|
fd2c464a42
|
feat(): 添加隐患处罚功能和重点作业处罚人员配置
|
2026-06-22 17:49:18 +08:00 |
|
lishiwei
|
f85d98241d
|
feat(): 添加项目创建来源字段（手动创建/自动创建）
|
2026-06-12 10:30:56 +08:00 |
|
lishiwei
|
91b0f36ffb
|
feat(): 支持重点作业属性类型多选和开工申请驳回功能
|
2026-06-11 17:46:21 +08:00 |
|
lishiwei
|
3179f7f644
|
Revert "feat(): 添加摄像头类型查询全部功能"
This reverts commit b60b1ef91a.
|
2026-06-11 10:49:22 +08:00 |
|
lishiwei
|
864d139081
|
Reapply "feat(): 添加摄像头类型查询全部功能"
This reverts commit 7c503bd0de.
|
2026-06-11 10:48:05 +08:00 |
|
lishiwei
|
7c503bd0de
|
Revert "feat(): 添加摄像头类型查询全部功能"
This reverts commit b60b1ef91a.
|
2026-06-11 10:45:11 +08:00 |
|
lishiwei
|
b60b1ef91a
|
feat(): 添加摄像头类型查询全部功能
|
2026-06-11 10:35:59 +08:00 |
 tianxinlei
|
2d6f8b0c63
|
5-26 - fix
|
2026-05-26 11:11:53 +08:00 |
|
tianxinlei
|
94d8a48912
|
5-26 - fix
|
2026-05-26 10:21:47 +08:00 |
|
tianxinlei
|
9ee10340af
|
5-26 - KeyProjectCameraAiCO 增加 String algorithmId字段
|
2026-05-26 09:47:14 +08:00 |
|
tianxinlei
|
b2d48e94a0
|
5-25 - 作业算法配置列表增加处置人
|
2026-05-25 18:01:14 +08:00 |
|
tianxinlei
|
ffc0350a10
|
5-22
|
2026-05-22 15:44:05 +08:00 |
zhangyue
|
1284a61eaa
|
添加消息通知和统计功能
|
2026-05-21 14:27:45 +08:00 |
|
zhangyue
|
af28851a3a
|
添加安全环保检查查询功能增强
|
2026-05-20 08:52:39 +08:00 |
|
tianxinlei
|
018fb1e188
|
5-19 - 隐患表增加相关方相关字段 is_related/program_id/program_name；hidden/save接口相关增加字段：isRelated/programId/programName
|
2026-05-19 16:08:22 +08:00 |
|
tianxinlei
|
6f808fa9b2
|
5-15 - fix
|
2026-05-15 16:47:04 +08:00 |
|
tianxinlei
|
b61acd96e1
|
5-15 - fix
|
2026-05-15 14:15:35 +08:00 |
|
tianxinlei
|
c0567e18f2
|
5-14 - fix
|
2026-05-14 17:19:29 +08:00 |
|
tianxinlei
|
cd65c72f42
|
5-14 - fix
|
2026-05-14 15:27:08 +08:00 |
|
tianxinlei
|
1c5cee2be4
|
Merge remote-tracking branch 'origin/main'
|
2026-05-13 17:01:11 +08:00 |
|
tianxinlei
|
b538413d94
|
5-13 - fix
|
2026-05-13 17:00:26 +08:00 |
|
zhangyue
|
c96bc1dc0e
|
添加用户待办事项统计功能
|
2026-05-12 10:33:36 +08:00 |
|
zhaokai
|
add7230fd1
|
修改mapper
|
2026-04-29 13:57:14 +08:00 |
|
zhangyue
|
e8d2721188
|
完善隐患管理功能并新增菜单权限控制
|
2026-04-27 15:26:31 +08:00 |
|
zhangyue
|
320d648274
|
完善隐患管理功能并优化检查导出功能
|
2026-04-15 15:57:57 +08:00 |
|
zhangyue
|
125c3a626c
|
添加安全环保检查导出功能
|
2026-04-13 11:33:33 +08:00 |
|
zhangyue
|
ab7b7e0aad
|
添加AI告警批量处理功能并优化分页查询
|
2026-04-10 11:03:17 +08:00 |
|
zhangyue
|
b9f20a92a4
|
添加AI相关功能控制器和命令执行器
|
2026-04-10 08:48:25 +08:00 |
|
zhangyue
|
f62296ef2a
|
添加安全环保检查申辩详情查询和流程图功能
|
2026-04-02 16:33:24 +08:00 |
|
zhangyue
|
ad8633449a
|
添加隐患验收和整改功能
|
2026-04-01 11:49:37 +08:00 |
|
zhaokai
|
477a94eb85
|
修改mapper
|
2026-04-01 10:00:30 +08:00 |
|
zhaokai
|
90921a0da1
|
重点作业重点工程相关
|
2026-03-30 17:20:04 +08:00 |