390 Commits

Author SHA1 Message Date
8447b867f3 规则报警和异步线程池优化 2025-10-24 18:02:55 +08:00
13f7360162 各专业隐患小类风险走势图bug修复 2025-10-21 15:17:51 +08:00
84c3ff4542 机械设备导入导出 2025-10-10 17:21:10 +08:00
2227f942bf 规范添加安全检查记录信息时间 2025-10-10 17:00:19 +08:00
54851acfe2 删除安全检查记录信息优化 2025-10-10 15:16:43 +08:00
25f564b2b7 隐患工单派发生成隐患单去重 2025-10-10 13:59:13 +08:00
d617e8c499 machine_device提交 2025-09-30 17:13:05 +08:00
d99914d445 新危大工程 2025-09-26 16:13:33 +08:00
3ea38f4805 bug修复 2025-09-18 18:39:42 +08:00
46317684a3 桥机修复 2025-09-16 10:34:35 +08:00
b4f248d7a3 项目数据权限 2025-09-13 10:24:05 +08:00
8f7a2c206e bug修复 2025-09-05 11:29:57 +08:00
9656de38e7 修复mysql不支持09-31 2025-09-04 11:32:57 +08:00
bc25c79962 bug修复 2025-09-03 16:47:58 +08:00
e6deadd6fe bug修复 2025-09-02 17:04:35 +08:00
5b678c3ee1 bug修复和mysql批量替换值 2025-08-30 18:12:22 +08:00
a5cc7c8874 bug修复 2025-08-30 17:04:09 +08:00
cdd918d0ef bug修复 2025-08-28 16:49:47 +08:00
9474d49433 Merge branch 'mod_security' into prod 2025-08-27 18:23:11 +08:00
afdea2e5bb bug修复 2025-08-27 17:47:11 +08:00
27182d10cc 青海中水北方修改 2025-08-27 15:19:43 +08:00
38c35543a0 Merge branch 'mod_security' into prod 2025-08-26 21:23:12 +08:00
c9747cfbef bug修复 2025-08-26 19:29:39 +08:00
ffe6fe38a9 bug修复 2025-08-26 09:14:03 +08:00
686420e7d2 青海中水北方修改 2025-08-25 15:32:29 +08:00
ca6f3100e1 bug修复 2025-08-22 14:39:56 +08:00
5b4b8a811c Merge branch 'prod' into mod_security
# Conflicts:
#	src/main/java/com/zhgd/xmgl/modules/project/enums/ProjectUfaceConfigSupplierTypeEnum.java
#	src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerAttendanceController.java
#	src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceService.java
#	src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java
#	src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
#	src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionSyncService.java
#	src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java
#	src/main/java/com/zhgd/xmgl/task/WorkerTask.java
2025-08-21 18:56:44 +08:00
7a4acb5a45 智能安全帽人员每日工作统计相关和bug修改 2025-08-16 18:21:28 +08:00
af7fb5f8f9 修改bug 2025-08-15 09:04:14 +08:00
0cf0c64722 修改bug 2025-08-13 11:43:02 +08:00
58d316bcb9 安全修改bug 2025-08-08 18:34:14 +08:00
0dc7d79eaa 安全bug修复 2025-08-07 14:11:29 +08:00
d87e8aa639 安全隐患检查字段设置配置、隐患统计分析接口 2025-08-07 11:35:46 +08:00
1fceef032c 安全检查绑定多选的责任单位和区域、复查人、核验人,隐患统计分析接口 2025-08-05 13:57:09 +08:00
6652fbeaa6 安全隐患检查字段设置和安全隐患复查核验人设置 2025-08-04 11:57:56 +08:00
88a34da4bb 通知提示音信息bug修复 2025-08-02 09:16:03 +08:00
b05f69ebca 人脸设备对接 2025-07-31 11:07:51 +08:00
b178980110 ICC的数据校验 2025-07-29 10:03:02 +08:00
60a4832eef icc的错误重试 2025-07-25 09:46:49 +08:00
5641225773 Merge branch 'icc' into uat
# Conflicts:
#	src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java
#	src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
2025-07-24 10:35:10 +08:00
41d32bbda2 管控bug修改 2025-07-22 18:08:32 +08:00
6e0f08bfa9 人脸设备对接 2025-07-21 10:44:43 +08:00
c04d785c5f 管控bug修改 2025-07-21 10:42:03 +08:00
f394535531 icc的劳务人员对接修改 2025-07-19 11:04:52 +08:00
82cf215ab3 风险点、危险源、月度、隐患排查、排查执行
风险点、危险源、月度、隐患排查、排查执行
2025-06-13 18:28:46 +08:00
6a2706a31c 测试推送新git仓库 2025-05-29 17:10:36 +08:00
50532d993b 模拟数据生成 2025-05-29 09:13:04 +08:00
4a1f52465c 模拟数据生成 2025-05-28 09:57:12 +08:00
de02477417 木垒安全管理调整 2024-10-26 17:46:14 +08:00
bff0d84786 bug修复 2024-09-05 17:44:32 +08:00