|
|
0b5791cd35
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
|
2025-11-10 18:25:41 +08:00 |
|
|
|
1e6b1af5e5
|
是否忽略员工打卡时的“进/出”方向标识和bug修复
|
2025-11-10 18:24:39 +08:00 |
|
|
|
47ba9ae7a6
|
去掉后门
|
2025-11-10 15:12:43 +08:00 |
|
|
|
fc70952695
|
查询企业的树形项目和监控分组和监控列表添加总数和在线视频监控数量
|
2025-11-08 09:15:53 +08:00 |
|
|
|
070206603d
|
Merge branch 'uat' into dunhuan_jdk8
# Conflicts:
# src/main/java/com/zhgd/xmgl/call/Mcs8Call.java
# src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraItemController.java
# src/main/java/com/zhgd/xmgl/modules/policecamera/service/IPoliceCameraItemService.java
# src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/PoliceCameraItemServiceImpl.java
# src/main/java/com/zhgd/xmgl/task/Mcs8Task.java
|
2025-11-07 16:42:46 +08:00 |
|
|
|
5429de0196
|
增加worker_month_attendance统计考勤时是否忽略员工打卡时的“进/出”方向标识，1忽略0不忽略
|
2025-11-07 16:12:43 +08:00 |
|
|
|
38342059c9
|
统计执法记录仪每日工作时长
|
2025-11-07 16:12:23 +08:00 |
|
|
|
5341bb4d94
|
更新天气key和secret
|
2025-11-07 11:27:11 +08:00 |
|
|
|
2e680cbf1d
|
执法记录仪设备列表增加默认码流类型：1、子码流，2、主码流，默认子码流
|
2025-11-07 11:26:43 +08:00 |
|
|
|
3a40fe8f36
|
ai报警企业版
|
2025-11-06 10:09:55 +08:00 |
|
|
|
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 |
|
|
|
06762a6e8a
|
优选多个提交
|
2025-11-04 16:51:41 +08:00 |
|
|
|
5ce08baa5e
|
修改注解@Controller
|
2025-11-04 16:47:33 +08:00 |
|
|
|
a0a4cc7577
|
增加个删除所有缓存接口
|
2025-11-04 16:47:31 +08:00 |
|
|
|
fe36de8bce
|
日志打印太多了改成debug
|
2025-11-04 16:47:29 +08:00 |
|
|
|
3a3f166006
|
10s定时更新执法仪设备状态
|
2025-11-04 16:47:28 +08:00 |
|
|
|
e581718c90
|
30s定时更新执法仪设备状态
|
2025-11-04 16:47:27 +08:00 |
|
|
|
2cb471c2a4
|
每月/日出勤/在职人数统计优化
|
2025-11-04 16:47:27 +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 |
|
|
|
d47a774e18
|
ai预警上传文件路径重复/修复
|
2025-10-29 10:26:30 +08:00 |
|
|
|
c5ca758835
|
ai预警上传文件路径重复/修复
|
2025-10-29 10:26:17 +08:00 |
|
|
|
01e4c53cee
|
海康ai预警的事件码转int，可能大于int范围，需要截取后面9位
|
2025-10-28 15:30:05 +08:00 |
|
|
|
b23d4de36c
|
海康ai预警的事件码转int，可能大于int范围，需要截取后面9位
|
2025-10-28 15:25:57 +08:00 |
|
|
|
84d76e5a20
|
增加桥梁长度(m)
|
2025-10-28 14:20:59 +08:00 |
|
|
|
57fa0fcff7
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
|
2025-10-25 18:11:10 +08:00 |
|
|
|
4a59060bdc
|
添加自定义大屏配置信息，添加修改规则
|
2025-10-25 18:08:59 +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 |
|
|
|
8d2e1a2e08
|
规则报警和异步线程池优化2
|
2025-10-25 16:44:39 +08:00 |
|
|
|
74f9894f7c
|
规则报警和异步线程池优化2
|
2025-10-25 16:41:35 +08:00 |
|
|
|
8447b867f3
|
规则报警和异步线程池优化
|
2025-10-24 18:02:55 +08:00 |
|
