|
|
ecaaf0cdc2
|
配置调整
|
2025-08-07 11:33:01 +08:00 |
|
|
|
b9582da9d9
|
Merge remote-tracking branch 'origin/mod_security' into mod_security
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java
|
2025-08-05 15:31:02 +08:00 |
|
|
|
0b0dfa754b
|
Merge branch 'uat' into mod_security
|
2025-08-05 15:23:20 +08:00 |
|
|
|
87ed00d464
|
SmartJavaAIOcr的bug修改
|
2025-08-05 15:19:57 +08:00 |
|
|
|
73a2fc37b2
|
SmartJavaAIOrc的bug修改
|
2025-08-05 15:18:40 +08:00 |
|
|
|
1fceef032c
|
安全检查绑定多选的责任单位和区域、复查人、核验人，隐患统计分析接口
|
2025-08-05 13:57:09 +08:00 |
|
|
|
098bb63b31
|
执法记录仪设备生成二维码保存格式改成devSn
|
2025-08-04 14:22:21 +08:00 |
|
|
|
6652fbeaa6
|
安全隐患检查字段设置和安全隐患复查核验人设置
|
2025-08-04 11:57:56 +08:00 |
|
|
|
369847e9d3
|
接入SmartJavaAIOrc
|
2025-08-04 11:34:57 +08:00 |
|
|
|
395d2a1617
|
Merge branch 'ocr' into uat
|
2025-08-04 09:30:06 +08:00 |
|
|
|
88a34da4bb
|
通知提示音信息bug修复
|
2025-08-02 09:16:03 +08:00 |
|
|
|
b05f69ebca
|
人脸设备对接
|
2025-07-31 11:07:51 +08:00 |
|
|
|
b256bf7729
|
ocr和施工日志bug修复
|
2025-07-30 15:45:16 +08:00 |
|
|
|
e7eef4e308
|
环境设备10分钟没有接收数据就离线，混凝土拌合站bug修复
|
2025-07-30 15:17:28 +08:00 |
|
|
|
ccf93552c0
|
短信配置
|
2025-07-29 18:17:51 +08:00 |
|
|
|
b178980110
|
ICC的数据校验
|
2025-07-29 10:03:02 +08:00 |
|
|
|
73370c8af0
|
ocr和施工日志bug修改
|
2025-07-25 18:20:39 +08:00 |
|
|
|
1b0fb0331b
|
ocr和施工日志
|
2025-07-25 18:07:45 +08:00 |
|
|
|
63eea7c798
|
icc修改bug
|
2025-07-25 15:53:37 +08:00 |
|
|
|
0f21141944
|
icc修改bug
|
2025-07-25 15:53:00 +08:00 |
|
|
|
abdb7e04c1
|
查询各个区域下在场人数优化
|
2025-07-25 15:08:42 +08:00 |
|
|
|
33b000f90c
|
map改成对象
|
2025-07-25 15:08:22 +08:00 |
|
|
|
8926a006da
|
map改成对象
|
2025-07-25 15:07:56 +08:00 |
|
|
|
d0a5adc391
|
mcs8的bug修改
|
2025-07-25 10:35:52 +08:00 |
|
|
|
fb963c2f56
|
mcs8的bug修改
|
2025-07-25 10:35:03 +08:00 |
|
|
|
321b5e41a1
|
Merge branch 'uat' into ocr
|
2025-07-25 09:51:08 +08:00 |
|
|
|
60a4832eef
|
icc的错误重试
|
2025-07-25 09:46:49 +08:00 |
|
|
|
3dee4efb53
|
Merge remote-tracking branch 'origin/uat' into uat
|
2025-07-24 18:31:01 +08:00 |
|
|
|
39415752dd
|
执法记录仪拉取时间更改
|
2025-07-24 18:30:43 +08:00 |
|
|
|
ac11217e31
|
删除多余字段
|
2025-07-24 11:03:05 +08:00 |
|
|
|
d187dfe6d8
|
删除多余字段
|
2025-07-24 10:59:01 +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 |
|
|
|
cd4c76a04d
|
mcs8修改bug
|
2025-07-24 10:04:54 +08:00 |
|
|
|
edcee38819
|
mcs8修改bug
|
2025-07-24 10:04:21 +08:00 |
|
|
|
db96864829
|
mcs8修改bug
|
2025-07-24 10:02:42 +08:00 |
|
|
|
87f312ee98
|
icc的对接bug修改
|
2025-07-24 09:44:58 +08:00 |
|
|
|
a2e184116d
|
icc的劳务人员，考勤最后是出场就删除在场记录，考勤最后是入场就更新在场时间
|
2025-07-23 18:06:33 +08:00 |
|
|
|
c5b1d70097
|
Merge branch 'xjw_attendance' into uat
# Conflicts:
# pom.xml
# src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java
# src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java
# src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml
# src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java
# src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java
# src/main/java/com/zhgd/xmgl/util/Fileutils.java
|
2025-07-23 15:02:15 +08:00 |
|
|
|
97c134b227
|
Merge branch 'xjw_attendance' into prod
|
2025-07-23 14:52:32 +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 |
|
|
|
19df573b88
|
管控bug修改
|
2025-07-17 16:02:12 +08:00 |
|
|
|
67855c9ce2
|
icc的劳务人员和考勤提交
|
2025-07-16 18:10:59 +08:00 |
|
|
|
a8b76fd788
|
icc的劳务人员同步提交
|
2025-07-16 14:27:44 +08:00 |
|
|
|
3212f171f5
|
定时2分钟获取人员定位标签报警数据任务bug修复
|
2025-07-16 11:41:01 +08:00 |
|
|
|
7dfee323ee
|
企业大屏配置和修改
|
2025-07-16 09:08:34 +08:00 |
|
|
|
896ff7ba47
|
icc提交
|
2025-07-15 11:20:42 +08:00 |
|
|
|
7e71847287
|
弹弓根据勾选设备进行下发
|
2025-07-14 15:08:27 +08:00 |
|
