|
|
2c2a30fd39
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
|
2025-11-05 18:26:55 +08:00 |
|
|
|
856a176426
|
执法记录仪的状态改成取isc的监控状态
|
2025-11-05 17:32:55 +08:00 |
|
|
|
702642e49b
|
高支模添加水平倾斜
|
2025-11-05 15:48:55 +08:00 |
|
|
|
c53b2fb77a
|
合并解决冲突或升级jdk17语法
|
2025-11-04 19:02:36 +08:00 |
|
|
|
eb2211c59a
|
权限改动
|
2025-11-04 18:48:37 +08:00 |
|
|
|
34677b8e07
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
# Conflicts:
# src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
# src/main/java/com/zhgd/xmgl/task/HighFormworkTask.java
# src/main/resources/application.properties
|
2025-11-04 17:10:58 +08:00 |
|
|
|
59680c77a3
|
批量移动执法记录仪设备
|
2025-11-04 16:34:42 +08:00 |
|
|
|
f46e10df30
|
分页列表查询执法记录仪设备列表信息增加状态筛选
|
2025-11-04 16:34:14 +08:00 |
|
|
|
f717d41732
|
mock添加临边防护-设备实时数据时候也添加报警数据和bug修复
|
2025-11-04 16:33:15 +08:00 |
|
|
|
9db2d419bd
|
监控状态更新频率改成10秒
|
2025-11-04 13:41:15 +08:00 |
|
|
|
ed4e521948
|
热加载日志
|
2025-11-04 11:49:46 +08:00 |
|
|
|
2a06c95f3b
|
济南拓兴添加高支模数据
|
2025-11-04 09:06:34 +08:00 |
|
|
|
6223e3fdd7
|
热加载日志
|
2025-11-04 09:04:31 +08:00 |
|
|
|
a3d7391c63
|
执法记录仪修改
|
2025-11-03 10:34:58 +08:00 |
|
|
|
fa9533a3ad
|
修改注解@Controller
|
2025-10-31 10:58:15 +08:00 |
|
|
|
6158e1cd5b
|
增加个删除所有缓存接口
|
2025-10-30 16:32:46 +08:00 |
|
|
|
498e52fedd
|
日志打印太多了改成debug
|
2025-10-30 16:16:18 +08:00 |
|
|
|
50144f36ac
|
10s定时更新执法仪设备状态
|
2025-10-29 16:49:28 +08:00 |
|
|
|
ee73faae33
|
30s定时更新执法仪设备状态
|
2025-10-29 16:43:59 +08:00 |
|
|
|
e092cde020
|
每月/日出勤/在职人数统计优化
|
2025-10-29 16:42:42 +08:00 |
|
|
|
c5ca758835
|
ai预警上传文件路径重复/修复
|
2025-10-29 10:26:17 +08:00 |
|
|
|
b23d4de36c
|
海康ai预警的事件码转int，可能大于int范围，需要截取后面9位
|
2025-10-28 15:25:57 +08:00 |
|
|
|
57fa0fcff7
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
|
2025-10-25 18:11:10 +08:00 |
|
|
|
d450a1f982
|
添加自定义大屏配置信息，添加修改规则
|
2025-10-25 18:08:11 +08:00 |
|
|
|
1629688cd4
|
合并解决冲突或升级jdk17语法
|
2025-10-25 17:14:20 +08:00 |
|
|
|
59339cc59e
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
# Conflicts:
# src/main/java/com/zhgd/xmgl/async/AsyncAiAnalyse.java
# src/main/java/com/zhgd/xmgl/modules/frontier/controller/FrontierProtectionDevAlarmController.java
# src/main/java/com/zhgd/xmgl/modules/frontier/service/IFrontierProtectionDevAlarmService.java
# src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevAlarmServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/project/service/impl/EnableMessageDevRuleServiceImpl.java
# src/main/java/com/zhgd/xmgl/task/MessageDevRuleTask.java
# src/main/java/com/zhgd/xmgl/task/VideoTask.java
|
2025-10-25 16:47:02 +08:00 |
|
|
|
74f9894f7c
|
规则报警和异步线程池优化2
|
2025-10-25 16:41:35 +08:00 |
|
|
|
f2b1bb62f7
|
规则报警和异步线程池优化
|
2025-10-24 17:56:25 +08:00 |
|
|
|
97f36b579d
|
视频监控在线状态改为3分钟更新一次
|
2025-10-23 17:44:30 +08:00 |
|
|
|
d8616fa68d
|
操作工作票优化
|
2025-10-23 17:37:07 +08:00 |
|
|
|
4dcd0596a2
|
拉取视频文件加上施工场站名称s
|
2025-10-23 16:21:26 +08:00 |
|
|
|
9da505964a
|
合并解决冲突或升级jdk17语法
|
2025-10-23 10:40:52 +08:00 |
|
|
|
f5060c81a1
|
登录null修复
|
2025-10-22 18:20:47 +08:00 |
|
|
|
76c7de5d3a
|
合并解决冲突或升级jdk17语法
|
2025-10-22 18:19:34 +08:00 |
|
|
|
44b04db1e9
|
登录null修复
|
2025-10-22 18:14:33 +08:00 |
|
|
|
dad273b0a4
|
临边防护app接口
|
2025-10-22 18:14:11 +08:00 |
|
|
|
afb8f322d6
|
执法记录仪不要从mcs8拉取视频类型的
|
2025-10-21 18:30:33 +08:00 |
|
|
|
5754bec261
|
各专业隐患小类风险走势图bug修复
|
2025-10-21 15:10:37 +08:00 |
|
|
|
a3a10e513a
|
天气appid更新
|
2025-10-21 14:51:01 +08:00 |
|
|
|
35434ada14
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
|
2025-10-20 18:22:53 +08:00 |
|
|
|
48454441f5
|
总企业加入省市区
|
2025-10-20 17:23:50 +08:00 |
|
|
|
5f506f5a38
|
AI识别修改
|
2025-10-20 17:10:17 +08:00 |
|
|
|
8b3594803e
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
|
2025-10-17 20:06:57 +08:00 |
|
|
|
f40cee4848
|
HikVideoUtil加上@Component
|
2025-10-17 20:05:52 +08:00 |
|
|
|
ac68011c81
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
|
2025-10-17 18:54:46 +08:00 |
|
|
|
328bc4b0d5
|
批量复制默认工种数据到某个项目bug修复
|
2025-10-17 18:54:29 +08:00 |
|
|
|
6199555729
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
|
2025-10-17 18:48:44 +08:00 |
|
|
|
76694a1b17
|
查询企业的树形项目和监控分组和监控列表和云端根据条件删除执法记录仪文件信息
|
2025-10-17 18:48:18 +08:00 |
|
|
|
8c228f1495
|
替换wss
|
2025-10-17 18:47:14 +08:00 |
|
|
|
32913ad718
|
工作票bug修复
|
2025-10-17 18:46:38 +08:00 |
|
